Bugzilla #44412:

Bugfix: The before border of a block is no longer swallowed if its first child issues a break-before.

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

diff --git a/src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java b/src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java
index 96e2c82fbc6c813a18eba384c1bf5370577de76d..98606bd1f744e6f24c003dfd73a305845c7bb092 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java
@@ -294,15 +294,24 @@ public abstract class BlockStackingLayoutManager extends AbstractLayoutManager
             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;

diff --git a/status.xml b/status.xml
index ac9d6a9cc7026ba59e3c046c86589e6e08f80192..8864a8dc4007e6ea70449b4b96763da734daed6a 100644 (file)
--- a/status.xml
+++ b/status.xml
@@ -116,6 +116,10 @@
           </p>
         </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.

diff --git a/test/layoutengine/standard-testcases/block_break-before_bug44412.xml b/test/layoutengine/standard-testcases/block_break-before_bug44412.xml
new file mode 100644 (file)
index 0000000..9ef4150
--- /dev/null
+++ b/test/layoutengine/standard-testcases/block_break-before_bug44412.xml
@@ -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(//block[@prod-id = 'b1'])"/>
+    <eval expected="4000 4000 4000 0" xpath="(//block[@prod-id = 'b1'])[1]/@bap"/>
+    <eval expected="4000 4000 0 4000" xpath="(//block[@prod-id = 'b1'])[2]/@bap"/>
+    <eval expected="0" xpath="(//block[@prod-id = 'b1'])[1]/@bpd"/>
+    <eval expected="43200" xpath="(//block[@prod-id = '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>