Author: matthias
Date: Sat Apr 29 22:17:48 2017
New Revision: 1793236
URL: http://svn.apache.org/viewvc?rev=1793236&view=rev
Log:
FOP-2570: fix border placement of spanned table cells in r-l writing-mode
Added:
xmlgraphics/fop/trunk/fop/test/layoutengine/standard-testcases/table-border-span-rl.xml
Modified:
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java?rev=1793236&r1=1793235&r2=1793236&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java Sat Apr 29 22:17:48 2017
@@ -471,17 +471,30 @@ public class TableCellLayoutManager exte
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;
Added: xmlgraphics/fop/trunk/fop/test/layoutengine/standard-testcases/table-border-span-rl.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop/test/layoutengine/standard-testcases/table-border-span-rl.xml?rev=1793236&view=auto
==============================================================================
--- xmlgraphics/fop/trunk/fop/test/layoutengine/standard-testcases/table-border-span-rl.xml (added)
+++ xmlgraphics/fop/trunk/fop/test/layoutengine/standard-testcases/table-border-span-rl.xml Sat Apr 29 22:17:48 2017
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+ 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: table-border-separate3.xml 627324 2008-02-13 09:35:01Z maxberger $ -->
+<testcase>
+ <info>
+ <p>This test checks correct placement of table borders of spanned table cells in right-to-left writing mode.</p>
+ </info>
+ <fo>
+ <fo:root
+ xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">
+ <fo:layout-master-set>
+ <fo:simple-page-master margin="20mm" master-name="A4" page-height="210mm" page-width="297mm">
+ <fo:region-body/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="A4">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block-container writing-mode="rl-tb">
+ <fo:table border-collapse="collapse" table-layout="fixed" width="100%">
+ <fo:table-column column-width="50%"/>
+ <fo:table-column column-width="30%"/>
+ <fo:table-column column-width="20%"/>
+ <fo:table-body>
+ <fo:table-row height="10pt" keep-together.within-page="auto">
+ <fo:table-cell border-color="#000000" border-style="solid" border-width="1pt" number-columns-spanned="3">
+ <fo:block>A1,B1,C1</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell border-color="#000000" border-style="solid">
+ <fo:block>A2</fo:block>
+ </fo:table-cell>
+ <fo:table-cell border-color="#000000" border-style="solid">
+ <fo:block>B2</fo:block>
+ </fo:table-cell>
+ <fo:table-cell border-color="#000000" border-style="solid">
+ <fo:block>C2</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell border-color="#000000" border-style="solid" number-columns-spanned="2">
+ <fo:block>A2,B2</fo:block>
+ </fo:table-cell>
+ <fo:table-cell border-color="#000000" border-style="solid">
+ <fo:block>C2</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell border-color="#000000" border-style="solid">
+ <fo:block>A3</fo:block>
+ </fo:table-cell>
+ <fo:table-cell border-color="#000000" border-style="solid" number-columns-spanned="2">
+ <fo:block>B3,C3</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ </fo:table-body>
+ </fo:table>
+ </fo:block-container>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <!-- ************** ROW 1 ************** -->
+ <!-- Border top, bottom and left of TCU 1 -->
+ <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"/>
+ <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"/>
+
+ <!-- Border top and bottom of TCU 2 -->
+ <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"/>
+ <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"/>
+
+ <!-- Border top, bottom and right of TCU 3 -->
+ <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"/>
+ <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"/>
+
+
+ <!-- ************** ROW 2 ************** -->
+ <!-- Border top, bottom, left and right of TCU 1 -->
+ <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"/>
+ <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"/>
+
+ <!-- Border top, bottom, left and right of TCU 2 -->
+ <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"/>
+ <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"/>
+
+ <!-- Border top, bottom, left and right of TCU 3 -->
+ <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"/>
+ <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"/>
+
+ <!-- ************** ROW 3 ************** -->
+ <!-- Border top, bottom and left of TCU 2 -->
+ <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"/>
+ <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"/>
+
+ <!-- Border top, bottom and right of TCU 3 -->
+ <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"/>
+ <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"/>
+
+ <!-- Border top, bottom, left and right of TCU 1 -->
+ <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"/>
+ <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"/>
+
+
+ <!-- ************** ROW 4 ************** -->
+ <!-- Border top, bottom, left and right of TCU 3 -->
+ <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"/>
+ <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"/>
+
+ <!-- Border top, bottom and left of TCU 1 -->
+ <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"/>
+ <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"/>
+
+ <!-- Border top, bottom and right of TCU 2 -->
+ <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"/>
+ <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"/>
+ </checks>
+</testcase>
\ No newline at end of file
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.