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

4 files changed, 57 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);
diff --git a/status.xml b/status.xml
index 9f0b2ffc8..a698be982 100644
--- a/status.xml
+++ b/status.xml
@@ -27,6 +27,10 @@
 
   <changes>
     <release version="FOP Trunk">
+      <action context="Code" dev="JM" type="fix" fixes-bug="37964">
+        Bugfix: hard breaks with even-page or odd-page were not handled correctly
+        when spaces were surrounding the break.
+      </action>
       <action context="Code" dev="JM" type="update">
         Changed the XMLHandler interface so it doesn't report the MIME type it
         supports but instead can report whether it supports a particular Renderer
diff --git a/test/layoutengine/standard-testcases/block_break-before_bug37964.xml b/test/layoutengine/standard-testcases/block_break-before_bug37964.xml
new file mode 100644
index 000000000..dfcfdf8e4
--- /dev/null
+++ b/test/layoutengine/standard-testcases/block_break-before_bug37964.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright 2005 The Apache Software Foundation
+
+  Licensed 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 basic breaks, particularly Bugzilla #37964 where I break-before with a
+      "even-page" did not end up on an even page due to a bug in space-resolution.
+    </p>
+  </info>
+  <fo>
+    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+      <fo:layout-master-set>
+        <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">
+          <fo:region-body/>
+        </fo:simple-page-master>
+      </fo:layout-master-set>
+      <fo:page-sequence master-reference="normal" white-space-collapse="true">
+        <fo:flow flow-name="xsl-region-body">
+          <fo:block>line1</fo:block>
+          <fo:block space-after="5pt">line2</fo:block>
+          <fo:block break-before="odd-page">line3 break-before="odd-page"</fo:block>
+          <fo:block>line4</fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <eval expected="1" xpath="//lineArea[starts-with(., 'line1')]/ancestor::pageViewport/@nr"/>
+    <eval expected="1" xpath="//lineArea[starts-with(., 'line2')]/ancestor::pageViewport/@nr"/>
+    <eval expected="3" xpath="//lineArea[starts-with(., 'line3')]/ancestor::pageViewport/@nr"/>
+    <eval expected="3" xpath="//lineArea[starts-with(., 'line4')]/ancestor::pageViewport/@nr"/>
+  </checks>
+</testcase>