Bugzilla #48082: value of conditional space not always taken into account in the calculation of a table's height

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

3 files changed, 71 insertions, 0 deletions

diff --git a/src/java/org/apache/fop/layoutmgr/table/ActiveCell.java b/src/java/org/apache/fop/layoutmgr/table/ActiveCell.java
index f249d769f..abcde41c7 100644
--- a/src/java/org/apache/fop/layoutmgr/table/ActiveCell.java
+++ b/src/java/org/apache/fop/layoutmgr/table/ActiveCell.java
@@ -398,7 +398,9 @@ class ActiveCell {
     private void increaseCurrentStep(int limit) {
         if (nextStep.end < elementList.size() - 1) {
             while (afterNextStep.totalLength <= limit && nextStep.breakClass == Constants.EN_AUTO) {
+                int condBeforeContentLength = nextStep.condBeforeContentLength;
                 nextStep.set(afterNextStep);
+                nextStep.condBeforeContentLength = condBeforeContentLength;
                 if (afterNextStep.end >= elementList.size() - 1) {
                     break;
                 }
diff --git a/status.xml b/status.xml
index c48992255..f3f22de2e 100644
--- a/status.xml
+++ b/status.xml
@@ -58,6 +58,10 @@
       documents. Example: the fix of marks layering will be such a case when it's done.
     -->
     <release version="FOP Trunk" date="TBD">
+      <action context="Layout" dev="VH" type="fix" fixes-bug="48082">
+        Bugfix: value of conditional space not always taken into account in the calculation of a 
+        table’s height.
+      </action>
       <action context="Renderers" dev="JM,VH" type="add" fixes-bug="46705" due-to="Jost Klopfstein">
         Added basic accessibility and Tagged PDF support. 
       </action>
diff --git a/test/layoutengine/standard-testcases/table_conditional-space.xml b/test/layoutengine/standard-testcases/table_conditional-space.xml
new file mode 100644
index 000000000..8b0b72558
--- /dev/null
+++ b/test/layoutengine/standard-testcases/table_conditional-space.xml
@@ -0,0 +1,65 @@
+<?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>
+      Bugzilla #48082: in some cases the value of a conditional space is not taken into account in 
+      the calculation of the table height.
+    </p>
+  </info>
+  <fo>
+    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
+      <fo:layout-master-set>
+        <fo:simple-page-master master-name="page" page-height="120pt" page-width="220pt">
+          <fo:region-body margin="10pt" background-color="#F0F0F0"/>
+        </fo:simple-page-master>
+      </fo:layout-master-set>
+      <fo:page-sequence master-reference="page" font-size="8pt" line-height="10pt">
+        <fo:flow flow-name="xsl-region-body">
+          <fo:table width="100%" table-layout="fixed" id="surrounding">
+            <fo:table-body>
+              <fo:table-row>
+                <fo:table-cell background-color="blue">
+                  <fo:block padding-after="20pt" background-color="yellow">Cell 1 Line 1</fo:block>
+                </fo:table-cell>
+                <fo:table-cell>
+                  <fo:block background-color="pink">
+                    <fo:block space-after="7pt">Cell 2 Line 1</fo:block>
+                  </fo:block>
+                  <fo:block background-color="orange">
+                    <fo:block>Cell 2 Line 2</fo:block>
+                    <fo:block>Cell 2 Line 3</fo:block>
+                  </fo:block>
+                </fo:table-cell>
+              </fo:table-row>
+            </fo:table-body>
+          </fo:table>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <eval expected="37000" xpath="//flow/block/@bpd"/>
+    <eval expected="37000" xpath="//flow/block/block[1]/@bpd"/>
+    <eval expected="30000" xpath="//flow/block/block[1]/block/@bpda"/>
+    <eval expected="37000" xpath="//flow/block/block[2]/@bpd"/>
+    <eval expected="17000" xpath="//flow/block/block[2]/block[1]/@bpd"/>
+    <eval expected="20000" xpath="//flow/block/block[2]/block[2]/@bpd"/>
+  </checks>
+</testcase>