diff options
Diffstat (limited to 'test')
11 files changed, 1695 insertions, 16 deletions
diff --git a/test/layoutengine/standard-testcases/table-cell_block_keep-with-next.xml b/test/layoutengine/standard-testcases/table-cell_block_keep-with-next.xml index 45df7e337..b4eb7aead 100644 --- a/test/layoutengine/standard-testcases/table-cell_block_keep-with-next.xml +++ b/test/layoutengine/standard-testcases/table-cell_block_keep-with-next.xml @@ -32,9 +32,8 @@ <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 table-layout="fixed" width="100%"> + <fo:table-column number-columns-repeated="2" column-width="proportional-column-width(1)"/> <fo:table-body> <fo:table-row> <fo:table-cell id="cell1"> diff --git a/test/layoutengine/standard-testcases/table-cell_keep-together.xml b/test/layoutengine/standard-testcases/table-cell_keep-together.xml new file mode 100644 index 000000000..e35f343ad --- /dev/null +++ b/test/layoutengine/standard-testcases/table-cell_keep-together.xml @@ -0,0 +1,209 @@ +<?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-together works on blocks in table-cells. + </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="118pt">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 keep-together="always"> + <fo:block>Cell 1.1 Line 1</fo:block> + <fo:block>Cell 1.1 Line 2</fo:block> + </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 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="118pt">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 keep-together="always"> + <fo:block>Cell 1.2 Line 1</fo:block> + <fo:block>Cell 1.2 Line 2</fo:block> + </fo:block> + </fo:table-cell> + </fo:table-row> + <fo:table-row> + <fo:table-cell border="2pt solid green"> + <fo:block>Cell 2.2 Line 1</fo:block> + <fo:block>Cell 2.2 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="100">3. 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> + <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 keep-together="always"> + <fo:block>Cell 2.1 Line 1</fo:block> + <fo:block>Cell 2.1 Line 2</fo:block> + </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="1" xpath="count(//pageViewport[@nr=1]//flow/block)"/> + <eval expected="1. Before the table" xpath="//pageViewport[@nr=1]//flow/block[1]/lineArea"/> + <!-- page 2 --> + <eval expected="2" xpath="count(//pageViewport[@nr=2]//flow/block)"/> + <eval expected="48000" xpath="//pageViewport[@nr=2]//flow/block[1]/@bpd"/> + <eval expected="56000" xpath="//pageViewport[@nr=2]//flow/block[1]/@bpda"/> + <eval expected="(solid,#000000,4000)" xpath="//pageViewport[@nr=2]//flow/block[1]/@border-before"/> + <eval expected="(solid,#000000,4000)" xpath="//pageViewport[@nr=2]//flow/block[1]/@border-after"/> + <eval expected="After the table" xpath="//pageViewport[@nr=2]//flow/block[2]/lineArea"/> + + <!-- table 2 --> + <eval expected="2" xpath="count(//pageSequence[2]/pageViewport)"/> + <!-- page 1 --> + <eval expected="1" xpath="count(//pageViewport[@nr=3]//flow/block)"/> + <eval expected="2. Before the table" xpath="//pageViewport[@nr=3]//flow/block[1]/lineArea"/> + <!-- page 2 --> + <eval expected="2" xpath="count(//pageViewport[@nr=4]//flow/block)"/> + <eval expected="48000" xpath="//pageViewport[@nr=4]//flow/block[1]/@bpd"/> + <eval expected="56000" xpath="//pageViewport[@nr=4]//flow/block[1]/@bpda"/> + <eval expected="(solid,#000000,4000)" xpath="//pageViewport[@nr=4]//flow/block[1]/@border-before"/> + <eval expected="(solid,#000000,4000)" xpath="//pageViewport[@nr=4]//flow/block[1]/@border-after"/> + <eval expected="After the table" xpath="//pageViewport[@nr=4]//flow/block[2]/lineArea"/> + + <!-- table 3 --> + <eval expected="2" xpath="count(//pageSequence[3]/pageViewport)"/> + <!-- page 1 --> + <eval expected="2" xpath="count(//pageViewport[@nr=5]//flow/block)"/> + <eval expected="3. Before the table" xpath="//pageViewport[@nr=5]//flow/block[1]/lineArea"/> + <eval expected="23000" xpath="//pageViewport[@nr=5]//flow/block[2]/@bpd"/> + <eval expected="23000" xpath="//pageViewport[@nr=5]//flow/block[2]/@bpda"/> + <!-- cell 1.1 --> + <eval expected="21000" xpath="//pageViewport[@nr=5]//flow/block[2]/block[1]/@bpd"/> + <eval expected="25000" xpath="//pageViewport[@nr=5]//flow/block[2]/block[1]/@bpda"/> + <eval expected="(solid,#000000,4000,collapse-outer)" xpath="//pageViewport[@nr=5]//flow/block[2]/block[1]/@border-before"/> + <eval expected="" xpath="//pageViewport[@nr=5]//flow/block[2]/block[1]/@border-after"/> + <eval expected="21000" xpath="//pageViewport[@nr=5]//flow/block[2]/block[2]/@bpd"/> + <eval expected="21000" xpath="//pageViewport[@nr=5]//flow/block[2]/block[2]/@bpda"/> + <eval expected="2" xpath="count(//pageViewport[@nr=5]//flow/block[2]/block[2]/block)"/> + <eval expected="Cell 1.1 Line 1" xpath="//pageViewport[@nr=5]//flow/block[2]/block[2]/block[1]/lineArea"/> + <eval expected="Cell 1.1 Line 2" xpath="//pageViewport[@nr=5]//flow/block[2]/block[2]/block[2]/lineArea"/> + <!-- cell 1.2 --> + <eval expected="20000" xpath="//pageViewport[@nr=5]//flow/block[2]/block[3]/@bpd"/> + <eval expected="26000" xpath="//pageViewport[@nr=5]//flow/block[2]/block[3]/@bpda"/> + <eval expected="(solid,#000000,4000,collapse-outer)" xpath="//pageViewport[@nr=5]//flow/block[2]/block[3]/@border-before"/> + <eval expected="(solid,#008080,2000,collapse-outer)" xpath="//pageViewport[@nr=5]//flow/block[2]/block[3]/@border-after"/> + <!-- page 2 --> + <eval expected="2" xpath="count(//pageViewport[@nr=6]//flow/block)"/> + <eval expected="After the table" xpath="//pageViewport[@nr=6]//flow/block[2]/lineArea"/> + <eval expected="23000" xpath="//pageViewport[@nr=6]//flow/block[1]/@bpd"/> + <eval expected="23000" xpath="//pageViewport[@nr=6]//flow/block[1]/@bpda"/> + <!-- cell 1.1 --> + <eval expected="21000" xpath="//pageViewport[@nr=6]//flow/block[1]/block[1]/@bpd"/> + <eval expected="25000" xpath="//pageViewport[@nr=6]//flow/block[1]/block[1]/@bpda"/> + <eval expected="" xpath="//pageViewport[@nr=6]//flow/block[1]/block[1]/@border-before"/> + <eval expected="(solid,#000000,4000,collapse-outer)" xpath="//pageViewport[@nr=6]//flow/block[1]/block[1]/@border-after"/> + <eval expected="21000" xpath="//pageViewport[@nr=6]//flow/block[1]/block[2]/@bpd"/> + <eval expected="21000" xpath="//pageViewport[@nr=6]//flow/block[1]/block[2]/@bpda"/> + <eval expected="0" xpath="count(//pageViewport[@nr=6]//flow/block[1]/block[2]/block)"/> + <!-- cell 2.2 --> + <eval expected="20000" xpath="//pageViewport[@nr=6]//flow/block[1]/block[3]/@bpd"/> + <eval expected="26000" xpath="//pageViewport[@nr=6]//flow/block[1]/block[3]/@bpda"/> + <eval expected="(solid,#808000,2000,collapse-outer)" xpath="//pageViewport[@nr=6]//flow/block[1]/block[3]/@border-before"/> + <eval expected="(solid,#000000,4000,collapse-outer)" xpath="//pageViewport[@nr=6]//flow/block[1]/block[3]/@border-after"/> + + </checks> +</testcase> diff --git a/test/layoutengine/standard-testcases/table-cell_keep-with-next.xml b/test/layoutengine/standard-testcases/table-cell_keep-with-next.xml new file mode 100644 index 000000000..f4cb03a01 --- /dev/null +++ b/test/layoutengine/standard-testcases/table-cell_keep-with-next.xml @@ -0,0 +1,376 @@ +<?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-next works on blocks in table-cells. + </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 keep-with-next="always">Cell 1.2 Line 2</fo:block> + </fo:table-cell> + </fo:table-row> + <fo:table-row> + <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 keep-with-next="always">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> + <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="78pt">3. 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 keep-with-next="always">Cell 1.2 Line 2</fo:block> + </fo:table-cell> + </fo:table-row> + <fo:table-row> + <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 4 --> + <fo:page-sequence master-reference="page" font-size="8pt" line-height="10pt"> + <fo:flow flow-name="xsl-region-body"> + <fo:block space-after="88">4. 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> + <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.2 Line 1</fo:block> + <fo:block keep-with-next="always">Cell 2.2 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="2" xpath="count(//pageViewport[@nr=5]//flow/block)"/> + <eval expected="3. Before the table" xpath="//pageViewport[@nr=5]//flow/block[1]/lineArea"/> + <eval expected="12000" xpath="//pageViewport[@nr=5]//flow/block[2]/@bpd"/> + <eval expected="16000" xpath="//pageViewport[@nr=5]//flow/block[2]/@bpda"/> + <eval expected="(solid,#000000,4000)" xpath="//pageViewport[@nr=5]//flow/block[2]/@border-before"/> + <eval expected="" xpath="//pageViewport[@nr=5]//flow/block[2]/@border-after"/> + <!-- cell 1.1 --> + <eval expected="10000" xpath="//pageViewport[@nr=5]//flow/block[2]/block[1]/@bpd"/> + <eval expected="12000" xpath="//pageViewport[@nr=5]//flow/block[2]/block[1]/@bpda"/> + <eval expected="(solid,#0000ff,2000)" xpath="//pageViewport[@nr=5]//flow/block[2]/block[1]/@border-before"/> + <eval expected="" xpath="//pageViewport[@nr=5]//flow/block[2]/block[1]/@border-after"/> + <eval expected="1" xpath="count(//pageViewport[@nr=5]//flow/block[2]/block[1]/block)"/> + <eval expected="Cell 1.1 Line 1" xpath="//pageViewport[@nr=5]//flow/block[2]/block[1]/block[1]/lineArea"/> + <!-- cell 1.2 --> + <eval expected="10000" xpath="//pageViewport[@nr=5]//flow/block[2]/block[2]/@bpd"/> + <eval expected="12000" xpath="//pageViewport[@nr=5]//flow/block[2]/block[2]/@bpda"/> + <eval expected="(solid,#008080,2000)" xpath="//pageViewport[@nr=5]//flow/block[2]/block[2]/@border-before"/> + <eval expected="" xpath="//pageViewport[@nr=5]//flow/block[2]/block[2]/@border-after"/> + <eval expected="1" xpath="count(//pageViewport[@nr=5]//flow/block[2]/block[2]/block)"/> + <eval expected="Cell 1.2 Line 1" xpath="//pageViewport[@nr=5]//flow/block[2]/block[2]/block[1]/lineArea"/> + <!-- page 2 --> + <eval expected="2" xpath="count(//pageViewport[@nr=6]//flow/block)"/> + <eval expected="After the table" xpath="//pageViewport[@nr=6]//flow/block[2]/lineArea"/> + <eval expected="36000" xpath="//pageViewport[@nr=6]//flow/block[1]/@bpd"/> + <eval expected="40000" xpath="//pageViewport[@nr=6]//flow/block[1]/@bpda"/> + <eval expected="" xpath="//pageViewport[@nr=6]//flow/block[1]/@border-before"/> + <eval expected="(solid,#000000,4000)" xpath="//pageViewport[@nr=6]//flow/block[1]/@border-after"/> + <!-- cell 1.1 --> + <eval expected="10000" xpath="//pageViewport[@nr=6]//flow/block[1]/block[1]/@bpd"/> + <eval expected="12000" xpath="//pageViewport[@nr=6]//flow/block[1]/block[1]/@bpda"/> + <eval expected="" xpath="//pageViewport[@nr=6]//flow/block[1]/block[1]/@border-before"/> + <eval expected="(solid,#0000ff,2000)" xpath="//pageViewport[@nr=6]//flow/block[1]/block[1]/@border-after"/> + <eval expected="1" xpath="count(//pageViewport[@nr=6]//flow/block[1]/block[1]/block)"/> + <eval expected="Cell 1.1 Line 2" xpath="//pageViewport[@nr=6]//flow/block[1]/block[1]/block[1]/lineArea"/> + <!-- cell 2.1 --> + <eval expected="20000" xpath="//pageViewport[@nr=6]//flow/block[1]/block[2]/@bpd"/> + <eval expected="24000" xpath="//pageViewport[@nr=6]//flow/block[1]/block[2]/@bpda"/> + <eval expected="(solid,#008000,2000)" xpath="//pageViewport[@nr=6]//flow/block[1]/block[2]/@border-before"/> + <eval expected="(solid,#008000,2000)" xpath="//pageViewport[@nr=6]//flow/block[1]/block[2]/@border-after"/> + <!-- cell 1.2 --> + <eval expected="34000" xpath="//pageViewport[@nr=6]//flow/block[1]/block[3]/@bpd"/> + <eval expected="36000" xpath="//pageViewport[@nr=6]//flow/block[1]/block[3]/@bpda"/> + <eval expected="" xpath="//pageViewport[@nr=6]//flow/block[1]/block[3]/@border-before"/> + <eval expected="(solid,#008080,2000)" xpath="//pageViewport[@nr=6]//flow/block[1]/block[3]/@border-after"/> + <eval expected="1" xpath="count(//pageViewport[@nr=6]//flow/block[1]/block[3]/block)"/> + <eval expected="Cell 1.2 Line 2" xpath="//pageViewport[@nr=6]//flow/block[1]/block[3]/block[1]/lineArea"/> + + <!-- table 4 --> + <eval expected="2" xpath="count(//pageSequence[4]/pageViewport)"/> + <!-- page 1 --> + <eval expected="2" xpath="count(//pageViewport[@nr=7]//flow/block)"/> + <eval expected="4. Before the table" xpath="//pageViewport[@nr=7]//flow/block[1]/lineArea"/> + <eval expected="34000" xpath="//pageViewport[@nr=7]//flow/block[2]/@bpd"/> + <eval expected="34000" xpath="//pageViewport[@nr=7]//flow/block[2]/@bpda"/> + <!-- cell 1.2 --> + <eval expected="20000" xpath="//pageViewport[@nr=7]//flow/block[2]/block[1]/@bpd"/> + <eval expected="26000" xpath="//pageViewport[@nr=7]//flow/block[2]/block[1]/@bpda"/> + <eval expected="(solid,#000000,4000,collapse-outer)" xpath="//pageViewport[@nr=7]//flow/block[2]/block[1]/@border-before"/> + <eval expected="(solid,#008080,2000,collapse-inner)" xpath="//pageViewport[@nr=7]//flow/block[2]/block[1]/@border-after"/> + <!-- cell 1.1 --> + <eval expected="21000" xpath="//pageViewport[@nr=7]//flow/block[2]/block[2]/@bpd"/> + <eval expected="25000" xpath="//pageViewport[@nr=7]//flow/block[2]/block[2]/@bpda"/> + <eval expected="(solid,#000000,4000,collapse-outer)" xpath="//pageViewport[@nr=7]//flow/block[2]/block[2]/@border-before"/> + <eval expected="" xpath="//pageViewport[@nr=7]//flow/block[2]/block[2]/@border-after"/> + <eval expected="11000" xpath="//pageViewport[@nr=7]//flow/block[2]/block[3]/@bpd"/> + <eval expected="11000" xpath="//pageViewport[@nr=7]//flow/block[2]/block[3]/@bpda"/> + <eval expected="" xpath="//pageViewport[@nr=7]//flow/block[2]/block[3]/@border-before"/> + <eval expected="" xpath="//pageViewport[@nr=7]//flow/block[2]/block[3]/@border-after"/> + <eval expected="32000" xpath="//pageViewport[@nr=7]//flow/block[2]/block[4]/@bpd"/> + <eval expected="32000" xpath="//pageViewport[@nr=7]//flow/block[2]/block[4]/@bpda"/> + <eval expected="2" xpath="count(//pageViewport[@nr=7]//flow/block[2]/block[4]/block)"/> + <eval expected="Cell 1.1 Line 1" xpath="//pageViewport[@nr=7]//flow/block[2]/block[4]/block[1]/lineArea"/> + <eval expected="Cell 1.1 Line 2" xpath="//pageViewport[@nr=7]//flow/block[2]/block[4]/block[2]/lineArea"/> + <!-- cell 2.2 --> + <eval expected="10000" xpath="//pageViewport[@nr=7]//flow/block[2]/block[5]/@bpd"/> + <eval expected="12000" xpath="//pageViewport[@nr=7]//flow/block[2]/block[5]/@bpda"/> + <eval expected="(solid,#808000,2000,collapse-inner)" xpath="//pageViewport[@nr=7]//flow/block[2]/block[5]/@border-before"/> + <eval expected="" xpath="//pageViewport[@nr=7]//flow/block[2]/block[5]/@border-after"/> + <eval expected="1" xpath="count(//pageViewport[@nr=7]//flow/block[2]/block[5]/block)"/> + <eval expected="Cell 2.2 Line 1" xpath="//pageViewport[@nr=7]//flow/block[2]/block[5]/block[1]/lineArea"/> + <!-- page 2 --> + <eval expected="2" xpath="count(//pageViewport[@nr=8]//flow/block)"/> + <eval expected="After the table" xpath="//pageViewport[@nr=8]//flow/block[2]/lineArea"/> + <eval expected="12000" xpath="//pageViewport[@nr=8]//flow/block[1]/@bpd"/> + <eval expected="12000" xpath="//pageViewport[@nr=8]//flow/block[1]/@bpda"/> + <!-- cell 1.1 --> + <eval expected="10000" xpath="//pageViewport[@nr=8]//flow/block[1]/block[1]/@bpd"/> + <eval expected="14000" xpath="//pageViewport[@nr=8]//flow/block[1]/block[1]/@bpda"/> + <eval expected="" xpath="//pageViewport[@nr=8]//flow/block[1]/block[1]/@border-before"/> + <eval expected="(solid,#000000,4000,collapse-outer)" xpath="//pageViewport[@nr=8]//flow/block[1]/block[1]/@border-after"/> + <eval expected="10000" xpath="//pageViewport[@nr=8]//flow/block[1]/block[2]/@bpd"/> + <eval expected="10000" xpath="//pageViewport[@nr=8]//flow/block[1]/block[2]/@bpda"/> + <eval expected="0" xpath="count(//pageViewport[@nr=8]//flow/block[1]/block[2]/block)"/> + <!-- cell 1.2 --> + <eval expected="10000" xpath="//pageViewport[@nr=8]//flow/block[1]/block[3]/@bpd"/> + <eval expected="14000" xpath="//pageViewport[@nr=8]//flow/block[1]/block[3]/@bpda"/> + <eval expected="" xpath="//pageViewport[@nr=8]//flow/block[1]/block[3]/@border-before"/> + <eval expected="(solid,#000000,4000,collapse-outer)" xpath="//pageViewport[@nr=8]//flow/block[1]/block[3]/@border-after"/> + <eval expected="1" xpath="count(//pageViewport[@nr=8]//flow/block[1]/block[3]/block)"/> + <eval expected="Cell 2.2 Line 2" xpath="//pageViewport[@nr=8]//flow/block[1]/block[3]/block[1]/lineArea"/> + + </checks> +</testcase> diff --git a/test/layoutengine/standard-testcases/table-cell_keep-with-previous.xml b/test/layoutengine/standard-testcases/table-cell_keep-with-previous.xml new file mode 100644 index 000000000..2ad4dd449 --- /dev/null +++ b/test/layoutengine/standard-testcases/table-cell_keep-with-previous.xml @@ -0,0 +1,256 @@ +<?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 blocks in table-cells. + </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> + <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 keep-with-previous="always">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> + <fo:table-cell border="2pt solid green"> + <fo:block keep-with-previous="always">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="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 keep-with-previous="always">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 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> + + </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="48000" xpath="//pageViewport[@nr=6]//flow/block[2]/@bpd"/> + <eval expected="56000" xpath="//pageViewport[@nr=6]//flow/block[2]/@bpda"/> + <eval expected="(solid,#000000,4000)" xpath="//pageViewport[@nr=6]//flow/block[2]/@border-before"/> + <eval expected="(solid,#000000,4000)" xpath="//pageViewport[@nr=6]//flow/block[2]/@border-after"/> + <eval expected="After the table" xpath="//pageViewport[@nr=6]//flow/block[3]/lineArea"/> + + </checks> +</testcase> diff --git a/test/layoutengine/standard-testcases/table-row_keep-together_2.xml b/test/layoutengine/standard-testcases/table-row_keep-together_2.xml new file mode 100644 index 000000000..0e2867b2e --- /dev/null +++ b/test/layoutengine/standard-testcases/table-row_keep-together_2.xml @@ -0,0 +1,203 @@ +<?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-together 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="118pt">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-together="always"> + <fo:table-cell border="2pt solid blue" keep-together="auto"> + <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" keep-together="auto"> + <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 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="118">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 keep-together="always"> + <fo:table-cell border="2pt solid blue" keep-together="auto"> + <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" keep-together="auto"> + <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 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="100">3. 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> + <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 keep-together="always"> + <fo:table-cell border="2pt solid olive" keep-together="auto"> + <fo:block>Cell 2.2 Line 1</fo:block> + <fo:block>Cell 2.2 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="1" xpath="count(//pageViewport[@nr=1]//flow/block)"/> + <eval expected="1. Before the table" xpath="//pageViewport[@nr=1]//flow/block[1]/lineArea"/> + <!-- page 2 --> + <eval expected="2" xpath="count(//pageViewport[@nr=2]//flow/block)"/> + <eval expected="48000" xpath="//pageViewport[@nr=2]//flow/block[1]/@bpd"/> + <eval expected="56000" xpath="//pageViewport[@nr=2]//flow/block[1]/@bpda"/> + <eval expected="(solid,#000000,4000)" xpath="//pageViewport[@nr=2]//flow/block[1]/@border-before"/> + <eval expected="(solid,#000000,4000)" xpath="//pageViewport[@nr=2]//flow/block[1]/@border-after"/> + <eval expected="After the table" xpath="//pageViewport[@nr=2]//flow/block[2]/lineArea"/> + + <!-- table 2 --> + <eval expected="2" xpath="count(//pageSequence[2]/pageViewport)"/> + <!-- page 1 --> + <eval expected="1" xpath="count(//pageViewport[@nr=3]//flow/block)"/> + <eval expected="2. Before the table" xpath="//pageViewport[@nr=3]//flow/block[1]/lineArea"/> + <!-- page 2 --> + <eval expected="2" xpath="count(//pageViewport[@nr=4]//flow/block)"/> + <eval expected="48000" xpath="//pageViewport[@nr=4]//flow/block[1]/@bpd"/> + <eval expected="56000" xpath="//pageViewport[@nr=4]//flow/block[1]/@bpda"/> + <eval expected="(solid,#000000,4000)" xpath="//pageViewport[@nr=4]//flow/block[1]/@border-before"/> + <eval expected="(solid,#000000,4000)" xpath="//pageViewport[@nr=4]//flow/block[1]/@border-after"/> + <eval expected="After the table" xpath="//pageViewport[@nr=4]//flow/block[2]/lineArea"/> + + <!-- table 3 --> + <eval expected="2" xpath="count(//pageSequence[3]/pageViewport)"/> + <!-- page 1 --> + <eval expected="2" xpath="count(//pageViewport[@nr=5]//flow/block)"/> + <eval expected="3. Before the table" xpath="//pageViewport[@nr=5]//flow/block[1]/lineArea"/> + <eval expected="23000" xpath="//pageViewport[@nr=5]//flow/block[2]/@bpd"/> + <eval expected="23000" xpath="//pageViewport[@nr=5]//flow/block[2]/@bpda"/> + <!-- cell 1.1 --> + <eval expected="21000" xpath="//pageViewport[@nr=5]//flow/block[2]/block[1]/@bpd"/> + <eval expected="25000" xpath="//pageViewport[@nr=5]//flow/block[2]/block[1]/@bpda"/> + <eval expected="(solid,#000000,4000,collapse-outer)" xpath="//pageViewport[@nr=5]//flow/block[2]/block[1]/@border-before"/> + <eval expected="" xpath="//pageViewport[@nr=5]//flow/block[2]/block[1]/@border-after"/> + <eval expected="21000" xpath="//pageViewport[@nr=5]//flow/block[2]/block[2]/@bpd"/> + <eval expected="21000" xpath="//pageViewport[@nr=5]//flow/block[2]/block[2]/@bpda"/> + <eval expected="2" xpath="count(//pageViewport[@nr=5]//flow/block[2]/block[2]/block)"/> + <eval expected="Cell 1.1 Line 1" xpath="//pageViewport[@nr=5]//flow/block[2]/block[2]/block[1]/lineArea"/> + <eval expected="Cell 1.1 Line 2" xpath="//pageViewport[@nr=5]//flow/block[2]/block[2]/block[2]/lineArea"/> + <!-- cell 1.2 --> + <eval expected="20000" xpath="//pageViewport[@nr=5]//flow/block[2]/block[3]/@bpd"/> + <eval expected="26000" xpath="//pageViewport[@nr=5]//flow/block[2]/block[3]/@bpda"/> + <eval expected="(solid,#000000,4000,collapse-outer)" xpath="//pageViewport[@nr=5]//flow/block[2]/block[3]/@border-before"/> + <eval expected="(solid,#008080,2000,collapse-outer)" xpath="//pageViewport[@nr=5]//flow/block[2]/block[3]/@border-after"/> + <!-- page 2 --> + <eval expected="2" xpath="count(//pageViewport[@nr=6]//flow/block)"/> + <eval expected="After the table" xpath="//pageViewport[@nr=6]//flow/block[2]/lineArea"/> + <eval expected="23000" xpath="//pageViewport[@nr=6]//flow/block[1]/@bpd"/> + <eval expected="23000" xpath="//pageViewport[@nr=6]//flow/block[1]/@bpda"/> + <!-- cell 1.1 --> + <eval expected="21000" xpath="//pageViewport[@nr=6]//flow/block[1]/block[1]/@bpd"/> + <eval expected="25000" xpath="//pageViewport[@nr=6]//flow/block[1]/block[1]/@bpda"/> + <eval expected="" xpath="//pageViewport[@nr=6]//flow/block[1]/block[1]/@border-before"/> + <eval expected="(solid,#000000,4000,collapse-outer)" xpath="//pageViewport[@nr=6]//flow/block[1]/block[1]/@border-after"/> + <eval expected="21000" xpath="//pageViewport[@nr=6]//flow/block[1]/block[2]/@bpd"/> + <eval expected="21000" xpath="//pageViewport[@nr=6]//flow/block[1]/block[2]/@bpda"/> + <eval expected="0" xpath="count(//pageViewport[@nr=6]//flow/block[1]/block[2]/block)"/> + <!-- cell 2.2 --> + <eval expected="20000" xpath="//pageViewport[@nr=6]//flow/block[1]/block[3]/@bpd"/> + <eval expected="26000" xpath="//pageViewport[@nr=6]//flow/block[1]/block[3]/@bpda"/> + <eval expected="(solid,#808000,2000,collapse-outer)" xpath="//pageViewport[@nr=6]//flow/block[1]/block[3]/@border-before"/> + <eval expected="(solid,#000000,4000,collapse-outer)" xpath="//pageViewport[@nr=6]//flow/block[1]/block[3]/@border-after"/> + + </checks> +</testcase> diff --git a/test/layoutengine/standard-testcases/table-row_keep-with-next.xml b/test/layoutengine/standard-testcases/table-row_keep-with-next.xml index 5ceedb932..3657f2a90 100644 --- a/test/layoutengine/standard-testcases/table-row_keep-with-next.xml +++ b/test/layoutengine/standard-testcases/table-row_keep-with-next.xml @@ -32,9 +32,8 @@ <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 table-layout="fixed" width="100%"> + <fo:table-column number-columns-repeated="2" column-width="proportional-column-width(1)"/> <fo:table-body> <fo:table-row keep-with-next.within-page="always"> <fo:table-cell id="cell1"> @@ -73,7 +72,7 @@ <box w="14400"/> <penalty w="0" p="0"/> <box w="14400"/> - <penalty w="0" p="INF"/> + <penalty w="0" p="0"/> <box w="14400"/> <penalty w="0" p="INF"/> <box w="14400"/> diff --git a/test/layoutengine/standard-testcases/table-row_keep-with-next_3.xml b/test/layoutengine/standard-testcases/table-row_keep-with-next_3.xml new file mode 100644 index 000000000..ffd4aafb9 --- /dev/null +++ b/test/layoutengine/standard-testcases/table-row_keep-with-next_3.xml @@ -0,0 +1,205 @@ +<?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-next 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 keep-with-next="always"> + <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> + <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 2 --> + <fo:page-sequence master-reference="page" font-size="8pt" line-height="10pt"> + <fo:flow flow-name="xsl-region-body"> + <fo:block space-after="88">2. 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> + <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 keep-with-next="always"> + <fo:table-cell border="2pt solid olive"> + <fo:block>Cell 2.2 Line 1</fo:block> + <fo:block>Cell 2.2 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 2.1 --> + <eval expected="20000" xpath="//pageViewport[@nr=2]//flow/block[1]/block[2]/@bpd"/> + <eval expected="24000" xpath="//pageViewport[@nr=2]//flow/block[1]/block[2]/@bpda"/> + <eval expected="(solid,#008000,2000)" xpath="//pageViewport[@nr=2]//flow/block[1]/block[2]/@border-before"/> + <eval expected="(solid,#008000,2000)" xpath="//pageViewport[@nr=2]//flow/block[1]/block[2]/@border-after"/> + <!-- cell 1.2 --> + <eval expected="34000" xpath="//pageViewport[@nr=2]//flow/block[1]/block[3]/@bpd"/> + <eval expected="36000" xpath="//pageViewport[@nr=2]//flow/block[1]/block[3]/@bpda"/> + <eval expected="" xpath="//pageViewport[@nr=2]//flow/block[1]/block[3]/@border-before"/> + <eval expected="(solid,#008080,2000)" xpath="//pageViewport[@nr=2]//flow/block[1]/block[3]/@border-after"/> + <eval expected="1" xpath="count(//pageViewport[@nr=2]//flow/block[1]/block[3]/block)"/> + <eval expected="Cell 1.2 Line 2" xpath="//pageViewport[@nr=2]//flow/block[1]/block[3]/block/lineArea"/> + + <!-- 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="34000" xpath="//pageViewport[@nr=3]//flow/block[2]/@bpd"/> + <eval expected="34000" xpath="//pageViewport[@nr=3]//flow/block[2]/@bpda"/> + <!-- cell 1.2 --> + <eval expected="20000" xpath="//pageViewport[@nr=3]//flow/block[2]/block[1]/@bpd"/> + <eval expected="26000" xpath="//pageViewport[@nr=3]//flow/block[2]/block[1]/@bpda"/> + <eval expected="(solid,#000000,4000,collapse-outer)" xpath="//pageViewport[@nr=3]//flow/block[2]/block[1]/@border-before"/> + <eval expected="(solid,#008080,2000,collapse-inner)" xpath="//pageViewport[@nr=3]//flow/block[2]/block[1]/@border-after"/> + <!-- cell 1.1 --> + <eval expected="21000" xpath="//pageViewport[@nr=3]//flow/block[2]/block[2]/@bpd"/> + <eval expected="25000" xpath="//pageViewport[@nr=3]//flow/block[2]/block[2]/@bpda"/> + <eval expected="(solid,#000000,4000,collapse-outer)" 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="11000" xpath="//pageViewport[@nr=3]//flow/block[2]/block[3]/@bpd"/> + <eval expected="11000" xpath="//pageViewport[@nr=3]//flow/block[2]/block[3]/@bpda"/> + <eval expected="" xpath="//pageViewport[@nr=3]//flow/block[2]/block[3]/@border-before"/> + <eval expected="" xpath="//pageViewport[@nr=3]//flow/block[2]/block[3]/@border-after"/> + <eval expected="32000" xpath="//pageViewport[@nr=3]//flow/block[2]/block[4]/@bpd"/> + <eval expected="32000" xpath="//pageViewport[@nr=3]//flow/block[2]/block[4]/@bpda"/> + <eval expected="2" xpath="count(//pageViewport[@nr=3]//flow/block[2]/block[4]/block)"/> + <eval expected="Cell 1.1 Line 1" xpath="//pageViewport[@nr=3]//flow/block[2]/block[4]/block[1]/lineArea"/> + <eval expected="Cell 1.1 Line 2" xpath="//pageViewport[@nr=3]//flow/block[2]/block[4]/block[2]/lineArea"/> + <!-- cell 2.2 --> + <eval expected="10000" xpath="//pageViewport[@nr=3]//flow/block[2]/block[5]/@bpd"/> + <eval expected="12000" xpath="//pageViewport[@nr=3]//flow/block[2]/block[5]/@bpda"/> + <eval expected="(solid,#808000,2000,collapse-inner)" xpath="//pageViewport[@nr=3]//flow/block[2]/block[5]/@border-before"/> + <eval expected="" xpath="//pageViewport[@nr=3]//flow/block[2]/block[5]/@border-after"/> + <eval expected="1" xpath="count(//pageViewport[@nr=3]//flow/block[2]/block[5]/block)"/> + <eval expected="Cell 2.2 Line 1" xpath="//pageViewport[@nr=3]//flow/block[2]/block[5]/block[1]/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="12000" xpath="//pageViewport[@nr=4]//flow/block[1]/@bpd"/> + <eval expected="12000" xpath="//pageViewport[@nr=4]//flow/block[1]/@bpda"/> + <!-- cell 1.1 --> + <eval expected="10000" xpath="//pageViewport[@nr=4]//flow/block[1]/block[1]/@bpd"/> + <eval expected="14000" 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,#000000,4000,collapse-outer)" xpath="//pageViewport[@nr=4]//flow/block[1]/block[1]/@border-after"/> + <eval expected="10000" xpath="//pageViewport[@nr=4]//flow/block[1]/block[2]/@bpd"/> + <eval expected="10000" xpath="//pageViewport[@nr=4]//flow/block[1]/block[2]/@bpda"/> + <eval expected="0" xpath="count(//pageViewport[@nr=4]//flow/block[1]/block[2]/block)"/> + <!-- cell 1.2 --> + <eval expected="10000" xpath="//pageViewport[@nr=4]//flow/block[1]/block[3]/@bpd"/> + <eval expected="14000" 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,#000000,4000,collapse-outer)" 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 2.2 Line 2" xpath="//pageViewport[@nr=4]//flow/block[1]/block[3]/block[1]/lineArea"/> + + </checks> +</testcase> diff --git a/test/layoutengine/standard-testcases/table-row_keep-with-previous.xml b/test/layoutengine/standard-testcases/table-row_keep-with-previous.xml index 466634552..34a8be4c1 100644 --- a/test/layoutengine/standard-testcases/table-row_keep-with-previous.xml +++ b/test/layoutengine/standard-testcases/table-row_keep-with-previous.xml @@ -31,10 +31,9 @@ </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: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:table-body> <fo:table-row keep-with-previous.within-page="always"> <fo:table-cell id="cell1"> diff --git a/test/layoutengine/standard-testcases/table-row_keep-with-previous_2.xml b/test/layoutengine/standard-testcases/table-row_keep-with-previous_2.xml new file mode 100644 index 000000000..e6131308a --- /dev/null +++ b/test/layoutengine/standard-testcases/table-row_keep-with-previous_2.xml @@ -0,0 +1,254 @@ +<?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> diff --git a/test/layoutengine/standard-testcases/table_break-before_break-after.xml b/test/layoutengine/standard-testcases/table_break-before_break-after.xml index 31c1fd8cb..0ec629d87 100644 --- a/test/layoutengine/standard-testcases/table_break-before_break-after.xml +++ b/test/layoutengine/standard-testcases/table_break-before_break-after.xml @@ -55,11 +55,9 @@ <eval expected="5" xpath="count(//pageViewport)"/> <!-- table --> <eval expected="18400" xpath="//pageViewport[@nr=3]//flow/block[1]/@bpd"/> - <!-- - <eval expected="26400" xpath="//pageViewport[@nr=3]//flow/block[1]/@bpda"/> - <eval expected="(solid,#000000,4000)" xpath="//pageViewport[@nr=3]//flow/block[1]/@border-before"/> - <eval expected="(solid,#000000,4000)" xpath="//pageViewport[@nr=3]//flow/block[1]/@border-after"/> - --> + <!--eval expected="26400" xpath="//pageViewport[@nr=3]//flow/block[1]/@bpda"/--> + <!--eval expected="(solid,#000000,4000)" xpath="//pageViewport[@nr=3]//flow/block[1]/@border-before"/--> + <!--eval expected="(solid,#000000,4000)" xpath="//pageViewport[@nr=3]//flow/block[1]/@border-after"/--> <!-- cell 1 --> <eval expected="14400" xpath="//pageViewport[@nr=3]//flow/block[1]/block[1]/@bpd"/> <eval expected="18400" xpath="//pageViewport[@nr=3]//flow/block[1]/block[1]/@bpda"/> diff --git a/test/layoutengine/standard-testcases/table_keep-together_2.xml b/test/layoutengine/standard-testcases/table_keep-together_2.xml new file mode 100644 index 000000000..0c3d400a0 --- /dev/null +++ b/test/layoutengine/standard-testcases/table_keep-together_2.xml @@ -0,0 +1,181 @@ +<?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-together works on tables. + </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-family="serif" font-size="8pt" + line-height="10pt"> + <fo:flow flow-name="xsl-region-body"> + <fo:block space-after="106pt">First line</fo:block> + <fo:table width="100%" table-layout="fixed" + border-collapse="separate" border="4pt solid black" + keep-together="always"> + <fo:table-column number-columns-repeated="2" + column-width="proportional-column-width(1)"/> + <fo:table-body keep-together="auto"> + <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> + <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 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 2 --> + <fo:page-sequence master-reference="page" font-family="serif" font-size="8pt" + line-height="10pt"> + <fo:flow flow-name="xsl-region-body"> + <fo:block space-after="100">First line</fo:block> + <fo:table width="100%" table-layout="fixed" + border-collapse="collapse" border="4pt solid black" + keep-together="always"> + <fo:table-column number-columns-repeated="2" + column-width="proportional-column-width(1)"/> + <fo:table-body keep-together="auto"> + <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> + <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 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 --> + <!-- Two pages --> + <eval expected="2" xpath="count(//pageSequence[1]/pageViewport)"/> + <!-- Only one line on the first page --> + <eval expected="1" xpath="count(//pageViewport[@nr=1]//flow/block)"/> + <eval expected="First line" xpath="//pageViewport[@nr=1]//flow/block[1]/lineArea/text[1]"/> + <!-- Line "Before the table" plus the table itself on the second page --> + <eval expected="2" xpath="count(//pageViewport[@nr=2]//flow/block)"/> + <eval expected="After the table" xpath="//pageViewport[@nr=2]//flow/block[2]/lineArea/text[1]"/> + <!-- table --> + <eval expected="48000" xpath="//pageViewport[@nr=2]//flow/block[1]/@bpd"/> + <eval expected="56000" xpath="//pageViewport[@nr=2]//flow/block[1]/@bpda"/> + <eval expected="(solid,#000000,4000)" 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="20000" xpath="//pageViewport[@nr=2]//flow/block[1]/block[1]/@bpd"/> + <eval expected="24000" xpath="//pageViewport[@nr=2]//flow/block[1]/block[1]/@bpda"/> + <eval expected="(solid,#0000ff,2000)" 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"/> + <!-- cell 1.2 --> + <eval expected="20000" xpath="//pageViewport[@nr=2]//flow/block[1]/block[2]/@bpd"/> + <eval expected="24000" xpath="//pageViewport[@nr=2]//flow/block[1]/block[2]/@bpda"/> + <eval expected="(solid,#008080,2000)" 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"/> + <!-- 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 --> + <!-- Two pages --> + <eval expected="2" xpath="count(//pageSequence[2]/pageViewport)"/> + <!-- Only one line on the first page --> + <eval expected="1" xpath="count(//pageViewport[@nr=3]//flow/block)"/> + <eval expected="First line" xpath="//pageViewport[@nr=3]//flow/block[1]/lineArea/text[1]"/> + <!-- Line "Before the table" plus the table itself on the second page --> + <eval expected="2" xpath="count(//pageViewport[@nr=4]//flow/block)"/> + <eval expected="After the table" xpath="//pageViewport[@nr=4]//flow/block[2]/lineArea/text[1]"/> + <!-- table --> + <eval expected="46000" xpath="//pageViewport[@nr=4]//flow/block[1]/@bpd"/> + <eval expected="46000" xpath="//pageViewport[@nr=4]//flow/block[1]/@bpda"/> + <!-- cell 1.1 --> + <eval expected="20000" xpath="//pageViewport[@nr=4]//flow/block[1]/block[1]/@bpd"/> + <eval expected="26000" xpath="//pageViewport[@nr=4]//flow/block[1]/block[1]/@bpda"/> + <eval expected="(solid,#000000,4000,collapse-outer)" xpath="//pageViewport[@nr=4]//flow/block[1]/block[1]/@border-before"/> + <eval expected="(solid,#0000ff,2000,collapse-inner)" xpath="//pageViewport[@nr=4]//flow/block[1]/block[1]/@border-after"/> + <!-- cell 1.2 --> + <eval expected="20000" xpath="//pageViewport[@nr=4]//flow/block[1]/block[2]/@bpd"/> + <eval expected="26000" xpath="//pageViewport[@nr=4]//flow/block[1]/block[2]/@bpda"/> + <eval expected="(solid,#000000,4000,collapse-outer)" xpath="//pageViewport[@nr=4]//flow/block[1]/block[2]/@border-before"/> + <eval expected="(solid,#008080,2000,collapse-inner)" xpath="//pageViewport[@nr=4]//flow/block[1]/block[2]/@border-after"/> + <!-- cell 2.1 --> + <eval expected="20000" xpath="//pageViewport[@nr=4]//flow/block[1]/block[3]/@bpd"/> + <eval expected="26000" xpath="//pageViewport[@nr=4]//flow/block[1]/block[3]/@bpda"/> + <eval expected="(solid,#008000,2000,collapse-inner)" xpath="//pageViewport[@nr=4]//flow/block[1]/block[3]/@border-before"/> + <eval expected="(solid,#000000,4000,collapse-outer)" xpath="//pageViewport[@nr=4]//flow/block[1]/block[3]/@border-after"/> + <!-- cell 2.2 --> + <eval expected="20000" xpath="//pageViewport[@nr=4]//flow/block[1]/block[4]/@bpd"/> + <eval expected="26000" xpath="//pageViewport[@nr=4]//flow/block[1]/block[4]/@bpda"/> + <eval expected="(solid,#808000,2000,collapse-inner)" xpath="//pageViewport[@nr=4]//flow/block[1]/block[4]/@border-before"/> + <eval expected="(solid,#000000,4000,collapse-outer)" xpath="//pageViewport[@nr=4]//flow/block[1]/block[4]/@border-after"/> + + </checks> +</testcase> |