Improve table-unit computation if proportional-column-width() is used

as a subexpression. Fixes bug 44658.


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

1 files changed, 61 insertions, 0 deletions

diff --git a/test/layoutengine/standard-testcases/table-cell_table-units_mixed.xml b/test/layoutengine/standard-testcases/table-cell_table-units_mixed.xml
new file mode 100644
index 000000000..868b14388
--- /dev/null
+++ b/test/layoutengine/standard-testcases/table-cell_table-units_mixed.xml
@@ -0,0 +1,61 @@
+<?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 calculation of table units when the column
+      widths are a mixture of fixed and proportional widths.
+    </p>
+  </info>
+  <fo>
+    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
+      <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%">
+            <fo:table-column column-number="1" column-width="2pt + proportional-column-width(1)" />
+            <fo:table-column column-number="2" column-width="proportional-column-width(1) + 2pt" />
+            <fo:table-column column-number="3"
+            column-width="proportional-column-width(.5) + 2pt + proportional-column-width(.5)" />
+            <fo:table-body>
+              <fo:table-cell border="solid 0.5pt black" starts-row="true">
+                <fo:block>Cell 1.1</fo:block>
+              </fo:table-cell>
+              <fo:table-cell border="solid 0.5pt red">
+                <fo:block>Cell 2.2</fo:block>
+              </fo:table-cell>
+              <fo:table-cell border="solid 0.5pt yellow" ends-row="true">
+                <fo:block>Cell 3.3</fo:block>
+              </fo:table-cell>
+            </fo:table-body>
+          </fo:table>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <eval expected="119500" xpath="//flow/block/block[1]/@ipd"/>
+    <eval expected="119500" xpath="//flow/block/block[2]/@ipd"/>
+    <eval expected="119500" xpath="//flow/block/block[3]/@ipd"/>
+  </checks>
+</testcase>