aboutsummaryrefslogtreecommitdiffstats
path: root/src/java/org/apache/fop/layoutmgr
diff options
context:
space:
mode:
authorJeremias Maerki <jeremias@apache.org>2005-07-11 07:20:42 +0000
committerJeremias Maerki <jeremias@apache.org>2005-07-11 07:20:42 +0000
commit01169d16ef99a7f8cd6dddc80e2635c81e0077b3 (patch)
treec202b90149652684b8306a0ac19c75bd5e88526b /src/java/org/apache/fop/layoutmgr
parent31af39e5bf4087f6f944b50c9263bf4402c0925f (diff)
downloadxmlgraphics-fop-01169d16ef99a7f8cd6dddc80e2635c81e0077b3.tar.gz
xmlgraphics-fop-01169d16ef99a7f8cd6dddc80e2635c81e0077b3.zip
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
Diffstat (limited to 'src/java/org/apache/fop/layoutmgr')
-rw-r--r--src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java9
1 files changed, 8 insertions, 1 deletions
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(),