Author: ssteiner
Date: Tue Jul 21 13:28:42 2020
New Revision: 1880106
URL: http://svn.apache.org/viewvc?rev=1880106&view=rev
Log:
FOP-2957: Don't change ipd on lastpage if column count changes
Added:
xmlgraphics/fop/trunk/fop/test/layoutengine/standard-testcases/flow_changing-ipd_last-page_17.xml
(with props)
Modified:
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/layoutmgr/PageBreaker.java
Modified:
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/layoutmgr/PageBreaker.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/layoutmgr/PageBreaker.java?rev=1880106&r1=1880105&r2=1880106&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/layoutmgr/PageBreaker.java
(original)
+++
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/layoutmgr/PageBreaker.java
Tue Jul 21 13:28:42 2020
@@ -68,6 +68,7 @@ public class PageBreaker extends Abstrac
private MinOptMax relayedFootnoteSeparatorLength;
private int previousFootnoteListIndex = -2;
private int previousFootnoteElementIndex = -2;
+ private int prevousColumnCount;
/**
* The FlowLayoutManager object, which processes
@@ -712,8 +713,10 @@ public class PageBreaker extends Abstrac
boolean onlyPageMasterDefined =
pslm.getPageSequence().hasPagePositionOnly();
if (lastPageMasterDefined && !onlyPageMasterDefined) {
// code not very robust and unable to handle situations were only
and last are defined
- if (pageProvider.getCurrentColumnCount() > 1
- && optimalPageCount % pageProvider.getCurrentColumnCount()
== 0) {
+ int currentColumnCount = pageProvider.getCurrentColumnCount();
+ boolean changeInColumnCount = prevousColumnCount > 0 &&
prevousColumnCount != currentColumnCount;
+ prevousColumnCount = currentColumnCount;
+ if ((currentColumnCount > 1 && optimalPageCount %
currentColumnCount == 0) || changeInColumnCount) {
return false;
}
int currentIPD = this.pageProvider.getCurrentIPD();
Added:
xmlgraphics/fop/trunk/fop/test/layoutengine/standard-testcases/flow_changing-ipd_last-page_17.xml
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop/test/layoutengine/standard-testcases/flow_changing-ipd_last-page_17.xml?rev=1880106&view=auto
==============================================================================
---
xmlgraphics/fop/trunk/fop/test/layoutengine/standard-testcases/flow_changing-ipd_last-page_17.xml
(added)
+++
xmlgraphics/fop/trunk/fop/test/layoutengine/standard-testcases/flow_changing-ipd_last-page_17.xml
Tue Jul 21 13:28:42 2020
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<!-- $Id$ -->
+<testcase>
+ <info>
+ <p>
+ This test checks that the definition of a special page-master for the
last page with a
+ different width that the previous "rest" page causes FOP to redo the
line breaking layout.
+ </p>
+ </info>
+ <fo>
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format";
xmlns:fox="http://xmlgraphics.apache.org/fop/extensions";>
+ <fo:layout-master-set>
+ <fo:simple-page-master margin="36pt" page-width="8.5in" page-height="11in"
master-name="PageFirst">
+ <fo:region-body margin-top="18pt" region-name="letterPageBody"/>
+ </fo:simple-page-master>
+ <fo:simple-page-master margin-top="0.25in" margin-right="0.25in"
margin-left="0.25in" margin-bottom="0.25in" page-width="8.5in"
master-name="RestPages" page-height="11in">
+ <fo:region-body margin-bottom="15pt" margin-top="39.6pt"
column-count="2" region-name="letterPageBody" background-color="yellow"/>
+ </fo:simple-page-master>
+ <fo:simple-page-master margin-right="0.25in" margin-left="0.25in"
margin-top="0.25in" margin-bottom="0.25in" page-width="8.5in"
master-name="PageLast" page-height="11in">
+ <fo:region-body margin-bottom="15pt" margin-top="39.6pt"
region-name="letterPageBody"/>
+ </fo:simple-page-master>
+ <fo:page-sequence-master master-name="LetterPages">
+ <fo:repeatable-page-master-alternatives>
+ <fo:conditional-page-master-reference page-position="first"
master-reference="PageFirst"/>
+ <fo:conditional-page-master-reference page-position="rest"
master-reference="PageLast" blank-or-not-blank="blank"/>
+ <fo:conditional-page-master-reference page-position="last"
master-reference="PageLast"/>
+ <fo:conditional-page-master-reference page-position="any"
master-reference="RestPages"/>
+ </fo:repeatable-page-master-alternatives>
+ </fo:page-sequence-master>
+ </fo:layout-master-set>
+ <fo:page-sequence format="1" id="th_default_sequence1"
initial-page-number="1" master-reference="LetterPages">
+ <fo:flow flow-name="letterPageBody">
+ <fo:block-container>
+ <fo:block>
+ <fo:block font-size="14pt" font-weight="bold">Important
Information</fo:block>
+ <fo:block line-height="0.001pt" page-break-after="always">
+ <fo:leader/>
+ </fo:block>
+ <fo:block font-size="14pt" font-weight="bold">CHANGES TO YOUR
MINIMUM MONTHLY PAYMENT</fo:block>
+ </fo:block>
+ </fo:block-container>
+ </fo:flow>
+ </fo:page-sequence>
+</fo:root>
+</fo>
+ <checks>
+ <eval expected="CHANGES"
xpath="//pageViewport[2]//lineArea[1]//text[1]/word[1]"/>
+ </checks>
+</testcase>
Propchange:
xmlgraphics/fop/trunk/fop/test/layoutengine/standard-testcases/flow_changing-ipd_last-page_17.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
xmlgraphics/fop/trunk/fop/test/layoutengine/standard-testcases/flow_changing-ipd_last-page_17.xml
------------------------------------------------------------------------------
svn:executable = *
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscr...@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-h...@xmlgraphics.apache.org
