Fixed checks or FO of footnotes2 and page-number3 to compensate for the fixed page-number and page-number-citation LMs.

Extended checks on linelayout2.xml and enabled it.

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

4 files changed, 20 insertions, 7 deletions

diff --git a/test/layoutengine/disabled-testcases.txt b/test/layoutengine/disabled-testcases.txt
index 36835e1d0..a5146d8cd 100644
--- a/test/layoutengine/disabled-testcases.txt
+++ b/test/layoutengine/disabled-testcases.txt
@@ -5,7 +5,6 @@ keep-with-previous2.xml
 keep-with-previous3.xml
 keep-with-previous4.xml
 keep-with-previous5.xml
-line-layout2.xml
 list4.xml
 multi-column2.xml
 multi-column3.xml
diff --git a/test/layoutengine/testcases/footnotes2.xml b/test/layoutengine/testcases/footnotes2.xml
index ee55fc16e..2eb4a41f8 100644
--- a/test/layoutengine/testcases/footnotes2.xml
+++ b/test/layoutengine/testcases/footnotes2.xml
@@ -78,8 +78,8 @@
     <!-- the footnotes on page 1 -->
     <eval expected="360000" xpath="//pageViewport[1]/page/regionViewport/regionBody/footnote/block[1]/@ipd"/>
     <eval expected="3" xpath="count(//pageViewport[1]/page/regionViewport/regionBody/footnote/block)"/>
-    <eval expected="8642" xpath="//pageViewport[1]/page/regionViewport/regionBody/footnote/block[1]/@bpd"/>
-    <eval expected="8442" xpath="//pageViewport[1]/page/regionViewport/regionBody/footnote/block[1]/block[1]/lineArea/@bpd"/>
+    <eval expected="7400" xpath="//pageViewport[1]/page/regionViewport/regionBody/footnote/block[1]/@bpd"/>
+    <eval expected="7200" xpath="//pageViewport[1]/page/regionViewport/regionBody/footnote/block[1]/block[1]/lineArea/@bpd"/>
     <eval expected="I'm a block serving as a footnote separator. I'm on page 1." xpath="//pageViewport[1]/page/regionViewport/regionBody/footnote/block[1]/block[1]/lineArea"/>
     <eval expected="14400" xpath="//pageViewport[1]/page/regionViewport/regionBody/footnote/block[2]/@bpd"/>
     <eval expected="14400" xpath="//pageViewport[1]/page/regionViewport/regionBody/footnote/block[2]/lineArea/@bpd"/>
@@ -101,8 +101,8 @@
     <!-- the footnotes on page 3 -->
     <eval expected="2" xpath="count(//pageViewport[3]/page/regionViewport/regionBody/footnote/block)"/>
     <eval expected="360000" xpath="//pageViewport[3]/page/regionViewport/regionBody/footnote/block[1]/@ipd"/>
-    <eval expected="8642" xpath="//pageViewport[3]/page/regionViewport/regionBody/footnote/block[1]/@bpd"/>
-    <eval expected="8442" xpath="//pageViewport[3]/page/regionViewport/regionBody/footnote/block[1]/block[1]/lineArea/@bpd"/>
+    <eval expected="7400" xpath="//pageViewport[3]/page/regionViewport/regionBody/footnote/block[1]/@bpd"/>
+    <eval expected="7200" xpath="//pageViewport[3]/page/regionViewport/regionBody/footnote/block[1]/block[1]/lineArea/@bpd"/>
     <eval expected="I'm a block serving as a footnote separator. I'm on page 3." xpath="//pageViewport[3]/page/regionViewport/regionBody/footnote/block[1]/block[1]/lineArea"/>
     <eval expected="14400" xpath="//pageViewport[3]/page/regionViewport/regionBody/footnote/block[2]/@bpd"/>
     <eval expected="14400" xpath="//pageViewport[3]/page/regionViewport/regionBody/footnote/block[2]/lineArea/@bpd"/>
diff --git a/test/layoutengine/testcases/line-layout2.xml b/test/layoutengine/testcases/line-layout2.xml
index 41dfbc1e0..49e9c9726 100644
--- a/test/layoutengine/testcases/line-layout2.xml
+++ b/test/layoutengine/testcases/line-layout2.xml
@@ -55,5 +55,19 @@
       <box w="14400"/>

       <skip>3</skip>

     </element-list>

+    

+    <eval expected="14400" xpath="//flow/block[1]/lineArea/@bpd"/>

+    <eval expected="14400" xpath="//flow/block[2]/lineArea/@bpd"/>

+    <eval expected="14400" xpath="//flow/block[3]/lineArea/@bpd"/>

+    <eval expected="14400" xpath="//flow/block[4]/lineArea/@bpd"/>

+    <eval expected="14400" xpath="//flow/block[5]/lineArea/@bpd"/>

+    <eval expected="14400" xpath="//flow/block[6]/lineArea/@bpd"/>

+    

+    <eval expected="10266" xpath="//flow/block[1]/lineArea/text/@vpos"/>

+    <eval expected="10266" xpath="//flow/block[2]/lineArea/text/@vpos"/>

+    <eval expected="10266" xpath="//flow/block[3]/lineArea/text/@vpos"/>

+    <eval expected="10266" xpath="//flow/block[4]/lineArea/text/@vpos"/>

+    <eval expected="10266" xpath="//flow/block[5]/lineArea/inlineparent/text/@vpos"/>

+    <eval expected="10266" xpath="//flow/block[6]/lineArea/char/@vpos"/>

   </checks>

 </testcase>

diff --git a/test/layoutengine/testcases/page-number3.xml b/test/layoutengine/testcases/page-number3.xml
index ecfc50d4b..cdee18916 100644
--- a/test/layoutengine/testcases/page-number3.xml
+++ b/test/layoutengine/testcases/page-number3.xml
@@ -34,7 +34,7 @@
           <fo:block>page: <fo:page-number/>, bof1 is on page <fo:page-number-citation ref-id="bof1"/></fo:block>
           <fo:block>page: <fo:page-number/>, bof2 is on page <fo:page-number-citation ref-id="bof2"/></fo:block>
           <fo:block>page: <fo:page-number/></fo:block>
-          <fo:block>page: <fo:page-number/></fo:block>
+          <fo:block break-before="page">page: <fo:page-number/></fo:block>
           <fo:block>page: <fo:page-number/></fo:block>
           <fo:block>page: <fo:page-number/> of <fo:page-number-citation ref-id="eof1"/></fo:block>
           <fo:block id="eof1"/>
@@ -46,7 +46,7 @@
           <fo:block>page: <fo:page-number/></fo:block>
           <fo:block>page: <fo:page-number/></fo:block>
           <fo:block>page: <fo:page-number/></fo:block>
-          <fo:block>page: <fo:page-number/>, bof1 is on page <fo:page-number-citation ref-id="bof1"/></fo:block>
+          <fo:block break-before="page">page: <fo:page-number/>, bof1 is on page <fo:page-number-citation ref-id="bof1"/></fo:block>
           <fo:block>page: <fo:page-number/>, bof2 is on page <fo:page-number-citation ref-id="bof2"/></fo:block>
           <fo:block>page: <fo:page-number/> of <fo:page-number-citation ref-id="eof2"/></fo:block>
           <fo:block id="eof2"/>