jeremias 2005/02/09 13:38:31
Modified: test/layoutengine/testcases line-layout1.xml
block-container6.xml markers2.xml table2.xml
normal-breaking1.xml table-column1.xml
table-column3.xml normal-breaking3.xml table1.xml
text-decoration1.xml markers1.xml
Log:
Better XPath statements for certain parser/XSLT combinations.
Suggested by: Simon Pepping
Revision Changes Path
1.2 +9 -9 xml-fop/test/layoutengine/testcases/line-layout1.xml
Index: line-layout1.xml
===================================================================
RCS file: /home/cvs/xml-fop/test/layoutengine/testcases/line-layout1.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- line-layout1.xml 2 Feb 2005 14:16:48 -0000 1.1
+++ line-layout1.xml 9 Feb 2005 21:38:31 -0000 1.2
@@ -50,19 +50,19 @@
</fo:root>
</fo>
<checks>
- <eval expected="word1 word2 word3"
xpath="//flow/block[1]/lineArea[1]/text"/>
- <eval expected="word1 word2 word3"
xpath="//flow/block[2]/lineArea[1]/text"/>
+ <eval expected="word1 word2 word3" xpath="//flow/block[1]/lineArea[1]"/>
+ <eval expected="word1 word2 word3" xpath="//flow/block[2]/lineArea[1]"/>
- <eval expected="line1" xpath="//flow/block[3]/lineArea[1]/text"/>
- <eval expected="line2" xpath="//flow/block[3]/lineArea[2]/text"/>
- <eval expected="line3" xpath="//flow/block[3]/lineArea[3]/text"/>
+ <eval expected="line1" xpath="//flow/block[3]/lineArea[1]"/>
+ <eval expected="line2" xpath="//flow/block[3]/lineArea[2]"/>
+ <eval expected="line3" xpath="//flow/block[3]/lineArea[3]"/>
<true xpath="boolean(//flow/block[4]/lineArea[1])"/>
<true xpath="not(boolean(//flow/block[4]/lineArea[1]/text))"/>
- <eval expected="line1" xpath="//flow/block[4]/lineArea[2]/text"/>
- <eval expected="line2" xpath="//flow/block[4]/lineArea[3]/text"/>
+ <eval expected="line1" xpath="//flow/block[4]/lineArea[2]"/>
+ <eval expected="line2" xpath="//flow/block[4]/lineArea[3]"/>
<true xpath="boolean(//flow/block[4]/lineArea[4])"/>
<true xpath="not(boolean(//flow/block[4]/lineArea[4]/text))"/>
- <eval expected="line3" xpath="//flow/block[4]/lineArea[5]/text"/>
+ <eval expected="line3" xpath="//flow/block[4]/lineArea[5]"/>
</checks>
</testcase>
1.2 +8 -8 xml-fop/test/layoutengine/testcases/block-container6.xml
Index: block-container6.xml
===================================================================
RCS file: /home/cvs/xml-fop/test/layoutengine/testcases/block-container6.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- block-container6.xml 26 Jan 2005 15:23:54 -0000 1.1
+++ block-container6.xml 9 Feb 2005 21:38:31 -0000 1.2
@@ -52,14 +52,14 @@
</fo:root>
</fo>
<checks>
- <true
xpath="starts-with(//pageViewport[1]/page/regionViewport/regionBody/mainReference/span/flow/block[1]/block/block[1]/lineArea/text,
'block1')"/>
- <eval expected="outside block-container"
xpath="//pageViewport[1]/page/regionViewport/regionBody/mainReference/span/flow/block[2]/lineArea/text"/>
- <true
xpath="starts-with(//pageViewport[1]/page/regionViewport/regionBody/mainReference/span/flow/block[3]/block/block[1]/lineArea/text,
'block2')"/>
+ <true
xpath="starts-with(//pageViewport[1]/page/regionViewport/regionBody/mainReference/span/flow/block[1]/block/block[1]/lineArea,
'block1')"/>
+ <eval expected="outside block-container"
xpath="//pageViewport[1]/page/regionViewport/regionBody/mainReference/span/flow/block[2]/lineArea"/>
+ <true
xpath="starts-with(//pageViewport[1]/page/regionViewport/regionBody/mainReference/span/flow/block[3]/block/block[1]/lineArea,
'block2')"/>
- <true
xpath="starts-with(//pageViewport[2]/page/regionViewport/regionBody/mainReference/span/flow/block[1]/block/block[1]/lineArea/text,
'block3')"/>
- <true
xpath="starts-with(//pageViewport[2]/page/regionViewport/regionBody/mainReference/span/flow/block[2]/block/block[1]/lineArea/text,
'block4')"/>
- <eval expected="outside block-container"
xpath="//pageViewport[2]/page/regionViewport/regionBody/mainReference/span/flow/block[3]/lineArea/text"/>
+ <true
xpath="starts-with(//pageViewport[2]/page/regionViewport/regionBody/mainReference/span/flow/block[1]/block/block[1]/lineArea,
'block3')"/>
+ <true
xpath="starts-with(//pageViewport[2]/page/regionViewport/regionBody/mainReference/span/flow/block[2]/block/block[1]/lineArea,
'block4')"/>
+ <eval expected="outside block-container"
xpath="//pageViewport[2]/page/regionViewport/regionBody/mainReference/span/flow/block[3]/lineArea"/>
- <true
xpath="starts-with(//pageViewport[3]/page/regionViewport/regionBody/mainReference/span/flow/block[1]/block/block[1]/lineArea/text,
'block5')"/>
+ <true
xpath="starts-with(//pageViewport[3]/page/regionViewport/regionBody/mainReference/span/flow/block[1]/block/block[1]/lineArea,
'block5')"/>
</checks>
</testcase>
1.2 +10 -10 xml-fop/test/layoutengine/testcases/markers2.xml
Index: markers2.xml
===================================================================
RCS file: /home/cvs/xml-fop/test/layoutengine/testcases/markers2.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- markers2.xml 27 Jan 2005 15:30:25 -0000 1.1
+++ markers2.xml 9 Feb 2005 21:38:31 -0000 1.2
@@ -97,17 +97,17 @@
</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/text"/>
- <eval expected="text1"
xpath="//pageViewport[1]/page/regionViewport[3]/regionBody/mainReference/span/flow/block[1]/block[2]/lineArea/text"/>
- <eval expected="text1"
xpath="//pageViewport[1]/page/regionViewport[3]/regionBody/mainReference/span/flow/block[1]/block[3]/lineArea/text"/>
+ <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"/>
<!-- etc... -->
- <eval expected="text1"
xpath="//pageViewport[2]/page/regionViewport[3]/regionBody/mainReference/span/flow/block[1]/block[1]/lineArea/text"/>
- <eval expected="Part 2"
xpath="//pageViewport[2]/page/regionViewport[3]/regionBody/mainReference/span/flow/block[2]/block[1]/lineArea/text"/>
- <eval expected="text2"
xpath="//pageViewport[2]/page/regionViewport[3]/regionBody/mainReference/span/flow/block[2]/block[2]/lineArea/text"/>
- <eval expected="text2"
xpath="//pageViewport[2]/page/regionViewport[3]/regionBody/mainReference/span/flow/block[2]/block[3]/lineArea/text"/>
+ <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"/>
<!-- etc... -->
- <eval expected="Part 3"
xpath="//pageViewport[2]/page/regionViewport[3]/regionBody/mainReference/span/flow/block[3]/block[1]/lineArea/text"/>
- <eval expected="text3"
xpath="//pageViewport[3]/page/regionViewport[3]/regionBody/mainReference/span/flow/block[1]/block[1]/lineArea/text"/>
+ <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"/>
<!-- Now we can check the markers -->
<eval expected="1"
xpath="//pageViewport[1]/page/regionViewport[2]/regionEnd/block[1]/descendant::lineArea/text"/>
1.2 +5 -5 xml-fop/test/layoutengine/testcases/table2.xml
Index: table2.xml
===================================================================
RCS file: /home/cvs/xml-fop/test/layoutengine/testcases/table2.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- table2.xml 7 Feb 2005 13:37:04 -0000 1.1
+++ table2.xml 9 Feb 2005 21:38:31 -0000 1.2
@@ -80,7 +80,7 @@
<eval expected="14400" xpath="//flow/block[3]/block[1]/@bpd"/>
<eval expected="144000" xpath="//flow/block[3]/block[1]/block[1]/@ipd"/>
<eval expected="14400" xpath="//flow/block[3]/block[1]/block[1]/@bpd"/>
- <eval expected="cell1"
xpath="//flow/block[3]/block[1]/block[1]/lineArea/text"/>
+ <eval expected="cell1"
xpath="//flow/block[3]/block[1]/block[1]/lineArea"/>
<!-- cell 2 -->
<true xpath="//flow/block[3]/block[2]/@is-reference-area"/>
@@ -90,7 +90,7 @@
<eval expected="14400" xpath="//flow/block[3]/block[2]/@bpd"/>
<eval expected="144000" xpath="//flow/block[3]/block[2]/block[1]/@ipd"/>
<eval expected="14400" xpath="//flow/block[3]/block[2]/block[1]/@bpd"/>
- <eval expected="cell2"
xpath="//flow/block[3]/block[2]/block[1]/lineArea/text"/>
+ <eval expected="cell2"
xpath="//flow/block[3]/block[2]/block[1]/lineArea"/>
<eval expected="color=#ffff00,repeat=0,horiz=0,vertical=0"
xpath="//flow/block[3]/block[2]/@background"/>
<!-- cell 3 -->
@@ -101,7 +101,7 @@
<eval expected="14400" xpath="//flow/block[3]/block[3]/@bpd"/>
<eval expected="144000" xpath="//flow/block[3]/block[3]/block[1]/@ipd"/>
<eval expected="14400" xpath="//flow/block[3]/block[3]/block[1]/@bpd"/>
- <eval expected="cell3"
xpath="//flow/block[3]/block[3]/block[1]/lineArea/text"/>
+ <eval expected="cell3"
xpath="//flow/block[3]/block[3]/block[1]/lineArea"/>
<eval expected="color=#ffa500,repeat=0,horiz=0,vertical=0"
xpath="//flow/block[3]/block[3]/@background"/>
<!-- cell 4 -->
@@ -112,6 +112,6 @@
<eval expected="14400" xpath="//flow/block[3]/block[4]/@bpd"/>
<eval expected="144000" xpath="//flow/block[3]/block[4]/block[1]/@ipd"/>
<eval expected="14400" xpath="//flow/block[3]/block[4]/block[1]/@bpd"/>
- <eval expected="cell4"
xpath="//flow/block[3]/block[4]/block[1]/lineArea/text"/>
+ <eval expected="cell4"
xpath="//flow/block[3]/block[4]/block[1]/lineArea"/>
</checks>
</testcase>
1.2 +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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- normal-breaking1.xml 26 Jan 2005 15:23:54 -0000 1.1
+++ normal-breaking1.xml 9 Feb 2005 21:38:31 -0000 1.2
@@ -59,29 +59,29 @@
</fo:root>
</fo>
<checks>
- <eval expected="block1"
xpath="//pageViewport[1]/page/regionViewport/regionBody/mainReference/span/flow/block[1]/lineArea/text"/>
- <eval expected="block2"
xpath="//pageViewport[1]/page/regionViewport/regionBody/mainReference/span/flow/block[2]/lineArea/text"/>
- <eval expected="block3"
xpath="//pageViewport[1]/page/regionViewport/regionBody/mainReference/span/flow/block[3]/lineArea/text"/>
- <eval expected="block4"
xpath="//pageViewport[1]/page/regionViewport/regionBody/mainReference/span/flow/block[4]/lineArea/text"/>
+ <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="block5"
xpath="//pageViewport[2]/page/regionViewport/regionBody/mainReference/span/flow/block[1]/lineArea/text"/>
- <eval expected="block6"
xpath="//pageViewport[2]/page/regionViewport/regionBody/mainReference/span/flow/block[2]/lineArea/text"/>
- <eval expected="block7"
xpath="//pageViewport[2]/page/regionViewport/regionBody/mainReference/span/flow/block[3]/lineArea/text"/>
- <eval expected="block8"
xpath="//pageViewport[2]/page/regionViewport/regionBody/mainReference/span/flow/block[4]/lineArea/text"/>
+ <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="block9"
xpath="//pageViewport[3]/page/regionViewport/regionBody/mainReference/span/flow/block[1]/lineArea/text"/>
+ <eval expected="block9"
xpath="//pageViewport[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/text"/>
- <eval expected="block2"
xpath="//pageViewport[4]/page/regionViewport/regionBody/mainReference/span/flow/block/block/block[2]/lineArea/text"/>
- <eval expected="block3"
xpath="//pageViewport[4]/page/regionViewport/regionBody/mainReference/span/flow/block/block/block[3]/lineArea/text"/>
- <eval expected="block4"
xpath="//pageViewport[4]/page/regionViewport/regionBody/mainReference/span/flow/block/block/block[4]/lineArea/text"/>
+ <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="block5"
xpath="//pageViewport[5]/page/regionViewport/regionBody/mainReference/span/flow/block[1]/block/block[1]/lineArea/text"/>
- <eval expected="block6"
xpath="//pageViewport[5]/page/regionViewport/regionBody/mainReference/span/flow/block[2]/lineArea/text"/>
- <eval expected="block7"
xpath="//pageViewport[5]/page/regionViewport/regionBody/mainReference/span/flow/block[3]/lineArea/text"/>
- <eval expected="block8"
xpath="//pageViewport[5]/page/regionViewport/regionBody/mainReference/span/flow/block[4]/lineArea/text"/>
+ <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="block9"
xpath="//pageViewport[6]/page/regionViewport/regionBody/mainReference/span/flow/block[1]/lineArea/text"/>
+ <eval expected="block9"
xpath="//pageViewport[6]/page/regionViewport/regionBody/mainReference/span/flow/block[1]/lineArea"/>
</checks>
</testcase>
1.2 +7 -7 xml-fop/test/layoutengine/testcases/table-column1.xml
Index: table-column1.xml
===================================================================
RCS file: /home/cvs/xml-fop/test/layoutengine/testcases/table-column1.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- table-column1.xml 31 Jan 2005 14:53:57 -0000 1.1
+++ table-column1.xml 9 Feb 2005 21:38:31 -0000 1.2
@@ -64,31 +64,31 @@
<checks>
<!-- cell 1 -->
- <eval expected="cell1"
xpath="//flow/block[1]/block[1]/block[1]/lineArea/text"/>
+ <eval expected="cell1"
xpath="//flow/block[1]/block[1]/block[1]/lineArea"/>
<eval expected="144000" xpath="//flow/block[1]/block[1]/@ipd"/>
<!-- cell 2 -->
- <eval expected="cell2"
xpath="//flow/block[1]/block[2]/block[1]/lineArea/text"/>
+ <eval expected="cell2"
xpath="//flow/block[1]/block[2]/block[1]/lineArea"/>
<eval expected="36000" xpath="//flow/block[1]/block[2]/@ipd"/>
<eval expected="144000" xpath="//flow/block[1]/block[2]/@left-offset"/>
<!-- cell 3 -->
- <eval expected="cell3"
xpath="//flow/block[1]/block[3]/block[1]/lineArea/text"/>
+ <eval expected="cell3"
xpath="//flow/block[1]/block[3]/block[1]/lineArea"/>
<eval expected="36000" xpath="//flow/block[1]/block[3]/@ipd"/>
<eval expected="180000" xpath="//flow/block[1]/block[3]/@left-offset"/>
<!-- cell 4 -->
- <eval expected="cell4"
xpath="//flow/block[1]/block[4]/block[1]/lineArea/text"/>
+ <eval expected="cell4"
xpath="//flow/block[1]/block[4]/block[1]/lineArea"/>
<eval expected="36000" xpath="//flow/block[1]/block[4]/@ipd"/>
<eval expected="216000" xpath="//flow/block[1]/block[4]/@left-offset"/>
<!-- cell 5 -->
- <eval expected="cell5"
xpath="//flow/block[1]/block[5]/block[1]/lineArea/text"/>
+ <eval expected="cell5"
xpath="//flow/block[1]/block[5]/block[1]/lineArea"/>
<eval expected="36000" xpath="//flow/block[1]/block[5]/@ipd"/>
<eval expected="252000" xpath="//flow/block[1]/block[5]/@left-offset"/>
<!-- cell 6 -->
- <eval expected="cell6"
xpath="//flow/block[1]/block[6]/block[1]/lineArea/text"/>
+ <eval expected="cell6"
xpath="//flow/block[1]/block[6]/block[1]/lineArea"/>
<eval expected="72000" xpath="//flow/block[1]/block[6]/@ipd"/>
<eval expected="288000" xpath="//flow/block[1]/block[6]/@left-offset"/>
</checks>
1.2 +7 -7 xml-fop/test/layoutengine/testcases/table-column3.xml
Index: table-column3.xml
===================================================================
RCS file: /home/cvs/xml-fop/test/layoutengine/testcases/table-column3.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- table-column3.xml 31 Jan 2005 17:02:27 -0000 1.1
+++ table-column3.xml 9 Feb 2005 21:38:31 -0000 1.2
@@ -72,27 +72,27 @@
</fo>
<checks>
<!-- cell 1 -->
- <eval expected="cell1"
xpath="//flow/block[1]/block[1]/block[1]/lineArea/text"/>
+ <eval expected="cell1"
xpath="//flow/block[1]/block[1]/block[1]/lineArea"/>
<eval expected="90000" xpath="//flow/block[1]/block[1]/@ipd"/>
<!-- cell 2 -->
- <eval expected="cell2"
xpath="//flow/block[1]/block[2]/block[1]/lineArea/text"/>
+ <eval expected="cell2"
xpath="//flow/block[1]/block[2]/block[1]/lineArea"/>
<eval expected="90000" xpath="//flow/block[1]/block[2]/@ipd"/>
<!-- cell 3 -->
- <eval expected="cell3"
xpath="//flow/block[1]/block[3]/block[1]/lineArea/text"/>
+ <eval expected="cell3"
xpath="//flow/block[1]/block[3]/block[1]/lineArea"/>
<eval expected="180000" xpath="//flow/block[1]/block[3]/@ipd"/>
<!-- cell 4 -->
- <eval expected="cell4"
xpath="//flow/block[2]/block[1]/block[1]/lineArea/text"/>
+ <eval expected="cell4"
xpath="//flow/block[2]/block[1]/block[1]/lineArea"/>
<eval expected="90000" xpath="//flow/block[2]/block[1]/@ipd"/>
<!-- cell 5 -->
- <eval expected="cell5"
xpath="//flow/block[2]/block[2]/block[1]/lineArea/text"/>
+ <eval expected="cell5"
xpath="//flow/block[2]/block[2]/block[1]/lineArea"/>
<eval expected="90000" xpath="//flow/block[2]/block[2]/@ipd"/>
<!-- cell 6 -->
- <eval expected="cell6"
xpath="//flow/block[2]/block[3]/block[1]/lineArea/text"/>
+ <eval expected="cell6"
xpath="//flow/block[2]/block[3]/block[1]/lineArea"/>
<eval expected="180000" xpath="//flow/block[2]/block[3]/@ipd"/>
</checks>
</testcase>
1.3 +5 -5 xml-fop/test/layoutengine/testcases/normal-breaking3.xml
Index: normal-breaking3.xml
===================================================================
RCS file: /home/cvs/xml-fop/test/layoutengine/testcases/normal-breaking3.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- normal-breaking3.xml 3 Feb 2005 08:22:42 -0000 1.2
+++ normal-breaking3.xml 9 Feb 2005 21:38:31 -0000 1.3
@@ -48,9 +48,9 @@
<!-- contents must be broken to the next page to show the bug. -->
<eval expected="2" xpath="count(//pageViewport)"/>
- <eval expected=""
xpath="//pageViewport[1]/page/regionViewport/regionBody/mainReference/span/flow/block[2]/lineArea[1]/text"/>
- <eval expected="line1"
xpath="//pageViewport[1]/page/regionViewport/regionBody/mainReference/span/flow/block[2]/lineArea[2]/text"/>
- <eval expected="line2"
xpath="//pageViewport[2]/page/regionViewport/regionBody/mainReference/span/flow/block[1]/lineArea[1]/text"/>
- <eval expected="line3"
xpath="//pageViewport[2]/page/regionViewport/regionBody/mainReference/span/flow/block[1]/lineArea[2]/text"/>
+ <eval expected=""
xpath="//pageViewport[1]/page/regionViewport/regionBody/mainReference/span/flow/block[2]/lineArea[1]"/>
+ <eval expected="line1"
xpath="//pageViewport[1]/page/regionViewport/regionBody/mainReference/span/flow/block[2]/lineArea[2]"/>
+ <eval expected="line2"
xpath="//pageViewport[2]/page/regionViewport/regionBody/mainReference/span/flow/block[1]/lineArea[1]"/>
+ <eval expected="line3"
xpath="//pageViewport[2]/page/regionViewport/regionBody/mainReference/span/flow/block[1]/lineArea[2]"/>
</checks>
</testcase>
1.3 +5 -5 xml-fop/test/layoutengine/testcases/table1.xml
Index: table1.xml
===================================================================
RCS file: /home/cvs/xml-fop/test/layoutengine/testcases/table1.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- table1.xml 9 Feb 2005 11:52:33 -0000 1.2
+++ table1.xml 9 Feb 2005 21:38:31 -0000 1.3
@@ -69,7 +69,7 @@
<eval expected="14400" xpath="//flow/block[1]/block[1]/@bpd"/>
<eval expected="144000" xpath="//flow/block[1]/block[1]/block[1]/@ipd"/>
<eval expected="14400" xpath="//flow/block[1]/block[1]/block[1]/@bpd"/>
- <eval expected="cell1"
xpath="//flow/block[1]/block[1]/block[1]/lineArea/text"/>
+ <eval expected="cell1"
xpath="//flow/block[1]/block[1]/block[1]/lineArea"/>
<!-- cell 2 -->
<true xpath="//flow/block[1]/block[2]/@is-reference-area"/>
@@ -79,7 +79,7 @@
<eval expected="14400" xpath="//flow/block[1]/block[2]/@bpd"/>
<eval expected="216000" xpath="//flow/block[1]/block[2]/block[1]/@ipd"/>
<eval expected="14400" xpath="//flow/block[1]/block[2]/block[1]/@bpd"/>
- <eval expected="cell2"
xpath="//flow/block[1]/block[2]/block[1]/lineArea/text"/>
+ <eval expected="cell2"
xpath="//flow/block[1]/block[2]/block[1]/lineArea"/>
<eval expected="color=#ffff00,repeat=0,horiz=0,vertical=0"
xpath="//flow/block[1]/block[2]/@background"/>
<!-- cell 3 -->
@@ -90,7 +90,7 @@
<eval expected="14400" xpath="//flow/block[1]/block[3]/@bpd"/>
<eval expected="144000" xpath="//flow/block[1]/block[3]/block[1]/@ipd"/>
<eval expected="14400" xpath="//flow/block[1]/block[3]/block[1]/@bpd"/>
- <eval expected="cell3"
xpath="//flow/block[1]/block[3]/block[1]/lineArea/text"/>
+ <eval expected="cell3"
xpath="//flow/block[1]/block[3]/block[1]/lineArea"/>
<eval expected="color=#ffa500,repeat=0,horiz=0,vertical=0"
xpath="//flow/block[1]/block[3]/@background"/>
<!-- cell 4 -->
@@ -101,6 +101,6 @@
<eval expected="14400" xpath="//flow/block[1]/block[4]/@bpd"/>
<eval expected="216000" xpath="//flow/block[1]/block[4]/block[1]/@ipd"/>
<eval expected="14400" xpath="//flow/block[1]/block[4]/block[1]/@bpd"/>
- <eval expected="cell4"
xpath="//flow/block[1]/block[4]/block[1]/lineArea/text"/>
+ <eval expected="cell4"
xpath="//flow/block[1]/block[4]/block[1]/lineArea"/>
</checks>
</testcase>
1.2 +6 -6 xml-fop/test/layoutengine/testcases/text-decoration1.xml
Index: text-decoration1.xml
===================================================================
RCS file: /home/cvs/xml-fop/test/layoutengine/testcases/text-decoration1.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- text-decoration1.xml 25 Jan 2005 13:17:14 -0000 1.1
+++ text-decoration1.xml 9 Feb 2005 21:38:31 -0000 1.2
@@ -55,15 +55,15 @@
<true
xpath="not(//flow/block[1]/lineArea/inlineparent[1]/text/@through-score)"/>
<true
xpath="not(//flow/block[1]/lineArea/inlineparent[1]/text/@through-score-color)"/>
<eval expected="#000000"
xpath="//flow/block[1]/lineArea/inlineparent[1]/text/@underline-score-color"/>
- <eval expected="underline"
xpath="//flow/block[1]/lineArea/inlineparent[1]/text"/>
+ <eval expected="underline"
xpath="//flow/block[1]/lineArea/inlineparent[1]"/>
<true
xpath="//flow/block[2]/lineArea/inlineparent[1]/text/@overline-score"/>
<eval expected="#000000"
xpath="//flow/block[2]/lineArea/inlineparent[1]/text/@overline-score-color"/>
- <eval expected="overline"
xpath="//flow/block[2]/lineArea/inlineparent[1]/text"/>
+ <eval expected="overline"
xpath="//flow/block[2]/lineArea/inlineparent[1]"/>
<true
xpath="//flow/block[3]/lineArea/inlineparent[1]/text/@through-score"/>
<eval expected="#000000"
xpath="//flow/block[3]/lineArea/inlineparent[1]/text/@through-score-color"/>
- <eval expected="line-through"
xpath="//flow/block[3]/lineArea/inlineparent[1]/text"/>
+ <eval expected="line-through"
xpath="//flow/block[3]/lineArea/inlineparent[1]"/>
<true xpath="//flow/block[4]/lineArea/inlineparent[1]/text/@blink"/>
<eval expected="blink"
xpath="//flow/block[4]/lineArea/inlineparent[1]/text"/>
@@ -75,7 +75,7 @@
<true
xpath="not(//flow/block[5]/lineArea/inlineparent[1]/text/@through-score)"/>
<eval expected="#000000"
xpath="//flow/block[5]/lineArea/inlineparent[1]/text/@underline-score-color"/>
<eval expected="#000000"
xpath="//flow/block[5]/lineArea/inlineparent[1]/text/@overline-score-color"/>
- <eval expected="over/under"
xpath="//flow/block[5]/lineArea/inlineparent[1]/text"/>
+ <eval expected="over/under"
xpath="//flow/block[5]/lineArea/inlineparent[1]"/>
<true
xpath="//flow/block[6]/lineArea/inlineparent[1]/text/@underline-score"/>
<true
xpath="//flow/block[6]/lineArea/inlineparent[1]/text/@overline-score"/>
@@ -83,7 +83,7 @@
<eval expected="#000000"
xpath="//flow/block[6]/lineArea/inlineparent[1]/text/@underline-score-color"/>
<eval expected="#000000"
xpath="//flow/block[6]/lineArea/inlineparent[1]/text/@overline-score-color"/>
<eval expected="#000000"
xpath="//flow/block[6]/lineArea/inlineparent[1]/text/@through-score-color"/>
- <eval expected="over/under/through"
xpath="//flow/block[6]/lineArea/inlineparent[1]/text"/>
+ <eval expected="over/under/through"
xpath="//flow/block[6]/lineArea/inlineparent[1]"/>
<!-- *** on different elements *** -->
<true xpath="//flow/block[7]/lineArea/text/@underline-score"/>
1.2 +14 -14 xml-fop/test/layoutengine/testcases/markers1.xml
Index: markers1.xml
===================================================================
RCS file: /home/cvs/xml-fop/test/layoutengine/testcases/markers1.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- markers1.xml 26 Jan 2005 16:23:12 -0000 1.1
+++ markers1.xml 9 Feb 2005 21:38:31 -0000 1.2
@@ -82,24 +82,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/text"/>
- <eval expected="block2"
xpath="//pageViewport[1]/page/regionViewport[3]/regionBody/mainReference/span/flow/block[2]/block/block[1]/lineArea/text"/>
- <eval expected="block3"
xpath="//pageViewport[1]/page/regionViewport[3]/regionBody/mainReference/span/flow/block[3]/block/block[1]/lineArea/text"/>
- <eval expected="block4"
xpath="//pageViewport[1]/page/regionViewport[3]/regionBody/mainReference/span/flow/block[4]/block/block[1]/lineArea/text"/>
+ <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="block5"
xpath="//pageViewport[2]/page/regionViewport[3]/regionBody/mainReference/span/flow/block[1]/block/block[1]/lineArea/text"/>
- <eval expected="block6"
xpath="//pageViewport[2]/page/regionViewport[3]/regionBody/mainReference/span/flow/block[2]/block/block[1]/lineArea/text"/>
- <eval expected="block7"
xpath="//pageViewport[2]/page/regionViewport[3]/regionBody/mainReference/span/flow/block[3]/block/block[1]/lineArea/text"/>
+ <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"/>
<!-- 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/text"/>
- <eval expected="block4"
xpath="//pageViewport[1]/page/regionViewport[2]/regionAfter/block[1]/lineArea/text"/>
- <eval expected="block4"
xpath="//pageViewport[1]/page/regionViewport[2]/regionAfter/block[2]/lineArea/text"/>
+ <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="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/text"/>
- <eval expected="block7"
xpath="//pageViewport[2]/page/regionViewport[2]/regionAfter/block[1]/lineArea/text"/>
- <eval expected="block7"
xpath="//pageViewport[2]/page/regionViewport[2]/regionAfter/block[2]/lineArea/text"/>
+ <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"/>
</checks>
</testcase>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
