Bugzilla #39443:

Bugfix: Sections with span="all" lead to overlapping text if spanning multiple pages.
Tables and list produced an illegal value for break class on normal breaks.

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

4 files changed, 22 insertions, 5 deletions

diff --git a/src/java/org/apache/fop/layoutmgr/AbstractBreaker.java b/src/java/org/apache/fop/layoutmgr/AbstractBreaker.java
index 0192008b9..55fb76ff2 100644
--- a/src/java/org/apache/fop/layoutmgr/AbstractBreaker.java
+++ b/src/java/org/apache/fop/layoutmgr/AbstractBreaker.java
@@ -372,7 +372,8 @@ public abstract class AbstractBreaker {
 
             log.debug("PLM> part: " + (p + 1)
                     + ", start at pos " + startElementIndex
-                    + ", break at pos " + endElementIndex);
+                    + ", break at pos " + endElementIndex
+                    + ", break class = " + lastBreakClass);
 
             startPart(effectiveList, lastBreakClass);
             
diff --git a/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java b/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java
index c3415aeb0..70a00bf6b 100644
--- a/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java
@@ -38,6 +38,7 @@ import org.apache.fop.fo.flow.RetrieveMarker;
 import org.apache.fop.fo.pagination.Flow;
 import org.apache.fop.fo.pagination.PageSequence;
 import org.apache.fop.fo.pagination.Region;
+import org.apache.fop.fo.pagination.RegionBody;
 import org.apache.fop.fo.pagination.SideRegion;
 import org.apache.fop.fo.pagination.SimplePageMaster;
 import org.apache.fop.fo.pagination.StaticContent;
@@ -773,8 +774,23 @@ public class PageSequenceLayoutManager extends AbstractLayoutManager {
             curPage.getPageViewport().createSpan(false);
             return;
         } else if (breakVal == Constants.EN_COLUMN || breakVal <= 0) {
-            if (curPage.getPageViewport().getCurrentSpan().hasMoreFlows()) {
-                curPage.getPageViewport().getCurrentSpan().moveToNextFlow();
+            PageViewport pv = curPage.getPageViewport();
+            
+            //Check if previous page was spanned
+            boolean forceNewPageWithSpan = false;
+            RegionBody rb = (RegionBody)curPage.getSimplePageMaster().getRegion(
+                    Constants.FO_REGION_BODY);
+            if (breakVal < 0 
+                    && rb.getColumnCount() > 1 
+                    && pv.getCurrentSpan().getColumnCount() == 1) {
+                forceNewPageWithSpan = true;
+            }
+            
+            if (forceNewPageWithSpan) {
+                curPage = makeNewPage(false, false);
+                curPage.getPageViewport().createSpan(true);
+            } else if (pv.getCurrentSpan().hasMoreFlows()) {
+                pv.getCurrentSpan().moveToNextFlow();
             } else {
                 curPage = makeNewPage(false, false);
             }
diff --git a/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java b/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java
index 7f3794bb6..4c7fedea7 100644
--- a/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java
@@ -300,7 +300,7 @@ public class ListItemLayoutManager extends BlockStackingLayoutManager
                     p = KnuthPenalty.INFINITE;
                 }
                 //returnList.add(new KnuthPenalty(penaltyHeight, p, false, stepPosition, false));
-                returnList.add(new BreakElement(stepPosition, penaltyHeight, p, 0, context));
+                returnList.add(new BreakElement(stepPosition, penaltyHeight, p, -1, context));
             }
         }
 
diff --git a/src/java/org/apache/fop/layoutmgr/table/TableStepper.java b/src/java/org/apache/fop/layoutmgr/table/TableStepper.java
index 554ae4069..03c04e188 100644
--- a/src/java/org/apache/fop/layoutmgr/table/TableStepper.java
+++ b/src/java/org/apache/fop/layoutmgr/table/TableStepper.java
@@ -359,7 +359,7 @@ public class TableStepper {
                 clearBreakCondition();
             }
             //returnList.add(new KnuthPenalty(effPenaltyLen, p, false, penaltyPos, false));
-            returnList.add(new BreakElement(penaltyPos, effPenaltyLen, p, 0, context));
+            returnList.add(new BreakElement(penaltyPos, effPenaltyLen, p, -1, context));
 
             log.debug("step=" + step + " (+" + increase + ")"
                     + " box=" + boxLen