From: Jeremias Maerki <jeremias@apache.org>
Date: Mon, 11 Jul 2005 07:20:42 +0000 (+0000)
Subject: Bugfix: Proper handling of page break between normally broken parts and the parts... 
X-Git-Tag: fop-0_90-alpha1~496
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=01169d16ef99a7f8cd6dddc80e2635c81e0077b3;p=xmlgraphics-fop.git

Bugfix: Proper handling of page break between normally broken parts and the parts that need to be balanced. (multi-column layout, fixes multi-column2a)

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 3622d0908..d8014787d 100644
--- 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(),