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 2007/12/12 17:13:16 UTC
svn commit: r603656 [7/7] - in
/xmlgraphics/fop/branches/Temp_ImagePackageRedesign: ./ examples/fo/basic/
lib/ src/documentation/ src/documentation/content/xdocs/
src/documentation/content/xdocs/trunk/
src/documentation/intermediate-format-ng/ src/java...
Modified: xmlgraphics/fop/branches/Temp_ImagePackageRedesign/test/layoutengine/standard-testcases/table-cell_block_break-after.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ImagePackageRedesign/test/layoutengine/standard-testcases/table-cell_block_break-after.xml?rev=603656&r1=603655&r2=603656&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ImagePackageRedesign/test/layoutengine/standard-testcases/table-cell_block_break-after.xml (original)
+++ xmlgraphics/fop/branches/Temp_ImagePackageRedesign/test/layoutengine/standard-testcases/table-cell_block_break-after.xml Wed Dec 12 08:13:06 2007
@@ -84,12 +84,10 @@
<eval expected="75000" xpath="//pageViewport[@nr=2]//flow/block[1]/block[1]/@ipda"/>
<eval expected="20800" xpath="//pageViewport[@nr=2]//flow/block[1]/block[1]/@bpd"/>
<eval expected="28800" xpath="//pageViewport[@nr=2]//flow/block[1]/block[1]/@bpda"/>
- <!-- Two blocks expected in the second cell -->
- <eval expected="2" xpath="count(//pageViewport[@nr=2]//flow/block[1]/block[2]/block)"/>
- <!-- First block has zero bpd -->
- <eval expected="0" xpath="//pageViewport[@nr=2]//flow/block[1]/block[2]/block[1]/@bpd"/>
- <!-- One line in the second block -->
- <eval expected="1" xpath="count(//pageViewport[@nr=2]//flow/block[1]/block[2]/block[2]//lineArea)"/>
+ <!-- One block expected in the second cell -->
+ <eval expected="1" xpath="count(//pageViewport[@nr=2]//flow/block[1]/block[2]/block)"/>
+ <!-- One line in the block -->
+ <eval expected="1" xpath="count(//pageViewport[@nr=2]//flow/block[1]/block[2]/block[1]//lineArea)"/>
<eval expected="63000" xpath="//pageViewport[@nr=2]//flow/block[1]/block[2]/@ipd"/>
<eval expected="75000" xpath="//pageViewport[@nr=2]//flow/block[1]/block[2]/@ipda"/>
<eval expected="16800" xpath="//pageViewport[@nr=2]//flow/block[1]/block[2]/@bpd"/>
Modified: xmlgraphics/fop/branches/Temp_ImagePackageRedesign/test/layoutengine/standard-testcases/table-cell_conditional-spaces_1.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ImagePackageRedesign/test/layoutengine/standard-testcases/table-cell_conditional-spaces_1.xml?rev=603656&r1=603655&r2=603656&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ImagePackageRedesign/test/layoutengine/standard-testcases/table-cell_conditional-spaces_1.xml (original)
+++ xmlgraphics/fop/branches/Temp_ImagePackageRedesign/test/layoutengine/standard-testcases/table-cell_conditional-spaces_1.xml Wed Dec 12 08:13:06 2007
@@ -144,5 +144,19 @@
<eval expected="31800" xpath="//pageViewport[8]//flow/block[2]/block/@bpd"/>
<eval expected="16800" xpath="//pageViewport[9]//flow/block/@bpd"/>
<eval expected="16800" xpath="//pageViewport[9]//flow/block/block/@bpd"/>
+
+ <element-list category="breaker">
+ <skip>3</skip> <!-- The block before the table -->
+ <penalty p="INF" w="0"/>
+ <glue w="4000"/> <!-- The border before -->
+ <box w="16800"/> <!-- Line 1 -->
+ <penalty p="0" w="0"/>
+ <glue w="25000"/> <!-- The space between lines -->
+ <box w="16800"/> <!-- Line 2 -->
+ <penalty p="INF" w="0"/>
+ <glue w="4000"/> <!-- The border after -->
+ <box w="0" aux="true"/> <!-- aux. box to prohibit cutting away the border -->
+ <skip>3</skip> <!-- glue for end of page -->
+ </element-list>
</checks>
</testcase>
Modified: xmlgraphics/fop/branches/Temp_ImagePackageRedesign/test/layoutengine/standard-testcases/table_border-collapse_collapse_spans_2.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ImagePackageRedesign/test/layoutengine/standard-testcases/table_border-collapse_collapse_spans_2.xml?rev=603656&r1=603655&r2=603656&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ImagePackageRedesign/test/layoutengine/standard-testcases/table_border-collapse_collapse_spans_2.xml (original)
+++ xmlgraphics/fop/branches/Temp_ImagePackageRedesign/test/layoutengine/standard-testcases/table_border-collapse_collapse_spans_2.xml Wed Dec 12 08:13:06 2007
@@ -329,10 +329,8 @@
<eval expected="63500" xpath="//flow/block[2]/block[7]/@bpda"/>
<eval expected="307500" xpath="//flow/block[2]/block[7]/@left-offset"/>
<eval expected="7500" xpath="//flow/block[2]/block[7]/@top-offset"/>
- <!--
<eval expected="80000" xpath="//flow/block[2]/block[8]/@ipd"/>
<eval expected="120000" xpath="//flow/block[2]/block[8]/@ipda"/>
- -->
<eval expected="43400" xpath="//flow/block[2]/block[8]/@bpd"/>
<eval expected="55400" xpath="//flow/block[2]/block[8]/@bpda"/>
<eval expected="15000" xpath="//flow/block[2]/block[8]/@left-offset"/>
@@ -340,9 +338,7 @@
<eval expected="(double,#ff00ff,6000,collapse-inner)" xpath="//flow/block[2]/block[8]/@border-before"/>
<eval expected="(inset,#ff00ff,6000,collapse-inner)" xpath="//flow/block[2]/block[8]/@border-after"/>
<eval expected="(solid,#ff00ff,30000,collapse-outer)" xpath="//flow/block[2]/block[8]/@border-start"/>
- <!--
<eval expected="(dashed,#ff0000,10000,collapse-inner)" xpath="//flow/block[2]/block[8]/@border-end"/>
- -->
<eval expected="95000" xpath="//flow/block[2]/block[9]/@ipd"/>
<eval expected="105000" xpath="//flow/block[2]/block[9]/@ipda"/>
<eval expected="52200" xpath="//flow/block[2]/block[9]/@bpd"/>
@@ -350,18 +346,14 @@
<eval expected="105000" xpath="//flow/block[2]/block[9]/@left-offset"/>
<eval expected="33800" xpath="//flow/block[2]/block[9]/@top-offset"/>
<eval expected="(dashed,#ff0000,10000,collapse-inner)" xpath="//flow/block[2]/block[9]/@border-start"/>
- <!--
<eval expected="92500" xpath="//flow/block[2]/block[10]/@ipd"/>
<eval expected="107500" xpath="//flow/block[2]/block[10]/@ipda"/>
- -->
<eval expected="49700" xpath="//flow/block[2]/block[10]/@bpd"/>
<eval expected="54700" xpath="//flow/block[2]/block[10]/@bpda"/>
<eval expected="200000" xpath="//flow/block[2]/block[10]/@left-offset"/>
<eval expected="31300" xpath="//flow/block[2]/block[10]/@top-offset"/>
<eval expected="(solid,#008000,5000,collapse-inner)" xpath="//flow/block[2]/block[10]/@border-before"/>
- <!--
<eval expected="(solid,#000080,15000,collapse-inner)" xpath="//flow/block[2]/block[10]/@border-end"/>
- -->
<eval expected="95000" xpath="//flow/block[2]/block[11]/@ipd"/>
<eval expected="105000" xpath="//flow/block[2]/block[11]/@ipda"/>
<eval expected="46900" xpath="//flow/block[2]/block[11]/@bpd"/>
@@ -378,10 +370,8 @@
<eval expected="86000" xpath="//flow/block[2]/block[12]/@top-offset"/>
<eval expected="(double,#008000,40000,collapse-inner)" xpath="//flow/block[2]/block[12]/@border-after"/>
<eval expected="(double,#ff0000,4000,collapse-inner)" xpath="//flow/block[2]/block[12]/@border-end"/>
- <!--
<eval expected="187500" xpath="//flow/block[2]/block[13]/@ipd"/>
<eval expected="187500" xpath="//flow/block[2]/block[13]/@ipda"/>
- -->
<eval expected="79100" xpath="//flow/block[2]/block[13]/@bpd"/>
<eval expected="79100" xpath="//flow/block[2]/block[13]/@bpda"/>
<eval expected="105000" xpath="//flow/block[2]/block[13]/@left-offset"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org