Rework of the marker/retrieve-marker implementation to cater for correct evaluation of percentages and relative font-sizes, as well as more correct white-space handling.

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

1 files changed, 98 insertions, 0 deletions

diff --git a/test/fotree/testcases/table-cell_column-number_rowspan_bug38397.fo b/test/fotree/testcases/table-cell_column-number_rowspan_bug38397.fo
new file mode 100644
index 000000000..0cf275217
--- /dev/null
+++ b/test/fotree/testcases/table-cell_column-number_rowspan_bug38397.fo
@@ -0,0 +1,98 @@
+<?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$ -->
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg"
+         xmlns:test="http://xmlgraphics.apache.org/fop/test">
+  <fo:layout-master-set>
+    <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">
+      <fo:region-body/>
+    </fo:simple-page-master>
+  </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="100%" border-collapse="separate">
+        <fo:table-column column-width="proportional-column-width(1)"/>
+        <fo:table-column column-width="proportional-column-width(1)"/>
+        <fo:table-column column-width="proportional-column-width(2)"/>
+        <fo:table-column column-width="proportional-column-width(2)"/>
+        <fo:table-body>
+          <fo:table-row>
+            <fo:table-cell number-rows-spanned="3" number-columns-spanned="2" display-align="center" border="solid 0.5pt">
+              <test:assert property="column-number" expected="1" />
+              <fo:block>cell1</fo:block>
+            </fo:table-cell>
+            <fo:table-cell number-rows-spanned="2" display-align="center" border="solid 0.5pt">
+              <test:assert property="column-number" expected="3" />
+              <fo:block>cell2</fo:block>
+            </fo:table-cell>
+            <fo:table-cell border="solid 0.5pt">
+              <test:assert property="column-number" expected="4" />
+              <fo:block>cell3</fo:block>
+            </fo:table-cell>
+          </fo:table-row>
+          <fo:table-row background-color="yellow">
+            <fo:table-cell border="solid 0.5pt">
+              <test:assert property="column-number" expected="4" />
+              <fo:block>cell4</fo:block>
+            </fo:table-cell>
+          </fo:table-row>
+          <fo:table-row>
+            <fo:table-cell number-rows-spanned="2" display-align="center" border="solid 0.5pt">
+              <test:assert property="column-number" expected="3" />
+              <fo:block>cell5</fo:block>
+            </fo:table-cell>
+            <fo:table-cell border="solid 0.5pt">
+              <test:assert property="column-number" expected="4" />
+              <fo:block>cell6</fo:block>
+            </fo:table-cell>
+          </fo:table-row>
+          <fo:table-row background-color="yellow">
+            <fo:table-cell number-rows-spanned="3" display-align="center" border="solid 0.5pt">
+              <test:assert property="column-number" expected="1" />
+              <fo:block>cell7</fo:block>
+            </fo:table-cell>
+            <fo:table-cell number-rows-spanned="3" display-align="center" border="solid 0.5pt">
+              <test:assert property="column-number" expected="2" />
+              <fo:block>cell8</fo:block>
+            </fo:table-cell>
+            <fo:table-cell border="solid 0.5pt">
+              <test:assert property="column-number" expected="4" />
+              <fo:block>cell9</fo:block>
+            </fo:table-cell>
+          </fo:table-row>
+          <fo:table-row>
+            <fo:table-cell number-rows-spanned="2" display-align="center" border="solid 0.5pt">
+              <test:assert property="column-number" expected="3" />
+              <fo:block>cell10</fo:block>
+            </fo:table-cell>
+            <fo:table-cell border="solid 0.5pt">
+              <test:assert property="column-number" expected="4" />
+              <fo:block>cell11</fo:block>
+            </fo:table-cell>
+          </fo:table-row>
+          <fo:table-row background-color="yellow">
+            <fo:table-cell border="solid 0.5pt">
+              <test:assert property="column-number" expected="4" />
+              <fo:block>cell12</fo:block>
+            </fo:table-cell>
+          </fo:table-row>
+        </fo:table-body>
+      </fo:table>
+    </fo:flow>
+  </fo:page-sequence>
+</fo:root>