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 je...@apache.org on 2005/06/09 16:20:45 UTC
cvs commit: xml-fop/test/layoutengine/testcases page-number1.xml normal-breaking1.xml page-master3.xml page-master1.xml page-number2.xml page-master2.xml markers7.xml
jeremias 2005/06/09 07:20:45
Modified: test/layoutengine/testcases page-number1.xml
normal-breaking1.xml page-master3.xml
page-master1.xml page-number2.xml page-master2.xml
markers7.xml
Log:
Additional fixes for checks that don't work anymore because the pageSequence elements are now generated correctly.
Revision Changes Path
1.2 +9 -9 xml-fop/test/layoutengine/testcases/page-number1.xml
Index: page-number1.xml
===================================================================
RCS file: /home/cvs/xml-fop/test/layoutengine/testcases/page-number1.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- page-number1.xml 21 Feb 2005 09:25:28 -0000 1.1
+++ page-number1.xml 9 Jun 2005 14:20:45 -0000 1.2
@@ -53,16 +53,16 @@
</fo:root>
</fo>
<checks>
- <eval expected="page: 1" xpath="//pageViewport[1]/page/regionViewport/regionBody/mainReference/span/flow/block[1]/lineArea"/>
- <eval expected="page: 1" xpath="//pageViewport[1]/page/regionViewport/regionBody/mainReference/span/flow/block[2]/lineArea"/>
+ <eval expected="page: 1" xpath="//pageViewport[@nr=1]/page/regionViewport/regionBody/mainReference/span/flow/block[1]/lineArea"/>
+ <eval expected="page: 1" xpath="//pageViewport[@nr=1]/page/regionViewport/regionBody/mainReference/span/flow/block[2]/lineArea"/>
- <eval expected="page: 2" xpath="//pageViewport[2]/page/regionViewport/regionBody/mainReference/span/flow/block[1]/lineArea"/>
- <eval expected="page: 2" xpath="//pageViewport[2]/page/regionViewport/regionBody/mainReference/span/flow/block[2]/lineArea"/>
+ <eval expected="page: 2" xpath="//pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span/flow/block[1]/lineArea"/>
+ <eval expected="page: 2" xpath="//pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span/flow/block[2]/lineArea"/>
- <eval expected="page: 3" xpath="//pageViewport[3]/page/regionViewport/regionBody/mainReference/span/flow/block[1]/lineArea"/>
- <eval expected="page: 3" xpath="//pageViewport[3]/page/regionViewport/regionBody/mainReference/span/flow/block[2]/lineArea"/>
+ <eval expected="page: 3" xpath="//pageViewport[@nr=3]/page/regionViewport/regionBody/mainReference/span/flow/block[1]/lineArea"/>
+ <eval expected="page: 3" xpath="//pageViewport[@nr=3]/page/regionViewport/regionBody/mainReference/span/flow/block[2]/lineArea"/>
- <eval expected="page: 4" xpath="//pageViewport[4]/page/regionViewport/regionBody/mainReference/span/flow/block[1]/lineArea"/>
- <eval expected="page: 4" xpath="//pageViewport[4]/page/regionViewport/regionBody/mainReference/span/flow/block[2]/lineArea"/>
+ <eval expected="page: 4" xpath="//pageViewport[@nr=4]/page/regionViewport/regionBody/mainReference/span/flow/block[1]/lineArea"/>
+ <eval expected="page: 4" xpath="//pageViewport[@nr=4]/page/regionViewport/regionBody/mainReference/span/flow/block[2]/lineArea"/>
</checks>
</testcase>
1.3 +19 -19 xml-fop/test/layoutengine/testcases/normal-breaking1.xml
Index: normal-breaking1.xml
===================================================================
RCS file: /home/cvs/xml-fop/test/layoutengine/testcases/normal-breaking1.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- normal-breaking1.xml 9 Feb 2005 21:38:31 -0000 1.2
+++ normal-breaking1.xml 9 Jun 2005 14:20:45 -0000 1.3
@@ -59,29 +59,29 @@
</fo:root>
</fo>
<checks>
- <eval expected="block1" xpath="//pageViewport[1]/page/regionViewport/regionBody/mainReference/span/flow/block[1]/lineArea"/>
- <eval expected="block2" xpath="//pageViewport[1]/page/regionViewport/regionBody/mainReference/span/flow/block[2]/lineArea"/>
- <eval expected="block3" xpath="//pageViewport[1]/page/regionViewport/regionBody/mainReference/span/flow/block[3]/lineArea"/>
- <eval expected="block4" xpath="//pageViewport[1]/page/regionViewport/regionBody/mainReference/span/flow/block[4]/lineArea"/>
+ <eval expected="block1" xpath="//pageViewport[@nr=1]/page/regionViewport/regionBody/mainReference/span/flow/block[1]/lineArea"/>
+ <eval expected="block2" xpath="//pageViewport[@nr=1]/page/regionViewport/regionBody/mainReference/span/flow/block[2]/lineArea"/>
+ <eval expected="block3" xpath="//pageViewport[@nr=1]/page/regionViewport/regionBody/mainReference/span/flow/block[3]/lineArea"/>
+ <eval expected="block4" xpath="//pageViewport[@nr=1]/page/regionViewport/regionBody/mainReference/span/flow/block[4]/lineArea"/>
- <eval expected="block5" xpath="//pageViewport[2]/page/regionViewport/regionBody/mainReference/span/flow/block[1]/lineArea"/>
- <eval expected="block6" xpath="//pageViewport[2]/page/regionViewport/regionBody/mainReference/span/flow/block[2]/lineArea"/>
- <eval expected="block7" xpath="//pageViewport[2]/page/regionViewport/regionBody/mainReference/span/flow/block[3]/lineArea"/>
- <eval expected="block8" xpath="//pageViewport[2]/page/regionViewport/regionBody/mainReference/span/flow/block[4]/lineArea"/>
+ <eval expected="block5" xpath="//pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span/flow/block[1]/lineArea"/>
+ <eval expected="block6" xpath="//pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span/flow/block[2]/lineArea"/>
+ <eval expected="block7" xpath="//pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span/flow/block[3]/lineArea"/>
+ <eval expected="block8" xpath="//pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span/flow/block[4]/lineArea"/>
- <eval expected="block9" xpath="//pageViewport[3]/page/regionViewport/regionBody/mainReference/span/flow/block[1]/lineArea"/>
+ <eval expected="block9" xpath="//pageViewport[@nr=3]/page/regionViewport/regionBody/mainReference/span/flow/block[1]/lineArea"/>
<!-- second page sequence uses a plain block-container -->
- <eval expected="block1" xpath="//pageViewport[4]/page/regionViewport/regionBody/mainReference/span/flow/block/block/block[1]/lineArea"/>
- <eval expected="block2" xpath="//pageViewport[4]/page/regionViewport/regionBody/mainReference/span/flow/block/block/block[2]/lineArea"/>
- <eval expected="block3" xpath="//pageViewport[4]/page/regionViewport/regionBody/mainReference/span/flow/block/block/block[3]/lineArea"/>
- <eval expected="block4" xpath="//pageViewport[4]/page/regionViewport/regionBody/mainReference/span/flow/block/block/block[4]/lineArea"/>
+ <eval expected="block1" xpath="//pageViewport[@nr=4]/page/regionViewport/regionBody/mainReference/span/flow/block/block/block[1]/lineArea"/>
+ <eval expected="block2" xpath="//pageViewport[@nr=4]/page/regionViewport/regionBody/mainReference/span/flow/block/block/block[2]/lineArea"/>
+ <eval expected="block3" xpath="//pageViewport[@nr=4]/page/regionViewport/regionBody/mainReference/span/flow/block/block/block[3]/lineArea"/>
+ <eval expected="block4" xpath="//pageViewport[@nr=4]/page/regionViewport/regionBody/mainReference/span/flow/block/block/block[4]/lineArea"/>
- <eval expected="block5" xpath="//pageViewport[5]/page/regionViewport/regionBody/mainReference/span/flow/block[1]/block/block[1]/lineArea"/>
- <eval expected="block6" xpath="//pageViewport[5]/page/regionViewport/regionBody/mainReference/span/flow/block[2]/lineArea"/>
- <eval expected="block7" xpath="//pageViewport[5]/page/regionViewport/regionBody/mainReference/span/flow/block[3]/lineArea"/>
- <eval expected="block8" xpath="//pageViewport[5]/page/regionViewport/regionBody/mainReference/span/flow/block[4]/lineArea"/>
+ <eval expected="block5" xpath="//pageViewport[@nr=5]/page/regionViewport/regionBody/mainReference/span/flow/block[1]/block/block[1]/lineArea"/>
+ <eval expected="block6" xpath="//pageViewport[@nr=5]/page/regionViewport/regionBody/mainReference/span/flow/block[2]/lineArea"/>
+ <eval expected="block7" xpath="//pageViewport[@nr=5]/page/regionViewport/regionBody/mainReference/span/flow/block[3]/lineArea"/>
+ <eval expected="block8" xpath="//pageViewport[@nr=5]/page/regionViewport/regionBody/mainReference/span/flow/block[4]/lineArea"/>
- <eval expected="block9" xpath="//pageViewport[6]/page/regionViewport/regionBody/mainReference/span/flow/block[1]/lineArea"/>
+ <eval expected="block9" xpath="//pageViewport[@nr=6]/page/regionViewport/regionBody/mainReference/span/flow/block[1]/lineArea"/>
</checks>
</testcase>
1.3 +17 -17 xml-fop/test/layoutengine/testcases/page-master3.xml
Index: page-master3.xml
===================================================================
RCS file: /home/cvs/xml-fop/test/layoutengine/testcases/page-master3.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- page-master3.xml 13 May 2005 19:16:51 -0000 1.2
+++ page-master3.xml 9 Jun 2005 14:20:45 -0000 1.3
@@ -54,22 +54,22 @@
</fo:root>
</fo>
<checks>
- <eval expected="10000 20000 320000 20000" xpath="//pageViewport[1]/page/regionViewport[1]/@rect"/>
- <eval expected="320000" xpath="//pageViewport[1]/page/regionViewport[1]/regionBefore/@ipda"/>
- <eval expected="20000" xpath="//pageViewport[1]/page/regionViewport[1]/regionBefore/@bpda"/>
- <eval expected="320000" xpath="//pageViewport[1]/page/regionViewport[1]/regionBefore/block[1]/@ipda"/>
- <eval expected="14400" xpath="//pageViewport[1]/page/regionViewport[1]/regionBefore/block[1]/@bpda"/>
- <eval expected="10000 40000 320000 280000" xpath="//pageViewport[1]/page/regionViewport[2]/@rect"/>
- <eval expected="320000" xpath="//pageViewport[1]/page/regionViewport[2]/regionBody/@ipda"/>
- <eval expected="280000" xpath="//pageViewport[1]/page/regionViewport[2]/regionBody/@bpda"/>
+ <eval expected="10000 20000 320000 20000" xpath="//pageViewport[@nr=1]/page/regionViewport[1]/@rect"/>
+ <eval expected="320000" xpath="//pageViewport[@nr=1]/page/regionViewport[1]/regionBefore/@ipda"/>
+ <eval expected="20000" xpath="//pageViewport[@nr=1]/page/regionViewport[1]/regionBefore/@bpda"/>
+ <eval expected="320000" xpath="//pageViewport[@nr=1]/page/regionViewport[1]/regionBefore/block[1]/@ipda"/>
+ <eval expected="14400" xpath="//pageViewport[@nr=1]/page/regionViewport[1]/regionBefore/block[1]/@bpda"/>
+ <eval expected="10000 40000 320000 280000" xpath="//pageViewport[@nr=1]/page/regionViewport[2]/@rect"/>
+ <eval expected="320000" xpath="//pageViewport[@nr=1]/page/regionViewport[2]/regionBody/@ipda"/>
+ <eval expected="280000" xpath="//pageViewport[@nr=1]/page/regionViewport[2]/regionBody/@bpda"/>
- <eval expected="10000 20000 20000 300000" xpath="//pageViewport[2]/page/regionViewport[1]/@rect"/>
- <eval expected="300000" xpath="//pageViewport[2]/page/regionViewport[1]/regionBefore/@ipda"/>
- <eval expected="20000" xpath="//pageViewport[2]/page/regionViewport[1]/regionBefore/@bpda"/>
- <eval expected="300000" xpath="//pageViewport[2]/page/regionViewport[1]/regionBefore/block[1]/@ipda"/>
- <eval expected="14400" xpath="//pageViewport[2]/page/regionViewport[1]/regionBefore/block[1]/@bpda"/>
- <eval expected="45000 20000 285000 300000" xpath="//pageViewport[2]/page/regionViewport[2]/@rect"/>
- <eval expected="300000" xpath="//pageViewport[2]/page/regionViewport[2]/regionBody/@ipda"/>
- <eval expected="285000" xpath="//pageViewport[2]/page/regionViewport[2]/regionBody/@bpda"/>
+ <eval expected="10000 20000 20000 300000" xpath="//pageViewport[@nr=2]/page/regionViewport[1]/@rect"/>
+ <eval expected="300000" xpath="//pageViewport[@nr=2]/page/regionViewport[1]/regionBefore/@ipda"/>
+ <eval expected="20000" xpath="//pageViewport[@nr=2]/page/regionViewport[1]/regionBefore/@bpda"/>
+ <eval expected="300000" xpath="//pageViewport[@nr=2]/page/regionViewport[1]/regionBefore/block[1]/@ipda"/>
+ <eval expected="14400" xpath="//pageViewport[@nr=2]/page/regionViewport[1]/regionBefore/block[1]/@bpda"/>
+ <eval expected="45000 20000 285000 300000" xpath="//pageViewport[@nr=2]/page/regionViewport[2]/@rect"/>
+ <eval expected="300000" xpath="//pageViewport[@nr=2]/page/regionViewport[2]/regionBody/@ipda"/>
+ <eval expected="285000" xpath="//pageViewport[@nr=2]/page/regionViewport[2]/regionBody/@bpda"/>
</checks>
</testcase>
1.4 +38 -38 xml-fop/test/layoutengine/testcases/page-master1.xml
Index: page-master1.xml
===================================================================
RCS file: /home/cvs/xml-fop/test/layoutengine/testcases/page-master1.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- page-master1.xml 17 Feb 2005 09:19:10 -0000 1.3
+++ page-master1.xml 9 Jun 2005 14:20:45 -0000 1.4
@@ -60,47 +60,47 @@
</fo:root>
</fo>
<checks>
- <true xpath="//pageViewport[1]/page/regionViewport/@is-viewport-area"/>
- <true xpath="//pageViewport[1]/page/regionViewport//regionBody/@is-reference-area"/>
- <true xpath="//pageViewport[1]/page/regionViewport//regionBody/mainReference/@is-reference-area"/>
- <true xpath="//pageViewport[1]/page/regionViewport//regionBody/mainReference/span/@is-reference-area"/>
- <true xpath="//pageViewport[1]/page/regionViewport//regionBody/mainReference/span/flow/@is-reference-area"/>
+ <true xpath="//pageViewport[@nr=1]/page/regionViewport/@is-viewport-area"/>
+ <true xpath="//pageViewport[@nr=1]/page/regionViewport//regionBody/@is-reference-area"/>
+ <true xpath="//pageViewport[@nr=1]/page/regionViewport//regionBody/mainReference/@is-reference-area"/>
+ <true xpath="//pageViewport[@nr=1]/page/regionViewport//regionBody/mainReference/span/@is-reference-area"/>
+ <true xpath="//pageViewport[@nr=1]/page/regionViewport//regionBody/mainReference/span/flow/@is-reference-area"/>
- <eval expected="0 0 360000 360000" xpath="//pageViewport[1]/@bounds"/>
- <eval expected="10000 20000 320000 300000" xpath="//pageViewport[1]/page/regionViewport/@rect"/>
- <eval expected="320000" xpath="//pageViewport[1]/page/regionViewport/@ipda"/>
- <eval expected="320000" xpath="//pageViewport[1]/page/regionViewport/@ipd"/>
- <eval expected="300000" xpath="//pageViewport[1]/page/regionViewport/@bpda"/>
- <eval expected="300000" xpath="//pageViewport[1]/page/regionViewport/@bpd"/>
- <eval expected="320000" xpath="//pageViewport[1]/page/regionViewport/regionBody/mainReference/span/flow/block/@ipda"/>
- <eval expected="320000" xpath="//pageViewport[1]/page/regionViewport/regionBody/mainReference/span/flow/block/@ipd"/>
+ <eval expected="0 0 360000 360000" xpath="//pageViewport[@nr=1]/@bounds"/>
+ <eval expected="10000 20000 320000 300000" xpath="//pageViewport[@nr=1]/page/regionViewport/@rect"/>
+ <eval expected="320000" xpath="//pageViewport[@nr=1]/page/regionViewport/@ipda"/>
+ <eval expected="320000" xpath="//pageViewport[@nr=1]/page/regionViewport/@ipd"/>
+ <eval expected="300000" xpath="//pageViewport[@nr=1]/page/regionViewport/@bpda"/>
+ <eval expected="300000" xpath="//pageViewport[@nr=1]/page/regionViewport/@bpd"/>
+ <eval expected="320000" xpath="//pageViewport[@nr=1]/page/regionViewport/regionBody/mainReference/span/flow/block/@ipda"/>
+ <eval expected="320000" xpath="//pageViewport[@nr=1]/page/regionViewport/regionBody/mainReference/span/flow/block/@ipd"/>
- <eval expected="0 0 360000 360000" xpath="//pageViewport[2]/@bounds"/>
- <eval expected="20000 20000 320000 320000" xpath="//pageViewport[2]/page/regionViewport/@rect"/>
- <eval expected="320000" xpath="//pageViewport[2]/page/regionViewport/@ipda"/>
- <eval expected="320000" xpath="//pageViewport[2]/page/regionViewport/@ipd"/>
- <eval expected="320000" xpath="//pageViewport[2]/page/regionViewport/@bpda"/>
- <eval expected="320000" xpath="//pageViewport[2]/page/regionViewport/@bpd"/>
- <eval expected="320000" xpath="//pageViewport[2]/page/regionViewport/regionBody/mainReference/span/flow/block/@ipda"/>
- <eval expected="320000" xpath="//pageViewport[2]/page/regionViewport/regionBody/mainReference/span/flow/block/@ipd"/>
+ <eval expected="0 0 360000 360000" xpath="//pageViewport[@nr=2]/@bounds"/>
+ <eval expected="20000 20000 320000 320000" xpath="//pageViewport[@nr=2]/page/regionViewport/@rect"/>
+ <eval expected="320000" xpath="//pageViewport[@nr=2]/page/regionViewport/@ipda"/>
+ <eval expected="320000" xpath="//pageViewport[@nr=2]/page/regionViewport/@ipd"/>
+ <eval expected="320000" xpath="//pageViewport[@nr=2]/page/regionViewport/@bpda"/>
+ <eval expected="320000" xpath="//pageViewport[@nr=2]/page/regionViewport/@bpd"/>
+ <eval expected="320000" xpath="//pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span/flow/block/@ipda"/>
+ <eval expected="320000" xpath="//pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span/flow/block/@ipd"/>
- <eval expected="0 0 360000 360000" xpath="//pageViewport[3]/@bounds"/>
- <eval expected="10000 20000 340000 320000" xpath="//pageViewport[3]/page/regionViewport/@rect"/>
- <eval expected="340000" xpath="//pageViewport[3]/page/regionViewport/@ipda"/>
- <eval expected="340000" xpath="//pageViewport[3]/page/regionViewport/@ipd"/>
- <eval expected="320000" xpath="//pageViewport[3]/page/regionViewport/@bpda"/>
- <eval expected="320000" xpath="//pageViewport[3]/page/regionViewport/@bpd"/>
- <eval expected="340000" xpath="//pageViewport[3]/page/regionViewport/regionBody/mainReference/span/flow/block/@ipda"/>
- <eval expected="340000" xpath="//pageViewport[3]/page/regionViewport/regionBody/mainReference/span/flow/block/@ipd"/>
+ <eval expected="0 0 360000 360000" xpath="//pageViewport[@nr=3]/@bounds"/>
+ <eval expected="10000 20000 340000 320000" xpath="//pageViewport[@nr=3]/page/regionViewport/@rect"/>
+ <eval expected="340000" xpath="//pageViewport[@nr=3]/page/regionViewport/@ipda"/>
+ <eval expected="340000" xpath="//pageViewport[@nr=3]/page/regionViewport/@ipd"/>
+ <eval expected="320000" xpath="//pageViewport[@nr=3]/page/regionViewport/@bpda"/>
+ <eval expected="320000" xpath="//pageViewport[@nr=3]/page/regionViewport/@bpd"/>
+ <eval expected="340000" xpath="//pageViewport[@nr=3]/page/regionViewport/regionBody/mainReference/span/flow/block/@ipda"/>
+ <eval expected="340000" xpath="//pageViewport[@nr=3]/page/regionViewport/regionBody/mainReference/span/flow/block/@ipd"/>
- <eval expected="0 0 360000 360000" xpath="//pageViewport[4]/@bounds"/>
- <eval expected="10000 20000 340000 310000" xpath="//pageViewport[4]/page/regionViewport/@rect"/>
- <eval expected="340000" xpath="//pageViewport[4]/page/regionViewport/@ipda"/>
- <eval expected="340000" xpath="//pageViewport[4]/page/regionViewport/@ipd"/>
- <eval expected="310000" xpath="//pageViewport[4]/page/regionViewport/@bpda"/>
- <eval expected="310000" xpath="//pageViewport[4]/page/regionViewport/@bpd"/>
- <eval expected="340000" xpath="//pageViewport[4]/page/regionViewport/regionBody/mainReference/span/flow/block/@ipda"/>
- <eval expected="340000" xpath="//pageViewport[4]/page/regionViewport/regionBody/mainReference/span/flow/block/@ipd"/>
+ <eval expected="0 0 360000 360000" xpath="//pageViewport[@nr=4]/@bounds"/>
+ <eval expected="10000 20000 340000 310000" xpath="//pageViewport[@nr=4]/page/regionViewport/@rect"/>
+ <eval expected="340000" xpath="//pageViewport[@nr=4]/page/regionViewport/@ipda"/>
+ <eval expected="340000" xpath="//pageViewport[@nr=4]/page/regionViewport/@ipd"/>
+ <eval expected="310000" xpath="//pageViewport[@nr=4]/page/regionViewport/@bpda"/>
+ <eval expected="310000" xpath="//pageViewport[@nr=4]/page/regionViewport/@bpd"/>
+ <eval expected="340000" xpath="//pageViewport[@nr=4]/page/regionViewport/regionBody/mainReference/span/flow/block/@ipda"/>
+ <eval expected="340000" xpath="//pageViewport[@nr=4]/page/regionViewport/regionBody/mainReference/span/flow/block/@ipd"/>
</checks>
</testcase>
1.2 +9 -9 xml-fop/test/layoutengine/testcases/page-number2.xml
Index: page-number2.xml
===================================================================
RCS file: /home/cvs/xml-fop/test/layoutengine/testcases/page-number2.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- page-number2.xml 21 Feb 2005 09:25:28 -0000 1.1
+++ page-number2.xml 9 Jun 2005 14:20:45 -0000 1.2
@@ -53,16 +53,16 @@
</fo:root>
</fo>
<checks>
- <eval expected="page: 1" xpath="//pageViewport[1]/page/regionViewport/regionBody/mainReference/span/flow/block[1]/lineArea"/>
- <eval expected="page: 1" xpath="//pageViewport[1]/page/regionViewport/regionBody/mainReference/span/flow/block[2]/lineArea"/>
+ <eval expected="page: 1" xpath="//pageViewport[@nr=1]/page/regionViewport/regionBody/mainReference/span/flow/block[1]/lineArea"/>
+ <eval expected="page: 1" xpath="//pageViewport[@nr=1]/page/regionViewport/regionBody/mainReference/span/flow/block[2]/lineArea"/>
- <eval expected="page: 2" xpath="//pageViewport[2]/page/regionViewport/regionBody/mainReference/span/flow/block[1]/lineArea"/>
- <eval expected="page: 2" xpath="//pageViewport[2]/page/regionViewport/regionBody/mainReference/span/flow/block[2]/lineArea"/>
+ <eval expected="page: 2" xpath="//pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span/flow/block[1]/lineArea"/>
+ <eval expected="page: 2" xpath="//pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span/flow/block[2]/lineArea"/>
- <eval expected="page: 11" xpath="//pageViewport[3]/page/regionViewport/regionBody/mainReference/span/flow/block[1]/lineArea"/>
- <eval expected="page: 11" xpath="//pageViewport[3]/page/regionViewport/regionBody/mainReference/span/flow/block[2]/lineArea"/>
+ <eval expected="page: 11" xpath="//pageViewport[@nr=11]/page/regionViewport/regionBody/mainReference/span/flow/block[1]/lineArea"/>
+ <eval expected="page: 11" xpath="//pageViewport[@nr=11]/page/regionViewport/regionBody/mainReference/span/flow/block[2]/lineArea"/>
- <eval expected="page: 12" xpath="//pageViewport[4]/page/regionViewport/regionBody/mainReference/span/flow/block[1]/lineArea"/>
- <eval expected="page: 12" xpath="//pageViewport[4]/page/regionViewport/regionBody/mainReference/span/flow/block[2]/lineArea"/>
+ <eval expected="page: 12" xpath="//pageViewport[@nr=12]/page/regionViewport/regionBody/mainReference/span/flow/block[1]/lineArea"/>
+ <eval expected="page: 12" xpath="//pageViewport[@nr=12]/page/regionViewport/regionBody/mainReference/span/flow/block[2]/lineArea"/>
</checks>
</testcase>
1.2 +33 -33 xml-fop/test/layoutengine/testcases/page-master2.xml
Index: page-master2.xml
===================================================================
RCS file: /home/cvs/xml-fop/test/layoutengine/testcases/page-master2.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- page-master2.xml 24 Jan 2005 14:05:44 -0000 1.1
+++ page-master2.xml 9 Jun 2005 14:20:45 -0000 1.2
@@ -60,41 +60,41 @@
</fo:root>
</fo>
<checks>
- <eval expected="0 0 360000 360000" xpath="//pageViewport[1]/@bounds"/>
- <eval expected="10000 20000 320000 300000" xpath="//pageViewport[1]/page/regionViewport/@rect"/>
- <eval expected="320000" xpath="//pageViewport[1]/page/regionViewport/@ipda"/>
- <eval expected="320000" xpath="//pageViewport[1]/page/regionViewport/@ipd"/>
- <eval expected="300000" xpath="//pageViewport[1]/page/regionViewport/@bpda"/>
- <eval expected="300000" xpath="//pageViewport[1]/page/regionViewport/@bpd"/>
- <eval expected="320000" xpath="//pageViewport[1]/page/regionViewport/regionBody/mainReference/span/flow/block/@ipda"/>
- <eval expected="320000" xpath="//pageViewport[1]/page/regionViewport/regionBody/mainReference/span/flow/block/@ipd"/>
+ <eval expected="0 0 360000 360000" xpath="//pageViewport[@nr=1]/@bounds"/>
+ <eval expected="10000 20000 320000 300000" xpath="//pageViewport[@nr=1]/page/regionViewport/@rect"/>
+ <eval expected="320000" xpath="//pageViewport[@nr=1]/page/regionViewport/@ipda"/>
+ <eval expected="320000" xpath="//pageViewport[@nr=1]/page/regionViewport/@ipd"/>
+ <eval expected="300000" xpath="//pageViewport[@nr=1]/page/regionViewport/@bpda"/>
+ <eval expected="300000" xpath="//pageViewport[@nr=1]/page/regionViewport/@bpd"/>
+ <eval expected="320000" xpath="//pageViewport[@nr=1]/page/regionViewport/regionBody/mainReference/span/flow/block/@ipda"/>
+ <eval expected="320000" xpath="//pageViewport[@nr=1]/page/regionViewport/regionBody/mainReference/span/flow/block/@ipd"/>
- <eval expected="0 0 360000 360000" xpath="//pageViewport[2]/@bounds"/>
- <eval expected="20000 20000 320000 320000" xpath="//pageViewport[2]/page/regionViewport/@rect"/>
- <eval expected="320000" xpath="//pageViewport[2]/page/regionViewport/@ipda"/>
- <eval expected="320000" xpath="//pageViewport[2]/page/regionViewport/@ipd"/>
- <eval expected="320000" xpath="//pageViewport[2]/page/regionViewport/@bpda"/>
- <eval expected="320000" xpath="//pageViewport[2]/page/regionViewport/@bpd"/>
- <eval expected="320000" xpath="//pageViewport[2]/page/regionViewport/regionBody/mainReference/span/flow/block/@ipda"/>
- <eval expected="320000" xpath="//pageViewport[2]/page/regionViewport/regionBody/mainReference/span/flow/block/@ipd"/>
+ <eval expected="0 0 360000 360000" xpath="//pageViewport[@nr=2]/@bounds"/>
+ <eval expected="20000 20000 320000 320000" xpath="//pageViewport[@nr=2]/page/regionViewport/@rect"/>
+ <eval expected="320000" xpath="//pageViewport[@nr=2]/page/regionViewport/@ipda"/>
+ <eval expected="320000" xpath="//pageViewport[@nr=2]/page/regionViewport/@ipd"/>
+ <eval expected="320000" xpath="//pageViewport[@nr=2]/page/regionViewport/@bpda"/>
+ <eval expected="320000" xpath="//pageViewport[@nr=2]/page/regionViewport/@bpd"/>
+ <eval expected="320000" xpath="//pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span/flow/block/@ipda"/>
+ <eval expected="320000" xpath="//pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span/flow/block/@ipd"/>
- <eval expected="0 0 360000 360000" xpath="//pageViewport[3]/@bounds"/>
- <eval expected="10000 20000 340000 320000" xpath="//pageViewport[3]/page/regionViewport/@rect"/>
- <eval expected="340000" xpath="//pageViewport[3]/page/regionViewport/@ipda"/>
- <eval expected="340000" xpath="//pageViewport[3]/page/regionViewport/@ipd"/>
- <eval expected="320000" xpath="//pageViewport[3]/page/regionViewport/@bpda"/>
- <eval expected="320000" xpath="//pageViewport[3]/page/regionViewport/@bpd"/>
- <eval expected="340000" xpath="//pageViewport[3]/page/regionViewport/regionBody/mainReference/span/flow/block/@ipda"/>
- <eval expected="340000" xpath="//pageViewport[3]/page/regionViewport/regionBody/mainReference/span/flow/block/@ipd"/>
+ <eval expected="0 0 360000 360000" xpath="//pageViewport[@nr=3]/@bounds"/>
+ <eval expected="10000 20000 340000 320000" xpath="//pageViewport[@nr=3]/page/regionViewport/@rect"/>
+ <eval expected="340000" xpath="//pageViewport[@nr=3]/page/regionViewport/@ipda"/>
+ <eval expected="340000" xpath="//pageViewport[@nr=3]/page/regionViewport/@ipd"/>
+ <eval expected="320000" xpath="//pageViewport[@nr=3]/page/regionViewport/@bpda"/>
+ <eval expected="320000" xpath="//pageViewport[@nr=3]/page/regionViewport/@bpd"/>
+ <eval expected="340000" xpath="//pageViewport[@nr=3]/page/regionViewport/regionBody/mainReference/span/flow/block/@ipda"/>
+ <eval expected="340000" xpath="//pageViewport[@nr=3]/page/regionViewport/regionBody/mainReference/span/flow/block/@ipd"/>
- <eval expected="0 0 360000 360000" xpath="//pageViewport[4]/@bounds"/>
- <eval expected="10000 20000 340000 310000" xpath="//pageViewport[4]/page/regionViewport/@rect"/>
- <eval expected="340000" xpath="//pageViewport[4]/page/regionViewport/@ipda"/>
- <eval expected="340000" xpath="//pageViewport[4]/page/regionViewport/@ipd"/>
- <eval expected="310000" xpath="//pageViewport[4]/page/regionViewport/@bpda"/>
- <eval expected="310000" xpath="//pageViewport[4]/page/regionViewport/@bpd"/>
- <eval expected="340000" xpath="//pageViewport[4]/page/regionViewport/regionBody/mainReference/span/flow/block/@ipda"/>
- <eval expected="340000" xpath="//pageViewport[4]/page/regionViewport/regionBody/mainReference/span/flow/block/@ipd"/>
+ <eval expected="0 0 360000 360000" xpath="//pageViewport[@nr=4]/@bounds"/>
+ <eval expected="10000 20000 340000 310000" xpath="//pageViewport[@nr=4]/page/regionViewport/@rect"/>
+ <eval expected="340000" xpath="//pageViewport[@nr=4]/page/regionViewport/@ipda"/>
+ <eval expected="340000" xpath="//pageViewport[@nr=4]/page/regionViewport/@ipd"/>
+ <eval expected="310000" xpath="//pageViewport[@nr=4]/page/regionViewport/@bpda"/>
+ <eval expected="310000" xpath="//pageViewport[@nr=4]/page/regionViewport/@bpd"/>
+ <eval expected="340000" xpath="//pageViewport[@nr=4]/page/regionViewport/regionBody/mainReference/span/flow/block/@ipda"/>
+ <eval expected="340000" xpath="//pageViewport[@nr=4]/page/regionViewport/regionBody/mainReference/span/flow/block/@ipd"/>
</checks>
</testcase>
1.2 +21 -21 xml-fop/test/layoutengine/testcases/markers7.xml
Index: markers7.xml
===================================================================
RCS file: /home/cvs/xml-fop/test/layoutengine/testcases/markers7.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- markers7.xml 30 May 2005 09:01:32 -0000 1.1
+++ markers7.xml 9 Jun 2005 14:20:45 -0000 1.2
@@ -307,34 +307,34 @@
</fo>
<checks>
<!-- fo:flow -->
- <eval expected="fo:flow" xpath="//pageViewport[1]/page/regionViewport[1]/regionBefore/block[1]/lineArea"/>
- <eval expected="fo:flow" xpath="//pageViewport[1]/page/regionViewport[2]/regionAfter/block[1]/lineArea"/>
+ <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"/>
<!-- fo:block -->
- <eval expected="fo:block" xpath="//pageViewport[2]/page/regionViewport[1]/regionBefore/block[1]/lineArea"/>
- <eval expected="fo:block" xpath="//pageViewport[2]/page/regionViewport[2]/regionAfter/block[1]/lineArea"/>
+ <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"/>
<!-- fo:block-container -->
- <eval expected="fo:block-container" xpath="//pageViewport[3]/page/regionViewport[1]/regionBefore/block[1]/lineArea"/>
- <eval expected="fo:block-container" xpath="//pageViewport[3]/page/regionViewport[2]/regionAfter/block[1]/lineArea"/>
+ <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"/>
<!-- fo:table -->
- <eval expected="fo:table" xpath="//pageViewport[4]/page/regionViewport[1]/regionBefore/block[1]/lineArea"/>
- <eval expected="fo:table" xpath="//pageViewport[4]/page/regionViewport[2]/regionAfter/block[1]/lineArea"/>
+ <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"/>
<!-- fo:table-body -->
- <eval expected="fo:table-body" xpath="//pageViewport[5]/page/regionViewport[1]/regionBefore/block[1]/lineArea"/>
- <eval expected="fo:table-body" xpath="//pageViewport[5]/page/regionViewport[2]/regionAfter/block[1]/lineArea"/>
+ <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"/>
<!-- fo:table-header -->
- <eval expected="fo:table-header" xpath="//pageViewport[6]/page/regionViewport[1]/regionBefore/block[1]/lineArea"/>
- <eval expected="fo:table-header" xpath="//pageViewport[6]/page/regionViewport[2]/regionAfter/block[1]/lineArea"/>
+ <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"/>
<!-- fo:table-footer -->
- <eval expected="fo:table-footer" xpath="//pageViewport[7]/page/regionViewport[1]/regionBefore/block[1]/lineArea"/>
- <eval expected="fo:table-footer" xpath="//pageViewport[7]/page/regionViewport[2]/regionAfter/block[1]/lineArea"/>
+ <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"/>
<!-- fo:table-cell -->
- <eval expected="fo:table-cell" xpath="//pageViewport[8]/page/regionViewport[1]/regionBefore/block[1]/lineArea"/>
- <eval expected="fo:table-cell" xpath="//pageViewport[8]/page/regionViewport[2]/regionAfter/block[1]/lineArea"/>
+ <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"/>
<!-- fo:list-block -->
- <eval expected="fo:list-block" xpath="//pageViewport[9]/page/regionViewport[1]/regionBefore/block[1]/lineArea"/>
- <eval expected="fo:list-block" xpath="//pageViewport[9]/page/regionViewport[2]/regionAfter/block[1]/lineArea"/>
+ <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"/>
<!-- fo:list-item -->
- <eval expected="fo:list-item" xpath="//pageViewport[10]/page/regionViewport[1]/regionBefore/block[1]/lineArea"/>
- <eval expected="fo:list-item" xpath="//pageViewport[10]/page/regionViewport[2]/regionAfter/block[1]/lineArea"/>
+ <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"/>
</checks>
</testcase>
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org