xmlgraphics-fop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jerem...@apache.org
Subject svn commit: r326545 - in /xmlgraphics/fop/branches/Temp_SpaceResolution: src/java/org/apache/fop/layoutmgr/SpaceResolver.java src/java/org/apache/fop/layoutmgr/StaticContentLayoutManager.java test/layoutengine/testcases/region_side_space-resolution.xml
Date Wed, 19 Oct 2005 13:04:53 GMT
Author: jeremias
Date: Wed Oct 19 06:04:44 2005
New Revision: 326545

URL: http://svn.apache.org/viewcvs?rev=326545&view=rev
Log:
Space resolution bugfix: Space specifiers didn't collapse when there was not break in the
sequence.
Test case for space resolution in side regions. This test case showed me the above bug.

Added:
    xmlgraphics/fop/branches/Temp_SpaceResolution/test/layoutengine/testcases/region_side_space-resolution.xml
  (with props)
Modified:
    xmlgraphics/fop/branches/Temp_SpaceResolution/src/java/org/apache/fop/layoutmgr/SpaceResolver.java
    xmlgraphics/fop/branches/Temp_SpaceResolution/src/java/org/apache/fop/layoutmgr/StaticContentLayoutManager.java

Modified: xmlgraphics/fop/branches/Temp_SpaceResolution/src/java/org/apache/fop/layoutmgr/SpaceResolver.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/branches/Temp_SpaceResolution/src/java/org/apache/fop/layoutmgr/SpaceResolver.java?rev=326545&r1=326544&r2=326545&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_SpaceResolution/src/java/org/apache/fop/layoutmgr/SpaceResolver.java
(original)
+++ xmlgraphics/fop/branches/Temp_SpaceResolution/src/java/org/apache/fop/layoutmgr/SpaceResolver.java
Wed Oct 19 06:04:44 2005
@@ -359,8 +359,8 @@
         } else {
             if (isFirst || isLast) {
                 performSpaceResolutionRule1(secondPart, secondPartLengths);
-                performSpaceResolutionRules2to3(secondPart, secondPartLengths);
             }
+            performSpaceResolutionRules2to3(secondPart, secondPartLengths);
         }
     }
     

Modified: xmlgraphics/fop/branches/Temp_SpaceResolution/src/java/org/apache/fop/layoutmgr/StaticContentLayoutManager.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/branches/Temp_SpaceResolution/src/java/org/apache/fop/layoutmgr/StaticContentLayoutManager.java?rev=326545&r1=326544&r2=326545&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_SpaceResolution/src/java/org/apache/fop/layoutmgr/StaticContentLayoutManager.java
(original)
+++ xmlgraphics/fop/branches/Temp_SpaceResolution/src/java/org/apache/fop/layoutmgr/StaticContentLayoutManager.java
Wed Oct 19 06:04:44 2005
@@ -19,11 +19,13 @@
 package org.apache.fop.layoutmgr;
 
 import java.util.LinkedList;
+import java.util.List;
 import java.util.ListIterator;
 
 import org.apache.fop.area.RegionReference;
 import org.apache.fop.area.Area;
 import org.apache.fop.area.Block;
+import org.apache.fop.fo.pagination.PageSequence;
 import org.apache.fop.fo.pagination.SideRegion;
 import org.apache.fop.fo.pagination.StaticContent;
 import org.apache.fop.layoutmgr.inline.InlineLevelLayoutManager;
@@ -251,6 +253,16 @@
             this.displayAlign = displayAlign;
         }
 
+        /** @see org.apache.fop.layoutmgr.AbstractBreaker#observeElementList(java.util.List)
*/
+        protected void observeElementList(List elementList) {
+            String elementListID = getStaticContentFO().getFlowName();
+            String pageSequenceID = ((PageSequence)lm.getParent().getFObj()).getId();
+            if (pageSequenceID != null && pageSequenceID.length() > 0) {
+                elementListID += "-" + pageSequenceID;
+            }
+            ElementListObserver.observe(elementList, "static-content", elementListID);
+        }
+        
         /** @see org.apache.fop.layoutmgr.AbstractBreaker#isPartOverflowRecoveryActivated()
*/
         protected boolean isPartOverflowRecoveryActivated() {
             //For side regions, this must be disabled because of wanted overflow.

Added: xmlgraphics/fop/branches/Temp_SpaceResolution/test/layoutengine/testcases/region_side_space-resolution.xml
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/branches/Temp_SpaceResolution/test/layoutengine/testcases/region_side_space-resolution.xml?rev=326545&view=auto
==============================================================================
--- xmlgraphics/fop/branches/Temp_SpaceResolution/test/layoutengine/testcases/region_side_space-resolution.xml
(added)
+++ xmlgraphics/fop/branches/Temp_SpaceResolution/test/layoutengine/testcases/region_side_space-resolution.xml
Wed Oct 19 06:04:44 2005
@@ -0,0 +1,64 @@
+<?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 if space resolution works in side regions.
+    </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 margin-top="50pt"/>
+          <fo:region-before extent="50pt" background-color="yellow"/>
+        </fo:simple-page-master>
+      </fo:layout-master-set>
+      <fo:page-sequence master-reference="normal" white-space-collapse="true">
+        <fo:static-content flow-name="xsl-region-before">
+          <fo:block space-before="1em" space-after="1em">line 1</fo:block>
+          <fo:block space-before="1em" space-after="1em">line 2</fo:block>
+        </fo:static-content>
+        <fo:flow flow-name="xsl-region-body">
+          <fo:block>region-body</fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <element-list category="static-content" id="xsl-region-before">
+      <box w="0"/> <!-- SpaceHandlingPosition -->
+      <box w="14400"/>
+      
+      <box w="0"/>
+      <penalty w="0" p="INF"/>
+      <glue w="12000"/>
+      
+      <box w="14400"/>
+      
+      <box w="0"/> <!-- SpaceHandlingPosition -->
+      <box w="0"/>
+      <skip>3</skip>
+    </element-list>
+
+    <true xpath="not(boolean(//regionBefore/block[1]/@space-before))"/>
+    <true xpath="not(boolean(//regionBefore/block[1]/@space-after))"/>
+    <eval expected="12000" xpath="//regionBefore/block[2]/@space-before"/>
+    <true xpath="not(boolean(//regionBefore/block[2]/@space-after))"/>
+  </checks>
+</testcase>

Propchange: xmlgraphics/fop/branches/Temp_SpaceResolution/test/layoutengine/testcases/region_side_space-resolution.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: xmlgraphics/fop/branches/Temp_SpaceResolution/test/layoutengine/testcases/region_side_space-resolution.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