mirrors
/
fop
mirror of https://github.com/apache/fop.git
Watch 1
Star 0
Fork 0
Code Issues 0 Releases 48 Wiki Activity
Browse Source

Updated the disabled-testcases.xml file: re-enabled testcases which could easily be updated, removed the other ones which anyway were superseded by more complete ones 


git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@635967 13f79535-47bb-0310-9956-ffa450edef68
tags/fop-0_95beta
Vincent Hennebert 16 years ago
parent
3b9e9f40ac
commit
b94be1d382
9 changed files with 228 additions and 848 deletions
Split View Show Diff Stats
  1. 0
    48
      test/layoutengine/disabled-testcases.xml
  2. 0
    110
      test/layoutengine/standard-testcases/table-body_background-image.xml
  3. 0
    85
      test/layoutengine/standard-testcases/table-cell_block_keep-with-previous.xml
  4. 0
    101
      test/layoutengine/standard-testcases/table-header_background-image.xml
  5. 210
    40
      test/layoutengine/standard-testcases/table-row_keep-with-previous.xml
  6. 0
    254
      test/layoutengine/standard-testcases/table-row_keep-with-previous_2.xml
  7. 0
    130
      test/layoutengine/standard-testcases/table_border-collapse_collapse_1.xml
  8. 0
    70
      test/layoutengine/standard-testcases/table_border-collapse_collapse_2.xml
  9. 18
    10
      test/layoutengine/standard-testcases/table_border_padding.xml

+ 0
- 48
test/layoutengine/disabled-testcases.xml View File

@@ -232,54 +232,6 @@
<file>region-body_column-count_bug36356.xml</file>
<description>Column balancing doesn't work as expected.</description>
</testcase>
<testcase>
<name>No background-images on table-body</name>
<file>table-body_background-image.xml</file>
<description>The backgrounds of table-body, table-header,
table-footer and table-column are not painted, yet.</description>
</testcase>
<testcase>
<name>Collapsing Border Model NYI</name>
<file>table_border-collapse_collapse_1.xml</file>
<description>Border-collapse="collapse" is not yet
implemented.</description>
</testcase>
<testcase>
<name>Collapsing Border Model NYI</name>
<file>table_border-collapse_collapse_2.xml</file>
<description>Border-collapse="collapse" is not yet
implemented.</description>
</testcase>
<testcase>
<name>Problems with border and padding on tables</name>
<file>table_border_padding.xml</file>
<description>The element list seems to not be fully correct, yet, causing
the layout to look odd.</description>
</testcase>
<testcase>
<name>keep-with-previous doesn't work inside tables</name>
<file>table-cell_block_keep-with-previous.xml</file>
<description>Keep-with-previous doesn't work inside tables and
lists, yet.</description>
</testcase>
<testcase>
<name>Border and padding conditionality is NYI on table-cells</name>
<file>table-cell_border_padding_conditionality.xml</file>
<description>Border and padding conditionality are not supported
on table-cells, yet.</description>
</testcase>
<testcase>
<name>No background-images on table-header</name>
<file>table-header_background-image.xml</file>
<description>The backgrounds of table-body, table-header,
table-footer and table-column are not painted, yet.</description>
</testcase>
<testcase>
<name>keep-with-previous doesn't work on table-rows</name>
<file>table-row_keep-with-previous.xml</file>
<description>Keep-with-previous doesn't work inside tables and
lists, yet.</description>
</testcase>
<testcase>
<name>table-cell empty area with marker.xml</name>
<file>table-cell_empty_area_with_marker.xml</file>

+ 0
- 110
test/layoutengine/standard-testcases/table-body_background-image.xml View File

@@ -1,110 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
The ASF licenses this file to You under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<!-- $Id$ -->
<testcase>
<info>
<p>
This test checks background image on a fo:table-body.
</p>
</info>
<variables>
<img>../../resources/images/bgimg300dpi.jpg</img>
</variables>
<fo>
<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:layout-master-set>
<fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">
<fo:region-body/>
</fo:simple-page-master>
</fo:layout-master-set>
<fo:page-sequence master-reference="normal" white-space-collapse="true">
<fo:flow flow-name="xsl-region-body">
<fo:table>
<fo:table-column column-number="1" />
<fo:table-column column-number="2" />
<fo:table-column column-number="3" />
<fo:table-header>
<fo:table-row>
<fo:table-cell>
<fo:block>Header Col 1</fo:block>
</fo:table-cell>
<fo:table-cell>
<fo:block>Header Col 2</fo:block>
</fo:table-cell>
<fo:table-cell>
<fo:block>Header Col 3</fo:block>
</fo:table-cell>
</fo:table-row>
</fo:table-header>
<fo:table-body background-color="yellow" background-repeat="no-repeat" background-position-horizontal="center" background-position-vertical="center" background-image="##img">
<fo:table-row>
<fo:table-cell>
<fo:block>Row 1 Col 1</fo:block>
</fo:table-cell>
<fo:table-cell>
<fo:block>Row 1 Col 2</fo:block>
</fo:table-cell>
<fo:table-cell>
<fo:block>Row 1 Col 3</fo:block>
</fo:table-cell>
</fo:table-row>
<fo:table-row>
<fo:table-cell>
<fo:block>Row 2 Col 1</fo:block>
</fo:table-cell>
<fo:table-cell>
<fo:block>Row 2 Col 2</fo:block>
</fo:table-cell>
<fo:table-cell>
<fo:block>Row 2 Col 3</fo:block>
</fo:table-cell>
</fo:table-row>
<fo:table-row>
<fo:table-cell>
<fo:block>Row 3 Col 1</fo:block>
</fo:table-cell>
<fo:table-cell>
<fo:block>Row 3 Col 2</fo:block>
</fo:table-cell>
<fo:table-cell>
<fo:block>Row 3 Col 3</fo:block>
</fo:table-cell>
</fo:table-row>
<fo:table-row>
<fo:table-cell>
<fo:block>Row 4 Col 1</fo:block>
</fo:table-cell>
<fo:table-cell>
<fo:block>Row 4 Col 2</fo:block>
</fo:table-cell>
<fo:table-cell>
<fo:block>Row 4 Col 3</fo:block>
</fo:table-cell>
</fo:table-row>
</fo:table-body>
</fo:table>
<fo:block>Table with centered background image on body</fo:block>
</fo:flow>
</fo:page-sequence>
</fo:root>
</fo>
<checks>
<!-- backgrounds on table-body are not supported at the time this test
was written. Therefore no checks! -->
</checks>
</testcase>

+ 0
- 85
test/layoutengine/standard-testcases/table-cell_block_keep-with-previous.xml View File

@@ -1,85 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
The ASF licenses this file to You under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<!-- $Id$ -->
<testcase>
<info>
<p>
This test checks keep-with-previous on content inside tables.
</p>
</info>
<fo>
<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg" white-space-collapse="true" widows="0" orphans="0">
<fo:layout-master-set>
<fo:simple-page-master master-name="normal" page-width="5in" page-height="4.5 * 14.4pt">
<fo:region-body/>
</fo:simple-page-master>
</fo:layout-master-set>
<fo:page-sequence master-reference="normal">
<fo:flow flow-name="xsl-region-body">
<fo:block>block1</fo:block>
<fo:table table-layout="fixed">
<fo:table-column/>
<fo:table-column/>
<fo:table-body>
<fo:table-row>
<fo:table-cell id="cell1">
<fo:block keep-with-previous.within-page="always">line1</fo:block>
<fo:block>line2</fo:block>
</fo:table-cell>
<fo:table-cell id="cell2">
<fo:block>line1</fo:block>
</fo:table-cell>
</fo:table-row>
<fo:table-row>
<fo:table-cell id="cell3">
<fo:block>line1</fo:block>
</fo:table-cell>
<fo:table-cell id="cell4">
<fo:block keep-with-previous.within-page="always">line1</fo:block>
</fo:table-cell>
</fo:table-row>
</fo:table-body>
</fo:table>
<fo:block>block2</fo:block>
</fo:flow>
</fo:page-sequence>
</fo:root>
</fo>
<checks>
<element-list category="table-cell" id="cell1">
<box w="14400"/>
<penalty w="0" p="0"/>
<box w="14400"/>
</element-list>
<element-list category="table-cell" id="cell2">
<box w="14400"/>
</element-list>
<element-list category="breaker" index="0">
<box w="14400"/>
<penalty w="0" p="INF"/>
<box w="14400"/>
<penalty w="0" p="INF"/>
<box w="14400"/>
<penalty w="0" p="INF"/>
<box w="14400"/>
<penalty w="0" p="0"/>
<box w="14400"/>
<skip>3</skip>
</element-list>
</checks>
</testcase>

+ 0
- 101
test/layoutengine/standard-testcases/table-header_background-image.xml View File

@@ -1,101 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
The ASF licenses this file to You under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<!-- $Id$ -->
<testcase>
<info>
<p>
This test checks background image on a fo:table-header and footer.
</p>
</info>
<variables>
<img>../../resources/images/bgimg300dpi.jpg</img>
</variables>
<fo>
<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:layout-master-set>
<fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">
<fo:region-body/>
</fo:simple-page-master>
</fo:layout-master-set>
<fo:page-sequence master-reference="normal" white-space-collapse="true">
<fo:flow flow-name="xsl-region-body">
<fo:table>
<fo:table-column column-number="1" />
<fo:table-column column-number="2" />
<fo:table-column column-number="3" />
<fo:table-header background-color="yellow" background-repeat="no-repeat" background-position-horizontal="center" background-position-vertical="center" background-image="##img">
<fo:table-row>
<fo:table-cell>
<fo:block>Header Col 1</fo:block>
</fo:table-cell>
<fo:table-cell>
<fo:block>Header Col 2</fo:block>
</fo:table-cell>
<fo:table-cell>
<fo:block>Header Col 3</fo:block>
</fo:table-cell>
</fo:table-row>
</fo:table-header>
<fo:table-footer background-color="yellow" background-repeat="no-repeat" background-position-horizontal="center" background-position-vertical="center" background-image="##img">
<fo:table-row>
<fo:table-cell>
<fo:block>Footer Col 1</fo:block>
</fo:table-cell>
<fo:table-cell>
<fo:block>Footer Col 2</fo:block>
</fo:table-cell>
<fo:table-cell>
<fo:block>Footer Col 3</fo:block>
</fo:table-cell>
</fo:table-row>
</fo:table-footer>
<fo:table-body background-color="blue">
<fo:table-row height="4in" background-color="blue">
<fo:table-cell>
<fo:block>Row 1 Col 1</fo:block>
</fo:table-cell>
<fo:table-cell>
<fo:block>Row 1 Col 2</fo:block>
</fo:table-cell>
<fo:table-cell>
<fo:block>Row 1 Col 3</fo:block>
</fo:table-cell>
</fo:table-row>
<fo:table-row height="4in" background-color="blue">
<fo:table-cell>
<fo:block>Row 2 Col 1</fo:block>
</fo:table-cell>
<fo:table-cell>
<fo:block>Row 2 Col 2</fo:block>
</fo:table-cell>
<fo:table-cell>
<fo:block>Row 2 Col 3</fo:block>
</fo:table-cell>
</fo:table-row>
</fo:table-body>
</fo:table>
<fo:block>Table with centered background image in header and footer</fo:block>
</fo:flow>
</fo:page-sequence>
</fo:root>
</fo>
<checks>
<!-- backgrounds on table-header/footer are not supported at the time this test
was written. Therefore no checks! -->
</checks>
</testcase>

+ 210
- 40
test/layoutengine/standard-testcases/table-row_keep-with-previous.xml View File

@@ -19,66 +19,236 @@
<testcase>
<info>
<p>
This test checks keep-with-previous on table-rows.
This test checks that keep-with-previous works on table-row.
</p>
</info>
<fo>
<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg" white-space-collapse="true" widows="0" orphans="0">
<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:layout-master-set>
<fo:simple-page-master master-name="normal" page-width="5in" page-height="4.5 * 14.4pt">
<fo:region-body/>
<fo:simple-page-master master-name="page" page-height="3in" page-width="5in"
margin="0.5in">
<fo:region-body background-color="#F0F0F0"/>
</fo:simple-page-master>
</fo:layout-master-set>
<fo:page-sequence master-reference="normal">

<!-- table 1 -->
<fo:page-sequence master-reference="page" font-size="8pt" line-height="10pt">
<fo:flow flow-name="xsl-region-body">
<fo:block space-after="1.5*14.4pt">block1</fo:block>
<fo:table table-layout="fixed" width="100%">
<fo:table-column number-columns-repeated="2" column-width="proportional-column-width(1)"/>
<fo:block space-after="106pt">1. Before the table</fo:block>
<fo:table width="100%" table-layout="fixed"
border-collapse="separate" border="4pt solid black">
<fo:table-column number-columns-repeated="2"
column-width="proportional-column-width(1)"/>
<fo:table-body>
<fo:table-row keep-with-previous.within-page="always">
<fo:table-cell id="cell1">
<fo:block>line1</fo:block>
<fo:block>line2</fo:block>
<fo:table-row>
<fo:table-cell border="2pt solid blue">
<fo:block>Cell 1.1 Line 1</fo:block>
<fo:block>Cell 1.1 Line 2</fo:block>
</fo:table-cell>
<fo:table-cell border="2pt solid teal">
<fo:block>Cell 1.2 Line 1</fo:block>
<fo:block>Cell 1.2 Line 2</fo:block>
</fo:table-cell>
</fo:table-row>
<fo:table-row keep-with-previous="always">
<fo:table-cell border="2pt solid green">
<fo:block>Cell 2.1 Line 1</fo:block>
<fo:block>Cell 2.1 Line 2</fo:block>
</fo:table-cell>
<fo:table-cell border="2pt solid olive">
<fo:block>Cell 3.1 Line 1</fo:block>
<fo:block>Cell 3.1 Line 2</fo:block>
</fo:table-cell>
</fo:table-row>
</fo:table-body>
</fo:table>
<fo:block>After the table</fo:block>
</fo:flow>
</fo:page-sequence>

<!-- table 2 -->
<fo:page-sequence master-reference="page" font-size="8pt" line-height="10pt">
<fo:flow flow-name="xsl-region-body">
<fo:block space-after="106pt">2. Before the table</fo:block>
<fo:table width="100%" table-layout="fixed"
border-collapse="separate" border="4pt solid black">
<fo:table-column number-columns-repeated="2"
column-width="proportional-column-width(1)"/>
<fo:table-body>
<fo:table-row>
<fo:table-cell border="2pt solid blue">
<fo:block>Cell 1.1 Line 1</fo:block>
<fo:block>Cell 1.1 Line 2</fo:block>
</fo:table-cell>
<fo:table-cell border="2pt solid teal" number-rows-spanned="2">
<fo:block>Cell 1.2 Line 1</fo:block>
<fo:block>Cell 1.2 Line 2</fo:block>
</fo:table-cell>
<fo:table-cell id="cell2">
<fo:block>line1</fo:block>
</fo:table-row>
<fo:table-row keep-with-previous="always">
<fo:table-cell border="2pt solid green">
<fo:block>Cell 2.1 Line 1</fo:block>
<fo:block>Cell 2.1 Line 2</fo:block>
</fo:table-cell>
</fo:table-row>
<fo:table-row keep-with-previous.within-page="always">
<fo:table-cell id="cell3">
<fo:block>line1</fo:block>
</fo:table-body>
</fo:table>
<fo:block>After the table</fo:block>
</fo:flow>
</fo:page-sequence>

<!-- table 3 -->
<fo:page-sequence master-reference="page" font-size="8pt" line-height="10pt">
<fo:flow flow-name="xsl-region-body">
<fo:block space-after="124">3. Before the table</fo:block>
<fo:block>Before the table</fo:block>
<fo:table width="100%" table-layout="fixed"
border-collapse="collapse" border="4pt solid black">
<fo:table-column number-columns-repeated="2"
column-width="proportional-column-width(1)"/>
<fo:table-body>
<fo:table-row keep-with-previous="always">
<fo:table-cell border="2pt solid blue" number-rows-spanned="2">
<fo:block>Cell 1.1 Line 1</fo:block>
<fo:block>Cell 1.1 Line 2</fo:block>
</fo:table-cell>
<fo:table-cell id="cell4">
<fo:block>line1</fo:block>
<fo:table-cell border="2pt solid teal">
<fo:block>Cell 1.2 Line 1</fo:block>
<fo:block>Cell 1.2 Line 2</fo:block>
</fo:table-cell>
</fo:table-row>
<fo:table-row>
<fo:table-cell border="2pt solid olive">
<fo:block>Cell 2.1 Line 1</fo:block>
<fo:block>Cell 2.1 Line 2</fo:block>
</fo:table-cell>
</fo:table-row>
</fo:table-body>
</fo:table>
<fo:block>block2</fo:block>
<fo:block>After the table</fo:block>
</fo:flow>
</fo:page-sequence>

</fo:root>
</fo>
<checks>
<element-list category="table-cell" id="cell1">
<box w="14400"/>
<penalty w="0" p="0"/>
<box w="14400"/>
</element-list>
<element-list category="table-cell" id="cell2">
<box w="14400"/>
</element-list>
<element-list category="breaker" index="0">
<box w="14400"/>
<penalty w="0" p="INF"/>
<box w="14400"/>
<penalty w="0" p="INF"/>
<box w="14400"/>
<penalty w="0" p="INF"/>
<box w="14400"/>
<penalty w="0" p="0"/>
<box w="14400"/>
<skip>3</skip>
</element-list>

<!-- table 1 -->
<eval expected="2" xpath="count(//pageSequence[1]/pageViewport)"/>
<!-- page 1 -->
<eval expected="2" xpath="count(//pageViewport[@nr=1]//flow/block)"/>
<eval expected="1. Before the table" xpath="//pageViewport[@nr=1]//flow/block[1]/lineArea"/>
<eval expected="12000" xpath="//pageViewport[@nr=1]//flow/block[2]/@bpd"/>
<eval expected="16000" xpath="//pageViewport[@nr=1]//flow/block[2]/@bpda"/>
<eval expected="(solid,#000000,4000)" xpath="//pageViewport[@nr=1]//flow/block[2]/@border-before"/>
<eval expected="" xpath="//pageViewport[@nr=1]//flow/block[2]/@border-after"/>
<!-- cell 1.1 -->
<eval expected="10000" xpath="//pageViewport[@nr=1]//flow/block[2]/block[1]/@bpd"/>
<eval expected="12000" xpath="//pageViewport[@nr=1]//flow/block[2]/block[1]/@bpda"/>
<eval expected="(solid,#0000ff,2000)" xpath="//pageViewport[@nr=1]//flow/block[2]/block[1]/@border-before"/>
<eval expected="" xpath="//pageViewport[@nr=1]//flow/block[2]/block[1]/@border-after"/>
<eval expected="1" xpath="count(//pageViewport[@nr=1]//flow/block[2]/block[1]/block)"/>
<eval expected="Cell 1.1 Line 1" xpath="//pageViewport[@nr=1]//flow/block[2]/block[1]/block/lineArea"/>
<!-- cell 1.2 -->
<eval expected="10000" xpath="//pageViewport[@nr=1]//flow/block[2]/block[2]/@bpd"/>
<eval expected="12000" xpath="//pageViewport[@nr=1]//flow/block[2]/block[2]/@bpda"/>
<eval expected="(solid,#008080,2000)" xpath="//pageViewport[@nr=1]//flow/block[2]/block[2]/@border-before"/>
<eval expected="" xpath="//pageViewport[@nr=1]//flow/block[2]/block[2]/@border-after"/>
<eval expected="1" xpath="count(//pageViewport[@nr=1]//flow/block[2]/block[2]/block)"/>
<eval expected="Cell 1.2 Line 1" xpath="//pageViewport[@nr=1]//flow/block[2]/block[2]/block/lineArea"/>
<!-- page 2 -->
<eval expected="2" xpath="count(//pageViewport[@nr=2]//flow/block)"/>
<eval expected="After the table" xpath="//pageViewport[@nr=2]//flow/block[2]/lineArea"/>
<eval expected="36000" xpath="//pageViewport[@nr=2]//flow/block[1]/@bpd"/>
<eval expected="40000" xpath="//pageViewport[@nr=2]//flow/block[1]/@bpda"/>
<eval expected="" xpath="//pageViewport[@nr=2]//flow/block[1]/@border-before"/>
<eval expected="(solid,#000000,4000)" xpath="//pageViewport[@nr=2]//flow/block[1]/@border-after"/>
<!-- cell 1.1 -->
<eval expected="10000" xpath="//pageViewport[@nr=2]//flow/block[1]/block[1]/@bpd"/>
<eval expected="12000" xpath="//pageViewport[@nr=2]//flow/block[1]/block[1]/@bpda"/>
<eval expected="" xpath="//pageViewport[@nr=2]//flow/block[1]/block[1]/@border-before"/>
<eval expected="(solid,#0000ff,2000)" xpath="//pageViewport[@nr=2]//flow/block[1]/block[1]/@border-after"/>
<eval expected="1" xpath="count(//pageViewport[@nr=2]//flow/block[1]/block[1]/block)"/>
<eval expected="Cell 1.1 Line 2" xpath="//pageViewport[@nr=2]//flow/block[1]/block[1]/block/lineArea"/>
<!-- cell 1.2 -->
<eval expected="10000" xpath="//pageViewport[@nr=2]//flow/block[1]/block[2]/@bpd"/>
<eval expected="12000" xpath="//pageViewport[@nr=2]//flow/block[1]/block[2]/@bpda"/>
<eval expected="" xpath="//pageViewport[@nr=2]//flow/block[1]/block[2]/@border-before"/>
<eval expected="(solid,#008080,2000)" xpath="//pageViewport[@nr=2]//flow/block[1]/block[2]/@border-after"/>
<eval expected="1" xpath="count(//pageViewport[@nr=2]//flow/block[1]/block[2]/block)"/>
<eval expected="Cell 1.2 Line 2" xpath="//pageViewport[@nr=2]//flow/block[1]/block[2]/block/lineArea"/>
<!-- cell 2.1 -->
<eval expected="20000" xpath="//pageViewport[@nr=2]//flow/block[1]/block[3]/@bpd"/>
<eval expected="24000" xpath="//pageViewport[@nr=2]//flow/block[1]/block[3]/@bpda"/>
<eval expected="(solid,#008000,2000)" xpath="//pageViewport[@nr=2]//flow/block[1]/block[3]/@border-before"/>
<eval expected="(solid,#008000,2000)" xpath="//pageViewport[@nr=2]//flow/block[1]/block[3]/@border-after"/>
<!-- cell 2.2 -->
<eval expected="20000" xpath="//pageViewport[@nr=2]//flow/block[1]/block[4]/@bpd"/>
<eval expected="24000" xpath="//pageViewport[@nr=2]//flow/block[1]/block[4]/@bpda"/>
<eval expected="(solid,#808000,2000)" xpath="//pageViewport[@nr=2]//flow/block[1]/block[4]/@border-before"/>
<eval expected="(solid,#808000,2000)" xpath="//pageViewport[@nr=2]//flow/block[1]/block[4]/@border-after"/>

<!-- table 2 -->
<eval expected="2" xpath="count(//pageSequence[2]/pageViewport)"/>
<!-- page 1 -->
<eval expected="2" xpath="count(//pageViewport[@nr=3]//flow/block)"/>
<eval expected="2. Before the table" xpath="//pageViewport[@nr=3]//flow/block[1]/lineArea"/>
<eval expected="12000" xpath="//pageViewport[@nr=3]//flow/block[2]/@bpd"/>
<eval expected="16000" xpath="//pageViewport[@nr=3]//flow/block[2]/@bpda"/>
<eval expected="(solid,#000000,4000)" xpath="//pageViewport[@nr=3]//flow/block[2]/@border-before"/>
<eval expected="" xpath="//pageViewport[@nr=3]//flow/block[2]/@border-after"/>
<!-- cell 1.1 -->
<eval expected="10000" xpath="//pageViewport[@nr=3]//flow/block[2]/block[1]/@bpd"/>
<eval expected="12000" xpath="//pageViewport[@nr=3]//flow/block[2]/block[1]/@bpda"/>
<eval expected="(solid,#0000ff,2000)" xpath="//pageViewport[@nr=3]//flow/block[2]/block[1]/@border-before"/>
<eval expected="" xpath="//pageViewport[@nr=3]//flow/block[2]/block[1]/@border-after"/>
<eval expected="1" xpath="count(//pageViewport[@nr=3]//flow/block[2]/block[1]/block)"/>
<eval expected="Cell 1.1 Line 1" xpath="//pageViewport[@nr=3]//flow/block[2]/block[1]/block/lineArea"/>
<!-- cell 1.2 -->
<eval expected="10000" xpath="//pageViewport[@nr=3]//flow/block[2]/block[2]/@bpd"/>
<eval expected="12000" xpath="//pageViewport[@nr=3]//flow/block[2]/block[2]/@bpda"/>
<eval expected="(solid,#008080,2000)" xpath="//pageViewport[@nr=3]//flow/block[2]/block[2]/@border-before"/>
<eval expected="" xpath="//pageViewport[@nr=3]//flow/block[2]/block[2]/@border-after"/>
<eval expected="1" xpath="count(//pageViewport[@nr=3]//flow/block[2]/block[2]/block)"/>
<eval expected="Cell 1.2 Line 1" xpath="//pageViewport[@nr=3]//flow/block[2]/block[2]/block/lineArea"/>
<!-- page 2 -->
<eval expected="2" xpath="count(//pageViewport[@nr=4]//flow/block)"/>
<eval expected="After the table" xpath="//pageViewport[@nr=4]//flow/block[2]/lineArea"/>
<eval expected="36000" xpath="//pageViewport[@nr=4]//flow/block[1]/@bpd"/>
<eval expected="40000" xpath="//pageViewport[@nr=4]//flow/block[1]/@bpda"/>
<eval expected="" xpath="//pageViewport[@nr=4]//flow/block[1]/@border-before"/>
<eval expected="(solid,#000000,4000)" xpath="//pageViewport[@nr=4]//flow/block[1]/@border-after"/>
<!-- cell 1.1 -->
<eval expected="10000" xpath="//pageViewport[@nr=4]//flow/block[1]/block[1]/@bpd"/>
<eval expected="12000" xpath="//pageViewport[@nr=4]//flow/block[1]/block[1]/@bpda"/>
<eval expected="" xpath="//pageViewport[@nr=4]//flow/block[1]/block[1]/@border-before"/>
<eval expected="(solid,#0000ff,2000)" xpath="//pageViewport[@nr=4]//flow/block[1]/block[1]/@border-after"/>
<eval expected="1" xpath="count(//pageViewport[@nr=4]//flow/block[1]/block[1]/block)"/>
<eval expected="Cell 1.1 Line 2" xpath="//pageViewport[@nr=4]//flow/block[1]/block[1]/block/lineArea"/>
<!-- cell 2.1 -->
<eval expected="20000" xpath="//pageViewport[@nr=4]//flow/block[1]/block[2]/@bpd"/>
<eval expected="24000" xpath="//pageViewport[@nr=4]//flow/block[1]/block[2]/@bpda"/>
<eval expected="(solid,#008000,2000)" xpath="//pageViewport[@nr=4]//flow/block[1]/block[2]/@border-before"/>
<eval expected="(solid,#008000,2000)" xpath="//pageViewport[@nr=4]//flow/block[1]/block[2]/@border-after"/>
<!-- cell 1.2 -->
<eval expected="34000" xpath="//pageViewport[@nr=4]//flow/block[1]/block[3]/@bpd"/>
<eval expected="36000" xpath="//pageViewport[@nr=4]//flow/block[1]/block[3]/@bpda"/>
<eval expected="" xpath="//pageViewport[@nr=4]//flow/block[1]/block[3]/@border-before"/>
<eval expected="(solid,#008080,2000)" xpath="//pageViewport[@nr=4]//flow/block[1]/block[3]/@border-after"/>
<eval expected="1" xpath="count(//pageViewport[@nr=4]//flow/block[1]/block[3]/block)"/>
<eval expected="Cell 1.2 Line 2" xpath="//pageViewport[@nr=4]//flow/block[1]/block[3]/block/lineArea"/>

<!-- table 3 -->
<eval expected="2" xpath="count(//pageSequence[3]/pageViewport)"/>
<!-- page 1 -->
<eval expected="1" xpath="count(//pageViewport[@nr=5]//flow/block)"/>
<eval expected="3. Before the table" xpath="//pageViewport[@nr=5]//flow/block[1]/lineArea"/>
<!-- page 2 -->
<eval expected="3" xpath="count(//pageViewport[@nr=6]//flow/block)"/>
<eval expected="Before the table" xpath="//pageViewport[@nr=6]//flow/block[1]/lineArea"/>
<eval expected="46000" xpath="//pageViewport[@nr=6]//flow/block[2]/@bpd"/>
<eval expected="46000" xpath="//pageViewport[@nr=6]//flow/block[2]/@bpda"/>
<eval expected="After the table" xpath="//pageViewport[@nr=6]//flow/block[3]/lineArea"/>

</checks>
</testcase>

+ 0
- 254
test/layoutengine/standard-testcases/table-row_keep-with-previous_2.xml View File

@@ -1,254 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
The ASF licenses this file to You under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<!-- $Id$ -->
<testcase>
<info>
<p>
This test checks that keep-with-previous works on table-row.
</p>
</info>
<fo>
<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
<fo:layout-master-set>
<fo:simple-page-master master-name="page" page-height="3in" page-width="5in"
margin="0.5in">
<fo:region-body background-color="#F0F0F0"/>
</fo:simple-page-master>
</fo:layout-master-set>

<!-- table 1 -->
<fo:page-sequence master-reference="page" font-size="8pt" line-height="10pt">
<fo:flow flow-name="xsl-region-body">
<fo:block space-after="106pt">1. Before the table</fo:block>
<fo:table width="100%" table-layout="fixed"
border-collapse="separate" border="4pt solid black">
<fo:table-column number-columns-repeated="2"
column-width="proportional-column-width(1)"/>
<fo:table-body>
<fo:table-row>
<fo:table-cell border="2pt solid blue">
<fo:block>Cell 1.1 Line 1</fo:block>
<fo:block>Cell 1.1 Line 2</fo:block>
</fo:table-cell>
<fo:table-cell border="2pt solid teal">
<fo:block>Cell 1.2 Line 1</fo:block>
<fo:block>Cell 1.2 Line 2</fo:block>
</fo:table-cell>
</fo:table-row>
<fo:table-row keep-with-previous="always">
<fo:table-cell border="2pt solid green">
<fo:block>Cell 2.1 Line 1</fo:block>
<fo:block>Cell 2.1 Line 2</fo:block>
</fo:table-cell>
<fo:table-cell border="2pt solid olive">
<fo:block>Cell 3.1 Line 1</fo:block>
<fo:block>Cell 3.1 Line 2</fo:block>
</fo:table-cell>
</fo:table-row>
</fo:table-body>
</fo:table>
<fo:block>After the table</fo:block>
</fo:flow>
</fo:page-sequence>

<!-- table 2 -->
<fo:page-sequence master-reference="page" font-size="8pt" line-height="10pt">
<fo:flow flow-name="xsl-region-body">
<fo:block space-after="106pt">2. Before the table</fo:block>
<fo:table width="100%" table-layout="fixed"
border-collapse="separate" border="4pt solid black">
<fo:table-column number-columns-repeated="2"
column-width="proportional-column-width(1)"/>
<fo:table-body>
<fo:table-row>
<fo:table-cell border="2pt solid blue">
<fo:block>Cell 1.1 Line 1</fo:block>
<fo:block>Cell 1.1 Line 2</fo:block>
</fo:table-cell>
<fo:table-cell border="2pt solid teal" number-rows-spanned="2">
<fo:block>Cell 1.2 Line 1</fo:block>
<fo:block>Cell 1.2 Line 2</fo:block>
</fo:table-cell>
</fo:table-row>
<fo:table-row keep-with-previous="always">
<fo:table-cell border="2pt solid green">
<fo:block>Cell 2.1 Line 1</fo:block>
<fo:block>Cell 2.1 Line 2</fo:block>
</fo:table-cell>
</fo:table-row>
</fo:table-body>
</fo:table>
<fo:block>After the table</fo:block>
</fo:flow>
</fo:page-sequence>

<!-- table 3 -->
<fo:page-sequence master-reference="page" font-size="8pt" line-height="10pt">
<fo:flow flow-name="xsl-region-body">
<fo:block space-after="124">3. Before the table</fo:block>
<fo:block>Before the table</fo:block>
<fo:table width="100%" table-layout="fixed"
border-collapse="collapse" border="4pt solid black">
<fo:table-column number-columns-repeated="2"
column-width="proportional-column-width(1)"/>
<fo:table-body>
<fo:table-row keep-with-previous="always">
<fo:table-cell border="2pt solid blue" number-rows-spanned="2">
<fo:block>Cell 1.1 Line 1</fo:block>
<fo:block>Cell 1.1 Line 2</fo:block>
</fo:table-cell>
<fo:table-cell border="2pt solid teal">
<fo:block>Cell 1.2 Line 1</fo:block>
<fo:block>Cell 1.2 Line 2</fo:block>
</fo:table-cell>
</fo:table-row>
<fo:table-row>
<fo:table-cell border="2pt solid olive">
<fo:block>Cell 2.1 Line 1</fo:block>
<fo:block>Cell 2.1 Line 2</fo:block>
</fo:table-cell>
</fo:table-row>
</fo:table-body>
</fo:table>
<fo:block>After the table</fo:block>
</fo:flow>
</fo:page-sequence>

</fo:root>
</fo>
<checks>

<!-- table 1 -->
<eval expected="2" xpath="count(//pageSequence[1]/pageViewport)"/>
<!-- page 1 -->
<eval expected="2" xpath="count(//pageViewport[@nr=1]//flow/block)"/>
<eval expected="1. Before the table" xpath="//pageViewport[@nr=1]//flow/block[1]/lineArea"/>
<eval expected="12000" xpath="//pageViewport[@nr=1]//flow/block[2]/@bpd"/>
<eval expected="16000" xpath="//pageViewport[@nr=1]//flow/block[2]/@bpda"/>
<eval expected="(solid,#000000,4000)" xpath="//pageViewport[@nr=1]//flow/block[2]/@border-before"/>
<eval expected="" xpath="//pageViewport[@nr=1]//flow/block[2]/@border-after"/>
<!-- cell 1.1 -->
<eval expected="10000" xpath="//pageViewport[@nr=1]//flow/block[2]/block[1]/@bpd"/>
<eval expected="12000" xpath="//pageViewport[@nr=1]//flow/block[2]/block[1]/@bpda"/>
<eval expected="(solid,#0000ff,2000)" xpath="//pageViewport[@nr=1]//flow/block[2]/block[1]/@border-before"/>
<eval expected="" xpath="//pageViewport[@nr=1]//flow/block[2]/block[1]/@border-after"/>
<eval expected="1" xpath="count(//pageViewport[@nr=1]//flow/block[2]/block[1]/block)"/>
<eval expected="Cell 1.1 Line 1" xpath="//pageViewport[@nr=1]//flow/block[2]/block[1]/block/lineArea"/>
<!-- cell 1.2 -->
<eval expected="10000" xpath="//pageViewport[@nr=1]//flow/block[2]/block[2]/@bpd"/>
<eval expected="12000" xpath="//pageViewport[@nr=1]//flow/block[2]/block[2]/@bpda"/>
<eval expected="(solid,#008080,2000)" xpath="//pageViewport[@nr=1]//flow/block[2]/block[2]/@border-before"/>
<eval expected="" xpath="//pageViewport[@nr=1]//flow/block[2]/block[2]/@border-after"/>
<eval expected="1" xpath="count(//pageViewport[@nr=1]//flow/block[2]/block[2]/block)"/>
<eval expected="Cell 1.2 Line 1" xpath="//pageViewport[@nr=1]//flow/block[2]/block[2]/block/lineArea"/>
<!-- page 2 -->
<eval expected="2" xpath="count(//pageViewport[@nr=2]//flow/block)"/>
<eval expected="After the table" xpath="//pageViewport[@nr=2]//flow/block[2]/lineArea"/>
<eval expected="36000" xpath="//pageViewport[@nr=2]//flow/block[1]/@bpd"/>
<eval expected="40000" xpath="//pageViewport[@nr=2]//flow/block[1]/@bpda"/>
<eval expected="" xpath="//pageViewport[@nr=2]//flow/block[1]/@border-before"/>
<eval expected="(solid,#000000,4000)" xpath="//pageViewport[@nr=2]//flow/block[1]/@border-after"/>
<!-- cell 1.1 -->
<eval expected="10000" xpath="//pageViewport[@nr=2]//flow/block[1]/block[1]/@bpd"/>
<eval expected="12000" xpath="//pageViewport[@nr=2]//flow/block[1]/block[1]/@bpda"/>
<eval expected="" xpath="//pageViewport[@nr=2]//flow/block[1]/block[1]/@border-before"/>
<eval expected="(solid,#0000ff,2000)" xpath="//pageViewport[@nr=2]//flow/block[1]/block[1]/@border-after"/>
<eval expected="1" xpath="count(//pageViewport[@nr=2]//flow/block[1]/block[1]/block)"/>
<eval expected="Cell 1.1 Line 2" xpath="//pageViewport[@nr=2]//flow/block[1]/block[1]/block/lineArea"/>
<!-- cell 1.2 -->
<eval expected="10000" xpath="//pageViewport[@nr=2]//flow/block[1]/block[2]/@bpd"/>
<eval expected="12000" xpath="//pageViewport[@nr=2]//flow/block[1]/block[2]/@bpda"/>
<eval expected="" xpath="//pageViewport[@nr=2]//flow/block[1]/block[2]/@border-before"/>
<eval expected="(solid,#008080,2000)" xpath="//pageViewport[@nr=2]//flow/block[1]/block[2]/@border-after"/>
<eval expected="1" xpath="count(//pageViewport[@nr=2]//flow/block[1]/block[2]/block)"/>
<eval expected="Cell 1.2 Line 2" xpath="//pageViewport[@nr=2]//flow/block[1]/block[2]/block/lineArea"/>
<!-- cell 2.1 -->
<eval expected="20000" xpath="//pageViewport[@nr=2]//flow/block[1]/block[3]/@bpd"/>
<eval expected="24000" xpath="//pageViewport[@nr=2]//flow/block[1]/block[3]/@bpda"/>
<eval expected="(solid,#008000,2000)" xpath="//pageViewport[@nr=2]//flow/block[1]/block[3]/@border-before"/>
<eval expected="(solid,#008000,2000)" xpath="//pageViewport[@nr=2]//flow/block[1]/block[3]/@border-after"/>
<!-- cell 2.2 -->
<eval expected="20000" xpath="//pageViewport[@nr=2]//flow/block[1]/block[4]/@bpd"/>
<eval expected="24000" xpath="//pageViewport[@nr=2]//flow/block[1]/block[4]/@bpda"/>
<eval expected="(solid,#808000,2000)" xpath="//pageViewport[@nr=2]//flow/block[1]/block[4]/@border-before"/>
<eval expected="(solid,#808000,2000)" xpath="//pageViewport[@nr=2]//flow/block[1]/block[4]/@border-after"/>

<!-- table 2 -->
<eval expected="2" xpath="count(//pageSequence[2]/pageViewport)"/>
<!-- page 1 -->
<eval expected="2" xpath="count(//pageViewport[@nr=3]//flow/block)"/>
<eval expected="2. Before the table" xpath="//pageViewport[@nr=3]//flow/block[1]/lineArea"/>
<eval expected="12000" xpath="//pageViewport[@nr=3]//flow/block[2]/@bpd"/>
<eval expected="16000" xpath="//pageViewport[@nr=3]//flow/block[2]/@bpda"/>
<eval expected="(solid,#000000,4000)" xpath="//pageViewport[@nr=3]//flow/block[2]/@border-before"/>
<eval expected="" xpath="//pageViewport[@nr=3]//flow/block[2]/@border-after"/>
<!-- cell 1.1 -->
<eval expected="10000" xpath="//pageViewport[@nr=3]//flow/block[2]/block[1]/@bpd"/>
<eval expected="12000" xpath="//pageViewport[@nr=3]//flow/block[2]/block[1]/@bpda"/>
<eval expected="(solid,#0000ff,2000)" xpath="//pageViewport[@nr=3]//flow/block[2]/block[1]/@border-before"/>
<eval expected="" xpath="//pageViewport[@nr=3]//flow/block[2]/block[1]/@border-after"/>
<eval expected="1" xpath="count(//pageViewport[@nr=3]//flow/block[2]/block[1]/block)"/>
<eval expected="Cell 1.1 Line 1" xpath="//pageViewport[@nr=3]//flow/block[2]/block[1]/block/lineArea"/>
<!-- cell 1.2 -->
<eval expected="10000" xpath="//pageViewport[@nr=3]//flow/block[2]/block[2]/@bpd"/>
<eval expected="12000" xpath="//pageViewport[@nr=3]//flow/block[2]/block[2]/@bpda"/>
<eval expected="(solid,#008080,2000)" xpath="//pageViewport[@nr=3]//flow/block[2]/block[2]/@border-before"/>
<eval expected="" xpath="//pageViewport[@nr=3]//flow/block[2]/block[2]/@border-after"/>
<eval expected="1" xpath="count(//pageViewport[@nr=3]//flow/block[2]/block[2]/block)"/>
<eval expected="Cell 1.2 Line 1" xpath="//pageViewport[@nr=3]//flow/block[2]/block[2]/block/lineArea"/>
<!-- page 2 -->
<eval expected="2" xpath="count(//pageViewport[@nr=4]//flow/block)"/>
<eval expected="After the table" xpath="//pageViewport[@nr=4]//flow/block[2]/lineArea"/>
<eval expected="36000" xpath="//pageViewport[@nr=4]//flow/block[1]/@bpd"/>
<eval expected="40000" xpath="//pageViewport[@nr=4]//flow/block[1]/@bpda"/>
<eval expected="" xpath="//pageViewport[@nr=4]//flow/block[1]/@border-before"/>
<eval expected="(solid,#000000,4000)" xpath="//pageViewport[@nr=4]//flow/block[1]/@border-after"/>
<!-- cell 1.1 -->
<eval expected="10000" xpath="//pageViewport[@nr=4]//flow/block[1]/block[1]/@bpd"/>
<eval expected="12000" xpath="//pageViewport[@nr=4]//flow/block[1]/block[1]/@bpda"/>
<eval expected="" xpath="//pageViewport[@nr=4]//flow/block[1]/block[1]/@border-before"/>
<eval expected="(solid,#0000ff,2000)" xpath="//pageViewport[@nr=4]//flow/block[1]/block[1]/@border-after"/>
<eval expected="1" xpath="count(//pageViewport[@nr=4]//flow/block[1]/block[1]/block)"/>
<eval expected="Cell 1.1 Line 2" xpath="//pageViewport[@nr=4]//flow/block[1]/block[1]/block/lineArea"/>
<!-- cell 2.1 -->
<eval expected="20000" xpath="//pageViewport[@nr=4]//flow/block[1]/block[2]/@bpd"/>
<eval expected="24000" xpath="//pageViewport[@nr=4]//flow/block[1]/block[2]/@bpda"/>
<eval expected="(solid,#008000,2000)" xpath="//pageViewport[@nr=4]//flow/block[1]/block[2]/@border-before"/>
<eval expected="(solid,#008000,2000)" xpath="//pageViewport[@nr=4]//flow/block[1]/block[2]/@border-after"/>
<!-- cell 1.2 -->
<eval expected="34000" xpath="//pageViewport[@nr=4]//flow/block[1]/block[3]/@bpd"/>
<eval expected="36000" xpath="//pageViewport[@nr=4]//flow/block[1]/block[3]/@bpda"/>
<eval expected="" xpath="//pageViewport[@nr=4]//flow/block[1]/block[3]/@border-before"/>
<eval expected="(solid,#008080,2000)" xpath="//pageViewport[@nr=4]//flow/block[1]/block[3]/@border-after"/>
<eval expected="1" xpath="count(//pageViewport[@nr=4]//flow/block[1]/block[3]/block)"/>
<eval expected="Cell 1.2 Line 2" xpath="//pageViewport[@nr=4]//flow/block[1]/block[3]/block/lineArea"/>

<!-- table 3 -->
<eval expected="2" xpath="count(//pageSequence[3]/pageViewport)"/>
<!-- page 1 -->
<eval expected="1" xpath="count(//pageViewport[@nr=5]//flow/block)"/>
<eval expected="3. Before the table" xpath="//pageViewport[@nr=5]//flow/block[1]/lineArea"/>
<!-- page 2 -->
<eval expected="3" xpath="count(//pageViewport[@nr=6]//flow/block)"/>
<eval expected="Before the table" xpath="//pageViewport[@nr=6]//flow/block[1]/lineArea"/>
<eval expected="46000" xpath="//pageViewport[@nr=6]//flow/block[2]/@bpd"/>
<eval expected="46000" xpath="//pageViewport[@nr=6]//flow/block[2]/@bpda"/>
<eval expected="After the table" xpath="//pageViewport[@nr=6]//flow/block[3]/lineArea"/>

</checks>
</testcase>

+ 0
- 130
test/layoutengine/standard-testcases/table_border-collapse_collapse_1.xml View File

@@ -1,130 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
The ASF licenses this file to You under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<!-- $Id$ -->
<testcase>
<info>
<p>
This test checks tables with collapse border model. Simple cell borders to start with.
</p>
</info>
<fo>
<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
<fo:layout-master-set>
<fo:simple-page-master master-name="normal" page-width="5in" page-height="5in" margin="20pt">
<fo:region-body margin="0pt"/>
</fo:simple-page-master>
</fo:layout-master-set>
<fo:page-sequence master-reference="normal" white-space-collapse="true">
<fo:flow flow-name="xsl-region-body">
<fo:block-container height="20pt" background-color="lightgray">
<fo:block>block before table</fo:block>
</fo:block-container>
<fo:block margin="0pt" border="groove 5pt green" border-right="15pt" height="20pt">normal border here</fo:block>
<fo:block-container margin-left="150pt" width="150pt + 7.5pt" height="5pt" background-color="gray">
<fo:block/>
</fo:block-container>
<fo:block-container margin-left="150pt + 7.5pt" width="150pt - 7.5pt - 7.5pt" height="5pt" background-color="gray">
<fo:block/>
</fo:block-container>
<fo:table table-layout="fixed" width="100%" border-collapse="collapse" background-color="rgb(90%, 90%, 100%)">
<fo:table-column column-width="150pt"/>
<fo:table-column column-width="150pt"/>
<fo:table-body>
<fo:table-row height="50pt">
<fo:table-cell border="solid 15pt blue">
<fo:block text-align="justify">cell1 cell1 cell1 cell1 cell1 cell1 cell1</fo:block>
</fo:table-cell>
<fo:table-cell background-color="yellow" border="solid 5pt black" border-right="groove 15pt red" border-top="dotted 5pt black" border-bottom="dotted 5pt green">
<fo:block text-align="justify">cell2 cell2 cell2 cell2 cell2 cell2 cell2</fo:block>
</fo:table-cell>
</fo:table-row>
<fo:table-row>
<fo:table-cell background-color="orange">
<fo:block>cell3</fo:block>
</fo:table-cell>
<fo:table-cell border="solid 10pt red" border-top="dotted 5pt red">
<fo:block>cell4</fo:block>
</fo:table-cell>
</fo:table-row>
</fo:table-body>
</fo:table>
<fo:block background-color="lightgray">block after table</fo:block>
</fo:flow>
</fo:page-sequence>
</fo:root>
</fo>
<checks>
<!-- table dimensions -->
<eval expected="320000" xpath="//flow/block[5]/@ipd"/>
<eval expected="71900" xpath="//flow/block[5]/@bpd"/>
<!-- cell 1 -->
<true xpath="//flow/block[5]/block[1]/@is-reference-area"/>
<eval expected="7500" xpath="//flow/block[5]/block[1]/@left-offset"/>
<eval expected="7500" xpath="//flow/block[5]/block[1]/@top-offset"/>
<eval expected="135000" xpath="//flow/block[5]/block[1]/@ipd"/>
<eval expected="35000" xpath="//flow/block[5]/block[1]/@bpd"/>
<eval expected="(solid,#0000ff,15000,collapse-outer)" xpath="//flow/block[5]/block[1]/@border-before"/>
<eval expected="(solid,#0000ff,15000,collapse-inner)" xpath="//flow/block[5]/block[1]/@border-after"/>
<eval expected="(solid,#0000ff,15000,collapse-outer)" xpath="//flow/block[5]/block[1]/@border-start"/>
<eval expected="(solid,#0000ff,15000,collapse-inner)" xpath="//flow/block[5]/block[1]/@border-end"/>
<eval expected="135000" xpath="//flow/block[5]/block[1]/block[1]/@ipd"/>
<eval expected="14400" xpath="//flow/block[5]/block[1]/block[1]/@bpd"/>

<!-- cell 2 -->
<true xpath="//flow/block[5]/block[2]/@is-reference-area"/>
<eval expected="157500" xpath="//flow/block[5]/block[2]/@left-offset"/>
<eval expected="2500" xpath="//flow/block[5]/block[2]/@top-offset"/>
<eval expected="135000" xpath="//flow/block[5]/block[2]/@ipd"/>
<eval expected="40000" xpath="//flow/block[5]/block[2]/@bpd"/>
<eval expected="(dotted,#000000,5000,collapse-outer)" xpath="//flow/block[5]/block[2]/@border-before"/>
<eval expected="(dotted,#00ff00,5000,collapse-inner)" xpath="//flow/block[5]/block[2]/@border-after"/>
<eval expected="(solid,#0000ff,15000,collapse-inner)" xpath="//flow/block[5]/block[2]/@border-start"/>
<eval expected="(groove,#ff0000,15000,collapse-outer)" xpath="//flow/block[5]/block[2]/@border-end"/>
<eval expected="color=#ffff00,repeat=0,horiz=0,vertical=0" xpath="//flow/block[5]/block[2]/@background"/>
<eval expected="135000" xpath="//flow/block[5]/block[2]/block[1]/@ipd"/>
<eval expected="14400" xpath="//flow/block[5]/block[2]/block[1]/@bpd"/>

<!-- cell 3 -->
<true xpath="//flow/block[5]/block[3]/@is-reference-area"/>
<true xpath="not(boolean(//flow/block[5]/block[3]/@left-offset)) or (//flow/block[5]/block[3]/@left-offset = 0)"/>
<eval expected="57500" xpath="//flow/block[5]/block[3]/@top-offset"/>
<eval expected="145000" xpath="//flow/block[5]/block[3]/@ipd"/>
<eval expected="14400" xpath="//flow/block[5]/block[3]/@bpd"/>
<eval expected="(solid,#0000ff,15000,collapse-inner)" xpath="//flow/block[5]/block[3]/@border-before"/>
<true xpath="not(boolean(//flow/block[5]/block[3]/@border-after))"/>
<true xpath="not(boolean(//flow/block[5]/block[3]/@border-start))"/>
<eval expected="(solid,#ff0000,10000,collapse-inner)" xpath="//flow/block[5]/block[3]/@border-end"/>
<eval expected="color=#ffa500,repeat=0,horiz=0,vertical=0" xpath="//flow/block[5]/block[3]/@background"/>
<eval expected="145000" xpath="//flow/block[5]/block[3]/block[1]/@ipd"/>
<eval expected="14400" xpath="//flow/block[5]/block[3]/block[1]/@bpd"/>

<!-- cell 4 -->
<true xpath="//flow/block[5]/block[4]/@is-reference-area"/>
<eval expected="155000" xpath="//flow/block[5]/block[4]/@left-offset"/>
<eval expected="52500" xpath="//flow/block[5]/block[4]/@top-offset"/>
<eval expected="140000" xpath="//flow/block[5]/block[4]/@ipd"/>
<eval expected="14400" xpath="//flow/block[5]/block[4]/@bpd"/>
<eval expected="(dotted,#ff0000,5000,collapse-inner)" xpath="//flow/block[5]/block[3]/@border-before"/>
<eval expected="(solid,#ff0000,10000,collapse-outer)" xpath="//flow/block[5]/block[3]/@border-after"/>
<eval expected="(solid,#ff0000,10000,collapse-inner)" xpath="//flow/block[5]/block[3]/@border-start"/>
<eval expected="(solid,#ff0000,10000,collapse-outer)" xpath="//flow/block[5]/block[3]/@border-end"/>
<eval expected="140000" xpath="//flow/block[5]/block[4]/block[1]/@ipd"/>
<eval expected="14400" xpath="//flow/block[5]/block[4]/block[1]/@bpd"/>
</checks>
</testcase>

+ 0
- 70
test/layoutengine/standard-testcases/table_border-collapse_collapse_2.xml View File

@@ -1,70 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
The ASF licenses this file to You under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<!-- $Id$ -->
<testcase>
<info>
<p>
This test checks tables with collapse border model. Simple cell borders to start with.
</p>
</info>
<fo>
<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
<fo:layout-master-set>
<fo:simple-page-master master-name="normal" page-width="5in" page-height="5in" margin="20pt">
<fo:region-body margin="0pt"/>
</fo:simple-page-master>
</fo:layout-master-set>
<fo:page-sequence master-reference="normal" white-space-collapse="true">
<fo:flow flow-name="xsl-region-body">
<fo:block background-color="lightgray">block before table</fo:block>
<fo:table table-layout="fixed" width="100%" border-collapse="collapse" padding="5pt">
<fo:table-column column-width="2in"/>
<fo:table-column column-width="2in"/>
<fo:table-body>
<fo:table-row>
<fo:table-cell border="solid 10pt blue">
<fo:block>cell1</fo:block>
</fo:table-cell>
<fo:table-cell background-color="yellow" border="solid 5pt black">
<fo:block>cell2</fo:block>
</fo:table-cell>
</fo:table-row>
<fo:table-row>
<fo:table-cell background-color="orange" border="dotted 15pt black" number-columns-spanned="2">
<fo:block>spanned</fo:block>
</fo:table-cell>
</fo:table-row>
<fo:table-row border="solid 15pt green">
<fo:table-cell>
<fo:block>cell4</fo:block>
</fo:table-cell>
<fo:table-cell background-color="yellow">
<fo:block>cell5</fo:block>
</fo:table-cell>
</fo:table-row>
</fo:table-body>
</fo:table>
<fo:block background-color="lightgray">block after table</fo:block>
</fo:flow>
</fo:page-sequence>
</fo:root>
</fo>
<checks>
<eval expected="add checks here" xpath="false"/>
</checks>
</testcase>

+ 18
- 10
test/layoutengine/standard-testcases/table_border_padding.xml View File

@@ -66,8 +66,8 @@
</fo>
<checks>
<!-- table dimensions -->
<eval expected="308000" xpath="//flow/block[2]/@ipda"/>
<eval expected="288000" xpath="//flow/block[2]/@ipd"/>
<eval expected="328000" xpath="//flow/block[2]/@ipda"/>
<eval expected="308000" xpath="//flow/block[2]/@ipd"/>
<eval expected="48800" xpath="//flow/block[2]/@bpda"/>
<eval expected="28800" xpath="//flow/block[2]/@bpd"/>
<eval expected="10000 10000 10000 10000" xpath="//flow/block[2]/@bap"/>
@@ -95,7 +95,7 @@
<eval expected="144000" xpath="//flow/block[2]/block[2]/block[1]/@ipd"/>
<eval expected="14400" xpath="//flow/block[2]/block[2]/block[1]/@bpd"/>
<eval expected="cell2" xpath="//flow/block[2]/block[2]/block[1]/lineArea"/>
<eval expected="color=#ffff00,repeat=0,horiz=0,vertical=0" xpath="//flow/block[2]/block[2]/@background"/>
<eval expected="color=#ffff00" xpath="//flow/block[2]/block[2]/@background"/>

<!-- cell 3 -->
<true xpath="//flow/block[2]/block[3]/@is-reference-area"/>
@@ -106,7 +106,7 @@
<eval expected="144000" xpath="//flow/block[2]/block[3]/block[1]/@ipd"/>
<eval expected="14400" xpath="//flow/block[2]/block[3]/block[1]/@bpd"/>
<eval expected="cell3" xpath="//flow/block[2]/block[3]/block[1]/lineArea"/>
<eval expected="color=#ffa500,repeat=0,horiz=0,vertical=0" xpath="//flow/block[2]/block[3]/@background"/>
<eval expected="color=#ffa500" xpath="//flow/block[2]/block[3]/@background"/>

<!-- cell 4 -->
<true xpath="//flow/block[2]/block[4]/@is-reference-area"/>
@@ -121,19 +121,27 @@
<element-list category="breaker">
<box w="14400"/>
<penalty w="0" p="0"/>
<box w="10000" aux="true"/>
<box w="0" aux="true"/>
<penalty w="0" p="INF" aux="true"/>
<glue w="10000" y="0" z="0" aux="true"/>
<box w="14400"/>
<penalty w="20000" p="0"/>
<penalty w="0" p="0"/>
<box w="14400"/>
<box w="10000" aux="true"/>
<penalty w="0" p="INF" aux="true"/>
<glue w="10000" y="0" z="0" aux="true"/>
<penalty w="0" p="0"/>
<box w="14400"/>
<penalty w="0" p="0"/>
<box w="10000" aux="true"/>
<box w="0" aux="true"/>
<penalty w="0" p="INF" aux="true"/>
<glue w="10000" y="0" z="0" aux="true"/>
<box w="14400"/>
<box w="10000" aux="true"/>
<box w="0" aux="true"/>
<penalty w="0" p="INF" aux="true"/>
<glue w="10000" y="0" z="0" aux="true"/>
<box w="0" aux="true"/>
<skip>3</skip>
</element-list>
</checks>
</testcase>

Write Preview
Loading…
Cancel
Save