Author: matthias
Date: Mon Jul 13 18:08:19 2015
New Revision: 1690781
URL: http://svn.apache.org/r1690781
Log:
FOP-2498: Fix "last" page master usage with force-page-count=end-on-even/-odd
Added:
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/page-sequence-force-page-count-end-on-even.xml
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java?rev=1690781&r1=1690780&r2=1690781&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java
Mon Jul 13 18:08:19 2015
@@ -225,14 +225,22 @@ public class PageSequenceLayoutManager e
protected int getForcedLastPageNum(final int lastPageNum) {
int forcedLastPageNum = lastPageNum;
int relativeLastPage = lastPageNum - startPageNum + 1;
- if (relativeLastPage % 2 != 0
- && (getPageSequence().getForcePageCount() == Constants.EN_EVEN
- || getPageSequence().getForcePageCount() ==
Constants.EN_END_ON_EVEN)) {
- forcedLastPageNum++;
- } else if (relativeLastPage % 2 == 0 && (
- getPageSequence().getForcePageCount() == Constants.EN_ODD
- || getPageSequence().getForcePageCount() ==
Constants.EN_END_ON_ODD)) {
- forcedLastPageNum++;
+ if (getPageSequence().getForcePageCount() == Constants.EN_EVEN) {
+ if (relativeLastPage % 2 != 0) {
+ forcedLastPageNum++;
+ }
+ } else if (getPageSequence().getForcePageCount() == Constants.EN_ODD)
{
+ if (relativeLastPage % 2 == 0) {
+ forcedLastPageNum++;
+ }
+ } else if (getPageSequence().getForcePageCount() ==
Constants.EN_END_ON_EVEN) {
+ if (lastPageNum % 2 != 0) {
+ forcedLastPageNum++;
+ }
+ } else if (getPageSequence().getForcePageCount() ==
Constants.EN_END_ON_ODD) {
+ if (lastPageNum % 2 == 0) {
+ forcedLastPageNum++;
+ }
}
return forcedLastPageNum;
}
Added:
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/page-sequence-force-page-count-end-on-even.xml
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/page-sequence-force-page-count-end-on-even.xml?rev=1690781&view=auto
==============================================================================
---
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/page-sequence-force-page-count-end-on-even.xml
(added)
+++
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/page-sequence-force-page-count-end-on-even.xml
Mon Jul 13 18:08:19 2015
@@ -0,0 +1,77 @@
+<?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 checks that when force-page-count=end-on-even that the last simple-
+ page-master is used when a single page overflows to a second
+ page and the page count is forced to end-on-even.
+ </p>
+ </info>
+ <fo>
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format";>
+ <fo:layout-master-set>
+ <fo:simple-page-master margin="2cm" master-name="last"
page-height="297mm"
+ page-width="210mm">
+ <fo:region-body/>
+ <fo:region-after extent="22.5mm" region-name="after-last"/>
+ </fo:simple-page-master>
+ <fo:simple-page-master margin="2cm" master-name="any"
page-height="297mm"
+ page-width="210mm">
+ <fo:region-body/>
+ </fo:simple-page-master>
+ <fo:page-sequence-master master-name="master">
+ <fo:repeatable-page-master-alternatives>
+ <fo:conditional-page-master-reference master-reference="last"
odd-or-even="any"
+ page-position="last"/>
+ <fo:conditional-page-master-reference master-reference="any"
odd-or-even="any"
+ page-position="any"/>
+ </fo:repeatable-page-master-alternatives>
+ </fo:page-sequence-master>
+ </fo:layout-master-set>
+ <fo:page-sequence force-page-count="end-on-odd" master-reference="master">
+ <fo:static-content flow-name="after-last">
+ <fo:block-container background-color="rgb(209,211,212)"
height="22.5mm">
+ <fo:block>Last-Page-3</fo:block>
+ </fo:block-container>
+ </fo:static-content>
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block>Page 1</fo:block>
+ <fo:block break-before="page">Page 2</fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ <fo:page-sequence force-page-count="end-on-odd" master-reference="master">
+ <fo:static-content flow-name="after-last">
+ <fo:block-container background-color="rgb(209,211,212)"
height="22.5mm">
+ <fo:block>Last-Page-5</fo:block>
+ </fo:block-container>
+ </fo:static-content>
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block>Page-4</fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+</fo:root>
+
+ </fo>
+ <checks>
+ <eval expected="Last-Page-3"
xpath="(//pageViewport)[3]//regionAfter//word"/>
+ <eval expected="Last-Page-5"
xpath="(//pageViewport)[5]//regionAfter//word"/>
+ <eval expected="5" xpath="count(//pageViewport)"/>
+ </checks>
+</testcase>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
