You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by vh...@apache.org on 2008/02/13 19:11:08 UTC

svn commit: r627553 [5/5] - in /xmlgraphics/fop/trunk: ./ src/java/org/apache/fop/fo/flow/table/ src/java/org/apache/fop/layoutmgr/table/ src/java/org/apache/fop/util/ test/layoutengine/standard-testcases/

Added: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/table-cell_break-before_first-row.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/table-cell_break-before_first-row.xml?rev=627553&view=auto
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/table-cell_break-before_first-row.xml (added)
+++ xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/table-cell_break-before_first-row.xml Wed Feb 13 10:11:06 2008
@@ -0,0 +1,688 @@
+<?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 break-before set on blocks in table-cells works correctly in various
+      conditions: when headers/footers shall be repeated at page breaks or not, in the separate or
+      collapsing border model, etc.
+    </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="10cm" page-width="15cm" margin="1cm">
+          <fo:region-body background-color="#F0F0F0"/>
+        </fo:simple-page-master>
+      </fo:layout-master-set>
+
+      <!-- 1. separate border model, discarded borders, no header/footer -->
+      <fo:page-sequence master-reference="page" font-size="8pt" line-height="10pt">
+        <fo:flow flow-name="xsl-region-body">
+          <fo:block>1. Before the table</fo:block>
+          <fo:table width="100%" table-layout="fixed"
+            border-collapse="separate" border="2pt solid black">
+            <fo:table-column column-width="proportional-column-width(1)" number-columns-repeated="2"/>
+            <fo:table-body>
+              <fo:table-row border="2pt solid green">
+                <fo:table-cell border="inherit">
+                  <fo:block break-before="page">Cell 1.1</fo:block>
+                  <fo:block>Cell 1.1</fo:block>
+                </fo:table-cell>
+                <fo:table-cell border="inherit">
+                  <fo:block>Cell 1.2</fo:block>
+                  <fo:block>Cell 1.2</fo:block>
+                </fo:table-cell>
+              </fo:table-row>
+              <fo:table-row border="2pt solid red">
+                <fo:table-cell border="inherit">
+                  <fo:block>Cell 2.1</fo:block>
+                  <fo:block>Cell 2.1</fo:block>
+                </fo:table-cell>
+                <fo:table-cell border="inherit">
+                  <fo:block>Cell 2.2</fo:block>
+                  <fo:block>Cell 2.2</fo:block>
+                </fo:table-cell>
+              </fo:table-row>
+              <fo:table-row border="2pt solid orange">
+                <fo:table-cell border="inherit">
+                  <fo:block>Cell 3.1</fo:block>
+                  <fo:block>Cell 3.1</fo:block>
+                </fo:table-cell>
+                <fo:table-cell border="inherit">
+                  <fo:block>Cell 3.2</fo:block>
+                  <fo:block>Cell 3.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>
+
+      <!-- 2. separate border model, discarded borders, repeated header/footer -->
+      <fo:page-sequence master-reference="page" font-size="8pt" line-height="10pt">
+        <fo:flow flow-name="xsl-region-body">
+          <fo:block>2. Before the table</fo:block>
+          <fo:table width="100%" table-layout="fixed"
+            border-collapse="separate" border="2pt solid black"
+            table-omit-header-at-break="false" table-omit-footer-at-break="false">
+            <fo:table-column column-width="proportional-column-width(1)" number-columns-repeated="2"/>
+            <fo:table-header>
+              <fo:table-row border="2pt solid blue">
+                <fo:table-cell border="inherit"><fo:block>Header 1.1</fo:block></fo:table-cell>
+                <fo:table-cell border="inherit"><fo:block>Header 1.2</fo:block></fo:table-cell>
+              </fo:table-row>
+            </fo:table-header>
+            <fo:table-footer>
+              <fo:table-row border="2pt solid purple">
+                <fo:table-cell border="inherit"><fo:block>Footer 1.1</fo:block></fo:table-cell>
+                <fo:table-cell border="inherit"><fo:block>Footer 1.2</fo:block></fo:table-cell>
+              </fo:table-row>
+            </fo:table-footer>
+            <fo:table-body>
+              <fo:table-row border="2pt solid green">
+                <fo:table-cell border="inherit">
+                  <fo:block>Cell 1.1</fo:block>
+                  <fo:block>Cell 1.1</fo:block>
+                </fo:table-cell>
+                <fo:table-cell border="inherit">
+                  <fo:block break-before="page">Cell 1.2</fo:block>
+                  <fo:block>Cell 1.2</fo:block>
+                </fo:table-cell>
+              </fo:table-row>
+              <fo:table-row border="2pt solid red">
+                <fo:table-cell border="inherit">
+                  <fo:block>Cell 2.1</fo:block>
+                  <fo:block>Cell 2.1</fo:block>
+                </fo:table-cell>
+                <fo:table-cell border="inherit">
+                  <fo:block>Cell 2.2</fo:block>
+                  <fo:block>Cell 2.2</fo:block>
+                </fo:table-cell>
+              </fo:table-row>
+              <fo:table-row border="2pt solid orange">
+                <fo:table-cell border="inherit">
+                  <fo:block>Cell 3.1</fo:block>
+                  <fo:block>Cell 3.1</fo:block>
+                </fo:table-cell>
+                <fo:table-cell border="inherit">
+                  <fo:block>Cell 3.2</fo:block>
+                  <fo:block>Cell 3.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>
+
+      <!-- 3. separate border model, discarded borders, omitted header/footer -->
+      <fo:page-sequence master-reference="page" font-size="8pt" line-height="10pt">
+        <fo:flow flow-name="xsl-region-body">
+          <fo:block>3. Before the table</fo:block>
+          <fo:table width="100%" table-layout="fixed"
+            border-collapse="separate" border="2pt solid black"
+            table-omit-header-at-break="true" table-omit-footer-at-break="true">
+            <fo:table-column column-width="proportional-column-width(1)" number-columns-repeated="2"/>
+            <fo:table-header>
+              <fo:table-row border="2pt solid blue">
+                <fo:table-cell border="inherit"><fo:block>Header 1.1</fo:block></fo:table-cell>
+                <fo:table-cell border="inherit"><fo:block>Header 1.2</fo:block></fo:table-cell>
+              </fo:table-row>
+            </fo:table-header>
+            <fo:table-footer>
+              <fo:table-row border="2pt solid purple">
+                <fo:table-cell border="inherit"><fo:block>Footer 1.1</fo:block></fo:table-cell>
+                <fo:table-cell border="inherit"><fo:block>Footer 1.2</fo:block></fo:table-cell>
+              </fo:table-row>
+            </fo:table-footer>
+            <fo:table-body>
+              <fo:table-row border="2pt solid green">
+                <fo:table-cell border="inherit">
+                  <fo:block break-before="page">Cell 1.1</fo:block>
+                  <fo:block>Cell 1.1</fo:block>
+                </fo:table-cell>
+                <fo:table-cell border="inherit">
+                  <fo:block>Cell 1.2</fo:block>
+                  <fo:block>Cell 1.2</fo:block>
+                </fo:table-cell>
+              </fo:table-row>
+              <fo:table-row border="2pt solid red">
+                <fo:table-cell border="inherit">
+                  <fo:block>Cell 2.1</fo:block>
+                  <fo:block>Cell 2.1</fo:block>
+                </fo:table-cell>
+                <fo:table-cell border="inherit">
+                  <fo:block>Cell 2.2</fo:block>
+                  <fo:block>Cell 2.2</fo:block>
+                </fo:table-cell>
+              </fo:table-row>
+              <fo:table-row border="2pt solid orange">
+                <fo:table-cell border="inherit">
+                  <fo:block>Cell 3.1</fo:block>
+                  <fo:block>Cell 3.1</fo:block>
+                </fo:table-cell>
+                <fo:table-cell border="inherit">
+                  <fo:block>Cell 3.2</fo:block>
+                  <fo:block>Cell 3.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>
+
+      <!-- 4. collapsing border model, discarded borders, no header/footer -->
+      <fo:page-sequence master-reference="page" font-size="8pt" line-height="10pt">
+        <fo:flow flow-name="xsl-region-body">
+          <fo:block>4. Before the table</fo:block>
+          <fo:table width="100%" table-layout="fixed"
+            border-collapse="collapse" border="2pt solid black">
+            <fo:table-column column-width="proportional-column-width(1)" number-columns-repeated="2"/>
+            <fo:table-body>
+              <fo:table-row border="2pt solid green">
+                <fo:table-cell border="inherit">
+                  <fo:block>Cell 1.1</fo:block>
+                  <fo:block>Cell 1.1</fo:block>
+                </fo:table-cell>
+                <fo:table-cell border="inherit">
+                  <fo:block break-before="page">Cell 1.2</fo:block>
+                  <fo:block>Cell 1.2</fo:block>
+                </fo:table-cell>
+              </fo:table-row>
+              <fo:table-row border="2pt solid red">
+                <fo:table-cell border="inherit">
+                  <fo:block>Cell 2.1</fo:block>
+                  <fo:block>Cell 2.1</fo:block>
+                </fo:table-cell>
+                <fo:table-cell border="inherit">
+                  <fo:block>Cell 2.2</fo:block>
+                  <fo:block>Cell 2.2</fo:block>
+                </fo:table-cell>
+              </fo:table-row>
+              <fo:table-row border="2pt solid orange">
+                <fo:table-cell border="inherit">
+                  <fo:block>Cell 3.1</fo:block>
+                  <fo:block>Cell 3.1</fo:block>
+                </fo:table-cell>
+                <fo:table-cell border="inherit">
+                  <fo:block>Cell 3.2</fo:block>
+                  <fo:block>Cell 3.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>
+
+      <!-- 5. collapsing border model, discarded borders, repeated header/footer -->
+      <fo:page-sequence master-reference="page" font-size="8pt" line-height="10pt">
+        <fo:flow flow-name="xsl-region-body">
+          <fo:block>5. Before the table</fo:block>
+          <fo:table width="100%" table-layout="fixed"
+            border-collapse="collapse" border="2pt solid black"
+            table-omit-header-at-break="false" table-omit-footer-at-break="false">
+            <fo:table-column column-width="proportional-column-width(1)" number-columns-repeated="2"/>
+            <fo:table-header>
+              <fo:table-row border="2pt solid blue">
+                <fo:table-cell border="inherit"><fo:block>Header 1.1</fo:block></fo:table-cell>
+                <fo:table-cell border="inherit"><fo:block>Header 1.2</fo:block></fo:table-cell>
+              </fo:table-row>
+            </fo:table-header>
+            <fo:table-footer>
+              <fo:table-row border="2pt solid purple">
+                <fo:table-cell border="inherit"><fo:block>Footer 1.1</fo:block></fo:table-cell>
+                <fo:table-cell border="inherit"><fo:block>Footer 1.2</fo:block></fo:table-cell>
+              </fo:table-row>
+            </fo:table-footer>
+            <fo:table-body>
+              <fo:table-row border="2pt solid green">
+                <fo:table-cell border="inherit">
+                  <fo:block break-before="page">Cell 1.1</fo:block>
+                  <fo:block>Cell 1.1</fo:block>
+                </fo:table-cell>
+                <fo:table-cell border="inherit">
+                  <fo:block>Cell 1.2</fo:block>
+                  <fo:block>Cell 1.2</fo:block>
+                </fo:table-cell>
+              </fo:table-row>
+              <fo:table-row border="2pt solid red">
+                <fo:table-cell border="inherit">
+                  <fo:block>Cell 2.1</fo:block>
+                  <fo:block>Cell 2.1</fo:block>
+                </fo:table-cell>
+                <fo:table-cell border="inherit">
+                  <fo:block>Cell 2.2</fo:block>
+                  <fo:block>Cell 2.2</fo:block>
+                </fo:table-cell>
+              </fo:table-row>
+              <fo:table-row border="2pt solid orange">
+                <fo:table-cell border="inherit">
+                  <fo:block>Cell 3.1</fo:block>
+                  <fo:block>Cell 3.1</fo:block>
+                </fo:table-cell>
+                <fo:table-cell border="inherit">
+                  <fo:block>Cell 3.2</fo:block>
+                  <fo:block>Cell 3.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>
+
+      <!-- 6. collapsing border model, discarded borders, omitted header/footer -->
+      <fo:page-sequence master-reference="page" font-size="8pt" line-height="10pt">
+        <fo:flow flow-name="xsl-region-body">
+          <fo:block>6. Before the table</fo:block>
+          <fo:table width="100%" table-layout="fixed"
+            border-collapse="collapse" border="2pt solid black"
+            table-omit-header-at-break="true" table-omit-footer-at-break="true">
+            <fo:table-column column-width="proportional-column-width(1)" number-columns-repeated="2"/>
+            <fo:table-header>
+              <fo:table-row border="2pt solid blue">
+                <fo:table-cell border="inherit"><fo:block>Header 1.1</fo:block></fo:table-cell>
+                <fo:table-cell border="inherit"><fo:block>Header 1.2</fo:block></fo:table-cell>
+              </fo:table-row>
+            </fo:table-header>
+            <fo:table-footer>
+              <fo:table-row border="2pt solid purple">
+                <fo:table-cell border="inherit"><fo:block>Footer 1.1</fo:block></fo:table-cell>
+                <fo:table-cell border="inherit"><fo:block>Footer 1.2</fo:block></fo:table-cell>
+              </fo:table-row>
+            </fo:table-footer>
+            <fo:table-body>
+              <fo:table-row border="2pt solid green">
+                <fo:table-cell border="inherit">
+                  <fo:block>Cell 1.1</fo:block>
+                  <fo:block>Cell 1.1</fo:block>
+                </fo:table-cell>
+                <fo:table-cell border="inherit">
+                  <fo:block break-before="page">Cell 1.2</fo:block>
+                  <fo:block>Cell 1.2</fo:block>
+                </fo:table-cell>
+              </fo:table-row>
+              <fo:table-row border="2pt solid red">
+                <fo:table-cell border="inherit">
+                  <fo:block>Cell 2.1</fo:block>
+                  <fo:block>Cell 2.1</fo:block>
+                </fo:table-cell>
+                <fo:table-cell border="inherit">
+                  <fo:block>Cell 2.2</fo:block>
+                  <fo:block>Cell 2.2</fo:block>
+                </fo:table-cell>
+              </fo:table-row>
+              <fo:table-row border="2pt solid orange">
+                <fo:table-cell border="inherit">
+                  <fo:block>Cell 3.1</fo:block>
+                  <fo:block>Cell 3.1</fo:block>
+                </fo:table-cell>
+                <fo:table-cell border="inherit">
+                  <fo:block>Cell 3.2</fo:block>
+                  <fo:block>Cell 3.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>
+
+    <!-- 1. separate border model, discarded borders, no header/footer -->
+    <!-- page 1 -->
+    <eval expected="2"                    xpath="count(//pageSequence[1]/pageViewport)"/>
+    <eval expected="1"                    xpath="count(//pageViewport[@nr='1']//flow/block)"/>
+    <eval expected="1. Before the table"  xpath="//pageViewport[@nr='1']//flow/block[1]//text"/>
+    <!-- page 2 -->
+    <eval expected="2"                    xpath="count(//pageViewport[@nr='2']//flow/block)"/>
+    <eval expected="After the table"      xpath="//pageViewport[@nr='2']//flow/block[2]//text"/>
+    <eval expected="72000"                xpath="//pageViewport[@nr='2']//flow/block[1]/@bpd"/>
+    <!--eval expected="76000"                xpath="//pageViewport[@nr='2']//flow/block[1]/@bpda"/-->
+    <!--eval expected="(solid,#000000,2000)" xpath="//pageViewport[@nr='2']//flow/block[1]/@border-before"/-->
+    <!--eval expected="(solid,#000000,2000)" 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,#008000,2000)" xpath="//pageViewport[@nr='2']//flow/block[1]/block[1]/@border-before"/>
+    <eval expected="(solid,#008000,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,#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 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,#ff0000,2000)" xpath="//pageViewport[@nr='2']//flow/block[1]/block[3]/@border-before"/>
+    <eval expected="(solid,#ff0000,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,#ff0000,2000)" xpath="//pageViewport[@nr='2']//flow/block[1]/block[4]/@border-before"/>
+    <eval expected="(solid,#ff0000,2000)" xpath="//pageViewport[@nr='2']//flow/block[1]/block[4]/@border-after"/>
+    <!-- cell 3.1 -->
+    <eval expected="20000"                xpath="//pageViewport[@nr='2']//flow/block[1]/block[5]/@bpd"/>
+    <eval expected="24000"                xpath="//pageViewport[@nr='2']//flow/block[1]/block[5]/@bpda"/>
+    <eval expected="(solid,#ffa500,2000)" xpath="//pageViewport[@nr='2']//flow/block[1]/block[5]/@border-before"/>
+    <eval expected="(solid,#ffa500,2000)" xpath="//pageViewport[@nr='2']//flow/block[1]/block[5]/@border-after"/>
+    <!-- cell 3.2 -->
+    <eval expected="20000"                xpath="//pageViewport[@nr='2']//flow/block[1]/block[6]/@bpd"/>
+    <eval expected="24000"                xpath="//pageViewport[@nr='2']//flow/block[1]/block[6]/@bpda"/>
+    <eval expected="(solid,#ffa500,2000)" xpath="//pageViewport[@nr='2']//flow/block[1]/block[6]/@border-before"/>
+    <eval expected="(solid,#ffa500,2000)" xpath="//pageViewport[@nr='2']//flow/block[1]/block[6]/@border-after"/>
+
+    <!-- 2. separate border model, discarded borders, repeated header/footer -->
+    <!-- page 1 -->
+    <eval expected="2"                    xpath="count(//pageSequence[2]/pageViewport)"/>
+    <eval expected="1"                    xpath="count(//pageViewport[@nr='3']//flow/block)"/>
+    <eval expected="2. Before the table"  xpath="//pageViewport[@nr='3']//flow/block[1]//text"/>
+    <!-- page 2 -->
+    <eval expected="2"                    xpath="count(//pageViewport[@nr='4']//flow/block)"/>
+    <eval expected="After the table"      xpath="//pageViewport[@nr='4']//flow/block[2]//text"/>
+    <eval expected="100000"               xpath="//pageViewport[@nr='4']//flow/block[1]/@bpd"/>
+    <!--eval expected="104000"               xpath="//pageViewport[@nr='4']//flow/block[1]/@bpda"/-->
+    <!--eval expected="(solid,#000000,2000)" xpath="//pageViewport[@nr='4']//flow/block[1]/@border-before"/-->
+    <!--eval expected="(solid,#000000,2000)" xpath="//pageViewport[@nr='4']//flow/block[1]/@border-after"/-->
+    <!-- header 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="(solid,#0000ff,2000)" 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"/>
+    <!-- header 1.2 -->
+    <eval expected="10000"                xpath="//pageViewport[@nr='4']//flow/block[1]/block[2]/@bpd"/>
+    <eval expected="14000"                xpath="//pageViewport[@nr='4']//flow/block[1]/block[2]/@bpda"/>
+    <eval expected="(solid,#0000ff,2000)" xpath="//pageViewport[@nr='4']//flow/block[1]/block[2]/@border-before"/>
+    <eval expected="(solid,#0000ff,2000)" xpath="//pageViewport[@nr='4']//flow/block[1]/block[2]/@border-after"/>
+    <!-- cell 1.1 -->
+    <eval expected="20000"                xpath="//pageViewport[@nr='4']//flow/block[1]/block[3]/@bpd"/>
+    <eval expected="24000"                xpath="//pageViewport[@nr='4']//flow/block[1]/block[3]/@bpda"/>
+    <eval expected="(solid,#008000,2000)" xpath="//pageViewport[@nr='4']//flow/block[1]/block[3]/@border-before"/>
+    <eval expected="(solid,#008000,2000)" xpath="//pageViewport[@nr='4']//flow/block[1]/block[3]/@border-after"/>
+    <!-- cell 1.2 -->
+    <eval expected="20000"                xpath="//pageViewport[@nr='4']//flow/block[1]/block[4]/@bpd"/>
+    <eval expected="24000"                xpath="//pageViewport[@nr='4']//flow/block[1]/block[4]/@bpda"/>
+    <eval expected="(solid,#008000,2000)" xpath="//pageViewport[@nr='4']//flow/block[1]/block[4]/@border-before"/>
+    <eval expected="(solid,#008000,2000)" xpath="//pageViewport[@nr='4']//flow/block[1]/block[4]/@border-after"/>
+    <!-- cell 2.1 -->
+    <eval expected="20000"                xpath="//pageViewport[@nr='4']//flow/block[1]/block[5]/@bpd"/>
+    <eval expected="24000"                xpath="//pageViewport[@nr='4']//flow/block[1]/block[5]/@bpda"/>
+    <eval expected="(solid,#ff0000,2000)" xpath="//pageViewport[@nr='4']//flow/block[1]/block[5]/@border-before"/>
+    <eval expected="(solid,#ff0000,2000)" xpath="//pageViewport[@nr='4']//flow/block[1]/block[5]/@border-after"/>
+    <!-- cell 2.2 -->
+    <eval expected="20000"                xpath="//pageViewport[@nr='4']//flow/block[1]/block[6]/@bpd"/>
+    <eval expected="24000"                xpath="//pageViewport[@nr='4']//flow/block[1]/block[6]/@bpda"/>
+    <eval expected="(solid,#ff0000,2000)" xpath="//pageViewport[@nr='4']//flow/block[1]/block[6]/@border-before"/>
+    <eval expected="(solid,#ff0000,2000)" xpath="//pageViewport[@nr='4']//flow/block[1]/block[6]/@border-after"/>
+    <!-- cell 3.1 -->
+    <eval expected="20000"                xpath="//pageViewport[@nr='4']//flow/block[1]/block[7]/@bpd"/>
+    <eval expected="24000"                xpath="//pageViewport[@nr='4']//flow/block[1]/block[7]/@bpda"/>
+    <eval expected="(solid,#ffa500,2000)" xpath="//pageViewport[@nr='4']//flow/block[1]/block[7]/@border-before"/>
+    <eval expected="(solid,#ffa500,2000)" xpath="//pageViewport[@nr='4']//flow/block[1]/block[7]/@border-after"/>
+    <!-- cell 3.2 -->
+    <eval expected="20000"                xpath="//pageViewport[@nr='4']//flow/block[1]/block[8]/@bpd"/>
+    <eval expected="24000"                xpath="//pageViewport[@nr='4']//flow/block[1]/block[8]/@bpda"/>
+    <eval expected="(solid,#ffa500,2000)" xpath="//pageViewport[@nr='4']//flow/block[1]/block[8]/@border-before"/>
+    <eval expected="(solid,#ffa500,2000)" xpath="//pageViewport[@nr='4']//flow/block[1]/block[8]/@border-after"/>
+    <!-- footer 1.1 -->
+    <eval expected="10000"                xpath="//pageViewport[@nr='4']//flow/block[1]/block[9]/@bpd"/>
+    <eval expected="14000"                xpath="//pageViewport[@nr='4']//flow/block[1]/block[9]/@bpda"/>
+    <eval expected="(solid,#800080,2000)" xpath="//pageViewport[@nr='4']//flow/block[1]/block[9]/@border-before"/>
+    <eval expected="(solid,#800080,2000)" xpath="//pageViewport[@nr='4']//flow/block[1]/block[9]/@border-after"/>
+    <!-- footer 1.2 -->
+    <eval expected="10000"                xpath="//pageViewport[@nr='4']//flow/block[1]/block[10]/@bpd"/>
+    <eval expected="14000"                xpath="//pageViewport[@nr='4']//flow/block[1]/block[10]/@bpda"/>
+    <eval expected="(solid,#800080,2000)" xpath="//pageViewport[@nr='4']//flow/block[1]/block[10]/@border-before"/>
+    <eval expected="(solid,#800080,2000)" xpath="//pageViewport[@nr='4']//flow/block[1]/block[10]/@border-after"/>
+
+    <!-- 3. separate border model, discarded borders, omitted header/footer -->
+    <!-- page 1 -->
+    <eval expected="2"                    xpath="count(//pageSequence[3]/pageViewport)"/>
+    <eval expected="1"                    xpath="count(//pageViewport[@nr='5']//flow/block)"/>
+    <eval expected="3. Before the table"  xpath="//pageViewport[@nr='5']//flow/block[1]//text"/>
+    <!-- page 2 -->
+    <eval expected="2"                    xpath="count(//pageViewport[@nr='6']//flow/block)"/>
+    <eval expected="After the table"      xpath="//pageViewport[@nr='6']//flow/block[2]//text"/>
+    <eval expected="100000"               xpath="//pageViewport[@nr='6']//flow/block[1]/@bpd"/>
+    <!--eval expected="104000"               xpath="//pageViewport[@nr='6']//flow/block[1]/@bpda"/-->
+    <!--eval expected="(solid,#000000,2000)" xpath="//pageViewport[@nr='6']//flow/block[1]/@border-before"/-->
+    <!--eval expected="(solid,#000000,2000)" xpath="//pageViewport[@nr='6']//flow/block[1]/@border-after"/-->
+    <!-- header 1.1 -->
+    <eval expected="10000"                xpath="//pageViewport[@nr='6']//flow/block[1]/block[1]/@bpd"/>
+    <eval expected="14000"                xpath="//pageViewport[@nr='6']//flow/block[1]/block[1]/@bpda"/>
+    <eval expected="(solid,#0000ff,2000)" 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"/>
+    <!-- header 1.2 -->
+    <eval expected="10000"                xpath="//pageViewport[@nr='6']//flow/block[1]/block[2]/@bpd"/>
+    <eval expected="14000"                xpath="//pageViewport[@nr='6']//flow/block[1]/block[2]/@bpda"/>
+    <eval expected="(solid,#0000ff,2000)" xpath="//pageViewport[@nr='6']//flow/block[1]/block[2]/@border-before"/>
+    <eval expected="(solid,#0000ff,2000)" xpath="//pageViewport[@nr='6']//flow/block[1]/block[2]/@border-after"/>
+    <!-- cell 1.1 -->
+    <eval expected="20000"                xpath="//pageViewport[@nr='6']//flow/block[1]/block[3]/@bpd"/>
+    <eval expected="24000"                xpath="//pageViewport[@nr='6']//flow/block[1]/block[3]/@bpda"/>
+    <eval expected="(solid,#008000,2000)" xpath="//pageViewport[@nr='6']//flow/block[1]/block[3]/@border-before"/>
+    <eval expected="(solid,#008000,2000)" xpath="//pageViewport[@nr='6']//flow/block[1]/block[3]/@border-after"/>
+    <!-- cell 1.2 -->
+    <eval expected="20000"                xpath="//pageViewport[@nr='6']//flow/block[1]/block[4]/@bpd"/>
+    <eval expected="24000"                xpath="//pageViewport[@nr='6']//flow/block[1]/block[4]/@bpda"/>
+    <eval expected="(solid,#008000,2000)" xpath="//pageViewport[@nr='6']//flow/block[1]/block[4]/@border-before"/>
+    <eval expected="(solid,#008000,2000)" xpath="//pageViewport[@nr='6']//flow/block[1]/block[4]/@border-after"/>
+    <!-- cell 2.1 -->
+    <eval expected="20000"                xpath="//pageViewport[@nr='6']//flow/block[1]/block[5]/@bpd"/>
+    <eval expected="24000"                xpath="//pageViewport[@nr='6']//flow/block[1]/block[5]/@bpda"/>
+    <eval expected="(solid,#ff0000,2000)" xpath="//pageViewport[@nr='6']//flow/block[1]/block[5]/@border-before"/>
+    <eval expected="(solid,#ff0000,2000)" xpath="//pageViewport[@nr='6']//flow/block[1]/block[5]/@border-after"/>
+    <!-- cell 2.2 -->
+    <eval expected="20000"                xpath="//pageViewport[@nr='6']//flow/block[1]/block[6]/@bpd"/>
+    <eval expected="24000"                xpath="//pageViewport[@nr='6']//flow/block[1]/block[6]/@bpda"/>
+    <eval expected="(solid,#ff0000,2000)" xpath="//pageViewport[@nr='6']//flow/block[1]/block[6]/@border-before"/>
+    <eval expected="(solid,#ff0000,2000)" xpath="//pageViewport[@nr='6']//flow/block[1]/block[6]/@border-after"/>
+    <!-- cell 3.1 -->
+    <eval expected="20000"                xpath="//pageViewport[@nr='6']//flow/block[1]/block[7]/@bpd"/>
+    <eval expected="24000"                xpath="//pageViewport[@nr='6']//flow/block[1]/block[7]/@bpda"/>
+    <eval expected="(solid,#ffa500,2000)" xpath="//pageViewport[@nr='6']//flow/block[1]/block[7]/@border-before"/>
+    <eval expected="(solid,#ffa500,2000)" xpath="//pageViewport[@nr='6']//flow/block[1]/block[7]/@border-after"/>
+    <!-- cell 3.2 -->
+    <eval expected="20000"                xpath="//pageViewport[@nr='6']//flow/block[1]/block[8]/@bpd"/>
+    <eval expected="24000"                xpath="//pageViewport[@nr='6']//flow/block[1]/block[8]/@bpda"/>
+    <eval expected="(solid,#ffa500,2000)" xpath="//pageViewport[@nr='6']//flow/block[1]/block[8]/@border-before"/>
+    <eval expected="(solid,#ffa500,2000)" xpath="//pageViewport[@nr='6']//flow/block[1]/block[8]/@border-after"/>
+    <!-- footer 1.1 -->
+    <eval expected="10000"                xpath="//pageViewport[@nr='6']//flow/block[1]/block[9]/@bpd"/>
+    <eval expected="14000"                xpath="//pageViewport[@nr='6']//flow/block[1]/block[9]/@bpda"/>
+    <eval expected="(solid,#800080,2000)" xpath="//pageViewport[@nr='6']//flow/block[1]/block[9]/@border-before"/>
+    <eval expected="(solid,#800080,2000)" xpath="//pageViewport[@nr='6']//flow/block[1]/block[9]/@border-after"/>
+    <!-- footer 1.2 -->
+    <eval expected="10000"                xpath="//pageViewport[@nr='6']//flow/block[1]/block[10]/@bpd"/>
+    <eval expected="14000"                xpath="//pageViewport[@nr='6']//flow/block[1]/block[10]/@bpda"/>
+    <eval expected="(solid,#800080,2000)" xpath="//pageViewport[@nr='6']//flow/block[1]/block[10]/@border-before"/>
+    <eval expected="(solid,#800080,2000)" xpath="//pageViewport[@nr='6']//flow/block[1]/block[10]/@border-after"/>
+
+    <!-- 4. collapsing border model, discarded borders, no header/footer -->
+    <!-- page 1 -->
+    <eval expected="2"                                   xpath="count(//pageSequence[4]/pageViewport)"/>
+    <eval expected="1"                                   xpath="count(//pageViewport[@nr='7']//flow/block)"/>
+    <eval expected="4. Before the table"                 xpath="//pageViewport[@nr='7']//flow/block[1]//text"/>
+    <!-- page 2 -->
+    <eval expected="2"                                   xpath="count(//pageViewport[@nr='8']//flow/block)"/>
+    <eval expected="After the table"                     xpath="//pageViewport[@nr='8']//flow/block[2]//text"/>
+    <eval expected="66000"                               xpath="//pageViewport[@nr='8']//flow/block[1]/@bpd"/>
+    <eval expected="66000"                               xpath="//pageViewport[@nr='8']//flow/block[1]/@bpda"/>
+    <!-- cell 1.1 -->
+    <eval expected="20000"                               xpath="//pageViewport[@nr='8']//flow/block[1]/block[1]/@bpd"/>
+    <eval expected="24000"                               xpath="//pageViewport[@nr='8']//flow/block[1]/block[1]/@bpda"/>
+    <eval expected="(solid,#008000,2000,collapse-outer)" xpath="//pageViewport[@nr='8']//flow/block[1]/block[1]/@border-before"/>
+    <eval expected="(solid,#008000,2000,collapse-inner)" xpath="//pageViewport[@nr='8']//flow/block[1]/block[1]/@border-after"/>
+    <!-- cell 1.2 -->
+    <eval expected="20000"                               xpath="//pageViewport[@nr='8']//flow/block[1]/block[2]/@bpd"/>
+    <eval expected="24000"                               xpath="//pageViewport[@nr='8']//flow/block[1]/block[2]/@bpda"/>
+    <eval expected="(solid,#008000,2000,collapse-outer)" xpath="//pageViewport[@nr='8']//flow/block[1]/block[2]/@border-before"/>
+    <eval expected="(solid,#008000,2000,collapse-inner)" xpath="//pageViewport[@nr='8']//flow/block[1]/block[2]/@border-after"/>
+    <!-- cell 2.1 -->
+    <eval expected="20000"                               xpath="//pageViewport[@nr='8']//flow/block[1]/block[3]/@bpd"/>
+    <eval expected="24000"                               xpath="//pageViewport[@nr='8']//flow/block[1]/block[3]/@bpda"/>
+    <eval expected="(solid,#ff0000,2000,collapse-inner)" xpath="//pageViewport[@nr='8']//flow/block[1]/block[3]/@border-before"/>
+    <eval expected="(solid,#ff0000,2000,collapse-inner)" xpath="//pageViewport[@nr='8']//flow/block[1]/block[3]/@border-after"/>
+    <!-- cell 2.2 -->
+    <eval expected="20000"                               xpath="//pageViewport[@nr='8']//flow/block[1]/block[4]/@bpd"/>
+    <eval expected="24000"                               xpath="//pageViewport[@nr='8']//flow/block[1]/block[4]/@bpda"/>
+    <eval expected="(solid,#ff0000,2000,collapse-inner)" xpath="//pageViewport[@nr='8']//flow/block[1]/block[4]/@border-before"/>
+    <eval expected="(solid,#ff0000,2000,collapse-inner)" xpath="//pageViewport[@nr='8']//flow/block[1]/block[4]/@border-after"/>
+    <!-- cell 3.1 -->
+    <eval expected="20000"                               xpath="//pageViewport[@nr='8']//flow/block[1]/block[5]/@bpd"/>
+    <eval expected="24000"                               xpath="//pageViewport[@nr='8']//flow/block[1]/block[5]/@bpda"/>
+    <eval expected="(solid,#ffa500,2000,collapse-inner)" xpath="//pageViewport[@nr='8']//flow/block[1]/block[5]/@border-before"/>
+    <eval expected="(solid,#ffa500,2000,collapse-outer)" xpath="//pageViewport[@nr='8']//flow/block[1]/block[5]/@border-after"/>
+    <!-- cell 3.2 -->
+    <eval expected="20000"                               xpath="//pageViewport[@nr='8']//flow/block[1]/block[6]/@bpd"/>
+    <eval expected="24000"                               xpath="//pageViewport[@nr='8']//flow/block[1]/block[6]/@bpda"/>
+    <eval expected="(solid,#ffa500,2000,collapse-inner)" xpath="//pageViewport[@nr='8']//flow/block[1]/block[6]/@border-before"/>
+    <eval expected="(solid,#ffa500,2000,collapse-outer)" xpath="//pageViewport[@nr='8']//flow/block[1]/block[6]/@border-after"/>
+
+    <!-- 5. collapsing border model, discarded borders, repeated header/footer -->
+    <!-- page 1 -->
+    <eval expected="2"                                   xpath="count(//pageSequence[5]/pageViewport)"/>
+    <eval expected="1"                                   xpath="count(//pageViewport[@nr='9']//flow/block)"/>
+    <eval expected="5. Before the table"                 xpath="//pageViewport[@nr='9']//flow/block[1]//text"/>
+    <!-- page 2 -->
+    <eval expected="2"                                   xpath="count(//pageViewport[@nr='10']//flow/block)"/>
+    <eval expected="After the table"                     xpath="//pageViewport[@nr='10']//flow/block[2]//text"/>
+    <eval expected="90000"                               xpath="//pageViewport[@nr='10']//flow/block[1]/@bpd"/>
+    <eval expected="90000"                               xpath="//pageViewport[@nr='10']//flow/block[1]/@bpda"/>
+    <!-- header 1.1 -->
+    <eval expected="10000"                               xpath="//pageViewport[@nr='10']//flow/block[1]/block[1]/@bpd"/>
+    <eval expected="14000"                               xpath="//pageViewport[@nr='10']//flow/block[1]/block[1]/@bpda"/>
+    <eval expected="(solid,#0000ff,2000,collapse-outer)" xpath="//pageViewport[@nr='10']//flow/block[1]/block[1]/@border-before"/>
+    <eval expected="(solid,#0000ff,2000,collapse-inner)" xpath="//pageViewport[@nr='10']//flow/block[1]/block[1]/@border-after"/>
+    <!-- header 1.2 -->
+    <eval expected="10000"                               xpath="//pageViewport[@nr='10']//flow/block[1]/block[2]/@bpd"/>
+    <eval expected="14000"                               xpath="//pageViewport[@nr='10']//flow/block[1]/block[2]/@bpda"/>
+    <eval expected="(solid,#0000ff,2000,collapse-outer)" xpath="//pageViewport[@nr='10']//flow/block[1]/block[2]/@border-before"/>
+    <eval expected="(solid,#0000ff,2000,collapse-inner)" xpath="//pageViewport[@nr='10']//flow/block[1]/block[2]/@border-after"/>
+    <!-- cell 1.1 -->
+    <eval expected="20000"                               xpath="//pageViewport[@nr='10']//flow/block[1]/block[3]/@bpd"/>
+    <eval expected="24000"                               xpath="//pageViewport[@nr='10']//flow/block[1]/block[3]/@bpda"/>
+    <eval expected="(solid,#008000,2000,collapse-inner)" xpath="//pageViewport[@nr='10']//flow/block[1]/block[3]/@border-before"/>
+    <eval expected="(solid,#008000,2000,collapse-inner)" xpath="//pageViewport[@nr='10']//flow/block[1]/block[3]/@border-after"/>
+    <!-- cell 1.2 -->
+    <eval expected="20000"                               xpath="//pageViewport[@nr='10']//flow/block[1]/block[4]/@bpd"/>
+    <eval expected="24000"                               xpath="//pageViewport[@nr='10']//flow/block[1]/block[4]/@bpda"/>
+    <eval expected="(solid,#008000,2000,collapse-inner)" xpath="//pageViewport[@nr='10']//flow/block[1]/block[4]/@border-before"/>
+    <eval expected="(solid,#008000,2000,collapse-inner)" xpath="//pageViewport[@nr='10']//flow/block[1]/block[4]/@border-after"/>
+    <!-- cell 2.1 -->
+    <eval expected="20000"                               xpath="//pageViewport[@nr='10']//flow/block[1]/block[5]/@bpd"/>
+    <eval expected="24000"                               xpath="//pageViewport[@nr='10']//flow/block[1]/block[5]/@bpda"/>
+    <eval expected="(solid,#ff0000,2000,collapse-inner)" xpath="//pageViewport[@nr='10']//flow/block[1]/block[5]/@border-before"/>
+    <eval expected="(solid,#ff0000,2000,collapse-inner)" xpath="//pageViewport[@nr='10']//flow/block[1]/block[5]/@border-after"/>
+    <!-- cell 2.2 -->
+    <eval expected="20000"                               xpath="//pageViewport[@nr='10']//flow/block[1]/block[6]/@bpd"/>
+    <eval expected="24000"                               xpath="//pageViewport[@nr='10']//flow/block[1]/block[6]/@bpda"/>
+    <eval expected="(solid,#ff0000,2000,collapse-inner)" xpath="//pageViewport[@nr='10']//flow/block[1]/block[6]/@border-before"/>
+    <eval expected="(solid,#ff0000,2000,collapse-inner)" xpath="//pageViewport[@nr='10']//flow/block[1]/block[6]/@border-after"/>
+    <!-- cell 3.1 -->
+    <eval expected="20000"                               xpath="//pageViewport[@nr='10']//flow/block[1]/block[7]/@bpd"/>
+    <eval expected="24000"                               xpath="//pageViewport[@nr='10']//flow/block[1]/block[7]/@bpda"/>
+    <eval expected="(solid,#ffa500,2000,collapse-inner)" xpath="//pageViewport[@nr='10']//flow/block[1]/block[7]/@border-before"/>
+    <eval expected="(solid,#ffa500,2000,collapse-inner)" xpath="//pageViewport[@nr='10']//flow/block[1]/block[7]/@border-after"/>
+    <!-- cell 3.2 -->
+    <eval expected="20000"                               xpath="//pageViewport[@nr='10']//flow/block[1]/block[8]/@bpd"/>
+    <eval expected="24000"                               xpath="//pageViewport[@nr='10']//flow/block[1]/block[8]/@bpda"/>
+    <eval expected="(solid,#ffa500,2000,collapse-inner)" xpath="//pageViewport[@nr='10']//flow/block[1]/block[8]/@border-before"/>
+    <eval expected="(solid,#ffa500,2000,collapse-inner)" xpath="//pageViewport[@nr='10']//flow/block[1]/block[8]/@border-after"/>
+    <!-- footer 1.1 -->
+    <eval expected="10000"                               xpath="//pageViewport[@nr='10']//flow/block[1]/block[9]/@bpd"/>
+    <eval expected="14000"                               xpath="//pageViewport[@nr='10']//flow/block[1]/block[9]/@bpda"/>
+    <eval expected="(solid,#800080,2000,collapse-inner)" xpath="//pageViewport[@nr='10']//flow/block[1]/block[9]/@border-before"/>
+    <eval expected="(solid,#800080,2000,collapse-outer)" xpath="//pageViewport[@nr='10']//flow/block[1]/block[9]/@border-after"/>
+    <!-- footer 1.2 -->
+    <eval expected="10000"                               xpath="//pageViewport[@nr='10']//flow/block[1]/block[10]/@bpd"/>
+    <eval expected="14000"                               xpath="//pageViewport[@nr='10']//flow/block[1]/block[10]/@bpda"/>
+    <eval expected="(solid,#800080,2000,collapse-inner)" xpath="//pageViewport[@nr='10']//flow/block[1]/block[10]/@border-before"/>
+    <eval expected="(solid,#800080,2000,collapse-outer)" xpath="//pageViewport[@nr='10']//flow/block[1]/block[10]/@border-after"/>
+
+    <!-- 6. collapsing border model, discarded borders, omitted header/footer -->
+    <!-- page 1 -->
+    <eval expected="2"                                   xpath="count(//pageSequence[6]/pageViewport)"/>
+    <eval expected="1"                                   xpath="count(//pageViewport[@nr='11']//flow/block)"/>
+    <eval expected="6. Before the table"                 xpath="//pageViewport[@nr='11']//flow/block[1]//text"/>
+    <!-- page 2 -->
+    <eval expected="2"                                   xpath="count(//pageViewport[@nr='12']//flow/block)"/>
+    <eval expected="After the table"                     xpath="//pageViewport[@nr='12']//flow/block[2]//text"/>
+    <eval expected="90000"                               xpath="//pageViewport[@nr='12']//flow/block[1]/@bpd"/>
+    <eval expected="90000"                               xpath="//pageViewport[@nr='12']//flow/block[1]/@bpda"/>
+    <!-- header 1.1 -->
+    <eval expected="10000"                               xpath="//pageViewport[@nr='12']//flow/block[1]/block[1]/@bpd"/>
+    <eval expected="14000"                               xpath="//pageViewport[@nr='12']//flow/block[1]/block[1]/@bpda"/>
+    <eval expected="(solid,#0000ff,2000,collapse-outer)" xpath="//pageViewport[@nr='12']//flow/block[1]/block[1]/@border-before"/>
+    <eval expected="(solid,#0000ff,2000,collapse-inner)" xpath="//pageViewport[@nr='12']//flow/block[1]/block[1]/@border-after"/>
+    <!-- header 1.2 -->
+    <eval expected="10000"                               xpath="//pageViewport[@nr='12']//flow/block[1]/block[2]/@bpd"/>
+    <eval expected="14000"                               xpath="//pageViewport[@nr='12']//flow/block[1]/block[2]/@bpda"/>
+    <eval expected="(solid,#0000ff,2000,collapse-outer)" xpath="//pageViewport[@nr='12']//flow/block[1]/block[2]/@border-before"/>
+    <eval expected="(solid,#0000ff,2000,collapse-inner)" xpath="//pageViewport[@nr='12']//flow/block[1]/block[2]/@border-after"/>
+    <!-- cell 1.1 -->
+    <eval expected="20000"                               xpath="//pageViewport[@nr='12']//flow/block[1]/block[3]/@bpd"/>
+    <eval expected="24000"                               xpath="//pageViewport[@nr='12']//flow/block[1]/block[3]/@bpda"/>
+    <eval expected="(solid,#008000,2000,collapse-inner)" xpath="//pageViewport[@nr='12']//flow/block[1]/block[3]/@border-before"/>
+    <eval expected="(solid,#008000,2000,collapse-inner)" xpath="//pageViewport[@nr='12']//flow/block[1]/block[3]/@border-after"/>
+    <!-- cell 1.2 -->
+    <eval expected="20000"                               xpath="//pageViewport[@nr='12']//flow/block[1]/block[4]/@bpd"/>
+    <eval expected="24000"                               xpath="//pageViewport[@nr='12']//flow/block[1]/block[4]/@bpda"/>
+    <eval expected="(solid,#008000,2000,collapse-inner)" xpath="//pageViewport[@nr='12']//flow/block[1]/block[4]/@border-before"/>
+    <eval expected="(solid,#008000,2000,collapse-inner)" xpath="//pageViewport[@nr='12']//flow/block[1]/block[4]/@border-after"/>
+    <!-- cell 2.1 -->
+    <eval expected="20000"                               xpath="//pageViewport[@nr='12']//flow/block[1]/block[5]/@bpd"/>
+    <eval expected="24000"                               xpath="//pageViewport[@nr='12']//flow/block[1]/block[5]/@bpda"/>
+    <eval expected="(solid,#ff0000,2000,collapse-inner)" xpath="//pageViewport[@nr='12']//flow/block[1]/block[5]/@border-before"/>
+    <eval expected="(solid,#ff0000,2000,collapse-inner)" xpath="//pageViewport[@nr='12']//flow/block[1]/block[5]/@border-after"/>
+    <!-- cell 2.2 -->
+    <eval expected="20000"                               xpath="//pageViewport[@nr='12']//flow/block[1]/block[6]/@bpd"/>
+    <eval expected="24000"                               xpath="//pageViewport[@nr='12']//flow/block[1]/block[6]/@bpda"/>
+    <eval expected="(solid,#ff0000,2000,collapse-inner)" xpath="//pageViewport[@nr='12']//flow/block[1]/block[6]/@border-before"/>
+    <eval expected="(solid,#ff0000,2000,collapse-inner)" xpath="//pageViewport[@nr='12']//flow/block[1]/block[6]/@border-after"/>
+    <!-- cell 3.1 -->
+    <eval expected="20000"                               xpath="//pageViewport[@nr='12']//flow/block[1]/block[7]/@bpd"/>
+    <eval expected="24000"                               xpath="//pageViewport[@nr='12']//flow/block[1]/block[7]/@bpda"/>
+    <eval expected="(solid,#ffa500,2000,collapse-inner)" xpath="//pageViewport[@nr='12']//flow/block[1]/block[7]/@border-before"/>
+    <eval expected="(solid,#ffa500,2000,collapse-inner)" xpath="//pageViewport[@nr='12']//flow/block[1]/block[7]/@border-after"/>
+    <!-- cell 3.2 -->
+    <eval expected="20000"                               xpath="//pageViewport[@nr='12']//flow/block[1]/block[8]/@bpd"/>
+    <eval expected="24000"                               xpath="//pageViewport[@nr='12']//flow/block[1]/block[8]/@bpda"/>
+    <eval expected="(solid,#ffa500,2000,collapse-inner)" xpath="//pageViewport[@nr='12']//flow/block[1]/block[8]/@border-before"/>
+    <eval expected="(solid,#ffa500,2000,collapse-inner)" xpath="//pageViewport[@nr='12']//flow/block[1]/block[8]/@border-after"/>
+    <!-- footer 1.1 -->
+    <eval expected="10000"                               xpath="//pageViewport[@nr='12']//flow/block[1]/block[9]/@bpd"/>
+    <eval expected="14000"                               xpath="//pageViewport[@nr='12']//flow/block[1]/block[9]/@bpda"/>
+    <eval expected="(solid,#800080,2000,collapse-inner)" xpath="//pageViewport[@nr='12']//flow/block[1]/block[9]/@border-before"/>
+    <eval expected="(solid,#800080,2000,collapse-outer)" xpath="//pageViewport[@nr='12']//flow/block[1]/block[9]/@border-after"/>
+    <!-- footer 1.2 -->
+    <eval expected="10000"                               xpath="//pageViewport[@nr='12']//flow/block[1]/block[10]/@bpd"/>
+    <eval expected="14000"                               xpath="//pageViewport[@nr='12']//flow/block[1]/block[10]/@bpda"/>
+    <eval expected="(solid,#800080,2000,collapse-inner)" xpath="//pageViewport[@nr='12']//flow/block[1]/block[10]/@border-before"/>
+    <eval expected="(solid,#800080,2000,collapse-outer)" xpath="//pageViewport[@nr='12']//flow/block[1]/block[10]/@border-after"/>
+
+  </checks>
+</testcase>

Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/table-cell_break-before_first-row.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/table-cell_break-before_first-row.xml
------------------------------------------------------------------------------
    svn:keywords = Revision Id

Modified: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/table-cell_break-before_inside.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/table-cell_break-before_inside.xml?rev=627553&r1=627552&r2=627553&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/table-cell_break-before_inside.xml (original)
+++ xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/table-cell_break-before_inside.xml Wed Feb 13 10:11:06 2008
@@ -19,9 +19,9 @@
 <testcase>
   <info>
     <p>
-      This test checks that break-before set on table-rows work correctly in various conditions:
-      when headers/footers shall be repeated at page breaks or not, in the separate or collapsing
-      border model, etc.
+      This test checks that break-before set on blocks in table-cells works correctly in various
+      conditions: when headers/footers shall be repeated at page breaks or not, in the separate or
+      collapsing border model, etc.
     </p>
   </info>
   <fo>

Added: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/table-cell_row-span_breaks.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/table-cell_row-span_breaks.xml?rev=627553&view=auto
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/table-cell_row-span_breaks.xml (added)
+++ xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/table-cell_row-span_breaks.xml Wed Feb 13 10:11:06 2008
@@ -0,0 +1,197 @@
+<?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 breaks on blocks inside cells work correctly when row spanning is in
+      progress.
+    </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="4in" 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>Before the table</fo:block>
+          <fo:table width="100%" table-layout="fixed"
+            border-collapse="separate" border="2pt solid black">
+            <fo:table-column column-width="proportional-column-width(1)" number-columns-repeated="2"/>
+            <fo:table-body border="2pt solid blue">
+              <fo:table-row border="inherit">
+                <fo:table-cell border="inherit" number-rows-spanned="2">
+                  <fo:block>Cell 1.1 Line 1</fo:block>
+                  <fo:block>Cell 1.1 Line 2</fo:block>
+                  <fo:block>Cell 1.1 Line 3</fo:block>
+                  <fo:block>Cell 1.1 Line 4</fo:block>
+                </fo:table-cell>
+                <fo:table-cell border="inherit" border-color="red">
+                  <fo:block>Cell 1.2 Line 1</fo:block>
+                  <fo:block break-after="page">Cell 1.2 Line 2</fo:block>
+                </fo:table-cell>
+              </fo:table-row>
+              <fo:table-row border="inherit">
+                <fo:table-cell border="inherit">
+                  <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 2 -->
+      <!-- the break-before="odd-page" on cell 2.1 should win over the break-after="page" of
+           cell 1.1 -->
+      <fo:page-sequence master-reference="page" font-size="8pt" line-height="10pt">
+        <fo:flow flow-name="xsl-region-body">
+          <fo:block>Before the table</fo:block>
+          <fo:table width="100%" table-layout="fixed"
+            border-collapse="separate" border="2pt solid black">
+            <fo:table-column column-width="proportional-column-width(1)" number-columns-repeated="2"/>
+            <fo:table-body border="2pt solid blue">
+              <fo:table-row border="inherit">
+                <fo:table-cell border="inherit" border-color="red">
+                  <fo:block>Cell 1.1 Line 1</fo:block>
+                  <fo:block break-after="page">Cell 1.1 Line 2</fo:block>
+                </fo:table-cell>
+                <fo:table-cell border="inherit" number-rows-spanned="2">
+                  <fo:block>Cell 1.2 Line 1</fo:block>
+                  <fo:block>Cell 1.2 Line 2</fo:block>
+                  <fo:block>Cell 1.2 Line 3</fo:block>
+                  <fo:block>Cell 1.2 Line 4</fo:block>
+                </fo:table-cell>
+              </fo:table-row>
+              <fo:table-row border="inherit">
+                <fo:table-cell border="inherit" border-color="red">
+                  <fo:block break-before="odd-page">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 -->
+    <!-- page 1 -->
+    <eval expected="2"                    xpath="count(//pageSequence[1]/pageViewport)"/>
+    <eval expected="24000"                xpath="//pageViewport[@nr='1']//flow/block[2]/@bpd"/>
+    <eval expected="26000"                xpath="//pageViewport[@nr='1']//flow/block[2]/@bpda"/>
+    <eval expected="(solid,#000000,2000)" 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="22000"                xpath="//pageViewport[@nr='1']//flow/block[2]/block[1]/@bpd"/>
+    <eval expected="24000"                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="2"              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[1]"/>
+    <eval expected="Cell 1.1 Line 2"      xpath="//pageViewport[@nr='1']//flow/block[2]/block[1]/block[2]"/>
+    <!-- cell 1.2 -->
+    <eval expected="20000"                xpath="//pageViewport[@nr='1']//flow/block[2]/block[2]/@bpd"/>
+    <eval expected="24000"                xpath="//pageViewport[@nr='1']//flow/block[2]/block[2]/@bpda"/>
+    <eval expected="(solid,#ff0000,2000)" xpath="//pageViewport[@nr='1']//flow/block[2]/block[2]/@border-before"/>
+    <eval expected="(solid,#ff0000,2000)" xpath="//pageViewport[@nr='1']//flow/block[2]/block[2]/@border-after"/>
+    <eval expected="2"              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[1]"/>
+    <eval expected="Cell 1.2 Line 2"      xpath="//pageViewport[@nr='1']//flow/block[2]/block[2]/block[2]"/>
+    <!-- page 2 -->
+    <eval expected="24000"                xpath="//pageViewport[@nr='2']//flow/block[1]/@bpd"/>
+    <eval expected="26000"                xpath="//pageViewport[@nr='2']//flow/block[1]/@bpda"/>
+    <eval expected=""                     xpath="//pageViewport[@nr='2']//flow/block[1]/@border-before"/>
+    <eval expected="(solid,#000000,2000)" xpath="//pageViewport[@nr='2']//flow/block[1]/@border-after"/>
+    <!-- cell 1.1 -->
+    <eval expected="22000"                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=""                     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="2"              xpath="count(//pageViewport[@nr='2']//flow/block[1]/block[1]/block)"/>
+    <eval expected="Cell 1.1 Line 3"      xpath="//pageViewport[@nr='2']//flow/block[1]/block[1]/block[1]"/>
+    <eval expected="Cell 1.1 Line 4"      xpath="//pageViewport[@nr='2']//flow/block[1]/block[1]/block[2]"/>
+    <!-- cell 2.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,#0000ff,2000)" xpath="//pageViewport[@nr='2']//flow/block[1]/block[2]/@border-before"/>
+    <eval expected="(solid,#0000ff,2000)" xpath="//pageViewport[@nr='2']//flow/block[1]/block[2]/@border-after"/>
+    <eval expected="2"              xpath="count(//pageViewport[@nr='2']//flow/block[1]/block[2]/block)"/>
+    <eval expected="Cell 2.2 Line 1"      xpath="//pageViewport[@nr='2']//flow/block[1]/block[2]/block[1]"/>
+    <eval expected="Cell 2.2 Line 2"      xpath="//pageViewport[@nr='2']//flow/block[1]/block[2]/block[2]"/>
+
+    <!-- table 2 -->
+    <!-- page 1 -->
+    <eval expected="3"                    xpath="count(//pageSequence[2]/pageViewport)"/>
+    <eval expected="24000"                xpath="//pageViewport[@nr='3']//flow/block[2]/@bpd"/>
+    <eval expected="26000"                xpath="//pageViewport[@nr='3']//flow/block[2]/@bpda"/>
+    <eval expected="(solid,#000000,2000)" 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="20000"                xpath="//pageViewport[@nr='3']//flow/block[2]/block[1]/@bpd"/>
+    <eval expected="24000"                xpath="//pageViewport[@nr='3']//flow/block[2]/block[1]/@bpda"/>
+    <eval expected="(solid,#ff0000,2000)" xpath="//pageViewport[@nr='3']//flow/block[2]/block[1]/@border-before"/>
+    <eval expected="(solid,#ff0000,2000)" xpath="//pageViewport[@nr='3']//flow/block[2]/block[1]/@border-after"/>
+    <eval expected="2"              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[1]"/>
+    <eval expected="Cell 1.1 Line 2"      xpath="//pageViewport[@nr='3']//flow/block[2]/block[1]/block[2]"/>
+    <!-- cell 1.2 -->
+    <eval expected="22000"                xpath="//pageViewport[@nr='3']//flow/block[2]/block[2]/@bpd"/>
+    <eval expected="24000"                xpath="//pageViewport[@nr='3']//flow/block[2]/block[2]/@bpda"/>
+    <eval expected="(solid,#0000ff,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="2"              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[1]"/>
+    <eval expected="Cell 1.2 Line 2"      xpath="//pageViewport[@nr='3']//flow/block[2]/block[2]/block[2]"/>
+    <!-- page 3 -->
+    <eval expected="0"              xpath="count(//pageViewport[@nr='4']//flow/block)"/>
+    <!-- page 2 -->
+    <eval expected="24000"                xpath="//pageViewport[@nr='5']//flow/block[1]/@bpd"/>
+    <eval expected="26000"                xpath="//pageViewport[@nr='5']//flow/block[1]/@bpda"/>
+    <eval expected=""                     xpath="//pageViewport[@nr='5']//flow/block[1]/@border-before"/>
+    <eval expected="(solid,#000000,2000)" xpath="//pageViewport[@nr='5']//flow/block[1]/@border-after"/>
+    <!-- cell 1.1 -->
+    <eval expected="20000"                xpath="//pageViewport[@nr='5']//flow/block[1]/block[1]/@bpd"/>
+    <eval expected="24000"                xpath="//pageViewport[@nr='5']//flow/block[1]/block[1]/@bpda"/>
+    <eval expected="(solid,#ff0000,2000)" xpath="//pageViewport[@nr='5']//flow/block[1]/block[1]/@border-before"/>
+    <eval expected="(solid,#ff0000,2000)" xpath="//pageViewport[@nr='5']//flow/block[1]/block[1]/@border-after"/>
+    <eval expected="2"              xpath="count(//pageViewport[@nr='5']//flow/block[1]/block[1]/block)"/>
+    <eval expected="Cell 2.1 Line 1"      xpath="//pageViewport[@nr='5']//flow/block[1]/block[1]/block[1]"/>
+    <eval expected="Cell 2.1 Line 2"      xpath="//pageViewport[@nr='5']//flow/block[1]/block[1]/block[2]"/>
+    <!-- cell 1.2 -->
+    <eval expected="22000"                xpath="//pageViewport[@nr='5']//flow/block[1]/block[2]/@bpd"/>
+    <eval expected="24000"                xpath="//pageViewport[@nr='5']//flow/block[1]/block[2]/@bpda"/>
+    <eval expected=""                     xpath="//pageViewport[@nr='5']//flow/block[1]/block[2]/@border-before"/>
+    <eval expected="(solid,#0000ff,2000)" xpath="//pageViewport[@nr='5']//flow/block[1]/block[2]/@border-after"/>
+    <eval expected="2"              xpath="count(//pageViewport[@nr='5']//flow/block[1]/block[2]/block)"/>
+    <eval expected="Cell 1.2 Line 3"      xpath="//pageViewport[@nr='5']//flow/block[1]/block[2]/block[1]"/>
+    <eval expected="Cell 1.2 Line 4"      xpath="//pageViewport[@nr='5']//flow/block[1]/block[2]/block[2]"/>
+
+  </checks>
+</testcase>

Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/table-cell_row-span_breaks.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/table-cell_row-span_breaks.xml
------------------------------------------------------------------------------
    svn:keywords = Revision Id



---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org