Additional fixes for checks that don't work anymore because the pageSequence elements are now generated correctly.

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198733 13f79535-47bb-0310-9956-ffa450edef68

7 files changed, 139 insertions, 139 deletions

diff --git a/test/layoutengine/testcases/markers7.xml b/test/layoutengine/testcases/markers7.xml
index 0caa5c325..429b23d11 100644
--- a/test/layoutengine/testcases/markers7.xml
+++ b/test/layoutengine/testcases/markers7.xml
@@ -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>
diff --git a/test/layoutengine/testcases/normal-breaking1.xml b/test/layoutengine/testcases/normal-breaking1.xml
index 5b494ed9a..2a15045a2 100644
--- a/test/layoutengine/testcases/normal-breaking1.xml
+++ b/test/layoutengine/testcases/normal-breaking1.xml
@@ -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>
diff --git a/test/layoutengine/testcases/page-master1.xml b/test/layoutengine/testcases/page-master1.xml
index 2cedc0b7f..2e3fe49fe 100644
--- a/test/layoutengine/testcases/page-master1.xml
+++ b/test/layoutengine/testcases/page-master1.xml
@@ -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>
diff --git a/test/layoutengine/testcases/page-master2.xml b/test/layoutengine/testcases/page-master2.xml
index 34adb49af..8b621ce84 100644
--- a/test/layoutengine/testcases/page-master2.xml
+++ b/test/layoutengine/testcases/page-master2.xml
@@ -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>
diff --git a/test/layoutengine/testcases/page-master3.xml b/test/layoutengine/testcases/page-master3.xml
index a0fd0b761..4b5f22757 100644
--- a/test/layoutengine/testcases/page-master3.xml
+++ b/test/layoutengine/testcases/page-master3.xml
@@ -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>
diff --git a/test/layoutengine/testcases/page-number1.xml b/test/layoutengine/testcases/page-number1.xml
index b89a4ad5a..75fc21ca8 100644
--- a/test/layoutengine/testcases/page-number1.xml
+++ b/test/layoutengine/testcases/page-number1.xml
@@ -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>
diff --git a/test/layoutengine/testcases/page-number2.xml b/test/layoutengine/testcases/page-number2.xml
index 68adda4b4..de18b8938 100644
--- a/test/layoutengine/testcases/page-number2.xml
+++ b/test/layoutengine/testcases/page-number2.xml
@@ -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>