FOP-2498: Fix "last" page master usage with force-page-count=end-on-even/-odd

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1690781 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 16 insertions, 8 deletions

diff --git a/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java b/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java
index 7d84a91ff..2e2bd0a22 100644
--- a/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java
@@ -225,14 +225,22 @@ public class PageSequenceLayoutManager extends AbstractPageSequenceLayoutManager
     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;
     }