Bugzilla #37964:

Hard breaks with even-page or odd-page were not handled correctly  when spaces were surrounding the break. The code that retrieves the break-class from the penalty assumes that the penalty is on the last element in the list, but the space resolution added additional glues after the penalty.

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

2 files changed, 5 insertions, 8 deletions

diff --git a/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java b/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java
index 59d331028..4e7b1af92 100644
--- a/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java
@@ -29,7 +29,6 @@ import org.apache.fop.area.Footnote;
 import org.apache.fop.area.PageViewport;
 import org.apache.fop.area.LineArea;
 import org.apache.fop.area.Resolvable;
-import org.apache.fop.area.Span;
 
 import org.apache.fop.fo.Constants;
 import org.apache.fop.fo.flow.Marker;
diff --git a/src/java/org/apache/fop/layoutmgr/SpaceResolver.java b/src/java/org/apache/fop/layoutmgr/SpaceResolver.java
index 583f8ffaa..a26763ac2 100644
--- a/src/java/org/apache/fop/layoutmgr/SpaceResolver.java
+++ b/src/java/org/apache/fop/layoutmgr/SpaceResolver.java
@@ -18,8 +18,6 @@
 
 package org.apache.fop.layoutmgr;
 
-import java.util.Arrays;
-import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.ListIterator;
@@ -442,6 +440,7 @@ public class SpaceResolver {
         glue2shrink -= glue3.opt - glue3.min;
         
         boolean hasPrecedingNonBlock = false;
+        boolean forcedBreak = false;
         if (log.isDebugEnabled()) {
             log.debug("noBreakLength=" + noBreakLength 
                     + ", glue1=" + glue1 
@@ -458,12 +457,10 @@ public class SpaceResolver {
             iter.add(new KnuthPenalty(breakPoss.getPenaltyWidth(), breakPoss.getPenaltyValue(), 
                     false, breakPoss.getBreakClass(), 
                     new SpaceHandlingBreakPosition(this, breakPoss), false));
-            //if (glue2.isNonZero()) {
+            if (breakPoss.getPenaltyValue() <= -KnuthPenalty.INFINITE) {
+                return; //return early. Not necessary (even wrong) to add additional elements
+            }
             if (glue2w != 0 || glue2stretch != 0 || glue2shrink != 0) {
-                /*
-                iter.add(new KnuthGlue(glue2.opt, glue2.max - glue2.opt, glue2.opt - glue2.min, 
-                        (Position)null, true));
-                        */
                 iter.add(new KnuthGlue(glue2w, glue2stretch, glue2shrink, 
                         (Position)null, true));
             }
@@ -504,6 +501,7 @@ public class SpaceResolver {
         /**
          * Main constructor.
          * @param resolver the space resolver that provides the info about the actual situation
+         * @param breakPoss the original break possibility that creates this Position 
          */
         public SpaceHandlingBreakPosition(SpaceResolver resolver, BreakElement breakPoss) {
             super(null);