FOP-2945: Don't use change ipd on columns where it won't fit

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

3 files changed, 15 insertions, 8 deletions

diff --git a/fop-core/src/main/java/org/apache/fop/layoutmgr/AbstractBreaker.java b/fop-core/src/main/java/org/apache/fop/layoutmgr/AbstractBreaker.java
index 625b520ed..f6bf00253 100644
--- a/fop-core/src/main/java/org/apache/fop/layoutmgr/AbstractBreaker.java
+++ b/fop-core/src/main/java/org/apache/fop/layoutmgr/AbstractBreaker.java
@@ -412,7 +412,7 @@ public abstract class AbstractBreaker {
                 boolean ipdChangesOnNextPage = (alg.getIPDdifference() != 0);
                 boolean onLastPageAndIPDChanges = false;
                 if (!ipdChangesOnNextPage) {
-                    onLastPageAndIPDChanges = (lastPageHasIPDChange() && !thereIsANonRestartableLM(alg)
+                    onLastPageAndIPDChanges = (lastPageHasIPDChange(optimalPageCount) && !thereIsANonRestartableLM(alg)
                             && (shouldRedoLayout() || (wasLayoutRedone() && optimalPageCount > 1)));
                 }
                 if ((ipdChangesOnNextPage || hasMoreContent() || optimalPageCount > 1)
@@ -774,7 +774,7 @@ public abstract class AbstractBreaker {
         return false;
     }
 
-    protected boolean lastPageHasIPDChange() {
+    protected boolean lastPageHasIPDChange(int optimalPageCount) {
         return false;
     }
 
diff --git a/fop-core/src/main/java/org/apache/fop/layoutmgr/PageBreaker.java b/fop-core/src/main/java/org/apache/fop/layoutmgr/PageBreaker.java
index b325ffe0e..d6575e5f9 100644
--- a/fop-core/src/main/java/org/apache/fop/layoutmgr/PageBreaker.java
+++ b/fop-core/src/main/java/org/apache/fop/layoutmgr/PageBreaker.java
@@ -707,16 +707,18 @@ public class PageBreaker extends AbstractBreaker {
         return layoutRedone;
     }
 
-    protected boolean lastPageHasIPDChange() {
+    protected boolean lastPageHasIPDChange(int optimalPageCount) {
         boolean lastPageMasterDefined = pslm.getPageSequence().hasPagePositionLast();
         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) {
+                return false;
+            }
             int currentIPD = this.pageProvider.getCurrentIPD();
             int lastPageIPD = this.pageProvider.getLastPageIPD();
-            if (lastPageIPD != -1 && currentIPD != lastPageIPD) {
-                return true;
-            }
+            return lastPageIPD != -1 && currentIPD != lastPageIPD;
         }
         return false;
     }
diff --git a/fop-core/src/main/java/org/apache/fop/layoutmgr/PageProvider.java b/fop-core/src/main/java/org/apache/fop/layoutmgr/PageProvider.java
index a49620621..eda65b922 100644
--- a/fop-core/src/main/java/org/apache/fop/layoutmgr/PageProvider.java
+++ b/fop-core/src/main/java/org/apache/fop/layoutmgr/PageProvider.java
@@ -394,8 +394,13 @@ public class PageProvider implements Constants {
     }
 
     public int getCurrentIPD() {
-        return getPageFromColumnIndex(startColumnOfCurrentElementList).getPageViewport().getBodyRegion()
-                .getColumnIPD();
+        Page page = getPageFromColumnIndex(startColumnOfCurrentElementList);
+        return page.getPageViewport().getBodyRegion().getColumnIPD();
+    }
+
+    public int getCurrentColumnCount() {
+        Page page = getPageFromColumnIndex(startColumnOfCurrentElementList);
+        return page.getPageViewport().getCurrentSpan().getColumnCount();
     }
 
     /**