FOP-2570: fix border placement of spanned table cells in r-l writing-mode

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

diff --git a/fop-core/src/main/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java b/fop-core/src/main/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java
index 42c174d64000b45f7cef3401c97571135395e153..eed28ff15a39313df0d51abdf39c7f4c01810b76 100644 (file)
--- a/fop-core/src/main/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java
+++ b/fop-core/src/main/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java
@@ -471,17 +471,30 @@ public class TableCellLayoutManager extends BlockStackingLayoutManager {
                     BorderInfo border = gridUnits[0].getBorderStart();
                     int borderWidth = border.getRetainedWidth() / 2;
                     if (borderWidth > 0) {
-                        addBorder(blocks, y, 0, Trait.BORDER_START, border,
-                                  inFirstColumn, level);
-                        adjustXOffset(blocks[y][0], borderWidth);
-                        adjustIPD(blocks[y][0], -borderWidth);
+                        if (level == 1) {
+                            addBorder(blocks, y, gridUnits.length - 1, Trait.BORDER_START, border,
+                                      inFirstColumn, level);
+                            adjustXOffset(blocks[y][gridUnits.length - 1], -borderWidth);
+                        } else {
+                            addBorder(blocks, y, 0, Trait.BORDER_START, border,
+                                      inFirstColumn, level);
+                            adjustXOffset(blocks[y][0], borderWidth);
+                            adjustIPD(blocks[y][0], -borderWidth);
+                        }
                     }
                     border = gridUnits[gridUnits.length - 1].getBorderEnd();
                     borderWidth = border.getRetainedWidth() / 2;
                     if (borderWidth > 0) {
-                        addBorder(blocks, y, gridUnits.length - 1, Trait.BORDER_END, border,
-                                  inLastColumn, level);
-                        adjustIPD(blocks[y][gridUnits.length - 1], -borderWidth);
+                        if (level == 1) {
+                            addBorder(blocks, y, 0, Trait.BORDER_END, border,
+                                      inLastColumn, level);
+                            adjustXOffset(blocks[y][0], borderWidth);
+                            adjustIPD(blocks[y][0], -borderWidth);
+                        } else {
+                            addBorder(blocks, y, gridUnits.length - 1, Trait.BORDER_END, border,
+                                    inLastColumn, level);
+                            adjustIPD(blocks[y][gridUnits.length - 1], -borderWidth);
+                        }
                     }
                 }
                 int dy = yoffset;

diff --git a/fop/test/layoutengine/standard-testcases/table-border-span-rl.xml b/fop/test/layoutengine/standard-testcases/table-border-span-rl.xml
new file mode 100644 (file)
index 0000000..6e0d46f
--- /dev/null
+++ b/fop/test/layoutengine/standard-testcases/table-border-span-rl.xml
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>\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: table-border-separate3.xml 627324 2008-02-13 09:35:01Z maxberger $ -->\r
+<testcase>\r
+  <info>\r
+    <p>This test checks correct placement of table borders of spanned table cells in right-to-left writing mode.</p>\r
+  </info>\r
+  <fo>\r
+    <fo:root \r
+      xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">\r
+      <fo:layout-master-set>\r
+        <fo:simple-page-master margin="20mm" master-name="A4" page-height="210mm" page-width="297mm">\r
+          <fo:region-body/>\r
+        </fo:simple-page-master>\r
+      </fo:layout-master-set>\r
+      <fo:page-sequence master-reference="A4">\r
+        <fo:flow flow-name="xsl-region-body">\r
+          <fo:block-container writing-mode="rl-tb">\r
+            <fo:table border-collapse="collapse" table-layout="fixed" width="100%">\r
+              <fo:table-column column-width="50%"/>\r
+              <fo:table-column column-width="30%"/>\r
+              <fo:table-column column-width="20%"/>\r
+              <fo:table-body>\r
+                <fo:table-row height="10pt" keep-together.within-page="auto">\r
+                  <fo:table-cell border-color="#000000" border-style="solid" border-width="1pt" number-columns-spanned="3">\r
+                    <fo:block>A1,B1,C1</fo:block>\r
+                  </fo:table-cell>\r
+                </fo:table-row>\r
+                <fo:table-row>\r
+                  <fo:table-cell border-color="#000000" border-style="solid">\r
+                    <fo:block>A2</fo:block>\r
+                  </fo:table-cell>\r
+                  <fo:table-cell border-color="#000000" border-style="solid">\r
+                    <fo:block>B2</fo:block>\r
+                  </fo:table-cell>\r
+                  <fo:table-cell border-color="#000000" border-style="solid">\r
+                    <fo:block>C2</fo:block>\r
+                  </fo:table-cell>\r
+                </fo:table-row>\r
+                <fo:table-row>\r
+                  <fo:table-cell border-color="#000000" border-style="solid" number-columns-spanned="2">\r
+                    <fo:block>A2,B2</fo:block>\r
+                  </fo:table-cell>\r
+                  <fo:table-cell border-color="#000000" border-style="solid">\r
+                    <fo:block>C2</fo:block>\r
+                  </fo:table-cell>\r
+                </fo:table-row>\r
+                <fo:table-row>\r
+                  <fo:table-cell border-color="#000000" border-style="solid">\r
+                    <fo:block>A3</fo:block>\r
+                  </fo:table-cell>\r
+                  <fo:table-cell border-color="#000000" border-style="solid" number-columns-spanned="2">\r
+                    <fo:block>B3,C3</fo:block>\r
+                  </fo:table-cell>\r
+                </fo:table-row>\r
+              </fo:table-body>\r
+            </fo:table>\r
+          </fo:block-container>\r
+        </fo:flow>\r
+      </fo:page-sequence>\r
+    </fo:root>\r
+  </fo>\r
+  <checks>\r
+    <!-- ************** ROW 1 ************** -->\r
+    <!-- Border top, bottom and left of TCU 1 -->\r
+    <eval expected="500" xpath="//flow/block[1]/block[1]/block[1]/block[1][@border-before and @border-after and @border-end and not(@border-start)]/@left-offset"/>\r
+    <eval expected="-500" xpath="//flow/block[1]/block[1]/block[1]/block[1][@border-before and @border-after and @border-end and not(@border-start)]/@top-offset"/>\r
+\r
+    <!-- Border top and bottom of TCU 2 -->\r
+    <eval expected="364252" xpath="//flow/block[1]/block[1]/block[1]/block[2][@border-before and @border-after and not(@border-end) and not(@border-start)]/@left-offset"/>\r
+    <eval expected="-500" xpath="//flow/block[1]/block[1]/block[1]/block[2][@border-before and @border-after and not(@border-end) and not(@border-start)]/@top-offset"/>\r
+\r
+    <!-- Border top, bottom and right of TCU 3 -->\r
+    <eval expected="582303" xpath="//flow/block[1]/block[1]/block[1]/block[3][@border-before and @border-after and @border-start and not(@border-end)]/@left-offset"/>\r
+    <eval expected="-500" xpath="//flow/block[1]/block[1]/block[1]/block[3][@border-before and @border-after and @border-start and not(@border-end)]/@top-offset"/>\r
+\r
+\r
+    <!-- ************** ROW 2 ************** -->\r
+    <!-- Border top, bottom, left and right of TCU 1 -->\r
+    <eval expected="364752" xpath="//flow/block[1]/block[1]/block[1]/block[5][.//word = 'A2'][@border-before and @border-after and @border-start and @border-end]/@left-offset"/>\r
+    <eval expected="12500" xpath="//flow/block[1]/block[1]/block[1]/block[5][.//word = 'A2'][@border-before and @border-after and @border-start and @border-end]/@top-offset"/>\r
+\r
+    <!-- Border top, bottom, left and right of TCU 2 -->\r
+    <eval expected="146201" xpath="//flow/block[1]/block[1]/block[1]/block[6][.//word = 'B2'][@border-before and @border-after and @border-end and @border-start]/@left-offset"/>\r
+    <eval expected="12500" xpath="//flow/block[1]/block[1]/block[1]/block[6][.//word = 'B2'][@border-before and @border-after and @border-end and @border-start]/@top-offset"/>\r
+\r
+    <!-- Border top, bottom, left and right of TCU 3 -->\r
+    <eval expected="500" xpath="//flow/block[1]/block[1]/block[1]/block[7][.//word = 'C2'][@border-before and @border-after and @border-end and @border-start]/@left-offset"/>\r
+    <eval expected="12500" xpath="//flow/block[1]/block[1]/block[1]/block[7][.//word = 'C2'][@border-before and @border-after and @border-end and @border-start]/@top-offset"/>\r
+\r
+    <!-- ************** ROW 3 ************** -->\r
+    <!-- Border top, bottom and left of TCU 2 -->\r
+    <eval expected="146201" xpath="//flow/block[1]/block[1]/block[1]/block[8][@border-before and @border-after and @border-end and not(@border-start)]/@left-offset"/>\r
+    <eval expected="25500" xpath="//flow/block[1]/block[1]/block[1]/block[8][@border-before and @border-after and @border-end and not(@border-start)]/@top-offset"/>\r
+\r
+    <!-- Border top, bottom and right of TCU 3 -->\r
+    <eval expected="509453" xpath="//flow/block[1]/block[1]/block[1]/block[9][@border-before and @border-after and not(@border-end) and @border-start]/@left-offset"/>\r
+    <eval expected="25500" xpath="//flow/block[1]/block[1]/block[1]/block[9][@border-before and @border-after and not(@border-end) and @border-start]/@top-offset"/>\r
+\r
+    <!-- Border top, bottom, left and right of TCU 1 -->\r
+    <eval expected="500" xpath="//flow/block[1]/block[1]/block[1]/block[11][.//word = 'C2'][@border-before and @border-after and @border-start and @border-end]/@left-offset"/>\r
+    <eval expected="25500" xpath="//flow/block[1]/block[1]/block[1]/block[11][.//word = 'C2'][@border-before and @border-after and @border-start and @border-end]/@top-offset"/>\r
+\r
+\r
+    <!-- ************** ROW 4 ************** -->\r
+    <!-- Border top, bottom, left and right of TCU 3 -->\r
+    <eval expected="364752" xpath="//flow/block[1]/block[1]/block[1]/block[12][.//word = 'A3'][@border-before and @border-after and @border-end and @border-start]/@left-offset"/>\r
+    <eval expected="38500" xpath="//flow/block[1]/block[1]/block[1]/block[12][.//word = 'A3'][@border-before and @border-after and @border-end and @border-start]/@top-offset"/>\r
+\r
+    <!-- Border top, bottom and left of TCU 1 -->\r
+    <eval expected="500" xpath="//flow/block[1]/block[1]/block[1]/block[13][@border-before and @border-after and @border-end and not(@border-start)]/@left-offset"/>\r
+    <eval expected="38500" xpath="//flow/block[1]/block[1]/block[1]/block[13][@border-before and @border-after and @border-end and not(@border-start)]/@top-offset"/>\r
+\r
+    <!-- Border top, bottom and right of TCU 2 -->\r
+    <eval expected="218051" xpath="//flow/block[1]/block[1]/block[1]/block[14][@border-before and @border-after and @border-start and not(@border-end)]/@left-offset"/>\r
+    <eval expected="38500" xpath="//flow/block[1]/block[1]/block[1]/block[14][@border-before and @border-after and @border-start and not(@border-end)]/@top-offset"/>\r
+  </checks>\r
+</testcase>
\ No newline at end of file