xmlgraphics-fop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jerem...@apache.org
Subject svn commit: r357942 - in /xmlgraphics/fop/trunk: src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java src/java/org/apache/fop/layoutmgr/SpaceResolver.java status.xml test/layoutengine/standard-testcases/block_break-before_bug37964.xml
Date Tue, 20 Dec 2005 09:33:55 GMT
Author: jeremias
Date: Tue Dec 20 01:33:44 2005
New Revision: 357942

URL: http://svn.apache.org/viewcvs?rev=357942&view=rev
Log:
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.

Added:
    xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_break-before_bug37964.xml
  (with props)
Modified:
    xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/SpaceResolver.java
    xmlgraphics/fop/trunk/status.xml

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java?rev=357942&r1=357941&r2=357942&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
Tue Dec 20 01:33:44 2005
@@ -29,7 +29,6 @@
 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;

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/SpaceResolver.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/SpaceResolver.java?rev=357942&r1=357941&r2=357942&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/SpaceResolver.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/SpaceResolver.java Tue Dec 20
01:33:44 2005
@@ -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 @@
         glue2shrink -= glue3.opt - glue3.min;
         
         boolean hasPrecedingNonBlock = false;
+        boolean forcedBreak = false;
         if (log.isDebugEnabled()) {
             log.debug("noBreakLength=" + noBreakLength 
                     + ", glue1=" + glue1 
@@ -458,12 +457,10 @@
             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 @@
         /**
          * 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);

Modified: xmlgraphics/fop/trunk/status.xml
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/status.xml?rev=357942&r1=357941&r2=357942&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/status.xml (original)
+++ xmlgraphics/fop/trunk/status.xml Tue Dec 20 01:33:44 2005
@@ -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

Added: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_break-before_bug37964.xml
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_break-before_bug37964.xml?rev=357942&view=auto
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_break-before_bug37964.xml
(added)
+++ xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_break-before_bug37964.xml
Tue Dec 20 01:33:44 2005
@@ -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>

Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_break-before_bug37964.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_break-before_bug37964.xml
------------------------------------------------------------------------------
    svn:keywords = Id



---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org


Mime
View raw message