From 6f2c345eb1501735aff9bd787841ebce46ee0cb8 Mon Sep 17 00:00:00 2001 From: Jeremias Maerki Date: Fri, 11 Nov 2005 16:39:21 +0000 Subject: Bugzilla #37468: Bugfix: A normal break inside a table resulted in the next part to be sent to the next page instead of the next flow. TableContentLayoutManager produces KnuthPenalties with breakClass=0. git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@332594 13f79535-47bb-0310-9956-ffa450edef68 --- src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/java/org/apache/fop') diff --git a/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java b/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java index 6dbc997b3..fce0b4479 100644 --- a/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java +++ b/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java @@ -191,7 +191,8 @@ public class PageSequenceLayoutManager extends AbstractLayoutManager { needColumnBalancing = (childLC.getNextSpan() == Constants.EN_ALL); } if (needColumnBalancing) { - AbstractBreaker.log.debug("Column balancing necessary for the next element list!!!"); + AbstractBreaker.log.debug( + "Column balancing necessary for the next element list!!!"); } return nextSequenceStartsOn; } @@ -321,7 +322,8 @@ public class PageSequenceLayoutManager extends AbstractLayoutManager { } else { newStartPos = 0; } - AbstractBreaker.log.debug("Restarting at " + restartPoint + ", new start position: " + newStartPos); + AbstractBreaker.log.debug("Restarting at " + restartPoint + + ", new start position: " + newStartPos); //Handle page break right here to avoid any side-effects handleBreakTrait(EN_PAGE); @@ -623,7 +625,7 @@ public class PageSequenceLayoutManager extends AbstractLayoutManager { } else if (breakVal == Constants.EN_NONE) { curPV.createSpan(false); return; - } else if (breakVal == Constants.EN_COLUMN || breakVal == -1) { + } else if (breakVal == Constants.EN_COLUMN || breakVal <= 0) { if (curPV.getCurrentSpan().hasMoreFlows()) { curPV.getCurrentSpan().moveToNextFlow(); } else { -- cgit v1.2.3