]> source.dussan.org Git - xmlgraphics-fop.git/commitdiff
Bugzilla #44412:
authorVincent Hennebert <vhennebert@apache.org>
Fri, 14 Mar 2008 12:19:45 +0000 (12:19 +0000)
committerVincent Hennebert <vhennebert@apache.org>
Fri, 14 Mar 2008 12:19:45 +0000 (12:19 +0000)
Bugfix: When there was a forced break after a block with (conditional) borders the border-after wasn't painted.
Changes made by Jeremias

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/fop-0_95@637075 13f79535-47bb-0310-9956-ffa450edef68

src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java
src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java
src/java/org/apache/fop/layoutmgr/LayoutContext.java
status.xml
test/layoutengine/standard-testcases/block-level_break-after_bug44412.xml [new file with mode: 0644]

index 435f25b487071c20c6951f60b53d33a26d94057e..5e5613898069212d54cefb99ffc798206938bef0 100644 (file)
@@ -386,6 +386,9 @@ public class BlockContainerLayoutManager extends BlockStackingLayoutManager
         }
         addKnuthElementsForBorderPaddingAfter(returnList, true);
         addKnuthElementsForSpaceAfter(returnList, alignment);
+
+        //All child content is processed. Only break-after can occur now, so...        
+        context.clearPendingMarks();
         addKnuthElementsForBreakAfter(returnList, context);
 
         setFinished(true);
index 541912a082ef9c0169ed9efc8fb6a662fbe5ff20..96e2c82fbc6c813a18eba384c1bf5370577de76d 100644 (file)
@@ -393,6 +393,9 @@ public abstract class BlockStackingLayoutManager extends AbstractLayoutManager
 
         addKnuthElementsForBorderPaddingAfter(returnList, true);
         addKnuthElementsForSpaceAfter(returnList, alignment);
+        
+        //All child content is processed. Only break-after can occur now, so...        
+        context.clearPendingMarks();
         if (forcedBreakAfterLast == null) {
             addKnuthElementsForBreakAfter(returnList, context);
         }
index a72fca9af54f9f5544af5a84f62f55761a7e96d8..79b5e232f87b50a28096335887e39554fee663cc 100644 (file)
@@ -285,12 +285,8 @@ public class LayoutContext {
      * Clears all pending marks on the LayoutContext.
      */
     public void clearPendingMarks() {
-        if (this.pendingBeforeMarks != null) {
-            this.pendingBeforeMarks.clear();
-        }
-        if (this.pendingAfterMarks != null) {
-            this.pendingAfterMarks.clear();
-        }
+        this.pendingBeforeMarks = null;
+        this.pendingAfterMarks = null;
     }
     
     /**
index 8a4fc3da99e95281a954a3bdb9eb4902bb92ef06..ac9d6a9cc7026ba59e3c046c86589e6e08f80192 100644 (file)
           </p>
         </section>
       </notes>
+      <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>
       <action context="Layout" dev="VH" type="fix">
         Bugfix: a forced break inside a cell was ignored when occurring before the minimum height
         set on the enclosing row was set.
diff --git a/test/layoutengine/standard-testcases/block-level_break-after_bug44412.xml b/test/layoutengine/standard-testcases/block-level_break-after_bug44412.xml
new file mode 100644 (file)
index 0000000..523d22c
--- /dev/null
@@ -0,0 +1,112 @@
+<?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 the border-after of an fo:block wasn't painted in
+      case break-after is present.
+    </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" break-before="column" break-after="column">A block with
+            borders and break-before and break-after.</fo:block>
+          <fo:block>After the block</fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+      <fo:page-sequence master-reference="page">
+        <fo:flow flow-name="xsl-region-body">
+          <fo:block-container id="bc1" border="4pt solid black" break-after="column">
+            <fo:block>A block-container with borders and break-after.</fo:block>
+          </fo:block-container>
+          <fo:block>After the block-container</fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+      <fo:page-sequence master-reference="page">
+        <fo:flow flow-name="xsl-region-body">
+          <fo:list-block id="lb1" border="4pt solid black" break-after="column">
+            <fo:list-item>
+              <fo:list-item-label end-indent="label-end()">
+                <fo:block>&#x2022;</fo:block>
+              </fo:list-item-label>
+              <fo:list-item-body>
+                <fo:block start-indent="body-start()">Blaaaaaah</fo:block>
+              </fo:list-item-body>
+            </fo:list-item>
+          </fo:list-block>
+          <fo:block>After the list-block</fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+      <fo:page-sequence master-reference="page">
+        <fo:flow flow-name="xsl-region-body">
+          <fo:list-block>
+            <fo:list-item id="li1" border="4pt solid black" break-after="column">
+              <fo:list-item-label end-indent="label-end()">
+                <fo:block>&#x2022;</fo:block>
+              </fo:list-item-label>
+              <fo:list-item-body>
+                <fo:block start-indent="body-start()">Blaaaaaah</fo:block>
+              </fo:list-item-body>
+            </fo:list-item>
+          </fo:list-block>
+          <fo:block>After the list-item</fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+      <fo:page-sequence master-reference="page">
+        <fo:flow flow-name="xsl-region-body">
+          <fo:table table-layout="fixed" width="100%" id="tbl1" border="4pt solid black" break-after="column">
+            <fo:table-column column-width="proportional-column-width(1)"/>
+            <fo:table-body>
+              <fo:table-row>
+                <fo:table-cell>
+                  <fo:block>Blaaaaah</fo:block>
+                </fo:table-cell>
+              </fo:table-row>
+            </fo:table-body>
+          </fo:table>
+          <fo:block>After the table</fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <eval expected="1" xpath="count(//block[@prod-id = 'b1'])"/>
+    <eval expected="4000 4000 4000 4000" xpath="//block[@prod-id = 'b1']/@bap"/>
+
+    <eval expected="2" xpath="count(//block[@prod-id = 'bc1'])"/> <!-- 2 because viewport/ref pair -->
+    <eval expected="4000 4000 4000 4000" xpath="//block[@prod-id = 'bc1'][1]/@bap"/>
+    
+    <eval expected="1" xpath="count(//block[@prod-id = 'lb1'])"/>
+    <eval expected="4000 4000 4000 4000" xpath="//block[@prod-id = 'lb1']/@bap"/>
+    
+    <eval expected="1" xpath="count(//block[@prod-id = 'li1'])"/>
+    <eval expected="4000 4000 4000 4000" xpath="//block[@prod-id = 'li1']/@bap"/>
+    
+    <eval expected="1" xpath="count(//block[@prod-id = 'tbl1'])"/>
+    <eval expected="4000 4000 4000 4000" xpath="//block[@prod-id = 'tbl1']/block[1]/@bap"/>
+  </checks>
+</testcase>