You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by ss...@apache.org on 2015/06/05 15:57:58 UTC
svn commit: r1683758 - in /xmlgraphics/fop/trunk:
src/java/org/apache/fop/render/ test/layoutengine/standard-testcases/
Author: ssteiner
Date: Fri Jun 5 13:57:57 2015
New Revision: 1683758
URL: http://svn.apache.org/r1683758
Log:
FOP-2476: Tagged pdf: Tags are showing in the wrong order in the acrobat's pro order panel
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/AbstractRenderer.java
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/markers_1.xml
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/markers_2.xml
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/markers_3.xml
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/markers_5a.xml
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/markers_5b.xml
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/markers_5c.xml
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/markers_5d.xml
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/markers_7.xml
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/page-number-citation-last_page-sequence.xml
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/retrieve-table-marker_multicolumn.xml
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/simple-page-master_margin_region-body_margin_relative.xml
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_0_region-body_margin_relative.xml
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_0_writing-mode_rl_region-body_margin_relative.xml
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_180_region-body_margin_relative.xml
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_180_writing-mode_rl_region-body_margin_relative.xml
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_270_region-body_margin_relative.xml
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_270_writing-mode_rl_region-body_margin_relative.xml
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_90_region-body_margin_relative.xml
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_90_writing-mode_rl_region-body_margin_relative.xml
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/AbstractRenderer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/AbstractRenderer.java?rev=1683758&r1=1683757&r2=1683758&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/AbstractRenderer.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/AbstractRenderer.java Fri Jun 5 13:57:57 2015
@@ -265,15 +265,15 @@ public abstract class AbstractRenderer
if (viewport != null) {
renderRegionViewport(viewport);
}
- viewport = page.getRegionViewport(FO_REGION_END);
+ viewport = page.getRegionViewport(FO_REGION_BODY);
if (viewport != null) {
renderRegionViewport(viewport);
}
- viewport = page.getRegionViewport(FO_REGION_AFTER);
+ viewport = page.getRegionViewport(FO_REGION_END);
if (viewport != null) {
renderRegionViewport(viewport);
}
- viewport = page.getRegionViewport(FO_REGION_BODY);
+ viewport = page.getRegionViewport(FO_REGION_AFTER);
if (viewport != null) {
renderRegionViewport(viewport);
}
Modified: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/markers_1.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/markers_1.xml?rev=1683758&r1=1683757&r2=1683758&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/markers_1.xml (original)
+++ xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/markers_1.xml Fri Jun 5 13:57:57 2015
@@ -83,24 +83,24 @@
</fo>
<checks>
<!-- First check that the page breaking is correct -->
- <eval expected="block1" xpath="//pageViewport[1]/page/regionViewport[3]/regionBody/mainReference/span/flow/block[1]/block/block[1]/lineArea"/>
- <eval expected="block2" xpath="//pageViewport[1]/page/regionViewport[3]/regionBody/mainReference/span/flow/block[2]/block/block[1]/lineArea"/>
- <eval expected="block3" xpath="//pageViewport[1]/page/regionViewport[3]/regionBody/mainReference/span/flow/block[3]/block/block[1]/lineArea"/>
- <eval expected="block4" xpath="//pageViewport[1]/page/regionViewport[3]/regionBody/mainReference/span/flow/block[4]/block/block[1]/lineArea"/>
+ <eval expected="block1" xpath="//pageViewport[1]/page/regionViewport[2]/regionBody/mainReference/span/flow/block[1]/block/block[1]/lineArea"/>
+ <eval expected="block2" xpath="//pageViewport[1]/page/regionViewport[2]/regionBody/mainReference/span/flow/block[2]/block/block[1]/lineArea"/>
+ <eval expected="block3" xpath="//pageViewport[1]/page/regionViewport[2]/regionBody/mainReference/span/flow/block[3]/block/block[1]/lineArea"/>
+ <eval expected="block4" xpath="//pageViewport[1]/page/regionViewport[2]/regionBody/mainReference/span/flow/block[4]/block/block[1]/lineArea"/>
- <eval expected="block5" xpath="//pageViewport[2]/page/regionViewport[3]/regionBody/mainReference/span/flow/block[1]/block/block[1]/lineArea"/>
- <eval expected="block6" xpath="//pageViewport[2]/page/regionViewport[3]/regionBody/mainReference/span/flow/block[2]/block/block[1]/lineArea"/>
- <eval expected="block7" xpath="//pageViewport[2]/page/regionViewport[3]/regionBody/mainReference/span/flow/block[3]/block/block[1]/lineArea"/>
+ <eval expected="block5" xpath="//pageViewport[2]/page/regionViewport[2]/regionBody/mainReference/span/flow/block[1]/block/block[1]/lineArea"/>
+ <eval expected="block6" xpath="//pageViewport[2]/page/regionViewport[2]/regionBody/mainReference/span/flow/block[2]/block/block[1]/lineArea"/>
+ <eval expected="block7" xpath="//pageViewport[2]/page/regionViewport[2]/regionBody/mainReference/span/flow/block[3]/block/block[1]/lineArea"/>
<!-- Now we can check the markers -->
<eval expected="1" xpath="//pageViewport[1]/page/regionViewport[1]/regionBefore/block[1]/lineArea/text[2]"/> <!-- page number -->
<eval expected="block1" xpath="//pageViewport[1]/page/regionViewport[1]/regionBefore/block[2]/lineArea"/>
- <eval expected="block4" xpath="//pageViewport[1]/page/regionViewport[2]/regionAfter/block[1]/lineArea"/>
- <eval expected="block4" xpath="//pageViewport[1]/page/regionViewport[2]/regionAfter/block[2]/lineArea"/>
+ <eval expected="block4" xpath="//pageViewport[1]/page/regionViewport[3]/regionAfter/block[1]/lineArea"/>
+ <eval expected="block4" xpath="//pageViewport[1]/page/regionViewport[3]/regionAfter/block[2]/lineArea"/>
<eval expected="2" xpath="//pageViewport[2]/page/regionViewport[1]/regionBefore/block[1]/lineArea/text[2]"/> <!-- page number -->
<eval expected="block5" xpath="//pageViewport[2]/page/regionViewport[1]/regionBefore/block[2]/lineArea"/>
- <eval expected="block7" xpath="//pageViewport[2]/page/regionViewport[2]/regionAfter/block[1]/lineArea"/>
- <eval expected="block7" xpath="//pageViewport[2]/page/regionViewport[2]/regionAfter/block[2]/lineArea"/>
+ <eval expected="block7" xpath="//pageViewport[2]/page/regionViewport[3]/regionAfter/block[1]/lineArea"/>
+ <eval expected="block7" xpath="//pageViewport[2]/page/regionViewport[3]/regionAfter/block[2]/lineArea"/>
</checks>
</testcase>
Modified: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/markers_2.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/markers_2.xml?rev=1683758&r1=1683757&r2=1683758&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/markers_2.xml (original)
+++ xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/markers_2.xml Fri Jun 5 13:57:57 2015
@@ -98,29 +98,29 @@
</fo>
<checks>
<!-- First check that the page breaking is correct -->
- <eval expected="Part 1" xpath="//pageViewport[1]/page/regionViewport[3]/regionBody/mainReference/span/flow/block[1]/block[1]/lineArea"/>
- <eval expected="text1" xpath="//pageViewport[1]/page/regionViewport[3]/regionBody/mainReference/span/flow/block[1]/block[2]/lineArea"/>
- <eval expected="text1" xpath="//pageViewport[1]/page/regionViewport[3]/regionBody/mainReference/span/flow/block[1]/block[3]/lineArea"/>
+ <eval expected="Part 1" xpath="//pageViewport[1]/page/regionViewport[2]/regionBody/mainReference/span/flow/block[1]/block[1]/lineArea"/>
+ <eval expected="text1" xpath="//pageViewport[1]/page/regionViewport[2]/regionBody/mainReference/span/flow/block[1]/block[2]/lineArea"/>
+ <eval expected="text1" xpath="//pageViewport[1]/page/regionViewport[2]/regionBody/mainReference/span/flow/block[1]/block[3]/lineArea"/>
<!-- etc... -->
- <eval expected="text1" xpath="//pageViewport[2]/page/regionViewport[3]/regionBody/mainReference/span/flow/block[1]/block[1]/lineArea"/>
- <eval expected="Part 2" xpath="//pageViewport[2]/page/regionViewport[3]/regionBody/mainReference/span/flow/block[2]/block[1]/lineArea"/>
- <eval expected="text2" xpath="//pageViewport[2]/page/regionViewport[3]/regionBody/mainReference/span/flow/block[2]/block[2]/lineArea"/>
- <eval expected="text2" xpath="//pageViewport[2]/page/regionViewport[3]/regionBody/mainReference/span/flow/block[2]/block[3]/lineArea"/>
+ <eval expected="text1" xpath="//pageViewport[2]/page/regionViewport[2]/regionBody/mainReference/span/flow/block[1]/block[1]/lineArea"/>
+ <eval expected="Part 2" xpath="//pageViewport[2]/page/regionViewport[2]/regionBody/mainReference/span/flow/block[2]/block[1]/lineArea"/>
+ <eval expected="text2" xpath="//pageViewport[2]/page/regionViewport[2]/regionBody/mainReference/span/flow/block[2]/block[2]/lineArea"/>
+ <eval expected="text2" xpath="//pageViewport[2]/page/regionViewport[2]/regionBody/mainReference/span/flow/block[2]/block[3]/lineArea"/>
<!-- etc... -->
- <eval expected="Part 3" xpath="//pageViewport[2]/page/regionViewport[3]/regionBody/mainReference/span/flow/block[3]/block[1]/lineArea"/>
- <eval expected="text3" xpath="//pageViewport[3]/page/regionViewport[3]/regionBody/mainReference/span/flow/block[1]/block[1]/lineArea"/>
+ <eval expected="Part 3" xpath="//pageViewport[2]/page/regionViewport[2]/regionBody/mainReference/span/flow/block[3]/block[1]/lineArea"/>
+ <eval expected="text3" xpath="//pageViewport[3]/page/regionViewport[2]/regionBody/mainReference/span/flow/block[1]/block[1]/lineArea"/>
<!-- Now we can check the markers -->
- <eval expected="1" xpath="//pageViewport[1]/page/regionViewport[2]/regionEnd/block[1]/descendant::lineArea/text"/>
- <eval expected="" xpath="//pageViewport[1]/page/regionViewport[2]/regionEnd/block[2]/descendant::lineArea/text"/>
- <eval expected="" xpath="//pageViewport[1]/page/regionViewport[2]/regionEnd/block[3]/descendant::lineArea/text"/>
+ <eval expected="1" xpath="//pageViewport[1]/page/regionViewport[3]/regionEnd/block[1]/descendant::lineArea/text"/>
+ <eval expected="" xpath="//pageViewport[1]/page/regionViewport[3]/regionEnd/block[2]/descendant::lineArea/text"/>
+ <eval expected="" xpath="//pageViewport[1]/page/regionViewport[3]/regionEnd/block[3]/descendant::lineArea/text"/>
- <eval expected="1" xpath="//pageViewport[2]/page/regionViewport[2]/regionEnd/block[1]/descendant::lineArea/text"/>
- <eval expected="2" xpath="//pageViewport[2]/page/regionViewport[2]/regionEnd/block[2]/descendant::lineArea/text"/>
- <eval expected="3" xpath="//pageViewport[2]/page/regionViewport[2]/regionEnd/block[3]/descendant::lineArea/text"/>
+ <eval expected="1" xpath="//pageViewport[2]/page/regionViewport[3]/regionEnd/block[1]/descendant::lineArea/text"/>
+ <eval expected="2" xpath="//pageViewport[2]/page/regionViewport[3]/regionEnd/block[2]/descendant::lineArea/text"/>
+ <eval expected="3" xpath="//pageViewport[2]/page/regionViewport[3]/regionEnd/block[3]/descendant::lineArea/text"/>
- <eval expected="" xpath="//pageViewport[3]/page/regionViewport[2]/regionEnd/block[1]/descendant::lineArea/text"/>
- <eval expected="" xpath="//pageViewport[3]/page/regionViewport[2]/regionEnd/block[2]/descendant::lineArea/text"/>
- <eval expected="3" xpath="//pageViewport[3]/page/regionViewport[2]/regionEnd/block[3]/descendant::lineArea/text"/>
+ <eval expected="" xpath="//pageViewport[3]/page/regionViewport[3]/regionEnd/block[1]/descendant::lineArea/text"/>
+ <eval expected="" xpath="//pageViewport[3]/page/regionViewport[3]/regionEnd/block[2]/descendant::lineArea/text"/>
+ <eval expected="3" xpath="//pageViewport[3]/page/regionViewport[3]/regionEnd/block[3]/descendant::lineArea/text"/>
</checks>
</testcase>
Modified: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/markers_3.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/markers_3.xml?rev=1683758&r1=1683757&r2=1683758&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/markers_3.xml (original)
+++ xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/markers_3.xml Fri Jun 5 13:57:57 2015
@@ -113,10 +113,10 @@
</fo>
<checks>
<!-- First check that the page breaking is correct -->
- <eval expected="7" xpath="count(//pageSequence[1]/pageViewport[1]/page/regionViewport[3]/regionBody/mainReference/span/flow/block/block/lineArea)"/>
- <eval expected="1" xpath="count(//pageSequence[1]/pageViewport[2]/page/regionViewport[3]/regionBody/mainReference/span/flow/block/block/lineArea)"/>
- <eval expected="7" xpath="count(//pageSequence[2]/pageViewport[1]/page/regionViewport[3]/regionBody/mainReference/span/flow/block/block/lineArea)"/>
- <eval expected="2" xpath="count(//pageSequence[2]/pageViewport[2]/page/regionViewport[3]/regionBody/mainReference/span/flow/block/block/lineArea)"/>
+ <eval expected="7" xpath="count(//pageSequence[1]/pageViewport[1]/page/regionViewport[2]/regionBody/mainReference/span/flow/block/block/lineArea)"/>
+ <eval expected="1" xpath="count(//pageSequence[1]/pageViewport[2]/page/regionViewport[2]/regionBody/mainReference/span/flow/block/block/lineArea)"/>
+ <eval expected="7" xpath="count(//pageSequence[2]/pageViewport[1]/page/regionViewport[2]/regionBody/mainReference/span/flow/block/block/lineArea)"/>
+ <eval expected="2" xpath="count(//pageSequence[2]/pageViewport[2]/page/regionViewport[2]/regionBody/mainReference/span/flow/block/block/lineArea)"/>
<!-- Now we can check the markers -->
<true xpath="boolean(//pageSequence[1]/pageViewport[1]/page/regionViewport[1]/regionBefore/block[2]/lineArea/text[. = '[PAGE]'])"/>
Modified: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/markers_5a.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/markers_5a.xml?rev=1683758&r1=1683757&r2=1683758&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/markers_5a.xml (original)
+++ xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/markers_5a.xml Fri Jun 5 13:57:57 2015
@@ -83,16 +83,16 @@
<checks>
<!-- page 1 -->
<eval expected="0.00" xpath="//pageViewport[1]/page/regionViewport[1]/regionBefore/block[2]/lineArea"/>
- <eval expected="4.00" xpath="//pageViewport[1]/page/regionViewport[2]/regionAfter/block[1]/lineArea"/>
- <eval expected="1: 1.00" xpath="//pageViewport[1]/page/regionViewport[3]/regionBody/mainReference/span/flow/block[1]/lineArea"/>
- <eval expected="2: 1.00" xpath="//pageViewport[1]/page/regionViewport[3]/regionBody/mainReference/span/flow/block[2]/lineArea"/>
- <eval expected="3: 1.00" xpath="//pageViewport[1]/page/regionViewport[3]/regionBody/mainReference/span/flow/block[3]/lineArea"/>
- <eval expected="4: 1.00" xpath="//pageViewport[1]/page/regionViewport[3]/regionBody/mainReference/span/flow/block[4]/lineArea"/>
+ <eval expected="4.00" xpath="//pageViewport[1]/page/regionViewport[3]/regionAfter/block[1]/lineArea"/>
+ <eval expected="1: 1.00" xpath="//pageViewport[1]/page/regionViewport[2]/regionBody/mainReference/span/flow/block[1]/lineArea"/>
+ <eval expected="2: 1.00" xpath="//pageViewport[1]/page/regionViewport[2]/regionBody/mainReference/span/flow/block[2]/lineArea"/>
+ <eval expected="3: 1.00" xpath="//pageViewport[1]/page/regionViewport[2]/regionBody/mainReference/span/flow/block[3]/lineArea"/>
+ <eval expected="4: 1.00" xpath="//pageViewport[1]/page/regionViewport[2]/regionBody/mainReference/span/flow/block[4]/lineArea"/>
<!-- page 2 -->
<eval expected="4.00" xpath="//pageViewport[2]/page/regionViewport[1]/regionBefore/block[2]/lineArea"/>
- <eval expected="6.00" xpath="//pageViewport[2]/page/regionViewport[2]/regionAfter/block[1]/lineArea"/>
- <eval expected="5: 1.00" xpath="//pageViewport[2]/page/regionViewport[3]/regionBody/mainReference/span/flow/block[1]/lineArea"/>
- <eval expected="6: 1.00" xpath="//pageViewport[2]/page/regionViewport[3]/regionBody/mainReference/span/flow/block[2]/lineArea"/>
+ <eval expected="6.00" xpath="//pageViewport[2]/page/regionViewport[3]/regionAfter/block[1]/lineArea"/>
+ <eval expected="5: 1.00" xpath="//pageViewport[2]/page/regionViewport[2]/regionBody/mainReference/span/flow/block[1]/lineArea"/>
+ <eval expected="6: 1.00" xpath="//pageViewport[2]/page/regionViewport[2]/regionBody/mainReference/span/flow/block[2]/lineArea"/>
</checks>
</testcase>
Modified: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/markers_5b.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/markers_5b.xml?rev=1683758&r1=1683757&r2=1683758&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/markers_5b.xml (original)
+++ xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/markers_5b.xml Fri Jun 5 13:57:57 2015
@@ -145,16 +145,16 @@
<checks>
<!-- page 1 -->
<eval expected="0.00" xpath="//pageViewport[1]/page/regionViewport[1]/regionBefore/block[2]/lineArea"/>
- <eval expected="4.00" xpath="//pageViewport[1]/page/regionViewport[2]/regionAfter/block[1]/lineArea"/>
- <eval expected="1" xpath="//pageViewport[1]/page/regionViewport[3]/regionBody/mainReference/span/flow/block[1]/block[1]/block[1]/lineArea"/>
- <eval expected="2" xpath="//pageViewport[1]/page/regionViewport[3]/regionBody/mainReference/span/flow/block[1]/block[4]/block[1]/lineArea"/>
- <eval expected="3" xpath="//pageViewport[1]/page/regionViewport[3]/regionBody/mainReference/span/flow/block[1]/block[7]/block[1]/lineArea"/>
- <eval expected="4" xpath="//pageViewport[1]/page/regionViewport[3]/regionBody/mainReference/span/flow/block[1]/block[10]/block[1]/lineArea"/>
+ <eval expected="4.00" xpath="//pageViewport[1]/page/regionViewport[3]/regionAfter/block[1]/lineArea"/>
+ <eval expected="1" xpath="//pageViewport[1]/page/regionViewport[2]/regionBody/mainReference/span/flow/block[1]/block[1]/block[1]/lineArea"/>
+ <eval expected="2" xpath="//pageViewport[1]/page/regionViewport[2]/regionBody/mainReference/span/flow/block[1]/block[4]/block[1]/lineArea"/>
+ <eval expected="3" xpath="//pageViewport[1]/page/regionViewport[2]/regionBody/mainReference/span/flow/block[1]/block[7]/block[1]/lineArea"/>
+ <eval expected="4" xpath="//pageViewport[1]/page/regionViewport[2]/regionBody/mainReference/span/flow/block[1]/block[10]/block[1]/lineArea"/>
<!-- page 2 -->
<eval expected="4.00" xpath="//pageViewport[2]/page/regionViewport[1]/regionBefore/block[2]/lineArea"/>
- <eval expected="6.00" xpath="//pageViewport[2]/page/regionViewport[2]/regionAfter/block[1]/lineArea"/>
- <eval expected="5" xpath="//pageViewport[2]/page/regionViewport[3]/regionBody/mainReference/span/flow/block[1]/block[1]/block[1]/lineArea"/>
- <eval expected="6" xpath="//pageViewport[2]/page/regionViewport[3]/regionBody/mainReference/span/flow/block[1]/block[4]/block[1]/lineArea"/>
+ <eval expected="6.00" xpath="//pageViewport[2]/page/regionViewport[3]/regionAfter/block[1]/lineArea"/>
+ <eval expected="5" xpath="//pageViewport[2]/page/regionViewport[2]/regionBody/mainReference/span/flow/block[1]/block[1]/block[1]/lineArea"/>
+ <eval expected="6" xpath="//pageViewport[2]/page/regionViewport[2]/regionBody/mainReference/span/flow/block[1]/block[4]/block[1]/lineArea"/>
</checks>
</testcase>
Modified: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/markers_5c.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/markers_5c.xml?rev=1683758&r1=1683757&r2=1683758&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/markers_5c.xml (original)
+++ xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/markers_5c.xml Fri Jun 5 13:57:57 2015
@@ -83,15 +83,15 @@
<checks>
<!-- page 1 -->
<eval expected="0.00" xpath="//pageViewport[1]/page/regionViewport[1]/regionBefore/block[2]/lineArea"/>
- <eval expected="3.00" xpath="//pageViewport[1]/page/regionViewport[2]/regionAfter/block[1]/lineArea"/>
- <eval expected="1: 1.00" xpath="//pageViewport[1]/page/regionViewport[3]/regionBody/mainReference/span/flow/block[1]/lineArea"/>
- <eval expected="2: 1.00" xpath="//pageViewport[1]/page/regionViewport[3]/regionBody/mainReference/span/flow/block[2]/lineArea"/>
- <eval expected="3: 1.00" xpath="//pageViewport[1]/page/regionViewport[3]/regionBody/mainReference/span/flow/block[3]/lineArea"/>
+ <eval expected="3.00" xpath="//pageViewport[1]/page/regionViewport[3]/regionAfter/block[1]/lineArea"/>
+ <eval expected="1: 1.00" xpath="//pageViewport[1]/page/regionViewport[2]/regionBody/mainReference/span/flow/block[1]/lineArea"/>
+ <eval expected="2: 1.00" xpath="//pageViewport[1]/page/regionViewport[2]/regionBody/mainReference/span/flow/block[2]/lineArea"/>
+ <eval expected="3: 1.00" xpath="//pageViewport[1]/page/regionViewport[2]/regionBody/mainReference/span/flow/block[3]/lineArea"/>
<!-- page 2 -->
<eval expected="3.00" xpath="//pageViewport[2]/page/regionViewport[1]/regionBefore/block[2]/lineArea"/>
- <eval expected="6.00" xpath="//pageViewport[2]/page/regionViewport[2]/regionAfter/block[1]/lineArea"/>
- <eval expected="5: 1.00" xpath="//pageViewport[2]/page/regionViewport[3]/regionBody/mainReference/span/flow/block[2]/lineArea"/>
- <eval expected="6: 1.00" xpath="//pageViewport[2]/page/regionViewport[3]/regionBody/mainReference/span/flow/block[3]/lineArea"/>
+ <eval expected="6.00" xpath="//pageViewport[2]/page/regionViewport[3]/regionAfter/block[1]/lineArea"/>
+ <eval expected="5: 1.00" xpath="//pageViewport[2]/page/regionViewport[2]/regionBody/mainReference/span/flow/block[2]/lineArea"/>
+ <eval expected="6: 1.00" xpath="//pageViewport[2]/page/regionViewport[2]/regionBody/mainReference/span/flow/block[3]/lineArea"/>
</checks>
</testcase>
Modified: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/markers_5d.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/markers_5d.xml?rev=1683758&r1=1683757&r2=1683758&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/markers_5d.xml (original)
+++ xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/markers_5d.xml Fri Jun 5 13:57:57 2015
@@ -126,16 +126,16 @@
<checks>
<!-- page 1 -->
<eval expected="0.00" xpath="//pageViewport[1]/page/regionViewport[1]/regionBefore/block[2]/lineArea"/>
- <eval expected="4.00" xpath="//pageViewport[1]/page/regionViewport[2]/regionAfter/block[1]/lineArea"/>
- <eval expected="1" xpath="//pageViewport[1]/page/regionViewport[3]/regionBody/mainReference/span/flow/block[1]/block[1]/block[1]/lineArea"/>
- <eval expected="2" xpath="//pageViewport[1]/page/regionViewport[3]/regionBody/mainReference/span/flow/block[1]/block[3]/block[1]/lineArea"/>
- <eval expected="3" xpath="//pageViewport[1]/page/regionViewport[3]/regionBody/mainReference/span/flow/block[1]/block[5]/block[1]/lineArea"/>
- <eval expected="4" xpath="//pageViewport[1]/page/regionViewport[3]/regionBody/mainReference/span/flow/block[1]/block[7]/block[1]/lineArea"/>
+ <eval expected="4.00" xpath="//pageViewport[1]/page/regionViewport[3]/regionAfter/block[1]/lineArea"/>
+ <eval expected="1" xpath="//pageViewport[1]/page/regionViewport[2]/regionBody/mainReference/span/flow/block[1]/block[1]/block[1]/lineArea"/>
+ <eval expected="2" xpath="//pageViewport[1]/page/regionViewport[2]/regionBody/mainReference/span/flow/block[1]/block[3]/block[1]/lineArea"/>
+ <eval expected="3" xpath="//pageViewport[1]/page/regionViewport[2]/regionBody/mainReference/span/flow/block[1]/block[5]/block[1]/lineArea"/>
+ <eval expected="4" xpath="//pageViewport[1]/page/regionViewport[2]/regionBody/mainReference/span/flow/block[1]/block[7]/block[1]/lineArea"/>
<!-- page 2 -->
<eval expected="4.00" xpath="//pageViewport[2]/page/regionViewport[1]/regionBefore/block[2]/lineArea"/>
- <eval expected="6.00" xpath="//pageViewport[2]/page/regionViewport[2]/regionAfter/block[1]/lineArea"/>
- <eval expected="5" xpath="//pageViewport[2]/page/regionViewport[3]/regionBody/mainReference/span/flow/block[1]/block[1]/block[1]/lineArea"/>
- <eval expected="6" xpath="//pageViewport[2]/page/regionViewport[3]/regionBody/mainReference/span/flow/block[1]/block[3]/block[1]/lineArea"/>
+ <eval expected="6.00" xpath="//pageViewport[2]/page/regionViewport[3]/regionAfter/block[1]/lineArea"/>
+ <eval expected="5" xpath="//pageViewport[2]/page/regionViewport[2]/regionBody/mainReference/span/flow/block[1]/block[1]/block[1]/lineArea"/>
+ <eval expected="6" xpath="//pageViewport[2]/page/regionViewport[2]/regionBody/mainReference/span/flow/block[1]/block[3]/block[1]/lineArea"/>
</checks>
</testcase>
Modified: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/markers_7.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/markers_7.xml?rev=1683758&r1=1683757&r2=1683758&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/markers_7.xml (original)
+++ xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/markers_7.xml Fri Jun 5 13:57:57 2015
@@ -309,33 +309,33 @@
<checks>
<!-- fo:flow -->
<eval expected="fo:flow" xpath="//pageViewport[@nr=1]/page/regionViewport[1]/regionBefore/block[1]/lineArea"/>
- <eval expected="fo:flow" xpath="//pageViewport[@nr=1]/page/regionViewport[2]/regionAfter/block[1]/lineArea"/>
+ <eval expected="fo:flow" xpath="//pageViewport[@nr=1]/page/regionViewport[3]/regionAfter/block[1]/lineArea"/>
<!-- fo:block -->
<eval expected="fo:block" xpath="//pageViewport[@nr=2]/page/regionViewport[1]/regionBefore/block[1]/lineArea"/>
- <eval expected="fo:block" xpath="//pageViewport[@nr=2]/page/regionViewport[2]/regionAfter/block[1]/lineArea"/>
+ <eval expected="fo:block" xpath="//pageViewport[@nr=2]/page/regionViewport[3]/regionAfter/block[1]/lineArea"/>
<!-- fo:block-container -->
<eval expected="fo:block-container" xpath="//pageViewport[@nr=3]/page/regionViewport[1]/regionBefore/block[1]/lineArea"/>
- <eval expected="fo:block-container" xpath="//pageViewport[@nr=3]/page/regionViewport[2]/regionAfter/block[1]/lineArea"/>
+ <eval expected="fo:block-container" xpath="//pageViewport[@nr=3]/page/regionViewport[3]/regionAfter/block[1]/lineArea"/>
<!-- fo:table -->
<eval expected="fo:table" xpath="//pageViewport[@nr=4]/page/regionViewport[1]/regionBefore/block[1]/lineArea"/>
- <eval expected="fo:table" xpath="//pageViewport[@nr=4]/page/regionViewport[2]/regionAfter/block[1]/lineArea"/>
+ <eval expected="fo:table" xpath="//pageViewport[@nr=4]/page/regionViewport[3]/regionAfter/block[1]/lineArea"/>
<!-- fo:table-body -->
<eval expected="fo:table-body" xpath="//pageViewport[@nr=5]/page/regionViewport[1]/regionBefore/block[1]/lineArea"/>
- <eval expected="fo:table-body" xpath="//pageViewport[@nr=5]/page/regionViewport[2]/regionAfter/block[1]/lineArea"/>
+ <eval expected="fo:table-body" xpath="//pageViewport[@nr=5]/page/regionViewport[3]/regionAfter/block[1]/lineArea"/>
<!-- fo:table-header -->
<eval expected="fo:table-header" xpath="//pageViewport[@nr=6]/page/regionViewport[1]/regionBefore/block[1]/lineArea"/>
- <eval expected="fo:table-header" xpath="//pageViewport[@nr=6]/page/regionViewport[2]/regionAfter/block[1]/lineArea"/>
+ <eval expected="fo:table-header" xpath="//pageViewport[@nr=6]/page/regionViewport[3]/regionAfter/block[1]/lineArea"/>
<!-- fo:table-footer -->
<eval expected="fo:table-footer" xpath="//pageViewport[@nr=7]/page/regionViewport[1]/regionBefore/block[1]/lineArea"/>
- <eval expected="fo:table-footer" xpath="//pageViewport[@nr=7]/page/regionViewport[2]/regionAfter/block[1]/lineArea"/>
+ <eval expected="fo:table-footer" xpath="//pageViewport[@nr=7]/page/regionViewport[3]/regionAfter/block[1]/lineArea"/>
<!-- fo:table-cell -->
<eval expected="fo:table-cell" xpath="//pageViewport[@nr=8]/page/regionViewport[1]/regionBefore/block[1]/lineArea"/>
- <eval expected="fo:table-cell" xpath="//pageViewport[@nr=8]/page/regionViewport[2]/regionAfter/block[1]/lineArea"/>
+ <eval expected="fo:table-cell" xpath="//pageViewport[@nr=8]/page/regionViewport[3]/regionAfter/block[1]/lineArea"/>
<!-- fo:list-block -->
<eval expected="fo:list-block" xpath="//pageViewport[@nr=9]/page/regionViewport[1]/regionBefore/block[1]/lineArea"/>
- <eval expected="fo:list-block" xpath="//pageViewport[@nr=9]/page/regionViewport[2]/regionAfter/block[1]/lineArea"/>
+ <eval expected="fo:list-block" xpath="//pageViewport[@nr=9]/page/regionViewport[3]/regionAfter/block[1]/lineArea"/>
<!-- fo:list-item -->
<eval expected="fo:list-item" xpath="//pageViewport[@nr=10]/page/regionViewport[1]/regionBefore/block[1]/lineArea"/>
- <eval expected="fo:list-item" xpath="//pageViewport[@nr=10]/page/regionViewport[2]/regionAfter/block[1]/lineArea"/>
+ <eval expected="fo:list-item" xpath="//pageViewport[@nr=10]/page/regionViewport[3]/regionAfter/block[1]/lineArea"/>
</checks>
</testcase>
Modified: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/page-number-citation-last_page-sequence.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/page-number-citation-last_page-sequence.xml?rev=1683758&r1=1683757&r2=1683758&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/page-number-citation-last_page-sequence.xml (original)
+++ xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/page-number-citation-last_page-sequence.xml Fri Jun 5 13:57:57 2015
@@ -128,14 +128,14 @@
<eval expected="4" xpath="count(//pageSequence[1]/pageViewport)"/>
<eval expected="4" xpath="count(//pageSequence[2]/pageViewport)"/>
- <eval expected="page 1 of 4" xpath="//pageSequence[1]/pageViewport[@nr=1]/page/regionViewport[1]/regionAfter/block[2]/lineArea"/>
- <eval expected="page 2 of 4" xpath="//pageSequence[1]/pageViewport[@nr=2]/page/regionViewport[1]/regionAfter/block[2]/lineArea"/>
- <eval expected="page 3 of 4" xpath="//pageSequence[1]/pageViewport[@nr=3]/page/regionViewport[1]/regionAfter/block[2]/lineArea"/>
- <eval expected="page 4 of 4" xpath="//pageSequence[1]/pageViewport[@nr=4]/page/regionViewport[1]/regionAfter/block[2]/lineArea"/>
+ <eval expected="page 1 of 4" xpath="//pageSequence[1]/pageViewport[@nr=1]/page/regionViewport[2]/regionAfter/block[2]/lineArea"/>
+ <eval expected="page 2 of 4" xpath="//pageSequence[1]/pageViewport[@nr=2]/page/regionViewport[2]/regionAfter/block[2]/lineArea"/>
+ <eval expected="page 3 of 4" xpath="//pageSequence[1]/pageViewport[@nr=3]/page/regionViewport[2]/regionAfter/block[2]/lineArea"/>
+ <eval expected="page 4 of 4" xpath="//pageSequence[1]/pageViewport[@nr=4]/page/regionViewport[2]/regionAfter/block[2]/lineArea"/>
- <eval expected="page 5 of 8" xpath="//pageSequence[2]/pageViewport[@nr=5]/page/regionViewport[1]/regionAfter/block[2]/lineArea"/>
- <eval expected="page 6 of 8" xpath="//pageSequence[2]/pageViewport[@nr=6]/page/regionViewport[1]/regionAfter/block[2]/lineArea"/>
- <eval expected="page 7 of 8" xpath="//pageSequence[2]/pageViewport[@nr=7]/page/regionViewport[1]/regionAfter/block[2]/lineArea"/>
- <eval expected="page 8 of 8" xpath="//pageSequence[2]/pageViewport[@nr=8]/page/regionViewport[1]/regionAfter/block[2]/lineArea"/>
+ <eval expected="page 5 of 8" xpath="//pageSequence[2]/pageViewport[@nr=5]/page/regionViewport[2]/regionAfter/block[2]/lineArea"/>
+ <eval expected="page 6 of 8" xpath="//pageSequence[2]/pageViewport[@nr=6]/page/regionViewport[2]/regionAfter/block[2]/lineArea"/>
+ <eval expected="page 7 of 8" xpath="//pageSequence[2]/pageViewport[@nr=7]/page/regionViewport[2]/regionAfter/block[2]/lineArea"/>
+ <eval expected="page 8 of 8" xpath="//pageSequence[2]/pageViewport[@nr=8]/page/regionViewport[2]/regionAfter/block[2]/lineArea"/>
</checks>
</testcase>
Modified: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/retrieve-table-marker_multicolumn.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/retrieve-table-marker_multicolumn.xml?rev=1683758&r1=1683757&r2=1683758&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/retrieve-table-marker_multicolumn.xml (original)
+++ xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/retrieve-table-marker_multicolumn.xml Fri Jun 5 13:57:57 2015
@@ -713,8 +713,8 @@
<eval expected="2" xpath="//lineArea[starts-with(., '[rbwt:t][rpwt:f-i-c]( Nevada )')]/ancestor::pageViewport/@nr" />
<eval expected="2" xpath="//lineArea[starts-with(., '[rbwt:p][rpwt:f-i-c]( Nevada )')]/ancestor::pageViewport/@nr" />
<eval expected="3" xpath="//lineArea[starts-with(., '[rbwt:t][rpwt:f-i-c]( Oregon )')]/ancestor::pageViewport/@nr" />
- <eval expected="[rbwt:t][rpwt:f-i-c]( California )" xpath="//pageViewport[2]/page/regionViewport[3]//flow[1]/block[1]/block[17]/block[1]/lineArea" />
- <eval expected="[rbwt:t][rpwt:f-i-c]( Oregon )" xpath="//pageViewport[3]/page/regionViewport[3]//flow[1]/block[1]/block[15]/block[1]/lineArea" />
- <eval expected="[rbwt:t][rpwt:f-i-c]( Washington )" xpath="//pageViewport[4]/page/regionViewport[3]//flow[1]/block[1]/block[5]/block[1]/lineArea" />
+ <eval expected="[rbwt:t][rpwt:f-i-c]( California )" xpath="//pageViewport[2]/page/regionViewport[2]//flow[1]/block[1]/block[17]/block[1]/lineArea" />
+ <eval expected="[rbwt:t][rpwt:f-i-c]( Oregon )" xpath="//pageViewport[3]/page/regionViewport[2]//flow[1]/block[1]/block[15]/block[1]/lineArea" />
+ <eval expected="[rbwt:t][rpwt:f-i-c]( Washington )" xpath="//pageViewport[4]/page/regionViewport[2]//flow[1]/block[1]/block[5]/block[1]/lineArea" />
</checks>
</testcase>
\ No newline at end of file
Modified: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/simple-page-master_margin_region-body_margin_relative.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/simple-page-master_margin_region-body_margin_relative.xml?rev=1683758&r1=1683757&r2=1683758&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/simple-page-master_margin_region-body_margin_relative.xml (original)
+++ xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/simple-page-master_margin_region-body_margin_relative.xml Fri Jun 5 13:57:57 2015
@@ -83,25 +83,25 @@
<eval expected="10800" xpath="//page/regionViewport[2]/regionStart/@ipd"/>
<eval expected="288000" xpath="//page/regionViewport[2]/regionStart/@bpd"/>
<!-- region end -->
- <eval expected="color=#ffa500" xpath="//page/regionViewport[3]/@background"/>
- <eval expected="10800" xpath="//page/regionViewport[3]/@ipd"/>
- <eval expected="288000" xpath="//page/regionViewport[3]/@bpd"/>
- <eval expected="194400 36000 10800 288000" xpath="//page/regionViewport[3]/@rect"/>
- <eval expected="10800" xpath="//page/regionViewport[3]/regionEnd/@ipd"/>
- <eval expected="288000" xpath="//page/regionViewport[3]/regionEnd/@bpd"/>
+ <eval expected="color=#ffa500" xpath="//page/regionViewport[4]/@background"/>
+ <eval expected="10800" xpath="//page/regionViewport[4]/@ipd"/>
+ <eval expected="288000" xpath="//page/regionViewport[4]/@bpd"/>
+ <eval expected="194400 36000 10800 288000" xpath="//page/regionViewport[4]/@rect"/>
+ <eval expected="10800" xpath="//page/regionViewport[4]/regionEnd/@ipd"/>
+ <eval expected="288000" xpath="//page/regionViewport[4]/regionEnd/@bpd"/>
<!-- region after -->
- <eval expected="color=#008000" xpath="//page/regionViewport[4]/@background"/>
- <eval expected="194400" xpath="//page/regionViewport[4]/@ipd"/>
- <eval expected="18000" xpath="//page/regionViewport[4]/@bpd"/>
- <eval expected="10800 324000 194400 18000" xpath="//page/regionViewport[4]/@rect"/>
- <eval expected="194400" xpath="//page/regionViewport[4]/regionAfter/@ipd"/>
- <eval expected="18000" xpath="//page/regionViewport[4]/regionAfter/@bpd"/>
+ <eval expected="color=#008000" xpath="//page/regionViewport[5]/@background"/>
+ <eval expected="194400" xpath="//page/regionViewport[5]/@ipd"/>
+ <eval expected="18000" xpath="//page/regionViewport[5]/@bpd"/>
+ <eval expected="10800 324000 194400 18000" xpath="//page/regionViewport[5]/@rect"/>
+ <eval expected="194400" xpath="//page/regionViewport[5]/regionAfter/@ipd"/>
+ <eval expected="18000" xpath="//page/regionViewport[5]/regionAfter/@bpd"/>
<!-- region body -->
- <eval expected="color=#ffff00" xpath="//page/regionViewport[5]/@background"/>
- <eval expected="172800" xpath="//page/regionViewport[5]/@ipd"/>
- <eval expected="288000" xpath="//page/regionViewport[5]/@bpd"/>
- <eval expected="21600 36000 172800 288000" xpath="//page/regionViewport[5]/@rect"/>
- <eval expected="172800" xpath="//page/regionViewport[5]/regionBody/@ipd"/>
- <eval expected="288000" xpath="//page/regionViewport[5]/regionBody/@bpd"/>
+ <eval expected="color=#ffff00" xpath="//page/regionViewport[3]/@background"/>
+ <eval expected="172800" xpath="//page/regionViewport[3]/@ipd"/>
+ <eval expected="288000" xpath="//page/regionViewport[3]/@bpd"/>
+ <eval expected="21600 36000 172800 288000" xpath="//page/regionViewport[3]/@rect"/>
+ <eval expected="172800" xpath="//page/regionViewport[3]/regionBody/@ipd"/>
+ <eval expected="288000" xpath="//page/regionViewport[3]/regionBody/@bpd"/>
</checks>
</testcase>
Modified: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_0_region-body_margin_relative.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_0_region-body_margin_relative.xml?rev=1683758&r1=1683757&r2=1683758&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_0_region-body_margin_relative.xml (original)
+++ xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_0_region-body_margin_relative.xml Fri Jun 5 13:57:57 2015
@@ -85,28 +85,28 @@
<eval expected="270000" xpath="//page/regionViewport[2]/regionStart/@bpd"/>
<eval expected="[1.0 0.0 0.0 1.0 10800.0 54000.0]" xpath="//page/regionViewport[2]/regionStart/@ctm"/>
<!-- region end -->
- <eval expected="color=#ffa500" xpath="//page/regionViewport[3]/@background"/>
- <eval expected="21600" xpath="//page/regionViewport[3]/@ipd"/>
- <eval expected="270000" xpath="//page/regionViewport[3]/@bpd"/>
- <eval expected="183600 54000 21600 270000" xpath="//page/regionViewport[3]/@rect"/>
- <eval expected="21600" xpath="//page/regionViewport[3]/regionEnd/@ipd"/>
- <eval expected="270000" xpath="//page/regionViewport[3]/regionEnd/@bpd"/>
- <eval expected="[1.0 0.0 0.0 1.0 183600.0 54000.0]" xpath="//page/regionViewport[3]/regionEnd/@ctm"/>
+ <eval expected="color=#ffa500" xpath="//page/regionViewport[4]/@background"/>
+ <eval expected="21600" xpath="//page/regionViewport[4]/@ipd"/>
+ <eval expected="270000" xpath="//page/regionViewport[4]/@bpd"/>
+ <eval expected="183600 54000 21600 270000" xpath="//page/regionViewport[4]/@rect"/>
+ <eval expected="21600" xpath="//page/regionViewport[4]/regionEnd/@ipd"/>
+ <eval expected="270000" xpath="//page/regionViewport[4]/regionEnd/@bpd"/>
+ <eval expected="[1.0 0.0 0.0 1.0 183600.0 54000.0]" xpath="//page/regionViewport[4]/regionEnd/@ctm"/>
<!-- region after -->
- <eval expected="color=#008000" xpath="//page/regionViewport[4]/@background"/>
- <eval expected="194400" xpath="//page/regionViewport[4]/@ipd"/>
- <eval expected="18000" xpath="//page/regionViewport[4]/@bpd"/>
- <eval expected="10800 324000 194400 18000" xpath="//page/regionViewport[4]/@rect"/>
- <eval expected="194400" xpath="//page/regionViewport[4]/regionAfter/@ipd"/>
- <eval expected="18000" xpath="//page/regionViewport[4]/regionAfter/@bpd"/>
- <eval expected="[1.0 0.0 0.0 1.0 10800.0 324000.0]" xpath="//page/regionViewport[4]/regionAfter/@ctm"/>
+ <eval expected="color=#008000" xpath="//page/regionViewport[5]/@background"/>
+ <eval expected="194400" xpath="//page/regionViewport[5]/@ipd"/>
+ <eval expected="18000" xpath="//page/regionViewport[5]/@bpd"/>
+ <eval expected="10800 324000 194400 18000" xpath="//page/regionViewport[5]/@rect"/>
+ <eval expected="194400" xpath="//page/regionViewport[5]/regionAfter/@ipd"/>
+ <eval expected="18000" xpath="//page/regionViewport[5]/regionAfter/@bpd"/>
+ <eval expected="[1.0 0.0 0.0 1.0 10800.0 324000.0]" xpath="//page/regionViewport[5]/regionAfter/@ctm"/>
<!-- region body -->
- <eval expected="color=#ffff00" xpath="//page/regionViewport[5]/@background"/>
- <eval expected="162000" xpath="//page/regionViewport[5]/@ipd"/>
- <eval expected="270000" xpath="//page/regionViewport[5]/@bpd"/>
- <eval expected="21600 54000 162000 270000" xpath="//page/regionViewport[5]/@rect"/>
- <eval expected="162000" xpath="//page/regionViewport[5]/regionBody/@ipd"/>
- <eval expected="270000" xpath="//page/regionViewport[5]/regionBody/@bpd"/>
- <eval expected="[1.0 0.0 0.0 1.0 21600.0 54000.0]" xpath="//page/regionViewport[5]/regionBody/@ctm"/>
+ <eval expected="color=#ffff00" xpath="//page/regionViewport[3]/@background"/>
+ <eval expected="162000" xpath="//page/regionViewport[3]/@ipd"/>
+ <eval expected="270000" xpath="//page/regionViewport[3]/@bpd"/>
+ <eval expected="21600 54000 162000 270000" xpath="//page/regionViewport[3]/@rect"/>
+ <eval expected="162000" xpath="//page/regionViewport[3]/regionBody/@ipd"/>
+ <eval expected="270000" xpath="//page/regionViewport[3]/regionBody/@bpd"/>
+ <eval expected="[1.0 0.0 0.0 1.0 21600.0 54000.0]" xpath="//page/regionViewport[3]/regionBody/@ctm"/>
</checks>
</testcase>
Modified: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_0_writing-mode_rl_region-body_margin_relative.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_0_writing-mode_rl_region-body_margin_relative.xml?rev=1683758&r1=1683757&r2=1683758&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_0_writing-mode_rl_region-body_margin_relative.xml (original)
+++ xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_0_writing-mode_rl_region-body_margin_relative.xml Fri Jun 5 13:57:57 2015
@@ -87,28 +87,28 @@
<eval expected="270000" xpath="//page/regionViewport[2]/regionStart/@bpd"/>
<eval expected="[1.0 0.0 0.0 1.0 183600.0 54000.0]" xpath="//page/regionViewport[2]/regionStart/@ctm"/>
<!-- region end -->
- <eval expected="color=#ffa500" xpath="//page/regionViewport[3]/@background"/>
- <eval expected="10800" xpath="//page/regionViewport[3]/@ipd"/>
- <eval expected="270000" xpath="//page/regionViewport[3]/@bpd"/>
- <eval expected="10800 54000 10800 270000" xpath="//page/regionViewport[3]/@rect"/>
- <eval expected="10800" xpath="//page/regionViewport[3]/regionEnd/@ipd"/>
- <eval expected="270000" xpath="//page/regionViewport[3]/regionEnd/@bpd"/>
- <eval expected="[1.0 0.0 0.0 1.0 10800.0 54000.0]" xpath="//page/regionViewport[3]/regionEnd/@ctm"/>
+ <eval expected="color=#ffa500" xpath="//page/regionViewport[4]/@background"/>
+ <eval expected="10800" xpath="//page/regionViewport[4]/@ipd"/>
+ <eval expected="270000" xpath="//page/regionViewport[4]/@bpd"/>
+ <eval expected="10800 54000 10800 270000" xpath="//page/regionViewport[4]/@rect"/>
+ <eval expected="10800" xpath="//page/regionViewport[4]/regionEnd/@ipd"/>
+ <eval expected="270000" xpath="//page/regionViewport[4]/regionEnd/@bpd"/>
+ <eval expected="[1.0 0.0 0.0 1.0 10800.0 54000.0]" xpath="//page/regionViewport[4]/regionEnd/@ctm"/>
<!-- region after -->
- <eval expected="color=#008000" xpath="//page/regionViewport[4]/@background"/>
- <eval expected="194400" xpath="//page/regionViewport[4]/@ipd"/>
- <eval expected="18000" xpath="//page/regionViewport[4]/@bpd"/>
- <eval expected="10800 324000 194400 18000" xpath="//page/regionViewport[4]/@rect"/>
- <eval expected="194400" xpath="//page/regionViewport[4]/regionAfter/@ipd"/>
- <eval expected="18000" xpath="//page/regionViewport[4]/regionAfter/@bpd"/>
- <eval expected="[1.0 0.0 0.0 1.0 10800.0 324000.0]" xpath="//page/regionViewport[4]/regionAfter/@ctm"/>
+ <eval expected="color=#008000" xpath="//page/regionViewport[5]/@background"/>
+ <eval expected="194400" xpath="//page/regionViewport[5]/@ipd"/>
+ <eval expected="18000" xpath="//page/regionViewport[5]/@bpd"/>
+ <eval expected="10800 324000 194400 18000" xpath="//page/regionViewport[5]/@rect"/>
+ <eval expected="194400" xpath="//page/regionViewport[5]/regionAfter/@ipd"/>
+ <eval expected="18000" xpath="//page/regionViewport[5]/regionAfter/@bpd"/>
+ <eval expected="[1.0 0.0 0.0 1.0 10800.0 324000.0]" xpath="//page/regionViewport[5]/regionAfter/@ctm"/>
<!-- region body -->
- <eval expected="color=#ffff00" xpath="//page/regionViewport[5]/@background"/>
- <eval expected="162000" xpath="//page/regionViewport[5]/@ipd"/>
- <eval expected="270000" xpath="//page/regionViewport[5]/@bpd"/>
- <eval expected="21600 54000 162000 270000" xpath="//page/regionViewport[5]/@rect"/>
- <eval expected="162000" xpath="//page/regionViewport[5]/regionBody/@ipd"/>
- <eval expected="270000" xpath="//page/regionViewport[5]/regionBody/@bpd"/>
- <eval expected="[1.0 0.0 0.0 1.0 21600.0 54000.0]" xpath="//page/regionViewport[5]/regionBody/@ctm"/>
+ <eval expected="color=#ffff00" xpath="//page/regionViewport[3]/@background"/>
+ <eval expected="162000" xpath="//page/regionViewport[3]/@ipd"/>
+ <eval expected="270000" xpath="//page/regionViewport[3]/@bpd"/>
+ <eval expected="21600 54000 162000 270000" xpath="//page/regionViewport[3]/@rect"/>
+ <eval expected="162000" xpath="//page/regionViewport[3]/regionBody/@ipd"/>
+ <eval expected="270000" xpath="//page/regionViewport[3]/regionBody/@bpd"/>
+ <eval expected="[1.0 0.0 0.0 1.0 21600.0 54000.0]" xpath="//page/regionViewport[3]/regionBody/@ctm"/>
</checks>
</testcase>
Modified: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_180_region-body_margin_relative.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_180_region-body_margin_relative.xml?rev=1683758&r1=1683757&r2=1683758&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_180_region-body_margin_relative.xml (original)
+++ xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_180_region-body_margin_relative.xml Fri Jun 5 13:57:57 2015
@@ -86,28 +86,28 @@
<eval expected="270000" xpath="//page/regionViewport[2]/regionStart/@bpd"/>
<eval expected="[-1.0 -0.0 0.0 -1.0 205200.0 306000.0]" xpath="//page/regionViewport[2]/regionStart/@ctm"/>
<!-- region end -->
- <eval expected="color=#ffa500" xpath="//page/regionViewport[3]/@background"/>
- <eval expected="21600" xpath="//page/regionViewport[3]/@ipd"/>
- <eval expected="270000" xpath="//page/regionViewport[3]/@bpd"/>
- <eval expected="10800 36000 21600 270000" xpath="//page/regionViewport[3]/@rect"/>
- <eval expected="21600" xpath="//page/regionViewport[3]/regionEnd/@ipd"/>
- <eval expected="270000" xpath="//page/regionViewport[3]/regionEnd/@bpd"/>
- <eval expected="[-1.0 -0.0 0.0 -1.0 32400.0 306000.0]" xpath="//page/regionViewport[3]/regionEnd/@ctm"/>
+ <eval expected="color=#ffa500" xpath="//page/regionViewport[4]/@background"/>
+ <eval expected="21600" xpath="//page/regionViewport[4]/@ipd"/>
+ <eval expected="270000" xpath="//page/regionViewport[4]/@bpd"/>
+ <eval expected="10800 36000 21600 270000" xpath="//page/regionViewport[4]/@rect"/>
+ <eval expected="21600" xpath="//page/regionViewport[4]/regionEnd/@ipd"/>
+ <eval expected="270000" xpath="//page/regionViewport[4]/regionEnd/@bpd"/>
+ <eval expected="[-1.0 -0.0 0.0 -1.0 32400.0 306000.0]" xpath="//page/regionViewport[4]/regionEnd/@ctm"/>
<!-- region after -->
- <eval expected="color=#008000" xpath="//page/regionViewport[4]/@background"/>
- <eval expected="194400" xpath="//page/regionViewport[4]/@ipd"/>
- <eval expected="18000" xpath="//page/regionViewport[4]/@bpd"/>
- <eval expected="10800 18000 194400 18000" xpath="//page/regionViewport[4]/@rect"/>
- <eval expected="194400" xpath="//page/regionViewport[4]/regionAfter/@ipd"/>
- <eval expected="18000" xpath="//page/regionViewport[4]/regionAfter/@bpd"/>
- <eval expected="[-1.0 -0.0 0.0 -1.0 205200.0 36000.0]" xpath="//page/regionViewport[4]/regionAfter/@ctm"/>
+ <eval expected="color=#008000" xpath="//page/regionViewport[5]/@background"/>
+ <eval expected="194400" xpath="//page/regionViewport[5]/@ipd"/>
+ <eval expected="18000" xpath="//page/regionViewport[5]/@bpd"/>
+ <eval expected="10800 18000 194400 18000" xpath="//page/regionViewport[5]/@rect"/>
+ <eval expected="194400" xpath="//page/regionViewport[5]/regionAfter/@ipd"/>
+ <eval expected="18000" xpath="//page/regionViewport[5]/regionAfter/@bpd"/>
+ <eval expected="[-1.0 -0.0 0.0 -1.0 205200.0 36000.0]" xpath="//page/regionViewport[5]/regionAfter/@ctm"/>
<!-- region body -->
- <eval expected="color=#ffff00" xpath="//page/regionViewport[5]/@background"/>
- <eval expected="162000" xpath="//page/regionViewport[5]/@ipd"/>
- <eval expected="270000" xpath="//page/regionViewport[5]/@bpd"/>
- <eval expected="32400 36000 162000 270000" xpath="//page/regionViewport[5]/@rect"/>
- <eval expected="162000" xpath="//page/regionViewport[5]/regionBody/@ipd"/>
- <eval expected="270000" xpath="//page/regionViewport[5]/regionBody/@bpd"/>
- <eval expected="[-1.0 -0.0 0.0 -1.0 194400.0 306000.0]" xpath="//page/regionViewport[5]/regionBody/@ctm"/>
+ <eval expected="color=#ffff00" xpath="//page/regionViewport[3]/@background"/>
+ <eval expected="162000" xpath="//page/regionViewport[3]/@ipd"/>
+ <eval expected="270000" xpath="//page/regionViewport[3]/@bpd"/>
+ <eval expected="32400 36000 162000 270000" xpath="//page/regionViewport[3]/@rect"/>
+ <eval expected="162000" xpath="//page/regionViewport[3]/regionBody/@ipd"/>
+ <eval expected="270000" xpath="//page/regionViewport[3]/regionBody/@bpd"/>
+ <eval expected="[-1.0 -0.0 0.0 -1.0 194400.0 306000.0]" xpath="//page/regionViewport[3]/regionBody/@ctm"/>
</checks>
</testcase>
Modified: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_180_writing-mode_rl_region-body_margin_relative.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_180_writing-mode_rl_region-body_margin_relative.xml?rev=1683758&r1=1683757&r2=1683758&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_180_writing-mode_rl_region-body_margin_relative.xml (original)
+++ xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_180_writing-mode_rl_region-body_margin_relative.xml Fri Jun 5 13:57:57 2015
@@ -87,28 +87,28 @@
<eval expected="270000" xpath="//page/regionViewport[2]/regionStart/@bpd"/>
<eval expected="[-1.0 -0.0 0.0 -1.0 32400.0 306000.0]" xpath="//page/regionViewport[2]/regionStart/@ctm"/>
<!-- region end -->
- <eval expected="color=#ffa500" xpath="//page/regionViewport[3]/@background"/>
- <eval expected="10800" xpath="//page/regionViewport[3]/@ipd"/>
- <eval expected="270000" xpath="//page/regionViewport[3]/@bpd"/>
- <eval expected="194400 36000 10800 270000" xpath="//page/regionViewport[3]/@rect"/>
- <eval expected="10800" xpath="//page/regionViewport[3]/regionEnd/@ipd"/>
- <eval expected="270000" xpath="//page/regionViewport[3]/regionEnd/@bpd"/>
- <eval expected="[-1.0 -0.0 0.0 -1.0 205200.0 306000.0]" xpath="//page/regionViewport[3]/regionEnd/@ctm"/>
+ <eval expected="color=#ffa500" xpath="//page/regionViewport[4]/@background"/>
+ <eval expected="10800" xpath="//page/regionViewport[4]/@ipd"/>
+ <eval expected="270000" xpath="//page/regionViewport[4]/@bpd"/>
+ <eval expected="194400 36000 10800 270000" xpath="//page/regionViewport[4]/@rect"/>
+ <eval expected="10800" xpath="//page/regionViewport[4]/regionEnd/@ipd"/>
+ <eval expected="270000" xpath="//page/regionViewport[4]/regionEnd/@bpd"/>
+ <eval expected="[-1.0 -0.0 0.0 -1.0 205200.0 306000.0]" xpath="//page/regionViewport[4]/regionEnd/@ctm"/>
<!-- region after -->
- <eval expected="color=#008000" xpath="//page/regionViewport[4]/@background"/>
- <eval expected="194400" xpath="//page/regionViewport[4]/@ipd"/>
- <eval expected="18000" xpath="//page/regionViewport[4]/@bpd"/>
- <eval expected="10800 18000 194400 18000" xpath="//page/regionViewport[4]/@rect"/>
- <eval expected="194400" xpath="//page/regionViewport[4]/regionAfter/@ipd"/>
- <eval expected="18000" xpath="//page/regionViewport[4]/regionAfter/@bpd"/>
- <eval expected="[-1.0 -0.0 0.0 -1.0 205200.0 36000.0]" xpath="//page/regionViewport[4]/regionAfter/@ctm"/>
+ <eval expected="color=#008000" xpath="//page/regionViewport[5]/@background"/>
+ <eval expected="194400" xpath="//page/regionViewport[5]/@ipd"/>
+ <eval expected="18000" xpath="//page/regionViewport[5]/@bpd"/>
+ <eval expected="10800 18000 194400 18000" xpath="//page/regionViewport[5]/@rect"/>
+ <eval expected="194400" xpath="//page/regionViewport[5]/regionAfter/@ipd"/>
+ <eval expected="18000" xpath="//page/regionViewport[5]/regionAfter/@bpd"/>
+ <eval expected="[-1.0 -0.0 0.0 -1.0 205200.0 36000.0]" xpath="//page/regionViewport[5]/regionAfter/@ctm"/>
<!-- region body -->
- <eval expected="color=#ffff00" xpath="//page/regionViewport[5]/@background"/>
- <eval expected="162000" xpath="//page/regionViewport[5]/@ipd"/>
- <eval expected="270000" xpath="//page/regionViewport[5]/@bpd"/>
- <eval expected="32400 36000 162000 270000" xpath="//page/regionViewport[5]/@rect"/>
- <eval expected="162000" xpath="//page/regionViewport[5]/regionBody/@ipd"/>
- <eval expected="270000" xpath="//page/regionViewport[5]/regionBody/@bpd"/>
- <eval expected="[-1.0 -0.0 0.0 -1.0 194400.0 306000.0]" xpath="//page/regionViewport[5]/regionBody/@ctm"/>
+ <eval expected="color=#ffff00" xpath="//page/regionViewport[3]/@background"/>
+ <eval expected="162000" xpath="//page/regionViewport[3]/@ipd"/>
+ <eval expected="270000" xpath="//page/regionViewport[3]/@bpd"/>
+ <eval expected="32400 36000 162000 270000" xpath="//page/regionViewport[3]/@rect"/>
+ <eval expected="162000" xpath="//page/regionViewport[3]/regionBody/@ipd"/>
+ <eval expected="270000" xpath="//page/regionViewport[3]/regionBody/@bpd"/>
+ <eval expected="[-1.0 -0.0 0.0 -1.0 194400.0 306000.0]" xpath="//page/regionViewport[3]/regionBody/@ctm"/>
</checks>
</testcase>
Modified: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_270_region-body_margin_relative.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_270_region-body_margin_relative.xml?rev=1683758&r1=1683757&r2=1683758&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_270_region-body_margin_relative.xml (original)
+++ xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_270_region-body_margin_relative.xml Fri Jun 5 13:57:57 2015
@@ -86,28 +86,28 @@
<eval expected="162000" xpath="//page/regionViewport[2]/regionStart/@bpd"/>
<eval expected="[0.0 1.0 -1.0 0.0 183600.0 18000.0]" xpath="//page/regionViewport[2]/regionStart/@ctm"/>
<!-- region end -->
- <eval expected="color=#ffa500" xpath="//page/regionViewport[3]/@background"/>
- <eval expected="36000" xpath="//page/regionViewport[3]/@ipd"/>
- <eval expected="162000" xpath="//page/regionViewport[3]/@bpd"/>
- <eval expected="21600 306000 162000 36000" xpath="//page/regionViewport[3]/@rect"/>
- <eval expected="36000" xpath="//page/regionViewport[3]/regionEnd/@ipd"/>
- <eval expected="162000" xpath="//page/regionViewport[3]/regionEnd/@bpd"/>
- <eval expected="[0.0 1.0 -1.0 0.0 183600.0 306000.0]" xpath="//page/regionViewport[3]/regionEnd/@ctm"/>
+ <eval expected="color=#ffa500" xpath="//page/regionViewport[4]/@background"/>
+ <eval expected="36000" xpath="//page/regionViewport[4]/@ipd"/>
+ <eval expected="162000" xpath="//page/regionViewport[4]/@bpd"/>
+ <eval expected="21600 306000 162000 36000" xpath="//page/regionViewport[4]/@rect"/>
+ <eval expected="36000" xpath="//page/regionViewport[4]/regionEnd/@ipd"/>
+ <eval expected="162000" xpath="//page/regionViewport[4]/regionEnd/@bpd"/>
+ <eval expected="[0.0 1.0 -1.0 0.0 183600.0 306000.0]" xpath="//page/regionViewport[4]/regionEnd/@ctm"/>
<!-- region after -->
- <eval expected="color=#008000" xpath="//page/regionViewport[4]/@background"/>
- <eval expected="324000" xpath="//page/regionViewport[4]/@ipd"/>
- <eval expected="10800" xpath="//page/regionViewport[4]/@bpd"/>
- <eval expected="10800 18000 10800 324000" xpath="//page/regionViewport[4]/@rect"/>
- <eval expected="324000" xpath="//page/regionViewport[4]/regionAfter/@ipd"/>
- <eval expected="10800" xpath="//page/regionViewport[4]/regionAfter/@bpd"/>
- <eval expected="[0.0 1.0 -1.0 0.0 21600.0 18000.0]" xpath="//page/regionViewport[4]/regionAfter/@ctm"/>
+ <eval expected="color=#008000" xpath="//page/regionViewport[5]/@background"/>
+ <eval expected="324000" xpath="//page/regionViewport[5]/@ipd"/>
+ <eval expected="10800" xpath="//page/regionViewport[5]/@bpd"/>
+ <eval expected="10800 18000 10800 324000" xpath="//page/regionViewport[5]/@rect"/>
+ <eval expected="324000" xpath="//page/regionViewport[5]/regionAfter/@ipd"/>
+ <eval expected="10800" xpath="//page/regionViewport[5]/regionAfter/@bpd"/>
+ <eval expected="[0.0 1.0 -1.0 0.0 21600.0 18000.0]" xpath="//page/regionViewport[5]/regionAfter/@ctm"/>
<!-- region body -->
- <eval expected="color=#ffff00" xpath="//page/regionViewport[5]/@background"/>
- <eval expected="270000" xpath="//page/regionViewport[5]/@ipd"/>
- <eval expected="162000" xpath="//page/regionViewport[5]/@bpd"/>
- <eval expected="21600 36000 162000 270000" xpath="//page/regionViewport[5]/@rect"/>
- <eval expected="270000" xpath="//page/regionViewport[5]/regionBody/@ipd"/>
- <eval expected="162000" xpath="//page/regionViewport[5]/regionBody/@bpd"/>
- <eval expected="[0.0 1.0 -1.0 0.0 183600.0 36000.0]" xpath="//page/regionViewport[5]/regionBody/@ctm"/>
+ <eval expected="color=#ffff00" xpath="//page/regionViewport[3]/@background"/>
+ <eval expected="270000" xpath="//page/regionViewport[3]/@ipd"/>
+ <eval expected="162000" xpath="//page/regionViewport[3]/@bpd"/>
+ <eval expected="21600 36000 162000 270000" xpath="//page/regionViewport[3]/@rect"/>
+ <eval expected="270000" xpath="//page/regionViewport[3]/regionBody/@ipd"/>
+ <eval expected="162000" xpath="//page/regionViewport[3]/regionBody/@bpd"/>
+ <eval expected="[0.0 1.0 -1.0 0.0 183600.0 36000.0]" xpath="//page/regionViewport[3]/regionBody/@ctm"/>
</checks>
</testcase>
Modified: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_270_writing-mode_rl_region-body_margin_relative.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_270_writing-mode_rl_region-body_margin_relative.xml?rev=1683758&r1=1683757&r2=1683758&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_270_writing-mode_rl_region-body_margin_relative.xml (original)
+++ xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_270_writing-mode_rl_region-body_margin_relative.xml Fri Jun 5 13:57:57 2015
@@ -87,28 +87,28 @@
<eval expected="270000" xpath="//page/regionViewport[2]/regionStart/@bpd"/>
<eval expected="[0.0 1.0 -1.0 0.0 306000.0 183600.0]" xpath="//page/regionViewport[2]/regionStart/@ctm"/>
<!-- region end -->
- <eval expected="color=#ffa500" xpath="//page/regionViewport[3]/@background"/>
- <eval expected="10800" xpath="//page/regionViewport[3]/@ipd"/>
- <eval expected="270000" xpath="//page/regionViewport[3]/@bpd"/>
- <eval expected="36000 10800 270000 10800" xpath="//page/regionViewport[3]/@rect"/>
- <eval expected="10800" xpath="//page/regionViewport[3]/regionEnd/@ipd"/>
- <eval expected="270000" xpath="//page/regionViewport[3]/regionEnd/@bpd"/>
- <eval expected="[0.0 1.0 -1.0 0.0 306000.0 10800.0]" xpath="//page/regionViewport[3]/regionEnd/@ctm"/>
+ <eval expected="color=#ffa500" xpath="//page/regionViewport[4]/@background"/>
+ <eval expected="10800" xpath="//page/regionViewport[4]/@ipd"/>
+ <eval expected="270000" xpath="//page/regionViewport[4]/@bpd"/>
+ <eval expected="36000 10800 270000 10800" xpath="//page/regionViewport[4]/@rect"/>
+ <eval expected="10800" xpath="//page/regionViewport[4]/regionEnd/@ipd"/>
+ <eval expected="270000" xpath="//page/regionViewport[4]/regionEnd/@bpd"/>
+ <eval expected="[0.0 1.0 -1.0 0.0 306000.0 10800.0]" xpath="//page/regionViewport[4]/regionEnd/@ctm"/>
<!-- region after -->
- <eval expected="color=#008000" xpath="//page/regionViewport[4]/@background"/>
- <eval expected="194400" xpath="//page/regionViewport[4]/@ipd"/>
- <eval expected="18000" xpath="//page/regionViewport[4]/@bpd"/>
- <eval expected="18000 10800 18000 194400" xpath="//page/regionViewport[4]/@rect"/>
- <eval expected="194400" xpath="//page/regionViewport[4]/regionAfter/@ipd"/>
- <eval expected="18000" xpath="//page/regionViewport[4]/regionAfter/@bpd"/>
- <eval expected="[0.0 1.0 -1.0 0.0 36000.0 10800.0]" xpath="//page/regionViewport[4]/regionAfter/@ctm"/>
+ <eval expected="color=#008000" xpath="//page/regionViewport[5]/@background"/>
+ <eval expected="194400" xpath="//page/regionViewport[5]/@ipd"/>
+ <eval expected="18000" xpath="//page/regionViewport[5]/@bpd"/>
+ <eval expected="18000 10800 18000 194400" xpath="//page/regionViewport[5]/@rect"/>
+ <eval expected="194400" xpath="//page/regionViewport[5]/regionAfter/@ipd"/>
+ <eval expected="18000" xpath="//page/regionViewport[5]/regionAfter/@bpd"/>
+ <eval expected="[0.0 1.0 -1.0 0.0 36000.0 10800.0]" xpath="//page/regionViewport[5]/regionAfter/@ctm"/>
<!-- region body -->
- <eval expected="color=#ffff00" xpath="//page/regionViewport[5]/@background"/>
- <eval expected="162000" xpath="//page/regionViewport[5]/@ipd"/>
- <eval expected="270000" xpath="//page/regionViewport[5]/@bpd"/>
- <eval expected="36000 21600 270000 162000" xpath="//page/regionViewport[5]/@rect"/>
- <eval expected="162000" xpath="//page/regionViewport[5]/regionBody/@ipd"/>
- <eval expected="270000" xpath="//page/regionViewport[5]/regionBody/@bpd"/>
- <eval expected="[0.0 1.0 -1.0 0.0 306000.0 21600.0]" xpath="//page/regionViewport[5]/regionBody/@ctm"/>
+ <eval expected="color=#ffff00" xpath="//page/regionViewport[3]/@background"/>
+ <eval expected="162000" xpath="//page/regionViewport[3]/@ipd"/>
+ <eval expected="270000" xpath="//page/regionViewport[3]/@bpd"/>
+ <eval expected="36000 21600 270000 162000" xpath="//page/regionViewport[3]/@rect"/>
+ <eval expected="162000" xpath="//page/regionViewport[3]/regionBody/@ipd"/>
+ <eval expected="270000" xpath="//page/regionViewport[3]/regionBody/@bpd"/>
+ <eval expected="[0.0 1.0 -1.0 0.0 306000.0 21600.0]" xpath="//page/regionViewport[3]/regionBody/@ctm"/>
</checks>
</testcase>
Modified: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_90_region-body_margin_relative.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_90_region-body_margin_relative.xml?rev=1683758&r1=1683757&r2=1683758&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_90_region-body_margin_relative.xml (original)
+++ xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_90_region-body_margin_relative.xml Fri Jun 5 13:57:57 2015
@@ -86,28 +86,28 @@
<eval expected="162000" xpath="//page/regionViewport[2]/regionStart/@bpd"/>
<eval expected="[0.0 -1.0 1.0 0.0 32400.0 342000.0]" xpath="//page/regionViewport[2]/regionStart/@ctm"/>
<!-- region end -->
- <eval expected="color=#ffa500" xpath="//page/regionViewport[3]/@background"/>
- <eval expected="36000" xpath="//page/regionViewport[3]/@ipd"/>
- <eval expected="162000" xpath="//page/regionViewport[3]/@bpd"/>
- <eval expected="32400 18000 162000 36000" xpath="//page/regionViewport[3]/@rect"/>
- <eval expected="36000" xpath="//page/regionViewport[3]/regionEnd/@ipd"/>
- <eval expected="162000" xpath="//page/regionViewport[3]/regionEnd/@bpd"/>
- <eval expected="[0.0 -1.0 1.0 0.0 32400.0 54000.0]" xpath="//page/regionViewport[3]/regionEnd/@ctm"/>
+ <eval expected="color=#ffa500" xpath="//page/regionViewport[4]/@background"/>
+ <eval expected="36000" xpath="//page/regionViewport[4]/@ipd"/>
+ <eval expected="162000" xpath="//page/regionViewport[4]/@bpd"/>
+ <eval expected="32400 18000 162000 36000" xpath="//page/regionViewport[4]/@rect"/>
+ <eval expected="36000" xpath="//page/regionViewport[4]/regionEnd/@ipd"/>
+ <eval expected="162000" xpath="//page/regionViewport[4]/regionEnd/@bpd"/>
+ <eval expected="[0.0 -1.0 1.0 0.0 32400.0 54000.0]" xpath="//page/regionViewport[4]/regionEnd/@ctm"/>
<!-- region after -->
- <eval expected="color=#008000" xpath="//page/regionViewport[4]/@background"/>
- <eval expected="324000" xpath="//page/regionViewport[4]/@ipd"/>
- <eval expected="10800" xpath="//page/regionViewport[4]/@bpd"/>
- <eval expected="194400 18000 10800 324000" xpath="//page/regionViewport[4]/@rect"/>
- <eval expected="324000" xpath="//page/regionViewport[4]/regionAfter/@ipd"/>
- <eval expected="10800" xpath="//page/regionViewport[4]/regionAfter/@bpd"/>
- <eval expected="[0.0 -1.0 1.0 0.0 194400.0 342000.0]" xpath="//page/regionViewport[4]/regionAfter/@ctm"/>
+ <eval expected="color=#008000" xpath="//page/regionViewport[5]/@background"/>
+ <eval expected="324000" xpath="//page/regionViewport[5]/@ipd"/>
+ <eval expected="10800" xpath="//page/regionViewport[5]/@bpd"/>
+ <eval expected="194400 18000 10800 324000" xpath="//page/regionViewport[5]/@rect"/>
+ <eval expected="324000" xpath="//page/regionViewport[5]/regionAfter/@ipd"/>
+ <eval expected="10800" xpath="//page/regionViewport[5]/regionAfter/@bpd"/>
+ <eval expected="[0.0 -1.0 1.0 0.0 194400.0 342000.0]" xpath="//page/regionViewport[5]/regionAfter/@ctm"/>
<!-- region body -->
- <eval expected="color=#ffff00" xpath="//page/regionViewport[5]/@background"/>
- <eval expected="270000" xpath="//page/regionViewport[5]/@ipd"/>
- <eval expected="162000" xpath="//page/regionViewport[5]/@bpd"/>
- <eval expected="32400 54000 162000 270000" xpath="//page/regionViewport[5]/@rect"/>
- <eval expected="270000" xpath="//page/regionViewport[5]/regionBody/@ipd"/>
- <eval expected="162000" xpath="//page/regionViewport[5]/regionBody/@bpd"/>
- <eval expected="[0.0 -1.0 1.0 0.0 32400.0 324000.0]" xpath="//page/regionViewport[5]/regionBody/@ctm"/>
+ <eval expected="color=#ffff00" xpath="//page/regionViewport[3]/@background"/>
+ <eval expected="270000" xpath="//page/regionViewport[3]/@ipd"/>
+ <eval expected="162000" xpath="//page/regionViewport[3]/@bpd"/>
+ <eval expected="32400 54000 162000 270000" xpath="//page/regionViewport[3]/@rect"/>
+ <eval expected="270000" xpath="//page/regionViewport[3]/regionBody/@ipd"/>
+ <eval expected="162000" xpath="//page/regionViewport[3]/regionBody/@bpd"/>
+ <eval expected="[0.0 -1.0 1.0 0.0 32400.0 324000.0]" xpath="//page/regionViewport[3]/regionBody/@ctm"/>
</checks>
</testcase>
Modified: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_90_writing-mode_rl_region-body_margin_relative.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_90_writing-mode_rl_region-body_margin_relative.xml?rev=1683758&r1=1683757&r2=1683758&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_90_writing-mode_rl_region-body_margin_relative.xml (original)
+++ xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_90_writing-mode_rl_region-body_margin_relative.xml Fri Jun 5 13:57:57 2015
@@ -87,28 +87,28 @@
<eval expected="270000" xpath="//page/regionViewport[2]/regionStart/@bpd"/>
<eval expected="[0.0 -1.0 1.0 0.0 54000.0 32400.0]" xpath="//page/regionViewport[2]/regionStart/@ctm"/>
<!-- region end -->
- <eval expected="color=#ffa500" xpath="//page/regionViewport[3]/@background"/>
- <eval expected="10800" xpath="//page/regionViewport[3]/@ipd"/>
- <eval expected="270000" xpath="//page/regionViewport[3]/@bpd"/>
- <eval expected="54000 194400 270000 10800" xpath="//page/regionViewport[3]/@rect"/>
- <eval expected="10800" xpath="//page/regionViewport[3]/regionEnd/@ipd"/>
- <eval expected="270000" xpath="//page/regionViewport[3]/regionEnd/@bpd"/>
- <eval expected="[0.0 -1.0 1.0 0.0 54000.0 205200.0]" xpath="//page/regionViewport[3]/regionEnd/@ctm"/>
+ <eval expected="color=#ffa500" xpath="//page/regionViewport[4]/@background"/>
+ <eval expected="10800" xpath="//page/regionViewport[4]/@ipd"/>
+ <eval expected="270000" xpath="//page/regionViewport[4]/@bpd"/>
+ <eval expected="54000 194400 270000 10800" xpath="//page/regionViewport[4]/@rect"/>
+ <eval expected="10800" xpath="//page/regionViewport[4]/regionEnd/@ipd"/>
+ <eval expected="270000" xpath="//page/regionViewport[4]/regionEnd/@bpd"/>
+ <eval expected="[0.0 -1.0 1.0 0.0 54000.0 205200.0]" xpath="//page/regionViewport[4]/regionEnd/@ctm"/>
<!-- region after -->
- <eval expected="color=#008000" xpath="//page/regionViewport[4]/@background"/>
- <eval expected="194400" xpath="//page/regionViewport[4]/@ipd"/>
- <eval expected="18000" xpath="//page/regionViewport[4]/@bpd"/>
- <eval expected="324000 10800 18000 194400" xpath="//page/regionViewport[4]/@rect"/>
- <eval expected="194400" xpath="//page/regionViewport[4]/regionAfter/@ipd"/>
- <eval expected="18000" xpath="//page/regionViewport[4]/regionAfter/@bpd"/>
- <eval expected="[0.0 -1.0 1.0 0.0 324000.0 205200.0]" xpath="//page/regionViewport[4]/regionAfter/@ctm"/>
+ <eval expected="color=#008000" xpath="//page/regionViewport[5]/@background"/>
+ <eval expected="194400" xpath="//page/regionViewport[5]/@ipd"/>
+ <eval expected="18000" xpath="//page/regionViewport[5]/@bpd"/>
+ <eval expected="324000 10800 18000 194400" xpath="//page/regionViewport[5]/@rect"/>
+ <eval expected="194400" xpath="//page/regionViewport[5]/regionAfter/@ipd"/>
+ <eval expected="18000" xpath="//page/regionViewport[5]/regionAfter/@bpd"/>
+ <eval expected="[0.0 -1.0 1.0 0.0 324000.0 205200.0]" xpath="//page/regionViewport[5]/regionAfter/@ctm"/>
<!-- region body -->
- <eval expected="color=#ffff00" xpath="//page/regionViewport[5]/@background"/>
- <eval expected="162000" xpath="//page/regionViewport[5]/@ipd"/>
- <eval expected="270000" xpath="//page/regionViewport[5]/@bpd"/>
- <eval expected="54000 32400 270000 162000" xpath="//page/regionViewport[5]/@rect"/>
- <eval expected="162000" xpath="//page/regionViewport[5]/regionBody/@ipd"/>
- <eval expected="270000" xpath="//page/regionViewport[5]/regionBody/@bpd"/>
- <eval expected="[0.0 -1.0 1.0 0.0 54000.0 194400.0]" xpath="//page/regionViewport[5]/regionBody/@ctm"/>
+ <eval expected="color=#ffff00" xpath="//page/regionViewport[3]/@background"/>
+ <eval expected="162000" xpath="//page/regionViewport[3]/@ipd"/>
+ <eval expected="270000" xpath="//page/regionViewport[3]/@bpd"/>
+ <eval expected="54000 32400 270000 162000" xpath="//page/regionViewport[3]/@rect"/>
+ <eval expected="162000" xpath="//page/regionViewport[3]/regionBody/@ipd"/>
+ <eval expected="270000" xpath="//page/regionViewport[3]/regionBody/@bpd"/>
+ <eval expected="[0.0 -1.0 1.0 0.0 54000.0 194400.0]" xpath="//page/regionViewport[3]/regionBody/@ctm"/>
</checks>
</testcase>
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org