From ce3ec60e0395a82e39a0fa270606e487ddc54916 Mon Sep 17 00:00:00 2001 From: Jeremias Maerki Date: Sun, 7 May 2006 12:21:56 +0000 Subject: [PATCH] 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 --- .../apache/fop/layoutmgr/AbstractBreaker.java | 3 +- .../layoutmgr/PageSequenceLayoutManager.java | 20 +++++- .../layoutmgr/list/ListItemLayoutManager.java | 2 +- .../fop/layoutmgr/table/TableStepper.java | 2 +- status.xml | 3 + .../region-body_column-count_span_3.xml | 68 +++++++++++++++++++ 6 files changed, 93 insertions(+), 5 deletions(-) create mode 100644 test/layoutengine/standard-testcases/region-body_column-count_span_3.xml 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 diff --git a/status.xml b/status.xml index d355d2289..f27e30a18 100644 --- a/status.xml +++ b/status.xml @@ -27,6 +27,9 @@ + + Bugfix: Sections with span="all" lead to overlapping text if spanning multiple pages. + Bugfix: Percentages in vertical-align property values were not correctly handled. diff --git a/test/layoutengine/standard-testcases/region-body_column-count_span_3.xml b/test/layoutengine/standard-testcases/region-body_column-count_span_3.xml new file mode 100644 index 000000000..b523a29b7 --- /dev/null +++ b/test/layoutengine/standard-testcases/region-body_column-count_span_3.xml @@ -0,0 +1,68 @@ + + + + + +

+ This test checks multi-column documents. Check that spanned section that are broken over + to multiple pages still respect the span setting. +

+ + + + + + + + + + + + This line is spanned over all columns. + This line is spanned over all columns. + This line is spanned over all columns. + This line is spanned over all columns. + This line is spanned over all columns. + This line is spanned over all columns. + This line is spanned over all columns. + This line is spanned over all columns. + This line is spanned over all columns. + This line is spanned over all columns. + This line is spanned over all columns. + This line is spanned over all columns. + This line is spanned over all columns. + This line is spanned over all columns. + This line is spanned over all columns. + This line is spanned over all columns. + This line is spanned over all columns. + This line is spanned over all columns. + This line is spanned over all columns. + This line is spanned over all columns. + + + + + + + + + + + + + + -- 2.39.5