Bugfix: Table headers and footers were swallowed when a table was nested in a list...

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

diff --git a/src/java/org/apache/fop/layoutmgr/list/ListItemContentLayoutManager.java b/src/java/org/apache/fop/layoutmgr/list/ListItemContentLayoutManager.java
index 6e647353e7d37e8fc451066afc8253d75a23bcfa..41ab67dcd9d682d190cf5eae000becafaa5f60ce 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/list/ListItemContentLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/list/ListItemContentLayoutManager.java
@@ -30,6 +30,7 @@ import org.apache.fop.layoutmgr.PositionIterator;
 import org.apache.fop.layoutmgr.Position;
 import org.apache.fop.layoutmgr.NonLeafPosition;
 import org.apache.fop.layoutmgr.TraitSetter;
+import org.apache.fop.layoutmgr.SpaceResolver.SpaceHandlingBreakPosition;
 import org.apache.fop.area.Area;
 import org.apache.fop.area.Block;
 
@@ -145,6 +146,8 @@ public class ListItemContentLayoutManager extends BlockStackingLayoutManager {
                 if (firstLM == null) {
                     firstLM = lastLM;
                 }
+            } else if (pos instanceof SpaceHandlingBreakPosition) {
+                positionList.add(pos);
             } else {
                 // pos was created by this ListBlockLM, so it must be ignored
             }

diff --git a/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java b/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java
index 6bcbf4de08d01d20727245ff0a5dc5894f1f36e7..336d34f30b04ec553293679f9c992b3ff6f2d43b 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java
@@ -288,7 +288,21 @@ public class ListItemLayoutManager extends BlockStackingLayoutManager
             int penaltyHeight = step 
                 + getMaxRemainingHeight(fullHeights, partialHeights) 
                 - totalHeight;
+            
+            //Additional penalty height from penalties in the source lists
+            int additionalPenaltyHeight = 0;
+            KnuthElement endEl = (KnuthElement)elementLists[0].get(end[0]);
+            if (endEl instanceof KnuthPenalty) {
+                additionalPenaltyHeight = ((KnuthPenalty)endEl).getW();
+            }
+            endEl = (KnuthElement)elementLists[1].get(end[1]);
+            if (endEl instanceof KnuthPenalty) {
+                additionalPenaltyHeight = Math.max(
+                        additionalPenaltyHeight, ((KnuthPenalty)endEl).getW());
+            }
+            
             int boxHeight = step - addedBoxHeight - penaltyHeight;
+            penaltyHeight += additionalPenaltyHeight; //Add AFTER calculating boxHeight!
 
             // add the new elements
             addedBoxHeight += boxHeight;
@@ -300,7 +314,6 @@ public class ListItemLayoutManager extends BlockStackingLayoutManager
                 if (keepWithNextActive || mustKeepTogether()) {
                     p = KnuthPenalty.INFINITE;
                 }
-                //returnList.add(new KnuthPenalty(penaltyHeight, p, false, stepPosition, false));
                 returnList.add(new BreakElement(stepPosition, penaltyHeight, p, -1, context));
             }
         }

diff --git a/status.xml b/status.xml
index 0346342883214562ebba99d7fc8a7afe4c791718..a12885ecdfe14ebc7fa0e8f3ecec5f6fee2105e3 100644 (file)
--- a/status.xml
+++ b/status.xml
@@ -28,6 +28,9 @@
 
   <changes>
     <release version="FOP Trunk">
+      <action context="Code" dev="JM" type="fix">
+        Bugfix: Table headers and footers were swallowed when a table was nested in a list-block.
+      </action>
       <action context="Code" dev="JM" type="fix">
         Fixed a bug with indent handling when margins are used on a surrounding block and 
         not start/end-indent.

diff --git a/test/layoutengine/standard-testcases/table-header_in_list_bug.xml b/test/layoutengine/standard-testcases/table-header_in_list_bug.xml
new file mode 100644 (file)
index 0000000..f235786
--- /dev/null
+++ b/test/layoutengine/standard-testcases/table-header_in_list_bug.xml
@@ -0,0 +1,115 @@
+<?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 lists with nested fo:tables. Table headers used to be
+      swallowed.
+    </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="3in" page-height="1in">
+          <fo:region-body/>
+        </fo:simple-page-master>
+      </fo:layout-master-set>
+      <fo:page-sequence master-reference="normal">
+        <fo:flow flow-name="xsl-region-body">
+          <fo:list-block>
+            <fo:list-item>
+              <fo:list-item-label end-indent="label-end()">
+                <fo:block>1.</fo:block>
+              </fo:list-item-label>
+              <fo:list-item-body start-indent="body-start()">
+                <fo:table table-layout="fixed" width="100%" border-collapse="separate" id="table">
+                  <fo:table-column column-width="100pt" text-align="right"/>
+                  <fo:table-header>
+                    <fo:table-row>
+                      <fo:table-cell padding-left="3pt" padding-top="1pt" border-style="solid" border-width="thin" padding-right="0.25cm" id="header-cell">
+                        <fo:block text-align="center">Header</fo:block>
+                      </fo:table-cell>
+                    </fo:table-row>
+                  </fo:table-header>
+                  <fo:table-body>
+                    <fo:table-row>
+                      <fo:table-cell padding-left="3pt" padding-top="1pt" border-style="solid" border-width="thin" padding-right="0.25cm">
+                        <fo:block text-align="right">1</fo:block>
+                      </fo:table-cell>
+                    </fo:table-row>
+                    <fo:table-row>
+                      <fo:table-cell padding-left="3pt" padding-top="1pt" border-style="solid" border-width="thin" padding-right="0.25cm">
+                        <fo:block text-align="right">2</fo:block>
+                      </fo:table-cell>
+                    </fo:table-row>
+                    <fo:table-row>
+                      <fo:table-cell padding-left="3pt" padding-top="1pt" border-style="solid" border-width="thin" padding-right="0.25cm">
+                        <fo:block text-align="right">3</fo:block>
+                      </fo:table-cell>
+                    </fo:table-row>
+                    <fo:table-row>
+                      <fo:table-cell padding-left="3pt" padding-top="1pt" border-style="solid" border-width="thin" padding-right="0.25cm">
+                        <fo:block text-align="right">4</fo:block>
+                      </fo:table-cell>
+                    </fo:table-row>
+                    <fo:table-row>
+                      <fo:table-cell padding-left="3pt" padding-top="1pt" border-style="solid" border-width="thin" padding-right="0.25cm">
+                        <fo:block text-align="right">5</fo:block>
+                      </fo:table-cell>
+                    </fo:table-row>
+                    <fo:table-row>
+                      <fo:table-cell padding-left="3pt" padding-top="1pt" border-style="solid" border-width="thin" padding-right="0.25cm">
+                        <fo:block text-align="right">6</fo:block>
+                      </fo:table-cell>
+                    </fo:table-row>
+                    <fo:table-row>
+                      <fo:table-cell padding-left="3pt" padding-top="1pt" border-style="solid" border-width="thin" padding-right="0.25cm">
+                        <fo:block text-align="right">7</fo:block>
+                      </fo:table-cell>
+                    </fo:table-row>
+                    <fo:table-row>
+                      <fo:table-cell padding-left="3pt" padding-top="1pt" border-style="solid" border-width="thin" padding-right="0.25cm">
+                        <fo:block text-align="right">8</fo:block>
+                      </fo:table-cell>
+                    </fo:table-row>
+                  </fo:table-body>
+                </fo:table>
+              </fo:list-item-body>
+            </fo:list-item>
+          </fo:list-block>
+          <fo:block font-size="8pt">
+            <fo:block>trailing text...</fo:block>
+            <fo:block>trailing text...</fo:block>
+          </fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <true xpath="boolean(//pageViewport[@nr='1']//block[@prod-id='header-cell'])"/>
+    <eval expected="4" xpath="count(//pageViewport[@nr='1']//block[@prod-id='table']/block)"/>
+    
+    <true xpath="boolean(//pageViewport[@nr='2']//block[@prod-id='header-cell'])"/>
+    <eval expected="4" xpath="count(//pageViewport[@nr='2']//block[@prod-id='table']/block)"/>
+    
+    <true xpath="boolean(//pageViewport[@nr='3']//block[@prod-id='header-cell'])"/>
+    <eval expected="3" xpath="count(//pageViewport[@nr='3']//block[@prod-id='table']/block)"/>
+    
+  </checks>
+</testcase>