aboutsummaryrefslogtreecommitdiffstats
path: root/test/fotree/unittests
diff options
context:
space:
mode:
authorVincent Hennebert <vhennebert@apache.org>2007-11-05 16:07:45 +0000
committerVincent Hennebert <vhennebert@apache.org>2007-11-05 16:07:45 +0000
commit2a762125322db82658fb650b131f80ed600fc93d (patch)
treef18aa23be572dc66809b135e958c8fb6faa8fb9f /test/fotree/unittests
parent9f7240917415e7cb777c1b446bdc8b09cca23237 (diff)
downloadxmlgraphics-fop-2a762125322db82658fb650b131f80ed600fc93d.tar.gz
xmlgraphics-fop-2a762125322db82658fb650b131f80ed600fc93d.zip
First step towards building row groups at the FO tree stage. The built row groups are currently not used and the TableRowIterator stuff remains unchanged; this allows for more atomic commits.
- introduced RowGroupBuilder hierarchy; - moved TableRowIterator test cases into fotree, and integrated them in the test suite. git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@592058 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'test/fotree/unittests')
-rw-r--r--test/fotree/unittests/table/TableRowIterator_no-col_no-row_simple.fo196
-rw-r--r--test/fotree/unittests/table/TableRowIterator_no-col_no-row_spans.fo122
-rw-r--r--test/fotree/unittests/table/TableRowIterator_no-col_simple.fo257
-rw-r--r--test/fotree/unittests/table/TableRowIterator_no-col_spans.fo169
-rw-r--r--test/fotree/unittests/table/TableRowIterator_no-row_simple.fo201
-rw-r--r--test/fotree/unittests/table/TableRowIterator_no-row_spans.fo128
-rw-r--r--test/fotree/unittests/table/TableRowIterator_simple.fo266
-rw-r--r--test/fotree/unittests/table/TableRowIterator_spans.fo175
8 files changed, 1514 insertions, 0 deletions
diff --git a/test/fotree/unittests/table/TableRowIterator_no-col_no-row_simple.fo b/test/fotree/unittests/table/TableRowIterator_no-col_no-row_simple.fo
new file mode 100644
index 000000000..0d35a2bb9
--- /dev/null
+++ b/test/fotree/unittests/table/TableRowIterator_no-col_no-row_simple.fo
@@ -0,0 +1,196 @@
+<?xml version="1.0" standalone="no"?>
+<!--
+ 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$ -->
+<!--
+ WARNING: this file was semi-automatically generated from TableRowIterator_simple.fo and
+ contains the very same tables using starts-row/ends-row instead of fo:table-row objects.
+ Please modify TableRowIterator_simple.fo instead.
+-->
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="page" page-height="20cm" page-width="15cm"
+ margin-top="1cm" margin-bottom="1cm" margin-left="1cm" margin-right="1cm">
+ <fo:region-body/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="page" font-family="serif" font-size="14pt">
+ <fo:flow flow-name="xsl-region-body">
+ <!-- Table 1: no header, no footer, one body (1 row) -->
+ <fo:table width="10cm" space-before="12pt" table-layout="fixed"
+ border-collapse="separate" border="1pt solid black">
+ <fo:table-body>
+ <fo:table-cell starts-row="true"><fo:block>Cell 1</fo:block></fo:table-cell>
+ <fo:table-cell ends-row="true"><fo:block>Cell 2</fo:block></fo:table-cell>
+ </fo:table-body>
+ </fo:table>
+
+ <!-- Table 2: no header, no footer, one body (2 rows) -->
+ <fo:table width="10cm" space-before="12pt" table-layout="fixed"
+ border-collapse="separate" border="1pt solid black">
+ <fo:table-body>
+ <fo:table-cell starts-row="true" ends-row="true"><fo:block>Cell 1</fo:block></fo:table-cell>
+ <fo:table-cell starts-row="true"><fo:block>Cell 3</fo:block></fo:table-cell>
+ <fo:table-cell ends-row="true"><fo:block>Cell 4</fo:block></fo:table-cell>
+ </fo:table-body>
+ </fo:table>
+
+ <!-- Table 3: no header, no footer, two bodies (1 row, 1 row) -->
+ <fo:table width="10cm" space-before="12pt" table-layout="fixed"
+ border-collapse="separate" border="1pt solid black">
+ <fo:table-body>
+ <fo:table-cell starts-row="true"><fo:block>Cell 1</fo:block></fo:table-cell>
+ <fo:table-cell ends-row="true"><fo:block>Cell 2</fo:block></fo:table-cell>
+ </fo:table-body>
+ <fo:table-body>
+ <fo:table-cell starts-row="true"><fo:block>Cell 3</fo:block></fo:table-cell>
+ <fo:table-cell><fo:block>Cell 4</fo:block></fo:table-cell>
+ <fo:table-cell ends-row="true"><fo:block>Cell 5</fo:block></fo:table-cell>
+ </fo:table-body>
+ </fo:table>
+
+ <!-- Table 4: no header, no footer, two bodies (2 rows, 3 rows) -->
+ <fo:table width="10cm" space-before="12pt" table-layout="fixed"
+ border-collapse="separate" border="1pt solid black">
+ <fo:table-body>
+ <fo:table-cell starts-row="true"><fo:block>Cell 1</fo:block></fo:table-cell>
+ <fo:table-cell><fo:block>Cell 1.2</fo:block></fo:table-cell>
+ <fo:table-cell ends-row="true"><fo:block>Cell 2</fo:block></fo:table-cell>
+ <fo:table-cell starts-row="true"><fo:block>Cell 3</fo:block></fo:table-cell>
+ <fo:table-cell ends-row="true"><fo:block>Cell 4</fo:block></fo:table-cell>
+ </fo:table-body>
+ <fo:table-body>
+ <fo:table-cell starts-row="true"><fo:block>Cell 5</fo:block></fo:table-cell>
+ <fo:table-cell ends-row="true"><fo:block>Cell 6</fo:block></fo:table-cell>
+ <fo:table-cell starts-row="true"><fo:block>Cell 7</fo:block></fo:table-cell>
+ <fo:table-cell ends-row="true"><fo:block>Cell 8</fo:block></fo:table-cell>
+ <fo:table-cell starts-row="true"><fo:block>Cell 9</fo:block></fo:table-cell>
+ <fo:table-cell ends-row="true"><fo:block>Cell 10</fo:block></fo:table-cell>
+ </fo:table-body>
+ </fo:table>
+
+ <!-- Table 5: one header (1 row), no footer, one body (1 row) -->
+ <fo:table width="10cm" space-before="12pt" table-layout="fixed"
+ border-collapse="separate" border="1pt solid black">
+ <fo:table-header>
+ <fo:table-cell starts-row="true"><fo:block>Header 1</fo:block></fo:table-cell>
+ <fo:table-cell ends-row="true"><fo:block>Header 2</fo:block></fo:table-cell>
+ </fo:table-header>
+ <fo:table-body>
+ <fo:table-cell starts-row="true"><fo:block>Cell 1</fo:block></fo:table-cell>
+ <fo:table-cell><fo:block>Cell 1.2</fo:block></fo:table-cell>
+ <fo:table-cell ends-row="true"><fo:block>Cell 2</fo:block></fo:table-cell>
+ </fo:table-body>
+ </fo:table>
+
+ <!-- Table 6: no header, one footer (1 row), one body (1 row) -->
+ <fo:table width="10cm" space-before="12pt" table-layout="fixed"
+ border-collapse="separate" border="1pt solid black">
+ <fo:table-footer>
+ <fo:table-cell starts-row="true"><fo:block>Footer 1</fo:block></fo:table-cell>
+ <fo:table-cell ends-row="true"><fo:block>Footer 2</fo:block></fo:table-cell>
+ </fo:table-footer>
+ <fo:table-body>
+ <fo:table-cell starts-row="true"><fo:block>Cell 1</fo:block></fo:table-cell>
+ <fo:table-cell><fo:block>Cell 1.2</fo:block></fo:table-cell>
+ <fo:table-cell ends-row="true"><fo:block>Cell 2</fo:block></fo:table-cell>
+ </fo:table-body>
+ </fo:table>
+
+ <!-- Table 7: one header (1 row), one footer (1 row), one body (1 row) -->
+ <fo:table width="10cm" space-before="12pt" table-layout="fixed"
+ border-collapse="separate" border="1pt solid black">
+ <fo:table-header>
+ <fo:table-cell starts-row="true"><fo:block>Header 1</fo:block></fo:table-cell>
+ <fo:table-cell ends-row="true"><fo:block>Header 2</fo:block></fo:table-cell>
+ </fo:table-header>
+ <fo:table-footer>
+ <fo:table-cell starts-row="true"><fo:block>Footer 1</fo:block></fo:table-cell>
+ <fo:table-cell><fo:block>Footer 1.2</fo:block></fo:table-cell>
+ <fo:table-cell ends-row="true"><fo:block>Footer 2</fo:block></fo:table-cell>
+ </fo:table-footer>
+ <fo:table-body>
+ <fo:table-cell starts-row="true"><fo:block>Cell 1</fo:block></fo:table-cell>
+ <fo:table-cell ends-row="true"><fo:block>Cell 2</fo:block></fo:table-cell>
+ </fo:table-body>
+ </fo:table>
+
+ <!-- Table 8: one header (2 rows), one footer (3 rows), one body (2 rows) -->
+ <fo:table width="10cm" space-before="12pt" table-layout="fixed"
+ border-collapse="separate" border="1pt solid black">
+ <fo:table-header>
+ <fo:table-cell starts-row="true"><fo:block>Header 1</fo:block></fo:table-cell>
+ <fo:table-cell ends-row="true"><fo:block>Header 2</fo:block></fo:table-cell>
+ <fo:table-cell starts-row="true"><fo:block>Header 3</fo:block></fo:table-cell>
+ <fo:table-cell ends-row="true"><fo:block>Header 4</fo:block></fo:table-cell>
+ </fo:table-header>
+ <fo:table-footer>
+ <fo:table-cell starts-row="true"><fo:block>Footer 1</fo:block></fo:table-cell>
+ <fo:table-cell ends-row="true"><fo:block>Footer 2</fo:block></fo:table-cell>
+ <fo:table-cell starts-row="true"><fo:block>Footer 4</fo:block></fo:table-cell>
+ <fo:table-cell ends-row="true"><fo:block>Footer 5</fo:block></fo:table-cell>
+ <fo:table-cell starts-row="true"><fo:block>Footer 5</fo:block></fo:table-cell>
+ <fo:table-cell ends-row="true"><fo:block>Footer 6</fo:block></fo:table-cell>
+ </fo:table-footer>
+ <fo:table-body>
+ <fo:table-cell starts-row="true"><fo:block>Cell 1</fo:block></fo:table-cell>
+ <fo:table-cell ends-row="true"><fo:block>Cell 2</fo:block></fo:table-cell>
+ <fo:table-cell starts-row="true"><fo:block>Cell 3</fo:block></fo:table-cell>
+ <fo:table-cell ends-row="true"><fo:block>Cell 4</fo:block></fo:table-cell>
+ </fo:table-body>
+ </fo:table>
+
+ <!-- Table 9: one header (3 rows), one footer (2 rows), three bodies (2 rows, 1 row, 3 rows) -->
+ <fo:table width="10cm" space-before="12pt" table-layout="fixed"
+ border-collapse="separate" border="1pt solid black">
+ <fo:table-header>
+ <fo:table-cell starts-row="true"><fo:block>Header 1</fo:block></fo:table-cell>
+ <fo:table-cell ends-row="true"><fo:block>Header 2</fo:block></fo:table-cell>
+ <fo:table-cell starts-row="true"><fo:block>Header 3</fo:block></fo:table-cell>
+ <fo:table-cell ends-row="true"><fo:block>Header 4</fo:block></fo:table-cell>
+ <fo:table-cell starts-row="true"><fo:block>Header 5</fo:block></fo:table-cell>
+ <fo:table-cell ends-row="true"><fo:block>Header 6</fo:block></fo:table-cell>
+ </fo:table-header>
+ <fo:table-footer>
+ <fo:table-cell starts-row="true"><fo:block>Footer 1</fo:block></fo:table-cell>
+ <fo:table-cell ends-row="true"><fo:block>Footer 2</fo:block></fo:table-cell>
+ <fo:table-cell starts-row="true"><fo:block>Footer 4</fo:block></fo:table-cell>
+ <fo:table-cell ends-row="true"><fo:block>Footer 5</fo:block></fo:table-cell>
+ </fo:table-footer>
+ <fo:table-body>
+ <fo:table-cell starts-row="true"><fo:block>Cell 1</fo:block></fo:table-cell>
+ <fo:table-cell ends-row="true"><fo:block>Cell 2</fo:block></fo:table-cell>
+ <fo:table-cell starts-row="true"><fo:block>Cell 3</fo:block></fo:table-cell>
+ <fo:table-cell ends-row="true"><fo:block>Cell 4</fo:block></fo:table-cell>
+ </fo:table-body>
+ <fo:table-body>
+ <fo:table-cell starts-row="true"><fo:block>Cell 5</fo:block></fo:table-cell>
+ <fo:table-cell ends-row="true"><fo:block>Cell 6</fo:block></fo:table-cell>
+ </fo:table-body>
+ <fo:table-body>
+ <fo:table-cell starts-row="true"><fo:block>Cell 7</fo:block></fo:table-cell>
+ <fo:table-cell ends-row="true"><fo:block>Cell 8</fo:block></fo:table-cell>
+ <fo:table-cell starts-row="true"><fo:block>Cell 9</fo:block></fo:table-cell>
+ <fo:table-cell ends-row="true"><fo:block>Cell 10</fo:block></fo:table-cell>
+ <fo:table-cell starts-row="true"><fo:block>Cell 10</fo:block></fo:table-cell>
+ <fo:table-cell ends-row="true"><fo:block>Cell 11</fo:block></fo:table-cell>
+ </fo:table-body>
+ </fo:table>
+
+ </fo:flow>
+ </fo:page-sequence>
+</fo:root>
diff --git a/test/fotree/unittests/table/TableRowIterator_no-col_no-row_spans.fo b/test/fotree/unittests/table/TableRowIterator_no-col_no-row_spans.fo
new file mode 100644
index 000000000..f20e47eb5
--- /dev/null
+++ b/test/fotree/unittests/table/TableRowIterator_no-col_no-row_spans.fo
@@ -0,0 +1,122 @@
+<?xml version="1.0" standalone="no"?>
+<!--
+ 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$ -->
+<!--
+ WARNING: this file was semi-automatically generated from TableRowIterator_spans.fo and
+ contains the very same tables using starts-row/ends-row instead of fo:table-row objects.
+ Please modify TableRowIterator_spans.fo instead.
+-->
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="page" page-height="20cm" page-width="15cm"
+ margin-top="1cm" margin-bottom="1cm" margin-left="1cm" margin-right="1cm">
+ <fo:region-body/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="page" font-family="serif" font-size="14pt">
+ <fo:flow flow-name="xsl-region-body">
+ <!-- Table 1: no header, no footer, one body (1 row with column-span) -->
+ <fo:table border-separation="2pt" width="10cm" space-before="12pt" table-layout="fixed"
+ border-collapse="separate" border="1pt solid black">
+ <fo:table-body>
+ <fo:table-cell border="1pt solid" number-columns-spanned="2" starts-row="true" ends-row="true"><fo:block>Cell 1</fo:block></fo:table-cell>
+ </fo:table-body>
+ </fo:table>
+
+ <!-- Table 2: no header, no footer, one body (1 row-group of 2 rows) -->
+ <fo:table border-separation="2pt" width="10cm" space-before="12pt" table-layout="fixed"
+ border-collapse="separate" border="1pt solid black">
+ <fo:table-body>
+ <fo:table-cell border="1pt solid" number-rows-spanned="2" starts-row="true"><fo:block>Cell 1</fo:block></fo:table-cell>
+ <fo:table-cell border="1pt solid" ends-row="true"><fo:block>Cell 2</fo:block></fo:table-cell>
+ <fo:table-cell border="1pt solid" starts-row="true" ends-row="true"><fo:block>Cell 4</fo:block></fo:table-cell>
+ </fo:table-body>
+ </fo:table>
+
+ <!-- Table 3: no header, no footer, one body (1 row-group of 2 rows, 1 row) -->
+ <fo:table border-separation="2pt" width="10cm" space-before="12pt" table-layout="fixed"
+ border-collapse="separate" border="1pt solid black">
+ <fo:table-body>
+ <fo:table-cell border="1pt solid" number-rows-spanned="2" starts-row="true"><fo:block>Cell 1</fo:block></fo:table-cell>
+ <fo:table-cell border="1pt solid" ends-row="true"><fo:block>Cell 2</fo:block></fo:table-cell>
+ <fo:table-cell border="1pt solid" starts-row="true" ends-row="true"><fo:block>Cell 4</fo:block></fo:table-cell>
+ <fo:table-cell border="1pt solid" starts-row="true"><fo:block>Cell 5</fo:block></fo:table-cell>
+ <fo:table-cell border="1pt solid" ends-row="true"><fo:block>Cell 6</fo:block></fo:table-cell>
+ </fo:table-body>
+ </fo:table>
+
+ <!-- Table 4: no header, no footer, one body (1 row, 1 row-group of 2 rows) -->
+ <fo:table border-separation="2pt" width="10cm" space-before="12pt" table-layout="fixed"
+ border-collapse="separate" border="1pt solid black">
+ <fo:table-body>
+ <fo:table-cell border="1pt solid" starts-row="true"><fo:block>Cell 1</fo:block></fo:table-cell>
+ <fo:table-cell border="1pt solid" ends-row="true"><fo:block>Cell 2</fo:block></fo:table-cell>
+ <fo:table-cell border="1pt solid" number-rows-spanned="2" starts-row="true"><fo:block>Cell 3</fo:block></fo:table-cell>
+ <fo:table-cell border="1pt solid" ends-row="true"><fo:block>Cell 5</fo:block></fo:table-cell>
+ <fo:table-cell border="1pt solid" starts-row="true" ends-row="true"><fo:block>Cell 7</fo:block></fo:table-cell>
+ </fo:table-body>
+ </fo:table>
+
+ <!-- Table 5: no header, no footer, one body (1 row, 1 row-group of 3 rows, 1 row) -->
+ <fo:table border-separation="2pt" width="10cm" space-before="12pt" table-layout="fixed"
+ border-collapse="separate" border="1pt solid black">
+ <fo:table-body>
+ <fo:table-cell border="1pt solid" starts-row="true"><fo:block>Cell 1</fo:block></fo:table-cell>
+ <fo:table-cell border="1pt solid" ends-row="true"><fo:block>Cell 2</fo:block></fo:table-cell>
+ <fo:table-cell border="1pt solid" starts-row="true"><fo:block>Cell 3</fo:block></fo:table-cell>
+ <fo:table-cell border="1pt solid" number-rows-spanned="2" ends-row="true"><fo:block>Cell 4</fo:block></fo:table-cell>
+ <fo:table-cell border="1pt solid" number-rows-spanned="2" starts-row="true" ends-row="true"><fo:block>Cell 5</fo:block></fo:table-cell>
+ <fo:table-cell border="1pt solid" starts-row="true" ends-row="true"><fo:block>Cell 8</fo:block></fo:table-cell>
+ <fo:table-cell border="1pt solid" starts-row="true"><fo:block>Cell 9</fo:block></fo:table-cell>
+ <fo:table-cell border="1pt solid" ends-row="true"><fo:block>Cell 10</fo:block></fo:table-cell>
+ </fo:table-body>
+ </fo:table>
+
+ <!-- Table 6: one header (1 row-group of 2 rows), one footer (1 row, 1 row-group of 3 rows),
+ one body (1 row-group of 2 rows, 1 row, 1 row-group of 3 rows) -->
+ <fo:table border-separation="2pt" width="10cm" space-before="12pt" table-layout="fixed"
+ border-collapse="separate" border="1pt solid black">
+ <fo:table-header>
+ <fo:table-cell border="1pt solid" number-rows-spanned="2" starts-row="true"><fo:block>Header 1</fo:block></fo:table-cell>
+ <fo:table-cell border="1pt solid" ends-row="true"><fo:block>Header 2</fo:block></fo:table-cell>
+ <fo:table-cell border="1pt solid" starts-row="true" ends-row="true"><fo:block>Header 4</fo:block></fo:table-cell>
+ </fo:table-header>
+ <fo:table-footer>
+ <fo:table-cell border="1pt solid" starts-row="true"><fo:block>Footer 1</fo:block></fo:table-cell>
+ <fo:table-cell border="1pt solid" ends-row="true"><fo:block>Footer 2</fo:block></fo:table-cell>
+ <fo:table-cell border="1pt solid" number-rows-spanned="2" starts-row="true"><fo:block>Footer 3</fo:block></fo:table-cell>
+ <fo:table-cell border="1pt solid" ends-row="true"><fo:block>Footer 4</fo:block></fo:table-cell>
+ <fo:table-cell border="1pt solid" number-rows-spanned="2" starts-row="true" ends-row="true"><fo:block>Footer 6</fo:block></fo:table-cell>
+ <fo:table-cell border="1pt solid" starts-row="true" ends-row="true"><fo:block>Footer 7</fo:block></fo:table-cell>
+ </fo:table-footer>
+ <fo:table-body>
+ <fo:table-cell border="1pt solid" starts-row="true"><fo:block>Cell 1</fo:block></fo:table-cell>
+ <fo:table-cell border="1pt solid" number-rows-spanned="2" ends-row="true"><fo:block>Cell 2</fo:block></fo:table-cell>
+ <fo:table-cell border="1pt solid" starts-row="true" ends-row="true"><fo:block>Cell 3</fo:block></fo:table-cell>
+ <fo:table-cell border="1pt solid" starts-row="true"><fo:block>Cell 5</fo:block></fo:table-cell>
+ <fo:table-cell border="1pt solid" ends-row="true"><fo:block>Cell 6</fo:block></fo:table-cell>
+ <fo:table-cell border="1pt solid" starts-row="true"><fo:block>Cell 7</fo:block></fo:table-cell>
+ <fo:table-cell border="1pt solid" number-rows-spanned="2" ends-row="true"><fo:block>Cell 8</fo:block></fo:table-cell>
+ <fo:table-cell border="1pt solid" number-rows-spanned="2" starts-row="true" ends-row="true"><fo:block>Cell 9</fo:block></fo:table-cell>
+ <fo:table-cell border="1pt solid" starts-row="true" ends-row="true"><fo:block>Cell 10</fo:block></fo:table-cell>
+ </fo:table-body>
+ </fo:table>
+
+ </fo:flow>
+ </fo:page-sequence>
+</fo:root>
diff --git a/test/fotree/unittests/table/TableRowIterator_no-col_simple.fo b/test/fotree/unittests/table/TableRowIterator_no-col_simple.fo
new file mode 100644
index 000000000..dc1c24685
--- /dev/null
+++ b/test/fotree/unittests/table/TableRowIterator_no-col_simple.fo
@@ -0,0 +1,257 @@
+<?xml version="1.0" standalone="no"?>
+<!--
+ 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$ -->
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="page" page-height="20cm" page-width="15cm"
+ margin-top="1cm" margin-bottom="1cm" margin-left="1cm" margin-right="1cm">
+ <fo:region-body/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="page" font-family="serif" font-size="14pt">
+ <fo:flow flow-name="xsl-region-body">
+ <!-- Table 1: no header, no footer, one body (1 row) -->
+ <fo:table width="10cm" space-before="12pt" table-layout="fixed"
+ border-collapse="separate" border="1pt solid black">
+ <fo:table-body>
+ <fo:table-row>
+ <fo:table-cell><fo:block>Cell 1</fo:block></fo:table-cell>
+ <fo:table-cell><fo:block>Cell 2</fo:block></fo:table-cell>
+ </fo:table-row>
+ </fo:table-body>
+ </fo:table>
+
+ <!-- Table 2: no header, no footer, one body (2 rows) -->
+ <fo:table width="10cm" space-before="12pt" table-layout="fixed"
+ border-collapse="separate" border="1pt solid black">
+ <fo:table-body>
+ <fo:table-row>
+ <fo:table-cell><fo:block>Cell 1</fo:block></fo:table-cell>
+ <fo:table-cell><fo:block>Cell 2</fo:block></fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell><fo:block>Cell 3</fo:block></fo:table-cell>
+ <fo:table-cell><fo:block>Cell 4</fo:block></fo:table-cell>
+ </fo:table-row>
+ </fo:table-body>
+ </fo:table>
+
+ <!-- Table 3: no header, no footer, two bodies (1 row, 1 row) -->
+ <fo:table width="10cm" space-before="12pt" table-layout="fixed"
+ border-collapse="separate" border="1pt solid black">
+ <fo:table-body>
+ <fo:table-row>
+ <fo:table-cell><fo:block>Cell 1</fo:block></fo:table-cell>
+ <fo:table-cell><fo:block>Cell 2</fo:block></fo:table-cell>
+ </fo:table-row>
+ </fo:table-body>
+ <fo:table-body>
+ <fo:table-row>
+ <fo:table-cell><fo:block>Cell 3</fo:block></fo:table-cell>
+ <fo:table-cell><fo:block>Cell 4</fo:block></fo:table-cell>
+ </fo:table-row>
+ </fo:table-body>
+ </fo:table>
+
+ <!-- Table 4: no header, no footer, two bodies (2 rows, 3 rows) -->
+ <fo:table width="10cm" space-before="12pt" table-layout="fixed"
+ border-collapse="separate" border="1pt solid black">
+ <fo:table-body>
+ <fo:table-row>
+ <fo:table-cell><fo:block>Cell 1</fo:block></fo:table-cell>
+ <fo:table-cell><fo:block>Cell 2</fo:block></fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell><fo:block>Cell 3</fo:block></fo:table-cell>
+ <fo:table-cell><fo:block>Cell 4</fo:block></fo:table-cell>
+ </fo:table-row>
+ </fo:table-body>
+ <fo:table-body>
+ <fo:table-row>
+ <fo:table-cell><fo:block>Cell 5</fo:block></fo:table-cell>
+ <fo:table-cell><fo:block>Cell 6</fo:block></fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell><fo:block>Cell 7</fo:block></fo:table-cell>
+ <fo:table-cell><fo:block>Cell 8</fo:block></fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell><fo:block>Cell 9</fo:block></fo:table-cell>
+ <fo:table-cell><fo:block>Cell 10</fo:block></fo:table-cell>
+ </fo:table-row>
+ </fo:table-body>
+ </fo:table>
+
+ <!-- Table 5: one header (1 row), no footer, one body (1 row) -->
+ <fo:table width="10cm" space-before="12pt" table-layout="fixed"
+ border-collapse="separate" border="1pt solid black">
+ <fo:table-header>
+ <fo:table-row>
+ <fo:table-cell><fo:block>Header 1</fo:block></fo:table-cell>
+ <fo:table-cell><fo:block>Header 2</fo:block></fo:table-cell>
+ </fo:table-row>
+ </fo:table-header>
+ <fo:table-body>
+ <fo:table-row>
+ <fo:table-cell><fo:block>Cell 1</fo:block></fo:table-cell>
+ <fo:table-cell><fo:block>Cell 2</fo:block></fo:table-cell>
+ </fo:table-row>
+ </fo:table-body>
+ </fo:table>
+
+ <!-- Table 6: no header, one footer (1 row), one body (1 row) -->
+ <fo:table width="10cm" space-before="12pt" table-layout="fixed"
+ border-collapse="separate" border="1pt solid black">
+ <fo:table-footer>
+ <fo:table-row>
+ <fo:table-cell><fo:block>Footer 1</fo:block></fo:table-cell>
+ <fo:table-cell><fo:block>Footer 2</fo:block></fo:table-cell>
+ </fo:table-row>
+ </fo:table-footer>
+ <fo:table-body>
+ <fo:table-row>
+ <fo:table-cell><fo:block>Cell 1</fo:block></fo:table-cell>
+ <fo:table-cell><fo:block>Cell 2</fo:block></fo:table-cell>
+ </fo:table-row>
+ </fo:table-body>
+ </fo:table>
+
+ <!-- Table 7: one header (1 row), one footer (1 row), one body (1 row) -->
+ <fo:table width="10cm" space-before="12pt" table-layout="fixed"
+ border-collapse="separate" border="1pt solid black">
+ <fo:table-header>
+ <fo:table-row>
+ <fo:table-cell><fo:block>Header 1</fo:block></fo:table-cell>
+ <fo:table-cell><fo:block>Header 2</fo:block></fo:table-cell>
+ </fo:table-row>
+ </fo:table-header>
+ <fo:table-footer>
+ <fo:table-row>
+ <fo:table-cell><fo:block>Footer 1</fo:block></fo:table-cell>
+ <fo:table-cell><fo:block>Footer 2</fo:block></fo:table-cell>
+ </fo:table-row>
+ </fo:table-footer>
+ <fo:table-body>
+ <fo:table-row>
+ <fo:table-cell><fo:block>Cell 1</fo:block></fo:table-cell>
+ <fo:table-cell><fo:block>Cell 2</fo:block></fo:table-cell>
+ </fo:table-row>
+ </fo:table-body>
+ </fo:table>
+
+ <!-- Table 8: one header (2 rows), one footer (3 rows), one body (2 rows) -->
+ <fo:table width="10cm" space-before="12pt" table-layout="fixed"
+ border-collapse="separate" border="1pt solid black">
+ <fo:table-header>
+ <fo:table-row>
+ <fo:table-cell><fo:block>Header 1</fo:block></fo:table-cell>
+ <fo:table-cell><fo:block>Header 2</fo:block></fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell><fo:block>Header 3</fo:block></fo:table-cell>
+ <fo:table-cell><fo:block>Header 4</fo:block></fo:table-cell>
+ </fo:table-row>
+ </fo:table-header>
+ <fo:table-footer>
+ <fo:table-row>
+ <fo:table-cell><fo:block>Footer 1</fo:block></fo:table-cell>
+ <fo:table-cell><fo:block>Footer 2</fo:block></fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell><fo:block>Footer 4</fo:block></fo:table-cell>
+ <fo:table-cell><fo:block>Footer 5</fo:block></fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell><fo:block>Footer 5</fo:block></fo:table-cell>
+ <fo:table-cell><fo:block>Footer 6</fo:block></fo:table-cell>
+ </fo:table-row>
+ </fo:table-footer>
+ <fo:table-body>
+ <fo:table-row>
+ <fo:table-cell><fo:block>Cell 1</fo:block></fo:table-cell>
+ <fo:table-cell><fo:block>Cell 2</fo:block></fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell><fo:block>Cell 3</fo:block></fo:table-cell>
+ <fo:table-cell><fo:block>Cell 4</fo:block></fo:table-cell>
+ </fo:table-row>
+ </fo:table-body>
+ </fo:table>
+
+ <!-- Table 9: one header (3 rows), one footer (2 rows), three bodies (2 rows, 1 row, 3 rows) -->
+ <fo:table width="10cm" space-before="12pt" table-layout="fixed"
+ border-collapse="separate" border="1pt solid black">
+ <fo:table-header>
+ <fo:table-row>
+ <fo:table-cell><fo:block>Header 1</fo:block></fo:table-cell>
+ <fo:table-cell><fo:block>Header 2</fo:block></fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell><fo:block>Header 3</fo:block></fo:table-cell>
+ <fo:table-cell><fo:block>Header 4</fo:block></fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell><fo:block>Header 5</fo:block></fo:table-cell>
+ <fo:table-cell><fo:block>Header 6</fo:block></fo:table-cell>
+ </fo:table-row>
+ </fo:table-header>
+ <fo:table-footer>
+ <fo:table-row>
+ <fo:table-cell><fo:block>Footer 1</fo:block></fo:table-cell>
+ <fo:table-cell><fo:block>Footer 2</fo:block></fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell><fo:block>Footer 4</fo:block></fo:table-cell>
+ <fo:table-cell><fo:block>Footer 5</fo:block></fo:table-cell>
+ </fo:table-row>
+ </fo:table-footer>
+ <fo:table-body>
+ <fo:table-row>
+ <fo:table-cell><fo:block>Cell 1</fo:block></fo:table-cell>
+ <fo:table-cell><fo:block>Cell 2</fo:block></fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell><fo:block>Cell 3</fo:block></fo:table-cell>
+ <fo:table-cell><fo:block>Cell 4</fo:block></fo:table-cell>
+ </fo:table-row>
+ </fo:table-body>
+ <fo:table-body>
+ <fo:table-row>
+ <fo:table-cell><fo:block>Cell 5</fo:block></fo:table-cell>
+ <fo:table-cell><fo:block>Cell 6</fo:block></fo:table-cell>
+ </fo:table-row>
+ </fo:table-body>
+ <fo:table-body>
+ <fo:table-row>
+ <fo:table-cell><fo:block>Cell 7</fo:block></fo:table-cell>
+ <fo:table-cell><fo:block>Cell 8</fo:block></fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell><fo:block>Cell 9</fo:block></fo:table-cell>
+ <fo:table-cell><fo:block>Cell 10</fo:block></fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell><fo:block>Cell 10</fo:block></fo:table-cell>
+ <fo:table-cell><fo:block>Cell 11</fo:block></fo:table-cell>
+ </fo:table-row>
+ </fo:table-body>
+ </fo:table>
+
+ </fo:flow>
+ </fo:page-sequence>
+</fo:root>
diff --git a/test/fotree/unittests/table/TableRowIterator_no-col_spans.fo b/test/fotree/unittests/table/TableRowIterator_no-col_spans.fo
new file mode 100644
index 000000000..67d218a02
--- /dev/null
+++ b/test/fotree/unittests/table/TableRowIterator_no-col_spans.fo
@@ -0,0 +1,169 @@
+<?xml version="1.0" standalone="no"?>
+<!--
+ 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$ -->
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="page" page-height="20cm" page-width="15cm"
+ margin-top="1cm" margin-bottom="1cm" margin-left="1cm" margin-right="1cm">
+ <fo:region-body/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="page" font-family="serif" font-size="14pt">
+ <fo:flow flow-name="xsl-region-body">
+ <!-- Table 1: no header, no footer, one body (1 row with column-span) -->
+ <fo:table border-separation="2pt" width="10cm" space-before="12pt" table-layout="fixed"
+ border-collapse="separate" border="1pt solid black">
+ <fo:table-body>
+ <fo:table-row>
+ <fo:table-cell border="1pt solid" number-columns-spanned="2"><fo:block>Cell 1</fo:block></fo:table-cell>
+ </fo:table-row>
+ </fo:table-body>
+ </fo:table>
+
+ <!-- Table 2: no header, no footer, one body (1 row-group of 2 rows) -->
+ <fo:table border-separation="2pt" width="10cm" space-before="12pt" table-layout="fixed"
+ border-collapse="separate" border="1pt solid black">
+ <fo:table-body>
+ <fo:table-row>
+ <fo:table-cell border="1pt solid" number-rows-spanned="2"><fo:block>Cell 1</fo:block></fo:table-cell>
+ <fo:table-cell border="1pt solid"><fo:block>Cell 2</fo:block></fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell border="1pt solid"><fo:block>Cell 4</fo:block></fo:table-cell>
+ </fo:table-row>
+ </fo:table-body>
+ </fo:table>
+
+ <!-- Table 3: no header, no footer, one body (1 row-group of 2 rows, 1 row) -->
+ <fo:table border-separation="2pt" width="10cm" space-before="12pt" table-layout="fixed"
+ border-collapse="separate" border="1pt solid black">
+ <fo:table-body>
+ <fo:table-row>
+ <fo:table-cell border="1pt solid" number-rows-spanned="2"><fo:block>Cell 1</fo:block></fo:table-cell>
+ <fo:table-cell border="1pt solid"><fo:block>Cell 2</fo:block></fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell border="1pt solid"><fo:block>Cell 4</fo:block></fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell border="1pt solid"><fo:block>Cell 5</fo:block></fo:table-cell>
+ <fo:table-cell border="1pt solid"><fo:block>Cell 6</fo:block></fo:table-cell>
+ </fo:table-row>
+ </fo:table-body>
+ </fo:table>
+
+ <!-- Table 4: no header, no footer, one body (1 row, 1 row-group of 2 rows) -->
+ <fo:table border-separation="2pt" width="10cm" space-before="12pt" table-layout="fixed"
+ border-collapse="separate" border="1pt solid black">
+ <fo:table-body>
+ <fo:table-row>
+ <fo:table-cell border="1pt solid"><fo:block>Cell 1</fo:block></fo:table-cell>
+ <fo:table-cell border="1pt solid"><fo:block>Cell 2</fo:block></fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell border="1pt solid" number-rows-spanned="2"><fo:block>Cell 3</fo:block></fo:table-cell>
+ <fo:table-cell border="1pt solid"><fo:block>Cell 5</fo:block></fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell border="1pt solid"><fo:block>Cell 7</fo:block></fo:table-cell>
+ </fo:table-row>
+ </fo:table-body>
+ </fo:table>
+
+ <!-- Table 5: no header, no footer, one body (1 row, 1 row-group of 3 rows, 1 row) -->
+ <fo:table border-separation="2pt" width="10cm" space-before="12pt" table-layout="fixed"
+ border-collapse="separate" border="1pt solid black">
+ <fo:table-body>
+ <fo:table-row>
+ <fo:table-cell border="1pt solid"><fo:block>Cell 1</fo:block></fo:table-cell>
+ <fo:table-cell border="1pt solid"><fo:block>Cell 2</fo:block></fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell border="1pt solid"><fo:block>Cell 3</fo:block></fo:table-cell>
+ <fo:table-cell border="1pt solid" number-rows-spanned="2"><fo:block>Cell 4</fo:block></fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell border="1pt solid" number-rows-spanned="2"><fo:block>Cell 5</fo:block></fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell border="1pt solid"><fo:block>Cell 8</fo:block></fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell border="1pt solid"><fo:block>Cell 9</fo:block></fo:table-cell>
+ <fo:table-cell border="1pt solid"><fo:block>Cell 10</fo:block></fo:table-cell>
+ </fo:table-row>
+ </fo:table-body>
+ </fo:table>
+
+ <!-- Table 6: one header (1 row-group of 2 rows), one footer (1 row, 1 row-group of 3 rows),
+ one body (1 row-group of 2 rows, 1 row, 1 row-group of 3 rows) -->
+ <fo:table border-separation="2pt" width="10cm" space-before="12pt" table-layout="fixed"
+ border-collapse="separate" border="1pt solid black">
+ <fo:table-header>
+ <fo:table-row>
+ <fo:table-cell border="1pt solid" number-rows-spanned="2"><fo:block>Header 1</fo:block></fo:table-cell>
+ <fo:table-cell border="1pt solid"><fo:block>Header 2</fo:block></fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell border="1pt solid"><fo:block>Header 4</fo:block></fo:table-cell>
+ </fo:table-row>
+ </fo:table-header>
+ <fo:table-footer>
+ <fo:table-row>
+ <fo:table-cell border="1pt solid"><fo:block>Footer 1</fo:block></fo:table-cell>
+ <fo:table-cell border="1pt solid"><fo:block>Footer 2</fo:block></fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell border="1pt solid" number-rows-spanned="2"><fo:block>Footer 3</fo:block></fo:table-cell>
+ <fo:table-cell border="1pt solid"><fo:block>Footer 4</fo:block></fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell border="1pt solid" number-rows-spanned="2"><fo:block>Footer 6</fo:block></fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell border="1pt solid"><fo:block>Footer 7</fo:block></fo:table-cell>
+ </fo:table-row>
+ </fo:table-footer>
+ <fo:table-body>
+ <fo:table-row>
+ <fo:table-cell border="1pt solid"><fo:block>Cell 1</fo:block></fo:table-cell>
+ <fo:table-cell border="1pt solid" number-rows-spanned="2"><fo:block>Cell 2</fo:block></fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell border="1pt solid"><fo:block>Cell 3</fo:block></fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell border="1pt solid"><fo:block>Cell 5</fo:block></fo:table-cell>
+ <fo:table-cell border="1pt solid"><fo:block>Cell 6</fo:block></fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell border="1pt solid"><fo:block>Cell 7</fo:block></fo:table-cell>
+ <fo:table-cell border="1pt solid" number-rows-spanned="2"><fo:block>Cell 8</fo:block></fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell border="1pt solid" number-rows-spanned="2"><fo:block>Cell 9</fo:block></fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell border="1pt solid"><fo:block>Cell 10</fo:block></fo:table-cell>
+ </fo:table-row>
+ </fo:table-body>
+ </fo:table>
+
+ </fo:flow>
+ </fo:page-sequence>
+</fo:root>
diff --git a/test/fotree/unittests/table/TableRowIterator_no-row_simple.fo b/test/fotree/unittests/table/TableRowIterator_no-row_simple.fo
new file mode 100644
index 000000000..b7ab28e33
--- /dev/null
+++ b/test/fotree/unittests/table/TableRowIterator_no-row_simple.fo
@@ -0,0 +1,201 @@
+<?xml version="1.0" standalone="no"?>
+<!--
+ 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$ -->
+<!--
+ WARNING: this file was semi-automatically generated from TableRowIterator_simple.fo and
+ contains the very same tables using starts-row/ends-row instead of fo:table-row objects.
+ Please modify TableRowIterator_simple.fo instead.
+-->
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="page" page-height="20cm" page-width="15cm"
+ margin-top="1cm" margin-bottom="1cm" margin-left="1cm" margin-right="1cm">
+ <fo:region-body/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="page" font-family="serif" font-size="14pt">
+ <fo:flow flow-name="xsl-region-body">
+ <!-- Table 1: no header, no footer, one body (1 row) -->
+ <fo:table width="10cm" space-before="12pt" table-layout="fixed"
+ border-collapse="separate" border="1pt solid black">
+ <fo:table-column number-columns-repeated="2" column-width="proportional-column-width(1)"/>
+ <fo:table-body>
+ <fo:table-cell starts-row="true"><fo:block>Cell 1</fo:block></fo:table-cell>
+ <fo:table-cell ends-row="true"><fo:block>Cell 2</fo:block></fo:table-cell>
+ </fo:table-body>
+ </fo:table>
+
+ <!-- Table 2: no header, no footer, one body (2 rows) -->
+ <fo:table width="10cm" space-before="12pt" table-layout="fixed"
+ border-collapse="separate" border="1pt solid black">
+ <fo:table-column number-columns-repeated="2" column-width="proportional-column-width(1)"/>
+ <fo:table-body>
+ <fo:table-cell starts-row="true"><fo:block>Cell 1</fo:block></fo:table-cell>
+ <fo:table-cell ends-row="true"><fo:block>Cell 2</fo:block></fo:table-cell>
+ <fo:table-cell starts-row="true"><fo:block>Cell 3</fo:block></fo:table-cell>
+ <fo:table-cell ends-row="true"><fo:block>Cell 4</fo:block></fo:table-cell>
+ </fo:table-body>
+ </fo:table>
+
+ <!-- Table 3: no header, no footer, two bodies (1 row, 1 row) -->
+ <fo:table width="10cm" space-before="12pt" table-layout="fixed"
+ border-collapse="separate" border="1pt solid black">
+ <fo:table-column number-columns-repeated="2" column-width="proportional-column-width(1)"/>
+ <fo:table-body>
+ <fo:table-cell starts-row="true"><fo:block>Cell 1</fo:block></fo:table-cell>
+ <fo:table-cell ends-row="true"><fo:block>Cell 2</fo:block></fo:table-cell>
+ </fo:table-body>
+ <fo:table-body>
+ <fo:table-cell starts-row="true"><fo:block>Cell 3</fo:block></fo:table-cell>
+ <fo:table-cell ends-row="true"><fo:block>Cell 4</fo:block></fo:table-cell>
+ </fo:table-body>
+ </fo:table>
+
+ <!-- Table 4: no header, no footer, two bodies (2 rows, 3 rows) -->
+ <fo:table width="10cm" space-before="12pt" table-layout="fixed"
+ border-collapse="separate" border="1pt solid black">
+ <fo:table-column number-columns-repeated="2" column-width="proportional-column-width(1)"/>
+ <fo:table-body>
+ <fo:table-cell starts-row="true"><fo:block>Cell 1</fo:block></fo:table-cell>
+ <fo:table-cell ends-row="true"><fo:block>Cell 2</fo:block></fo:table-cell>
+ <fo:table-cell starts-row="true"><fo:block>Cell 3</fo:block></fo:table-cell>
+ <fo:table-cell ends-row="true"><fo:block>Cell 4</fo:block></fo:table-cell>
+ </fo:table-body>
+ <fo:table-body>
+ <fo:table-cell starts-row="true"><fo:block>Cell 5</fo:block></fo:table-cell>
+ <fo:table-cell ends-row="true"><fo:block>Cell 6</fo:block></fo:table-cell>
+ <fo:table-cell starts-row="true"><fo:block>Cell 7</fo:block></fo:table-cell>
+ <fo:table-cell ends-row="true"><fo:block>Cell 8</fo:block></fo:table-cell>
+ <fo:table-cell starts-row="true"><fo:block>Cell 9</fo:block></fo:table-cell>
+ <fo:table-cell ends-row="true"><fo:block>Cell 10</fo:block></fo:table-cell>
+ </fo:table-body>
+ </fo:table>
+
+ <!-- Table 5: one header (1 row), no footer, one body (1 row) -->
+ <fo:table width="10cm" space-before="12pt" table-layout="fixed"
+ border-collapse="separate" border="1pt solid black">
+ <fo:table-column number-columns-repeated="2" column-width="proportional-column-width(1)"/>
+ <fo:table-header>
+ <fo:table-cell starts-row="true"><fo:block>Header 1</fo:block></fo:table-cell>
+ <fo:table-cell ends-row="true"><fo:block>Header 2</fo:block></fo:table-cell>
+ </fo:table-header>
+ <fo:table-body>
+ <fo:table-cell starts-row="true"><fo:block>Cell 1</fo:block></fo:table-cell>
+ <fo:table-cell ends-row="true"><fo:block>Cell 2</fo:block></fo:table-cell>
+ </fo:table-body>
+ </fo:table>
+
+ <!-- Table 6: no header, one footer (1 row), one body (1 row) -->
+ <fo:table width="10cm" space-before="12pt" table-layout="fixed"
+ border-collapse="separate" border="1pt solid black">
+ <fo:table-column number-columns-repeated="2" column-width="proportional-column-width(1)"/>
+ <fo:table-footer>
+ <fo:table-cell starts-row="true"><fo:block>Footer 1</fo:block></fo:table-cell>
+ <fo:table-cell ends-row="true"><fo:block>Footer 2</fo:block></fo:table-cell>
+ </fo:table-footer>
+ <fo:table-body>
+ <fo:table-cell starts-row="true"><fo:block>Cell 1</fo:block></fo:table-cell>
+ <fo:table-cell ends-row="true"><fo:block>Cell 2</fo:block></fo:table-cell>
+ </fo:table-body>
+ </fo:table>
+
+ <!-- Table 7: one header (1 row), one footer (1 row), one body (1 row) -->
+ <fo:table width="10cm" space-before="12pt" table-layout="fixed"
+ border-collapse="separate" border="1pt solid black">
+ <fo:table-column number-columns-repeated="2" column-width="proportional-column-width(1)"/>
+ <fo:table-header>
+ <fo:table-cell starts-row="true"><fo:block>Header 1</fo:block></fo:table-cell>
+ <fo:table-cell ends-row="true"><fo:block>Header 2</fo:block></fo:table-cell>
+ </fo:table-header>
+ <fo:table-footer>
+ <fo:table-cell starts-row="true"><fo:block>Footer 1</fo:block></fo:table-cell>
+ <fo:table-cell ends-row="true"><fo:block>Footer 2</fo:block></fo:table-cell>
+ </fo:table-footer>
+ <fo:table-body>
+ <fo:table-cell starts-row="true"><fo:block>Cell 1</fo:block></fo:table-cell>
+ <fo:table-cell ends-row="true"><fo:block>Cell 2</fo:block></fo:table-cell>
+ </fo:table-body>
+ </fo:table>
+
+ <!-- Table 8: one header (2 rows), one footer (3 rows), one body (2 rows) -->
+ <fo:table width="10cm" space-before="12pt" table-layout="fixed"
+ border-collapse="separate" border="1pt solid black">
+ <fo:table-column number-columns-repeated="2" column-width="proportional-column-width(1)"/>
+ <fo:table-header>
+ <fo:table-cell starts-row="true"><fo:block>Header 1</fo:block></fo:table-cell>
+ <fo:table-cell ends-row="true"><fo:block>Header 2</fo:block></fo:table-cell>
+ <fo:table-cell starts-row="true"><fo:block>Header 3</fo:block></fo:table-cell>
+ <fo:table-cell ends-row="true"><fo:block>Header 4</fo:block></fo:table-cell>
+ </fo:table-header>
+ <fo:table-footer>
+ <fo:table-cell starts-row="true"><fo:block>Footer 1</fo:block></fo:table-cell>
+ <fo:table-cell ends-row="true"><fo:block>Footer 2</fo:block></fo:table-cell>
+ <fo:table-cell starts-row="true"><fo:block>Footer 4</fo:block></fo:table-cell>
+ <fo:table-cell ends-row="true"><fo:block>Footer 5</fo:block></fo:table-cell>
+ <fo:table-cell starts-row="true"><fo:block>Footer 5</fo:block></fo:table-cell>
+ <fo:table-cell ends-row="true"><fo:block>Footer 6</fo:block></fo:table-cell>
+ </fo:table-footer>
+ <fo:table-body>
+ <fo:table-cell starts-row="true"><fo:block>Cell 1</fo:block></fo:table-cell>
+ <fo:table-cell ends-row="true"><fo:block>Cell 2</fo:block></fo:table-cell>
+ <fo:table-cell starts-row="true"><fo:block>Cell 3</fo:block></fo:table-cell>
+ <fo:table-cell ends-row="true"><fo:block>Cell 4</fo:block></fo:table-cell>
+ </fo:table-body>
+ </fo:table>
+
+ <!-- Table 9: one header (3 rows), one footer (2 rows), three bodies (2 rows, 1 row, 3 rows) -->
+ <fo:table width="10cm" space-before="12pt" table-layout="fixed"
+ border-collapse="separate" border="1pt solid black">
+ <fo:table-column number-columns-repeated="2" column-width="proportional-column-width(1)"/>
+ <fo:table-header>
+ <fo:table-cell starts-row="true"><fo:block>Header 1</fo:block></fo:table-cell>
+ <fo:table-cell ends-row="true"><fo:block>Header 2</fo:block></fo:table-cell>
+ <fo:table-cell starts-row="true"><fo:block>Header 3</fo:block></fo:table-cell>
+ <fo:table-cell ends-row="true"><fo:block>Header 4</fo:block></fo:table-cell>
+ <fo:table-cell starts-row="true"><fo:block>Header 5</fo:block></fo:table-cell>
+ <fo:table-cell ends-row="true"><fo:block>Header 6</fo:block></fo:table-cell>
+ </fo:table-header>
+ <fo:table-footer>
+ <fo:table-cell starts-row="true"><fo:block>Footer 1</fo:block></fo:table-cell>
+ <fo:table-cell ends-row="true"><fo:block>Footer 2</fo:block></fo:table-cell>
+ <fo:table-cell starts-row="true"><fo:block>Footer 4</fo:block></fo:table-cell>
+ <fo:table-cell ends-row="true"><fo:block>Footer 5</fo:block></fo:table-cell>
+ </fo:table-footer>
+ <fo:table-body>
+ <fo:table-cell starts-row="true"><fo:block>Cell 1</fo:block></fo:table-cell>
+ <fo:table-cell ends-row="true"><fo:block>Cell 2</fo:block></fo:table-cell>
+ <fo:table-cell starts-row="true"><fo:block>Cell 3</fo:block></fo:table-cell>
+ <fo:table-cell ends-row="true"><fo:block>Cell 4</fo:block></fo:table-cell>
+ </fo:table-body>
+ <fo:table-body>
+ <fo:table-cell starts-row="true"><fo:block>Cell 5</fo:block></fo:table-cell>
+ <fo:table-cell ends-row="true"><fo:block>Cell 6</fo:block></fo:table-cell>
+ </fo:table-body>
+ <fo:table-body>
+ <fo:table-cell starts-row="true"><fo:block>Cell 7</fo:block></fo:table-cell>
+ <fo:table-cell ends-row="true"><fo:block>Cell 8</fo:block></fo:table-cell>
+ <fo:table-cell starts-row="true"><fo:block>Cell 9</fo:block></fo:table-cell>
+ <fo:table-cell ends-row="true"><fo:block>Cell 10</fo:block></fo:table-cell>
+ <fo:table-cell starts-row="true"><fo:block>Cell 10</fo:block></fo:table-cell>
+ <fo:table-cell ends-row="true"><fo:block>Cell 11</fo:block></fo:table-cell>
+ </fo:table-body>
+ </fo:table>
+
+ </fo:flow>
+ </fo:page-sequence>
+</fo:root>
diff --git a/test/fotree/unittests/table/TableRowIterator_no-row_spans.fo b/test/fotree/unittests/table/TableRowIterator_no-row_spans.fo
new file mode 100644
index 000000000..83597dbbd
--- /dev/null
+++ b/test/fotree/unittests/table/TableRowIterator_no-row_spans.fo
@@ -0,0 +1,128 @@
+<?xml version="1.0" standalone="no"?>
+<!--
+ 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$ -->
+<!--
+ WARNING: this file was semi-automatically generated from TableRowIterator_spans.fo and
+ contains the very same tables using starts-row/ends-row instead of fo:table-row objects.
+ Please modify TableRowIterator_spans.fo instead.
+-->
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="page" page-height="20cm" page-width="15cm"
+ margin-top="1cm" margin-bottom="1cm" margin-left="1cm" margin-right="1cm">
+ <fo:region-body/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="page" font-family="serif" font-size="14pt">
+ <fo:flow flow-name="xsl-region-body">
+ <!-- Table 1: no header, no footer, one body (1 row with column-span) -->
+ <fo:table border-separation="2pt" width="10cm" space-before="12pt" table-layout="fixed"
+ border-collapse="separate" border="1pt solid black">
+ <fo:table-column number-columns-repeated="2" column-width="proportional-column-width(1)"/>
+ <fo:table-body>
+ <fo:table-cell border="1pt solid" number-columns-spanned="2" starts-row="true" ends-row="true"><fo:block>Cell 1</fo:block></fo:table-cell>
+ </fo:table-body>
+ </fo:table>
+
+ <!-- Table 2: no header, no footer, one body (1 row-group of 2 rows) -->
+ <fo:table border-separation="2pt" width="10cm" space-before="12pt" table-layout="fixed"
+ border-collapse="separate" border="1pt solid black">
+ <fo:table-column number-columns-repeated="2" column-width="proportional-column-width(1)"/>
+ <fo:table-body>
+ <fo:table-cell border="1pt solid" number-rows-spanned="2" starts-row="true"><fo:block>Cell 1</fo:block></fo:table-cell>
+ <fo:table-cell border="1pt solid" ends-row="true"><fo:block>Cell 2</fo:block></fo:table-cell>
+ <fo:table-cell border="1pt solid" starts-row="true" ends-row="true"><fo:block>Cell 4</fo:block></fo:table-cell>
+ </fo:table-body>
+ </fo:table>
+
+ <!-- Table 3: no header, no footer, one body (1 row-group of 2 rows, 1 row) -->
+ <fo:table border-separation="2pt" width="10cm" space-before="12pt" table-layout="fixed"
+ border-collapse="separate" border="1pt solid black">
+ <fo:table-column number-columns-repeated="2" column-width="proportional-column-width(1)"/>
+ <fo:table-body>
+ <fo:table-cell border="1pt solid" number-rows-spanned="2" starts-row="true"><fo:block>Cell 1</fo:block></fo:table-cell>
+ <fo:table-cell border="1pt solid" ends-row="true"><fo:block>Cell 2</fo:block></fo:table-cell>
+ <fo:table-cell border="1pt solid" starts-row="true" ends-row="true"><fo:block>Cell 4</fo:block></fo:table-cell>
+ <fo:table-cell border="1pt solid" starts-row="true"><fo:block>Cell 5</fo:block></fo:table-cell>
+ <fo:table-cell border="1pt solid" ends-row="true"><fo:block>Cell 6</fo:block></fo:table-cell>
+ </fo:table-body>
+ </fo:table>
+
+ <!-- Table 4: no header, no footer, one body (1 row, 1 row-group of 2 rows) -->
+ <fo:table border-separation="2pt" width="10cm" space-before="12pt" table-layout="fixed"
+ border-collapse="separate" border="1pt solid black">
+ <fo:table-column number-columns-repeated="2" column-width="proportional-column-width(1)"/>
+ <fo:table-body>
+ <fo:table-cell border="1pt solid" starts-row="true"><fo:block>Cell 1</fo:block></fo:table-cell>
+ <fo:table-cell border="1pt solid" ends-row="true"><fo:block>Cell 2</fo:block></fo:table-cell>
+ <fo:table-cell border="1pt solid" number-rows-spanned="2" starts-row="true"><fo:block>Cell 3</fo:block></fo:table-cell>
+ <fo:table-cell border="1pt solid" ends-row="true"><fo:block>Cell 5</fo:block></fo:table-cell>
+ <fo:table-cell border="1pt solid" starts-row="true" ends-row="true"><fo:block>Cell 7</fo:block></fo:table-cell>
+ </fo:table-body>
+ </fo:table>
+
+ <!-- Table 5: no header, no footer, one body (1 row, 1 row-group of 3 rows, 1 row) -->
+ <fo:table border-separation="2pt" width="10cm" space-before="12pt" table-layout="fixed"
+ border-collapse="separate" border="1pt solid black">
+ <fo:table-column number-columns-repeated="2" column-width="proportional-column-width(1)"/>
+ <fo:table-body>
+ <fo:table-cell border="1pt solid" starts-row="true"><fo:block>Cell 1</fo:block></fo:table-cell>
+ <fo:table-cell border="1pt solid" ends-row="true"><fo:block>Cell 2</fo:block></fo:table-cell>
+ <fo:table-cell border="1pt solid" starts-row="true"><fo:block>Cell 3</fo:block></fo:table-cell>
+ <fo:table-cell border="1pt solid" number-rows-spanned="2" ends-row="true"><fo:block>Cell 4</fo:block></fo:table-cell>
+ <fo:table-cell border="1pt solid" number-rows-spanned="2" starts-row="true" ends-row="true"><fo:block>Cell 5</fo:block></fo:table-cell>
+ <fo:table-cell border="1pt solid" starts-row="true" ends-row="true"><fo:block>Cell 8</fo:block></fo:table-cell>
+ <fo:table-cell border="1pt solid" starts-row="true"><fo:block>Cell 9</fo:block></fo:table-cell>
+ <fo:table-cell border="1pt solid" ends-row="true"><fo:block>Cell 10</fo:block></fo:table-cell>
+ </fo:table-body>
+ </fo:table>
+
+ <!-- Table 6: one header (1 row-group of 2 rows), one footer (1 row, 1 row-group of 3 rows),
+ one body (1 row-group of 2 rows, 1 row, 1 row-group of 3 rows) -->
+ <fo:table border-separation="2pt" width="10cm" space-before="12pt" table-layout="fixed"
+ border-collapse="separate" border="1pt solid black">
+ <fo:table-column number-columns-repeated="2" column-width="proportional-column-width(1)"/>
+ <fo:table-header>
+ <fo:table-cell border="1pt solid" number-rows-spanned="2" starts-row="true"><fo:block>Header 1</fo:block></fo:table-cell>
+ <fo:table-cell border="1pt solid" ends-row="true"><fo:block>Header 2</fo:block></fo:table-cell>
+ <fo:table-cell border="1pt solid" starts-row="true" ends-row="true"><fo:block>Header 4</fo:block></fo:table-cell>
+ </fo:table-header>
+ <fo:table-footer>
+ <fo:table-cell border="1pt solid" starts-row="true"><fo:block>Footer 1</fo:block></fo:table-cell>
+ <fo:table-cell border="1pt solid" ends-row="true"><fo:block>Footer 2</fo:block></fo:table-cell>
+ <fo:table-cell border="1pt solid" number-rows-spanned="2" starts-row="true"><fo:block>Footer 3</fo:block></fo:table-cell>
+ <fo:table-cell border="1pt solid" ends-row="true"><fo:block>Footer 4</fo:block></fo:table-cell>
+ <fo:table-cell border="1pt solid" number-rows-spanned="2" starts-row="true" ends-row="true"><fo:block>Footer 6</fo:block></fo:table-cell>
+ <fo:table-cell border="1pt solid" starts-row="true" ends-row="true"><fo:block>Footer 7</fo:block></fo:table-cell>
+ </fo:table-footer>
+ <fo:table-body>
+ <fo:table-cell border="1pt solid" starts-row="true"><fo:block>Cell 1</fo:block></fo:table-cell>
+ <fo:table-cell border="1pt solid" number-rows-spanned="2" ends-row="true"><fo:block>Cell 2</fo:block></fo:table-cell>
+ <fo:table-cell border="1pt solid" starts-row="true" ends-row="true"><fo:block>Cell 3</fo:block></fo:table-cell>
+ <fo:table-cell border="1pt solid" starts-row="true"><fo:block>Cell 5</fo:block></fo:table-cell>
+ <fo:table-cell border="1pt solid" ends-row="true"><fo:block>Cell 6</fo:block></fo:table-cell>
+ <fo:table-cell border="1pt solid" starts-row="true"><fo:block>Cell 7</fo:block></fo:table-cell>
+ <fo:table-cell border="1pt solid" number-rows-spanned="2" ends-row="true"><fo:block>Cell 8</fo:block></fo:table-cell>
+ <fo:table-cell border="1pt solid" number-rows-spanned="2" starts-row="true" ends-row="true"><fo:block>Cell 9</fo:block></fo:table-cell>
+ <fo:table-cell border="1pt solid" starts-row="true" ends-row="true"><fo:block>Cell 10</fo:block></fo:table-cell>
+ </fo:table-body>
+ </fo:table>
+
+ </fo:flow>
+ </fo:page-sequence>
+</fo:root>
diff --git a/test/fotree/unittests/table/TableRowIterator_simple.fo b/test/fotree/unittests/table/TableRowIterator_simple.fo
new file mode 100644
index 000000000..fb2e8c1b7
--- /dev/null
+++ b/test/fotree/unittests/table/TableRowIterator_simple.fo
@@ -0,0 +1,266 @@
+<?xml version="1.0" standalone="no"?>
+<!--
+ 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$ -->
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="page" page-height="20cm" page-width="15cm"
+ margin-top="1cm" margin-bottom="1cm" margin-left="1cm" margin-right="1cm">
+ <fo:region-body/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="page" font-family="serif" font-size="14pt">
+ <fo:flow flow-name="xsl-region-body">
+ <!-- Table 1: no header, no footer, one body (1 row) -->
+ <fo:table width="10cm" space-before="12pt" table-layout="fixed"
+ border-collapse="separate" border="1pt solid black">
+ <fo:table-column number-columns-repeated="2" column-width="proportional-column-width(1)"/>
+ <fo:table-body>
+ <fo:table-row>
+ <fo:table-cell><fo:block>Cell 1</fo:block></fo:table-cell>
+ <fo:table-cell><fo:block>Cell 2</fo:block></fo:table-cell>
+ </fo:table-row>
+ </fo:table-body>
+ </fo:table>
+
+ <!-- Table 2: no header, no footer, one body (2 rows) -->
+ <fo:table width="10cm" space-before="12pt" table-layout="fixed"
+ border-collapse="separate" border="1pt solid black">
+ <fo:table-column number-columns-repeated="2" column-width="proportional-column-width(1)"/>
+ <fo:table-body>
+ <fo:table-row>
+ <fo:table-cell><fo:block>Cell 1</fo:block></fo:table-cell>
+ <fo:table-cell><fo:block>Cell 2</fo:block></fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell><fo:block>Cell 3</fo:block></fo:table-cell>
+ <fo:table-cell><fo:block>Cell 4</fo:block></fo:table-cell>
+ </fo:table-row>
+ </fo:table-body>
+ </fo:table>
+
+ <!-- Table 3: no header, no footer, two bodies (1 row, 1 row) -->
+ <fo:table width="10cm" space-before="12pt" table-layout="fixed"
+ border-collapse="separate" border="1pt solid black">
+ <fo:table-column number-columns-repeated="2" column-width="proportional-column-width(1)"/>
+ <fo:table-body>
+ <fo:table-row>
+ <fo:table-cell><fo:block>Cell 1</fo:block></fo:table-cell>
+ <fo:table-cell><fo:block>Cell 2</fo:block></fo:table-cell>
+ </fo:table-row>
+ </fo:table-body>
+ <fo:table-body>
+ <fo:table-row>
+ <fo:table-cell><fo:block>Cell 3</fo:block></fo:table-cell>
+ <fo:table-cell><fo:block>Cell 4</fo:block></fo:table-cell>
+ </fo:table-row>
+ </fo:table-body>
+ </fo:table>
+
+ <!-- Table 4: no header, no footer, two bodies (2 rows, 3 rows) -->
+ <fo:table width="10cm" space-before="12pt" table-layout="fixed"
+ border-collapse="separate" border="1pt solid black">
+ <fo:table-column number-columns-repeated="2" column-width="proportional-column-width(1)"/>
+ <fo:table-body>
+ <fo:table-row>
+ <fo:table-cell><fo:block>Cell 1</fo:block></fo:table-cell>
+ <fo:table-cell><fo:block>Cell 2</fo:block></fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell><fo:block>Cell 3</fo:block></fo:table-cell>
+ <fo:table-cell><fo:block>Cell 4</fo:block></fo:table-cell>
+ </fo:table-row>
+ </fo:table-body>
+ <fo:table-body>
+ <fo:table-row>
+ <fo:table-cell><fo:block>Cell 5</fo:block></fo:table-cell>
+ <fo:table-cell><fo:block>Cell 6</fo:block></fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell><fo:block>Cell 7</fo:block></fo:table-cell>
+ <fo:table-cell><fo:block>Cell 8</fo:block></fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell><fo:block>Cell 9</fo:block></fo:table-cell>
+ <fo:table-cell><fo:block>Cell 10</fo:block></fo:table-cell>
+ </fo:table-row>
+ </fo:table-body>
+ </fo:table>
+
+ <!-- Table 5: one header (1 row), no footer, one body (1 row) -->
+ <fo:table width="10cm" space-before="12pt" table-layout="fixed"
+ border-collapse="separate" border="1pt solid black">
+ <fo:table-column number-columns-repeated="2" column-width="proportional-column-width(1)"/>
+ <fo:table-header>
+ <fo:table-row>
+ <fo:table-cell><fo:block>Header 1</fo:block></fo:table-cell>
+ <fo:table-cell><fo:block>Header 2</fo:block></fo:table-cell>
+ </fo:table-row>
+ </fo:table-header>
+ <fo:table-body>
+ <fo:table-row>
+ <fo:table-cell><fo:block>Cell 1</fo:block></fo:table-cell>
+ <fo:table-cell><fo:block>Cell 2</fo:block></fo:table-cell>
+ </fo:table-row>
+ </fo:table-body>
+ </fo:table>
+
+ <!-- Table 6: no header, one footer (1 row), one body (1 row) -->
+ <fo:table width="10cm" space-before="12pt" table-layout="fixed"
+ border-collapse="separate" border="1pt solid black">
+ <fo:table-column number-columns-repeated="2" column-width="proportional-column-width(1)"/>
+ <fo:table-footer>
+ <fo:table-row>
+ <fo:table-cell><fo:block>Footer 1</fo:block></fo:table-cell>
+ <fo:table-cell><fo:block>Footer 2</fo:block></fo:table-cell>
+ </fo:table-row>
+ </fo:table-footer>
+ <fo:table-body>
+ <fo:table-row>
+ <fo:table-cell><fo:block>Cell 1</fo:block></fo:table-cell>
+ <fo:table-cell><fo:block>Cell 2</fo:block></fo:table-cell>
+ </fo:table-row>
+ </fo:table-body>
+ </fo:table>
+
+ <!-- Table 7: one header (1 row), one footer (1 row), one body (1 row) -->
+ <fo:table width="10cm" space-before="12pt" table-layout="fixed"
+ border-collapse="separate" border="1pt solid black">
+ <fo:table-column number-columns-repeated="2" column-width="proportional-column-width(1)"/>
+ <fo:table-header>
+ <fo:table-row>
+ <fo:table-cell><fo:block>Header 1</fo:block></fo:table-cell>
+ <fo:table-cell><fo:block>Header 2</fo:block></fo:table-cell>
+ </fo:table-row>
+ </fo:table-header>
+ <fo:table-footer>
+ <fo:table-row>
+ <fo:table-cell><fo:block>Footer 1</fo:block></fo:table-cell>
+ <fo:table-cell><fo:block>Footer 2</fo:block></fo:table-cell>
+ </fo:table-row>
+ </fo:table-footer>
+ <fo:table-body>
+ <fo:table-row>
+ <fo:table-cell><fo:block>Cell 1</fo:block></fo:table-cell>
+ <fo:table-cell><fo:block>Cell 2</fo:block></fo:table-cell>
+ </fo:table-row>
+ </fo:table-body>
+ </fo:table>
+
+ <!-- Table 8: one header (2 rows), one footer (3 rows), one body (2 rows) -->
+ <fo:table width="10cm" space-before="12pt" table-layout="fixed"
+ border-collapse="separate" border="1pt solid black">
+ <fo:table-column number-columns-repeated="2" column-width="proportional-column-width(1)"/>
+ <fo:table-header>
+ <fo:table-row>
+ <fo:table-cell><fo:block>Header 1</fo:block></fo:table-cell>
+ <fo:table-cell><fo:block>Header 2</fo:block></fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell><fo:block>Header 3</fo:block></fo:table-cell>
+ <fo:table-cell><fo:block>Header 4</fo:block></fo:table-cell>
+ </fo:table-row>
+ </fo:table-header>
+ <fo:table-footer>
+ <fo:table-row>
+ <fo:table-cell><fo:block>Footer 1</fo:block></fo:table-cell>
+ <fo:table-cell><fo:block>Footer 2</fo:block></fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell><fo:block>Footer 4</fo:block></fo:table-cell>
+ <fo:table-cell><fo:block>Footer 5</fo:block></fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell><fo:block>Footer 5</fo:block></fo:table-cell>
+ <fo:table-cell><fo:block>Footer 6</fo:block></fo:table-cell>
+ </fo:table-row>
+ </fo:table-footer>
+ <fo:table-body>
+ <fo:table-row>
+ <fo:table-cell><fo:block>Cell 1</fo:block></fo:table-cell>
+ <fo:table-cell><fo:block>Cell 2</fo:block></fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell><fo:block>Cell 3</fo:block></fo:table-cell>
+ <fo:table-cell><fo:block>Cell 4</fo:block></fo:table-cell>
+ </fo:table-row>
+ </fo:table-body>
+ </fo:table>
+
+ <!-- Table 9: one header (3 rows), one footer (2 rows), three bodies (2 rows, 1 row, 3 rows) -->
+ <fo:table width="10cm" space-before="12pt" table-layout="fixed"
+ border-collapse="separate" border="1pt solid black">
+ <fo:table-column number-columns-repeated="2" column-width="proportional-column-width(1)"/>
+ <fo:table-header>
+ <fo:table-row>
+ <fo:table-cell><fo:block>Header 1</fo:block></fo:table-cell>
+ <fo:table-cell><fo:block>Header 2</fo:block></fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell><fo:block>Header 3</fo:block></fo:table-cell>
+ <fo:table-cell><fo:block>Header 4</fo:block></fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell><fo:block>Header 5</fo:block></fo:table-cell>
+ <fo:table-cell><fo:block>Header 6</fo:block></fo:table-cell>
+ </fo:table-row>
+ </fo:table-header>
+ <fo:table-footer>
+ <fo:table-row>
+ <fo:table-cell><fo:block>Footer 1</fo:block></fo:table-cell>
+ <fo:table-cell><fo:block>Footer 2</fo:block></fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell><fo:block>Footer 4</fo:block></fo:table-cell>
+ <fo:table-cell><fo:block>Footer 5</fo:block></fo:table-cell>
+ </fo:table-row>
+ </fo:table-footer>
+ <fo:table-body>
+ <fo:table-row>
+ <fo:table-cell><fo:block>Cell 1</fo:block></fo:table-cell>
+ <fo:table-cell><fo:block>Cell 2</fo:block></fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell><fo:block>Cell 3</fo:block></fo:table-cell>
+ <fo:table-cell><fo:block>Cell 4</fo:block></fo:table-cell>
+ </fo:table-row>
+ </fo:table-body>
+ <fo:table-body>
+ <fo:table-row>
+ <fo:table-cell><fo:block>Cell 5</fo:block></fo:table-cell>
+ <fo:table-cell><fo:block>Cell 6</fo:block></fo:table-cell>
+ </fo:table-row>
+ </fo:table-body>
+ <fo:table-body>
+ <fo:table-row>
+ <fo:table-cell><fo:block>Cell 7</fo:block></fo:table-cell>
+ <fo:table-cell><fo:block>Cell 8</fo:block></fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell><fo:block>Cell 9</fo:block></fo:table-cell>
+ <fo:table-cell><fo:block>Cell 10</fo:block></fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell><fo:block>Cell 10</fo:block></fo:table-cell>
+ <fo:table-cell><fo:block>Cell 11</fo:block></fo:table-cell>
+ </fo:table-row>
+ </fo:table-body>
+ </fo:table>
+
+ </fo:flow>
+ </fo:page-sequence>
+</fo:root>
diff --git a/test/fotree/unittests/table/TableRowIterator_spans.fo b/test/fotree/unittests/table/TableRowIterator_spans.fo
new file mode 100644
index 000000000..761d6e2e4
--- /dev/null
+++ b/test/fotree/unittests/table/TableRowIterator_spans.fo
@@ -0,0 +1,175 @@
+<?xml version="1.0" standalone="no"?>
+<!--
+ 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$ -->
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="page" page-height="20cm" page-width="15cm"
+ margin-top="1cm" margin-bottom="1cm" margin-left="1cm" margin-right="1cm">
+ <fo:region-body/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="page" font-family="serif" font-size="14pt">
+ <fo:flow flow-name="xsl-region-body">
+ <!-- Table 1: no header, no footer, one body (1 row with column-span) -->
+ <fo:table border-separation="2pt" width="10cm" space-before="12pt" table-layout="fixed"
+ border-collapse="separate" border="1pt 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="1pt solid" number-columns-spanned="2"><fo:block>Cell 1</fo:block></fo:table-cell>
+ </fo:table-row>
+ </fo:table-body>
+ </fo:table>
+
+ <!-- Table 2: no header, no footer, one body (1 row-group of 2 rows) -->
+ <fo:table border-separation="2pt" width="10cm" space-before="12pt" table-layout="fixed"
+ border-collapse="separate" border="1pt 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="1pt solid" number-rows-spanned="2"><fo:block>Cell 1</fo:block></fo:table-cell>
+ <fo:table-cell border="1pt solid"><fo:block>Cell 2</fo:block></fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell border="1pt solid"><fo:block>Cell 4</fo:block></fo:table-cell>
+ </fo:table-row>
+ </fo:table-body>
+ </fo:table>
+
+ <!-- Table 3: no header, no footer, one body (1 row-group of 2 rows, 1 row) -->
+ <fo:table border-separation="2pt" width="10cm" space-before="12pt" table-layout="fixed"
+ border-collapse="separate" border="1pt 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="1pt solid" number-rows-spanned="2"><fo:block>Cell 1</fo:block></fo:table-cell>
+ <fo:table-cell border="1pt solid"><fo:block>Cell 2</fo:block></fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell border="1pt solid"><fo:block>Cell 4</fo:block></fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell border="1pt solid"><fo:block>Cell 5</fo:block></fo:table-cell>
+ <fo:table-cell border="1pt solid"><fo:block>Cell 6</fo:block></fo:table-cell>
+ </fo:table-row>
+ </fo:table-body>
+ </fo:table>
+
+ <!-- Table 4: no header, no footer, one body (1 row, 1 row-group of 2 rows) -->
+ <fo:table border-separation="2pt" width="10cm" space-before="12pt" table-layout="fixed"
+ border-collapse="separate" border="1pt 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="1pt solid"><fo:block>Cell 1</fo:block></fo:table-cell>
+ <fo:table-cell border="1pt solid"><fo:block>Cell 2</fo:block></fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell border="1pt solid" number-rows-spanned="2"><fo:block>Cell 3</fo:block></fo:table-cell>
+ <fo:table-cell border="1pt solid"><fo:block>Cell 5</fo:block></fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell border="1pt solid"><fo:block>Cell 7</fo:block></fo:table-cell>
+ </fo:table-row>
+ </fo:table-body>
+ </fo:table>
+
+ <!-- Table 5: no header, no footer, one body (1 row, 1 row-group of 3 rows, 1 row) -->
+ <fo:table border-separation="2pt" width="10cm" space-before="12pt" table-layout="fixed"
+ border-collapse="separate" border="1pt 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="1pt solid"><fo:block>Cell 1</fo:block></fo:table-cell>
+ <fo:table-cell border="1pt solid"><fo:block>Cell 2</fo:block></fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell border="1pt solid"><fo:block>Cell 3</fo:block></fo:table-cell>
+ <fo:table-cell border="1pt solid" number-rows-spanned="2"><fo:block>Cell 4</fo:block></fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell border="1pt solid" number-rows-spanned="2"><fo:block>Cell 5</fo:block></fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell border="1pt solid"><fo:block>Cell 8</fo:block></fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell border="1pt solid"><fo:block>Cell 9</fo:block></fo:table-cell>
+ <fo:table-cell border="1pt solid"><fo:block>Cell 10</fo:block></fo:table-cell>
+ </fo:table-row>
+ </fo:table-body>
+ </fo:table>
+
+ <!-- Table 6: one header (1 row-group of 2 rows), one footer (1 row, 1 row-group of 3 rows),
+ one body (1 row-group of 2 rows, 1 row, 1 row-group of 3 rows) -->
+ <fo:table border-separation="2pt" width="10cm" space-before="12pt" table-layout="fixed"
+ border-collapse="separate" border="1pt solid black">
+ <fo:table-column number-columns-repeated="2" column-width="proportional-column-width(1)"/>
+ <fo:table-header>
+ <fo:table-row>
+ <fo:table-cell border="1pt solid" number-rows-spanned="2"><fo:block>Header 1</fo:block></fo:table-cell>
+ <fo:table-cell border="1pt solid"><fo:block>Header 2</fo:block></fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell border="1pt solid"><fo:block>Header 4</fo:block></fo:table-cell>
+ </fo:table-row>
+ </fo:table-header>
+ <fo:table-footer>
+ <fo:table-row>
+ <fo:table-cell border="1pt solid"><fo:block>Footer 1</fo:block></fo:table-cell>
+ <fo:table-cell border="1pt solid"><fo:block>Footer 2</fo:block></fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell border="1pt solid" number-rows-spanned="2"><fo:block>Footer 3</fo:block></fo:table-cell>
+ <fo:table-cell border="1pt solid"><fo:block>Footer 4</fo:block></fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell border="1pt solid" number-rows-spanned="2"><fo:block>Footer 6</fo:block></fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell border="1pt solid"><fo:block>Footer 7</fo:block></fo:table-cell>
+ </fo:table-row>
+ </fo:table-footer>
+ <fo:table-body>
+ <fo:table-row>
+ <fo:table-cell border="1pt solid"><fo:block>Cell 1</fo:block></fo:table-cell>
+ <fo:table-cell border="1pt solid" number-rows-spanned="2"><fo:block>Cell 2</fo:block></fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell border="1pt solid"><fo:block>Cell 3</fo:block></fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell border="1pt solid"><fo:block>Cell 5</fo:block></fo:table-cell>
+ <fo:table-cell border="1pt solid"><fo:block>Cell 6</fo:block></fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell border="1pt solid"><fo:block>Cell 7</fo:block></fo:table-cell>
+ <fo:table-cell border="1pt solid" number-rows-spanned="2"><fo:block>Cell 8</fo:block></fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell border="1pt solid" number-rows-spanned="2"><fo:block>Cell 9</fo:block></fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell border="1pt solid"><fo:block>Cell 10</fo:block></fo:table-cell>
+ </fo:table-row>
+ </fo:table-body>
+ </fo:table>
+
+ </fo:flow>
+ </fo:page-sequence>
+</fo:root>