Bugzilla #37813:

Fixed a bug that occurred if the first block was span="all". A page break was inserted in this situation, the first span was calculated as if it were span="none".
Code added to remove empty span areas. This is a lot easier and cleaner than trying not to instantiate the first span right from the beginning.

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@354752 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/java/org/apache/fop/area/MainReference.java b/src/java/org/apache/fop/area/MainReference.java
index 638008587236a1903b56e42e12469ea42063d817..bdba40f1edd7bc0abc7ec614fdd6fb65352fa7fe 100644 (file)
--- a/src/java/org/apache/fop/area/MainReference.java
+++ b/src/java/org/apache/fop/area/MainReference.java
@@ -51,6 +51,10 @@ public class MainReference extends Area {
      * @return the created span area.
      */
     public Span createSpan(boolean spanAll) {
+        if (spanAreas.size() > 0 && getCurrentSpan().getBPD() == 0) {
+            //Remove the current one if it is empty
+            spanAreas.remove(spanAreas.size() - 1);
+        }
         RegionViewport rv = parent.getRegionViewport();
         int ipdWidth = (int) parent.getIPD()
             - rv.getBorderAndPaddingWidthStart() - rv.getBorderAndPaddingWidthEnd();

diff --git a/src/java/org/apache/fop/layoutmgr/AbstractBreaker.java b/src/java/org/apache/fop/layoutmgr/AbstractBreaker.java
index fbac14f383a8b884d8f5288c642d3bed4b90fd31..83f3c3afb149a25c592e5537d0b3a3f77e9d1c39 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/AbstractBreaker.java
+++ b/src/java/org/apache/fop/layoutmgr/AbstractBreaker.java
@@ -439,6 +439,7 @@ public abstract class AbstractBreaker {
         BlockSequence blockList;
         if ((returnedList = getNextKnuthElements(childLC, alignment)) != null) {
             if (returnedList.size() == 0) {
+                nextSequenceStartsOn = handleSpanChange(childLC, nextSequenceStartsOn);
                 return nextSequenceStartsOn;
             }
             blockList = new BlockSequence(nextSequenceStartsOn);

diff --git a/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java b/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java
index fce0b4479b58365d16586e65ec934ea919a4c49a..9bc09c2f5b3e9e6d674986c5c0292c6887a3c92e 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java
@@ -29,6 +29,7 @@ import org.apache.fop.area.Footnote;
 import org.apache.fop.area.PageViewport;
 import org.apache.fop.area.LineArea;
 import org.apache.fop.area.Resolvable;
+import org.apache.fop.area.Span;
 
 import org.apache.fop.fo.Constants;
 import org.apache.fop.fo.flow.Marker;
@@ -326,7 +327,9 @@ public class PageSequenceLayoutManager extends AbstractLayoutManager {
                         + ", new start position: " + newStartPos);
 
                 //Handle page break right here to avoid any side-effects
-                handleBreakTrait(EN_PAGE);
+                if (newStartPos > 0) {
+                    handleBreakTrait(EN_PAGE);
+                }
                 pageBreakHandled = true;
                 //Update so the available BPD is reported correctly
                 pvProvider.setStartOfNextElementList(currentPageNum, 

diff --git a/status.xml b/status.xml
index f4b99d6abf26a74990182d7c9bfa5363c10bfeb3..1af95fffffb413ce8f6bafe8ec1ace4d2c5b71e8 100644 (file)
--- a/status.xml
+++ b/status.xml
@@ -27,6 +27,10 @@
 
   <changes>
     <release version="FOP Trunk">
+      <action context="Code" dev="JM" type="fix" fixes-bug="37813">
+        Bugfix: A span="all" on the first block cause a subsequent page break and the first block
+        didn't span all columns.
+      </action>
       <action context="Code" dev="JM" type="fix">
         Bugfix: Self-created OutputStreams in PNG Renderer were not properly closed.
       </action>

diff --git a/test/layoutengine/standard-testcases/region-body_column-count_bug37813.xml b/test/layoutengine/standard-testcases/region-body_column-count_bug37813.xml
new file mode 100644 (file)
index 0000000..82985e5
--- /dev/null
+++ b/test/layoutengine/standard-testcases/region-body_column-count_bug37813.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright 2005 The Apache Software Foundation
+
+  Licensed 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 multi-column documents. Checks a problem described in Bugzilla #37813.
+      A page break is performed after the first block which spans.
+    </p>
+  </info>
+  <fo>
+    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
+      <fo:layout-master-set>
+        <fo:simple-page-master master-name="normal" page-width="320pt" page-height="5in">
+          <fo:region-body column-count="3" column-gap="10pt"/>
+        </fo:simple-page-master>
+      </fo:layout-master-set>
+      <fo:page-sequence master-reference="normal">
+        <fo:flow flow-name="xsl-region-body">
+          <fo:block span="all">
+            <fo:block>This line is spanned over all columns.</fo:block>
+          </fo:block>
+          <fo:block>
+            <fo:block>line1</fo:block>
+            <fo:block>line2</fo:block>
+            <fo:block>line3</fo:block>
+            <fo:block>line4</fo:block>
+            <fo:block>line5</fo:block>
+            <fo:block>line6</fo:block>
+          </fo:block>
+          <fo:block span="all">
+            <fo:block>This line is spanned over all columns.</fo:block>
+          </fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <eval expected="1" xpath="count(//pageViewport)"/>
+    <eval expected="14400" xpath="//span[1]/@bpd"/>
+    <eval expected="28800" xpath="//span[2]/@bpd"/>
+    <eval expected="14400" xpath="//span[3]/@bpd"/>
+  </checks>
+</testcase>