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/29 23:01:47 UTC
svn commit: r202428 - in /xmlgraphics/fop/trunk/test/layoutengine:
disabled-testcases.txt testcases/footnotes2.xml testcases/line-layout2.xml
testcases/page-number3.xml
Author: jeremias
Date: Wed Jun 29 14:01:45 2005
New Revision: 202428
URL: http://svn.apache.org/viewcvs?rev=202428&view=rev
Log:
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.
Modified:
xmlgraphics/fop/trunk/test/layoutengine/disabled-testcases.txt
xmlgraphics/fop/trunk/test/layoutengine/testcases/footnotes2.xml
xmlgraphics/fop/trunk/test/layoutengine/testcases/line-layout2.xml
xmlgraphics/fop/trunk/test/layoutengine/testcases/page-number3.xml
Modified: xmlgraphics/fop/trunk/test/layoutengine/disabled-testcases.txt
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/test/layoutengine/disabled-testcases.txt?rev=202428&r1=202427&r2=202428&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/disabled-testcases.txt (original)
+++ xmlgraphics/fop/trunk/test/layoutengine/disabled-testcases.txt Wed Jun 29 14:01:45 2005
@@ -5,7 +5,6 @@
keep-with-previous3.xml
keep-with-previous4.xml
keep-with-previous5.xml
-line-layout2.xml
list4.xml
multi-column2.xml
multi-column3.xml
Modified: xmlgraphics/fop/trunk/test/layoutengine/testcases/footnotes2.xml
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/test/layoutengine/testcases/footnotes2.xml?rev=202428&r1=202427&r2=202428&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/testcases/footnotes2.xml (original)
+++ xmlgraphics/fop/trunk/test/layoutengine/testcases/footnotes2.xml Wed Jun 29 14:01:45 2005
@@ -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"/>
Modified: xmlgraphics/fop/trunk/test/layoutengine/testcases/line-layout2.xml
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/test/layoutengine/testcases/line-layout2.xml?rev=202428&r1=202427&r2=202428&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/testcases/line-layout2.xml (original)
+++ xmlgraphics/fop/trunk/test/layoutengine/testcases/line-layout2.xml Wed Jun 29 14:01:45 2005
@@ -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>
Modified: xmlgraphics/fop/trunk/test/layoutengine/testcases/page-number3.xml
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/test/layoutengine/testcases/page-number3.xml?rev=202428&r1=202427&r2=202428&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/testcases/page-number3.xml (original)
+++ xmlgraphics/fop/trunk/test/layoutengine/testcases/page-number3.xml Wed Jun 29 14:01:45 2005
@@ -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"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org