Bugfix: Proper handling of page break between normally broken parts and the parts...

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

diff --git a/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java b/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java
index 3622d0908360c1df84f67e7810878d1022821481..d8014787dd1f93ccf1e013ddb7f051102661484d 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java
@@ -317,7 +317,14 @@ public class PageSequenceLayoutManager extends AbstractLayoutManager {
                     newStartPos = 0;
                 }
                 log.debug("Restarting at " + restartPoint + ", new start position: " + newStartPos);
-                
+
+                //Handle page break right here to avoid any side-effects
+                handleBreakTrait(EN_PAGE);
+                pageBreakHandled = true;
+                //Update so the available BPD is reported correctly
+                pvProvider.setStartOfNextElementList(currentPageNum, 
+                        curPV.getCurrentSpan().getCurrentFlowIndex());
+
                 //Restart last page
                 PageBreakingAlgorithm algRestart = new BalancingColumnBreakingAlgorithm(
                         getTopLevelLM(),