Author: jeremias
Date: Fri Mar 14 07:41:03 2008
New Revision: 637119
URL: http://svn.apache.org/viewvc?rev=637119&view=rev
Log:
Bugzilla #44412:
Bugfix: The before border of a block is no longer swallowed if its first child
issues a break-before.
Added:
xmlgraphics/fop/branches/fop-0_95/test/layoutengine/standard-testcases/block_break-before_bug44412.xml
(with props)
Modified:
xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java
xmlgraphics/fop/branches/fop-0_95/status.xml
Modified:
xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java?rev=637119&r1=637118&r2=637119&view=diff
==============================================================================
---
xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java
(original)
+++
xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java
Fri Mar 14 07:41:03 2008
@@ -294,15 +294,24 @@
if (returnedList != null
&& returnedList.size() == 1
&& ((ListElement)
returnedList.getFirst()).isForcedBreak()) {
- // a descendant of this block has break-before
- contentList.addAll(returnedList);
if (curLM.isFinished() && !hasNextChildLM()) {
+ // a descendant of this block has break-before
+ contentList.addAll(returnedList);
+
forcedBreakAfterLast =
(BreakElement)contentList.removeLast();
context.clearPendingMarks();
break;
}
+ if (contentList.size() == 0) {
+ // Empty fo:block, zero-length box makes sure the IDs
and/or markers
+ // are registered and borders/padding are painted.
+ returnList.add(new KnuthBox(0, notifyPos(new
Position(this)), false));
+ }
+ // a descendant of this block has break-before
+ contentList.addAll(returnedList);
+
/* extension: conversione di tutta la sequenza fin'ora
ottenuta */
if (bpUnit > 0) {
storedList = contentList;
Modified: xmlgraphics/fop/branches/fop-0_95/status.xml
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/fop-0_95/status.xml?rev=637119&r1=637118&r2=637119&view=diff
==============================================================================
--- xmlgraphics/fop/branches/fop-0_95/status.xml (original)
+++ xmlgraphics/fop/branches/fop-0_95/status.xml Fri Mar 14 07:41:03 2008
@@ -117,6 +117,10 @@
</section>
</notes>
<action context="Layout" dev="JM" type="fix" fixes-bug="44412">
+ Bugfix: The before border of a block is no longer swallowed if its
first child issues
+ a break-before.
+ </action>
+ <action context="Layout" dev="JM" type="fix" fixes-bug="44412">
Bugfix: When there was a forced break after a block with (conditional)
borders the
border-after wasn't painted.
</action>
Added:
xmlgraphics/fop/branches/fop-0_95/test/layoutengine/standard-testcases/block_break-before_bug44412.xml
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/fop-0_95/test/layoutengine/standard-testcases/block_break-before_bug44412.xml?rev=637119&view=auto
==============================================================================
---
xmlgraphics/fop/branches/fop-0_95/test/layoutengine/standard-testcases/block_break-before_bug44412.xml
(added)
+++
xmlgraphics/fop/branches/fop-0_95/test/layoutengine/standard-testcases/block_break-before_bug44412.xml
Fri Mar 14 07:41:03 2008
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<!-- $Id$ -->
+<testcase>
+ <info>
+ <p>
+ This test checks Bugzilla #44412 where a break-before on the first child
of an otherwise
+ empty block is set. It is expected that the parent block creates two
areas, the first with
+ only border-before on the first page and zero bpd.
+ </p>
+ </info>
+ <fo>
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format";>
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="page" page-height="5in"
page-width="5in" margin="20pt">
+ <fo:region-body/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="page">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block>Before the block</fo:block>
+ <fo:block id="b1" border="4pt solid black">
+ <fo:block break-before="page">The break-before set on this block
causes the parent
+ block to produce an empty block area with only a border before
on the
+ first page.</fo:block>
+ </fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <eval expected="2" xpath="count(//[EMAIL PROTECTED] = 'b1'])"/>
+ <eval expected="4000 4000 4000 0" xpath="(//[EMAIL PROTECTED] =
'b1'])[1]/@bap"/>
+ <eval expected="4000 4000 0 4000" xpath="(//[EMAIL PROTECTED] =
'b1'])[2]/@bap"/>
+ <eval expected="0" xpath="(//[EMAIL PROTECTED] = 'b1'])[1]/@bpd"/>
+ <eval expected="43200" xpath="(//[EMAIL PROTECTED] = 'b1'])[2]/@bpd"/>
+
+ <element-list category="breaker" index="0">
+ <box w="14400"/>
+ <penalty w="0" p="0"/>
+ <box w="0" aux="true"/>
+ <penalty w="0" p="INF"/>
+ <glue w="4000"/> <!-- border-before -->
+ <box w="0"/> <!-- first block area of the "b1" block with zero bpd -->
+
+ <skip>3</skip>
+ </element-list>
+ </checks>
+</testcase>
Propchange:
xmlgraphics/fop/branches/fop-0_95/test/layoutengine/standard-testcases/block_break-before_bug44412.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
xmlgraphics/fop/branches/fop-0_95/test/layoutengine/standard-testcases/block_break-before_bug44412.xml
------------------------------------------------------------------------------
svn:keywords = Id
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
