- add border-collapse="separate" to the properties of tables in some testcases, in...

- fix svn keywords for region_display-align_table.xml

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@522907 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/test/layoutengine/standard-testcases/region_display-align_table.xml b/test/layoutengine/standard-testcases/region_display-align_table.xml
index 5aea73ec0aa37ee84e6df372a539acdb842c9ba8..be08e2b163e3d913864b8e5e742bf3070d7860b4 100644 (file)
--- a/test/layoutengine/standard-testcases/region_display-align_table.xml
+++ b/test/layoutengine/standard-testcases/region_display-align_table.xml
@@ -1,256 +1,256 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<!--\r
-  Licensed to the Apache Software Foundation (ASF) under one or more\r
-  contributor license agreements.  See the NOTICE file distributed with\r
-  this work for additional information regarding copyright ownership.\r
-  The ASF licenses this file to You under the Apache License, Version 2.0\r
-  (the "License"); you may not use this file except in compliance with\r
-  the License.  You may obtain a copy of the License at\r
-\r
-       http://www.apache.org/licenses/LICENSE-2.0\r
-\r
-  Unless required by applicable law or agreed to in writing, software\r
-  distributed under the License is distributed on an "AS IS" BASIS,\r
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
-  See the License for the specific language governing permissions and\r
-  limitations under the License.\r
--->\r
-<!-- $Id$ -->\r
-<testcase>\r
-  <info>\r
-    <p>\r
-      This test checks the implementation of display-align in all regions.\r
-    </p>\r
-  </info>\r
-  <fo>\r
-    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">\r
-      <fo:layout-master-set>\r
-        <fo:simple-page-master master-name="before" page-width="5in" page-height="5in" margin="10pt">\r
-          <fo:region-body background-color="rgb(100%, 100%, 80%)" margin="30pt" display-align="before"/>\r
-          <fo:region-before background-color="rgb(100%, 80%, 80%)" extent="30pt" display-align="before"/>\r
-          <fo:region-after background-color="rgb(80%, 80%, 80%)" extent="30pt" display-align="before"/>\r
-          <fo:region-start background-color="rgb(80%, 100%, 80%)" extent="30pt" display-align="before"/>\r
-          <fo:region-end background-color="rgb(80%, 80%, 100%)" extent="30pt" display-align="before"/>\r
-        </fo:simple-page-master>\r
-        <fo:simple-page-master master-name="center" page-width="5in" page-height="5in" margin="10pt">\r
-          <fo:region-body background-color="rgb(100%, 100%, 80%)" margin="30pt" display-align="center"/>\r
-          <fo:region-before background-color="rgb(100%, 80%, 80%)" extent="30pt" display-align="center"/>\r
-          <fo:region-after background-color="rgb(80%, 80%, 80%)" extent="30pt" display-align="center"/>\r
-          <fo:region-start background-color="rgb(80%, 100%, 80%)" extent="30pt" display-align="center"/>\r
-          <fo:region-end background-color="rgb(80%, 80%, 100%)" extent="30pt" display-align="center"/>\r
-        </fo:simple-page-master>\r
-        <fo:simple-page-master master-name="after" page-width="5in" page-height="5in" margin="10pt">\r
-          <fo:region-body background-color="rgb(100%, 100%, 80%)" margin="30pt" display-align="after"/>\r
-          <fo:region-before background-color="rgb(100%, 80%, 80%)" extent="30pt" display-align="after"/>\r
-          <fo:region-after background-color="rgb(80%, 80%, 80%)" extent="30pt" display-align="after"/>\r
-          <fo:region-start background-color="rgb(80%, 100%, 80%)" extent="30pt" display-align="after"/>\r
-          <fo:region-end background-color="rgb(80%, 80%, 100%)" extent="30pt" display-align="after"/>\r
-        </fo:simple-page-master>\r
-      </fo:layout-master-set>\r
-      \r
-      <fo:page-sequence master-reference="before">\r
-        <fo:static-content flow-name="xsl-region-before">\r
-          <fo:table width="20pt" table-layout="fixed" border="1pt solid red">\r
-                         <fo:table-column column-number="1" width="100%"/>\r
-                         <fo:table-body>\r
-                                 <fo:table-row>\r
-                                         <fo:table-cell column-number="1">\r
-                                                 <fo:block>X</fo:block>\r
-                                         </fo:table-cell>\r
-                                 </fo:table-row>\r
-                         </fo:table-body>\r
-          </fo:table>\r
-        </fo:static-content>\r
-        <fo:static-content flow-name="xsl-region-after">\r
-          <fo:table width="20pt" table-layout="fixed" border="1pt solid red">\r
-                         <fo:table-column column-number="1" width="100%"/>\r
-                         <fo:table-body>\r
-                                 <fo:table-row>\r
-                                         <fo:table-cell column-number="1">\r
-                                                 <fo:block>X</fo:block>\r
-                                         </fo:table-cell>\r
-                                 </fo:table-row>\r
-                         </fo:table-body>\r
-          </fo:table> \r
-       </fo:static-content>\r
-        <fo:static-content flow-name="xsl-region-start">\r
-          <fo:table width="20pt" table-layout="fixed" border="1pt solid red">\r
-                         <fo:table-column column-number="1" width="100%"/>\r
-                         <fo:table-body>\r
-                                 <fo:table-row>\r
-                                         <fo:table-cell column-number="1">\r
-                                                 <fo:block>X</fo:block>\r
-                                         </fo:table-cell>\r
-                                 </fo:table-row>\r
-                         </fo:table-body>\r
-          </fo:table>\r
-        </fo:static-content>\r
-        <fo:static-content flow-name="xsl-region-end">\r
-          <fo:table width="20pt" table-layout="fixed" border="1pt solid red">\r
-                         <fo:table-column column-number="1" width="100%"/>\r
-                         <fo:table-body>\r
-                                 <fo:table-row>\r
-                                         <fo:table-cell column-number="1">\r
-                                                 <fo:block>X</fo:block>\r
-                                         </fo:table-cell>\r
-                                 </fo:table-row>\r
-                         </fo:table-body>\r
-          </fo:table>\r
-        </fo:static-content>\r
-               <fo:flow flow-name="xsl-region-body">\r
-          <fo:table width="20pt" table-layout="fixed" border="1pt solid red">\r
-                         <fo:table-column column-number="1" width="100%"/>\r
-                         <fo:table-body>\r
-                                 <fo:table-row>\r
-                                         <fo:table-cell column-number="1">\r
-                                                 <fo:block>X</fo:block>\r
-                                         </fo:table-cell>\r
-                                 </fo:table-row>\r
-                         </fo:table-body>\r
-          </fo:table>\r
-        </fo:flow>\r
-      </fo:page-sequence>\r
-\r
-      <fo:page-sequence master-reference="center">\r
-        <fo:static-content flow-name="xsl-region-before">\r
-          <fo:table width="20pt" table-layout="fixed" border="1pt solid red">\r
-                         <fo:table-column column-number="1" width="100%"/>\r
-                         <fo:table-body>\r
-                                 <fo:table-row>\r
-                                         <fo:table-cell column-number="1">\r
-                                                 <fo:block>X</fo:block>\r
-                                         </fo:table-cell>\r
-                                 </fo:table-row>\r
-                         </fo:table-body>\r
-          </fo:table>\r
-        </fo:static-content>\r
-        <fo:static-content flow-name="xsl-region-after">\r
-          <fo:table width="20pt" table-layout="fixed" border="1pt solid red">\r
-                         <fo:table-column column-number="1" width="100%"/>\r
-                         <fo:table-body>\r
-                                 <fo:table-row>\r
-                                         <fo:table-cell column-number="1">\r
-                                                 <fo:block>X</fo:block>\r
-                                         </fo:table-cell>\r
-                                 </fo:table-row>\r
-                         </fo:table-body>\r
-          </fo:table>\r
-       </fo:static-content>\r
-        <fo:static-content flow-name="xsl-region-start">\r
-          <fo:table width="20pt" table-layout="fixed" border="1pt solid red">\r
-                         <fo:table-column column-number="1" width="100%"/>\r
-                         <fo:table-body>\r
-                                 <fo:table-row>\r
-                                         <fo:table-cell column-number="1">\r
-                                                 <fo:block>X</fo:block>\r
-                                         </fo:table-cell>\r
-                                 </fo:table-row>\r
-                         </fo:table-body>\r
-          </fo:table>\r
-        </fo:static-content>\r
-        <fo:static-content flow-name="xsl-region-end">\r
-          <fo:table width="20pt" table-layout="fixed" border="1pt solid red">\r
-                         <fo:table-column column-number="1" width="100%"/>\r
-                         <fo:table-body>\r
-                                 <fo:table-row>\r
-                                         <fo:table-cell column-number="1">\r
-                                                 <fo:block>X</fo:block>\r
-                                         </fo:table-cell>\r
-                                 </fo:table-row>\r
-                         </fo:table-body>\r
-          </fo:table>\r
-        </fo:static-content>\r
-               <fo:flow flow-name="xsl-region-body">\r
-          <fo:table width="20pt" table-layout="fixed" border="1pt solid red">\r
-                         <fo:table-column column-number="1" width="100%"/>\r
-                         <fo:table-body>\r
-                                 <fo:table-row>\r
-                                         <fo:table-cell column-number="1">\r
-                                                 <fo:block>X</fo:block>\r
-                                         </fo:table-cell>\r
-                                 </fo:table-row>\r
-                         </fo:table-body>\r
-          </fo:table>\r
-        </fo:flow>\r
-      </fo:page-sequence>\r
-\r
-      <fo:page-sequence master-reference="after">\r
-        <fo:static-content flow-name="xsl-region-before">\r
-          <fo:table width="20pt" table-layout="fixed" border="1pt solid red">\r
-                         <fo:table-column column-number="1" width="100%"/>\r
-                         <fo:table-body>\r
-                                 <fo:table-row>\r
-                                         <fo:table-cell column-number="1">\r
-                                                 <fo:block>X</fo:block>\r
-                                         </fo:table-cell>\r
-                                 </fo:table-row>\r
-                         </fo:table-body>\r
-          </fo:table>\r
-        </fo:static-content>\r
-        <fo:static-content flow-name="xsl-region-after">\r
-          <fo:table width="20pt" table-layout="fixed" border="1pt solid red">\r
-                         <fo:table-column column-number="1" width="100%"/>\r
-                         <fo:table-body>\r
-                                 <fo:table-row>\r
-                                         <fo:table-cell column-number="1">\r
-                                                 <fo:block>X</fo:block>\r
-                                         </fo:table-cell>\r
-                                 </fo:table-row>\r
-                         </fo:table-body>\r
-          </fo:table>\r
-        </fo:static-content>\r
-        <fo:static-content flow-name="xsl-region-start">\r
-          <fo:table width="20pt" table-layout="fixed" border="1pt solid red">\r
-                         <fo:table-column column-number="1" width="100%"/>\r
-                         <fo:table-body>\r
-                                 <fo:table-row>\r
-                                         <fo:table-cell column-number="1">\r
-                                                 <fo:block>X</fo:block>\r
-                                         </fo:table-cell>\r
-                                 </fo:table-row>\r
-                         </fo:table-body>\r
-          </fo:table>\r
-        </fo:static-content>\r
-        <fo:static-content flow-name="xsl-region-end">\r
-          <fo:table width="20pt" table-layout="fixed" border="1pt solid red">\r
-                         <fo:table-column column-number="1" width="100%"/>\r
-                         <fo:table-body>\r
-                                 <fo:table-row>\r
-                                         <fo:table-cell column-number="1">\r
-                                                 <fo:block>X</fo:block>\r
-                                         </fo:table-cell>\r
-                                 </fo:table-row>\r
-                         </fo:table-body>\r
-          </fo:table>\r
-        </fo:static-content>\r
-               <fo:flow flow-name="xsl-region-body">\r
-          <fo:table width="20pt" table-layout="fixed" border="1pt solid red">\r
-                         <fo:table-column column-number="1" width="100%"/>\r
-                         <fo:table-body>\r
-                                 <fo:table-row>\r
-                                         <fo:table-cell column-number="1">\r
-                                                 <fo:block>X</fo:block>\r
-                                         </fo:table-cell>\r
-                                 </fo:table-row>\r
-                         </fo:table-body>\r
-          </fo:table>\r
-        </fo:flow>\r
-      </fo:page-sequence>\r
-    </fo:root>\r
-  </fo>\r
-  <checks>\r
-    <eval expected="0 0 360000 360000" xpath="//pageViewport[1]/@bounds"/>\r
-    <!-- display-align="center" -->\r
-    <eval expected="6800" xpath="//pageViewport[@nr='2']//regionBefore/block[1]/@bpd"/>\r
-    <eval expected="161800" xpath="//pageViewport[@nr='2']//regionStart/block[1]/@bpd"/>\r
-    <eval expected="161800" xpath="//pageViewport[@nr='2']//regionEnd/block[1]/@bpd"/>\r
-    <eval expected="6800" xpath="//pageViewport[@nr='2']//regionAfter/block[1]/@bpd"/>\r
-    <eval expected="131800" xpath="//pageViewport[@nr='2']//regionBody//block[1]/@bpd"/>\r
-    <!-- display-align="after" -->\r
-    <eval expected="13600" xpath="//pageViewport[@nr='3']//regionBefore/block[1]/@bpd"/>\r
-    <eval expected="323600" xpath="//pageViewport[@nr='3']//regionStart/block[1]/@bpd"/>\r
-    <eval expected="323600" xpath="//pageViewport[@nr='3']//regionEnd/block[1]/@bpd"/>\r
-    <eval expected="13600" xpath="//pageViewport[@nr='3']//regionAfter/block[1]/@bpd"/>\r
-    <eval expected="263600" xpath="//pageViewport[@nr='3']//regionBody//block[1]/@bpd"/>\r
-  </checks>\r
-</testcase>\r
+<?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 the implementation of display-align in all regions.
+    </p>
+  </info>
+  <fo>
+    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+      <fo:layout-master-set>
+        <fo:simple-page-master master-name="before" page-width="5in" page-height="5in" margin="10pt">
+          <fo:region-body background-color="rgb(100%, 100%, 80%)" margin="30pt" display-align="before"/>
+          <fo:region-before background-color="rgb(100%, 80%, 80%)" extent="30pt" display-align="before"/>
+          <fo:region-after background-color="rgb(80%, 80%, 80%)" extent="30pt" display-align="before"/>
+          <fo:region-start background-color="rgb(80%, 100%, 80%)" extent="30pt" display-align="before"/>
+          <fo:region-end background-color="rgb(80%, 80%, 100%)" extent="30pt" display-align="before"/>
+        </fo:simple-page-master>
+        <fo:simple-page-master master-name="center" page-width="5in" page-height="5in" margin="10pt">
+          <fo:region-body background-color="rgb(100%, 100%, 80%)" margin="30pt" display-align="center"/>
+          <fo:region-before background-color="rgb(100%, 80%, 80%)" extent="30pt" display-align="center"/>
+          <fo:region-after background-color="rgb(80%, 80%, 80%)" extent="30pt" display-align="center"/>
+          <fo:region-start background-color="rgb(80%, 100%, 80%)" extent="30pt" display-align="center"/>
+          <fo:region-end background-color="rgb(80%, 80%, 100%)" extent="30pt" display-align="center"/>
+        </fo:simple-page-master>
+        <fo:simple-page-master master-name="after" page-width="5in" page-height="5in" margin="10pt">
+          <fo:region-body background-color="rgb(100%, 100%, 80%)" margin="30pt" display-align="after"/>
+          <fo:region-before background-color="rgb(100%, 80%, 80%)" extent="30pt" display-align="after"/>
+          <fo:region-after background-color="rgb(80%, 80%, 80%)" extent="30pt" display-align="after"/>
+          <fo:region-start background-color="rgb(80%, 100%, 80%)" extent="30pt" display-align="after"/>
+          <fo:region-end background-color="rgb(80%, 80%, 100%)" extent="30pt" display-align="after"/>
+        </fo:simple-page-master>
+      </fo:layout-master-set>
+      
+      <fo:page-sequence master-reference="before">
+        <fo:static-content flow-name="xsl-region-before">
+          <fo:table width="20pt" table-layout="fixed" border="1pt solid red" border-collapse="separate">
+                         <fo:table-column column-number="1" width="100%"/>
+                         <fo:table-body>
+                                 <fo:table-row>
+                                         <fo:table-cell column-number="1">
+                                                 <fo:block>X</fo:block>
+                                         </fo:table-cell>
+                                 </fo:table-row>
+                         </fo:table-body>
+          </fo:table>
+        </fo:static-content>
+        <fo:static-content flow-name="xsl-region-after">
+          <fo:table width="20pt" table-layout="fixed" border="1pt solid red" border-collapse="separate">
+                         <fo:table-column column-number="1" width="100%"/>
+                         <fo:table-body>
+                                 <fo:table-row>
+                                         <fo:table-cell column-number="1">
+                                                 <fo:block>X</fo:block>
+                                         </fo:table-cell>
+                                 </fo:table-row>
+                         </fo:table-body>
+          </fo:table> 
+       </fo:static-content>
+        <fo:static-content flow-name="xsl-region-start">
+          <fo:table width="20pt" table-layout="fixed" border="1pt solid red" border-collapse="separate">
+                         <fo:table-column column-number="1" width="100%"/>
+                         <fo:table-body>
+                                 <fo:table-row>
+                                         <fo:table-cell column-number="1">
+                                                 <fo:block>X</fo:block>
+                                         </fo:table-cell>
+                                 </fo:table-row>
+                         </fo:table-body>
+          </fo:table>
+        </fo:static-content>
+        <fo:static-content flow-name="xsl-region-end">
+          <fo:table width="20pt" table-layout="fixed" border="1pt solid red" border-collapse="separate">
+                         <fo:table-column column-number="1" width="100%"/>
+                         <fo:table-body>
+                                 <fo:table-row>
+                                         <fo:table-cell column-number="1">
+                                                 <fo:block>X</fo:block>
+                                         </fo:table-cell>
+                                 </fo:table-row>
+                         </fo:table-body>
+          </fo:table>
+        </fo:static-content>
+               <fo:flow flow-name="xsl-region-body">
+          <fo:table width="20pt" table-layout="fixed" border="1pt solid red" border-collapse="separate">
+                         <fo:table-column column-number="1" width="100%"/>
+                         <fo:table-body>
+                                 <fo:table-row>
+                                         <fo:table-cell column-number="1">
+                                                 <fo:block>X</fo:block>
+                                         </fo:table-cell>
+                                 </fo:table-row>
+                         </fo:table-body>
+          </fo:table>
+        </fo:flow>
+      </fo:page-sequence>
+
+      <fo:page-sequence master-reference="center">
+        <fo:static-content flow-name="xsl-region-before">
+          <fo:table width="20pt" table-layout="fixed" border="1pt solid red" border-collapse="separate">
+                         <fo:table-column column-number="1" width="100%"/>
+                         <fo:table-body>
+                                 <fo:table-row>
+                                         <fo:table-cell column-number="1">
+                                                 <fo:block>X</fo:block>
+                                         </fo:table-cell>
+                                 </fo:table-row>
+                         </fo:table-body>
+          </fo:table>
+        </fo:static-content>
+        <fo:static-content flow-name="xsl-region-after">
+          <fo:table width="20pt" table-layout="fixed" border="1pt solid red" border-collapse="separate">
+                         <fo:table-column column-number="1" width="100%"/>
+                         <fo:table-body>
+                                 <fo:table-row>
+                                         <fo:table-cell column-number="1">
+                                                 <fo:block>X</fo:block>
+                                         </fo:table-cell>
+                                 </fo:table-row>
+                         </fo:table-body>
+          </fo:table>
+       </fo:static-content>
+        <fo:static-content flow-name="xsl-region-start">
+          <fo:table width="20pt" table-layout="fixed" border="1pt solid red" border-collapse="separate">
+                         <fo:table-column column-number="1" width="100%"/>
+                         <fo:table-body>
+                                 <fo:table-row>
+                                         <fo:table-cell column-number="1">
+                                                 <fo:block>X</fo:block>
+                                         </fo:table-cell>
+                                 </fo:table-row>
+                         </fo:table-body>
+          </fo:table>
+        </fo:static-content>
+        <fo:static-content flow-name="xsl-region-end">
+          <fo:table width="20pt" table-layout="fixed" border="1pt solid red" border-collapse="separate">
+                         <fo:table-column column-number="1" width="100%"/>
+                         <fo:table-body>
+                                 <fo:table-row>
+                                         <fo:table-cell column-number="1">
+                                                 <fo:block>X</fo:block>
+                                         </fo:table-cell>
+                                 </fo:table-row>
+                         </fo:table-body>
+          </fo:table>
+        </fo:static-content>
+               <fo:flow flow-name="xsl-region-body">
+          <fo:table width="20pt" table-layout="fixed" border="1pt solid red" border-collapse="separate">
+                         <fo:table-column column-number="1" width="100%"/>
+                         <fo:table-body>
+                                 <fo:table-row>
+                                         <fo:table-cell column-number="1">
+                                                 <fo:block>X</fo:block>
+                                         </fo:table-cell>
+                                 </fo:table-row>
+                         </fo:table-body>
+          </fo:table>
+        </fo:flow>
+      </fo:page-sequence>
+
+      <fo:page-sequence master-reference="after">
+        <fo:static-content flow-name="xsl-region-before">
+          <fo:table width="20pt" table-layout="fixed" border="1pt solid red" border-collapse="separate">
+                         <fo:table-column column-number="1" width="100%"/>
+                         <fo:table-body>
+                                 <fo:table-row>
+                                         <fo:table-cell column-number="1">
+                                                 <fo:block>X</fo:block>
+                                         </fo:table-cell>
+                                 </fo:table-row>
+                         </fo:table-body>
+          </fo:table>
+        </fo:static-content>
+        <fo:static-content flow-name="xsl-region-after">
+          <fo:table width="20pt" table-layout="fixed" border="1pt solid red" border-collapse="separate">
+                         <fo:table-column column-number="1" width="100%"/>
+                         <fo:table-body>
+                                 <fo:table-row>
+                                         <fo:table-cell column-number="1">
+                                                 <fo:block>X</fo:block>
+                                         </fo:table-cell>
+                                 </fo:table-row>
+                         </fo:table-body>
+          </fo:table>
+        </fo:static-content>
+        <fo:static-content flow-name="xsl-region-start">
+          <fo:table width="20pt" table-layout="fixed" border="1pt solid red" border-collapse="separate">
+                         <fo:table-column column-number="1" width="100%"/>
+                         <fo:table-body>
+                                 <fo:table-row>
+                                         <fo:table-cell column-number="1">
+                                                 <fo:block>X</fo:block>
+                                         </fo:table-cell>
+                                 </fo:table-row>
+                         </fo:table-body>
+          </fo:table>
+        </fo:static-content>
+        <fo:static-content flow-name="xsl-region-end">
+          <fo:table width="20pt" table-layout="fixed" border="1pt solid red" border-collapse="separate">
+                         <fo:table-column column-number="1" width="100%"/>
+                         <fo:table-body>
+                                 <fo:table-row>
+                                         <fo:table-cell column-number="1">
+                                                 <fo:block>X</fo:block>
+                                         </fo:table-cell>
+                                 </fo:table-row>
+                         </fo:table-body>
+          </fo:table>
+        </fo:static-content>
+               <fo:flow flow-name="xsl-region-body">
+          <fo:table width="20pt" table-layout="fixed" border="1pt solid red" border-collapse="separate">
+                         <fo:table-column column-number="1" width="100%"/>
+                         <fo:table-body>
+                                 <fo:table-row>
+                                         <fo:table-cell column-number="1">
+                                                 <fo:block>X</fo:block>
+                                         </fo:table-cell>
+                                 </fo:table-row>
+                         </fo:table-body>
+          </fo:table>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <eval expected="0 0 360000 360000" xpath="//pageViewport[1]/@bounds"/>
+    <!-- display-align="center" -->
+    <eval expected="6800" xpath="//pageViewport[@nr='2']//regionBefore/block[1]/@bpd"/>
+    <eval expected="161800" xpath="//pageViewport[@nr='2']//regionStart/block[1]/@bpd"/>
+    <eval expected="161800" xpath="//pageViewport[@nr='2']//regionEnd/block[1]/@bpd"/>
+    <eval expected="6800" xpath="//pageViewport[@nr='2']//regionAfter/block[1]/@bpd"/>
+    <eval expected="131800" xpath="//pageViewport[@nr='2']//regionBody//block[1]/@bpd"/>
+    <!-- display-align="after" -->
+    <eval expected="13600" xpath="//pageViewport[@nr='3']//regionBefore/block[1]/@bpd"/>
+    <eval expected="323600" xpath="//pageViewport[@nr='3']//regionStart/block[1]/@bpd"/>
+    <eval expected="323600" xpath="//pageViewport[@nr='3']//regionEnd/block[1]/@bpd"/>
+    <eval expected="13600" xpath="//pageViewport[@nr='3']//regionAfter/block[1]/@bpd"/>
+    <eval expected="263600" xpath="//pageViewport[@nr='3']//regionBody//block[1]/@bpd"/>
+  </checks>
+</testcase>

diff --git a/test/layoutengine/standard-testcases/table_table-layout_fixed_2.xml b/test/layoutengine/standard-testcases/table_table-layout_fixed_2.xml
index 3ca02190e50d6c048c29a013a5a3ece77f29deed..cd611fca2fb4fed1980c214bd795e610f82b7151 100644 (file)
--- a/test/layoutengine/standard-testcases/table_table-layout_fixed_2.xml
+++ b/test/layoutengine/standard-testcases/table_table-layout_fixed_2.xml
@@ -34,7 +34,7 @@
       </fo:layout-master-set>
       <fo:page-sequence master-reference="normal" white-space-collapse="true">
         <fo:flow flow-name="xsl-region-body">
-          <fo:table table-layout="fixed" width="300pt" border="solid 5pt">
+          <fo:table table-layout="fixed" width="300pt" border="solid 5pt" border-collapse="separate">
             <fo:table-body>
               <fo:table-cell width="100pt">
                 <fo:block>cell1</fo:block>