Fixed a bug where the area for a finished cell that is broken over pages was created...

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

diff --git a/src/java/org/apache/fop/layoutmgr/table/TableContentLayoutManager.java b/src/java/org/apache/fop/layoutmgr/table/TableContentLayoutManager.java
index 511c8559a96791305d83d949d434b563ff6781da..6847021f1ff7ebef6940a2b9846fb001bfe06c21 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/table/TableContentLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/table/TableContentLayoutManager.java
@@ -916,7 +916,8 @@ public class TableContentLayoutManager implements PercentBaseContext {
                     if (gu == null 
                             && !currentGU.isEmpty() 
                             && currentGU.getColSpanIndex() == 0 
-                            && currentGU.isLastGridUnitColSpan()) {
+                            && currentGU.isLastGridUnitColSpan()
+                            && (forcedFlush || currentGU.isLastGridUnitRowSpan())) {
                         gu = currentGU.getPrimary();
                     }
                     if (gu != null) {

diff --git a/status.xml b/status.xml
index 958eebd8b87ee81bc471c9645be2efdaa4a2281b..b8092d0f2791d1c0ff34d307a453959d81179c3c 100644 (file)
--- a/status.xml
+++ b/status.xml
@@ -27,6 +27,10 @@
 
   <changes>
     <release version="FOP Trunk">
+      <action context="Code" dev="JM" type="fix">
+        Fixed a bug where the area for a finished cell that is broken over pages was 
+        created once for each row it was spanned over instead of only once.
+      </action>
       <action context="Code" dev="JM" type="add">
         Added checks that warn about tables and block-containers that are wider than
         the available content area.

diff --git a/test/layoutengine/standard-testcases/table-cell_page-break_span.xml b/test/layoutengine/standard-testcases/table-cell_page-break_span.xml
new file mode 100644 (file)
index 0000000..406cd19
--- /dev/null
+++ b/test/layoutengine/standard-testcases/table-cell_page-break_span.xml
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright 2005 The Apache Software Foundation
+
+  Licensed 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 tables, especially table-cells. This test: page break.
+    </p>
+  </info>
+  <fo>
+    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+      <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:block-container height="3.8in">
+            <fo:block/>
+          </fo:block-container>
+          <fo:table table-layout="fixed" width="100%" border-collapse="separate">
+            <fo:table-column column-width="2in"/>
+            <fo:table-column column-width="3in"/>
+            <fo:table-body>
+              <fo:table-row>
+                <fo:table-cell border="solid 1pt" id="cell1">
+                  <fo:block>cell1</fo:block>
+                </fo:table-cell>
+                <fo:table-cell border="solid 1pt" id="cell2">
+                  <fo:block>cell2</fo:block>
+                </fo:table-cell>
+              </fo:table-row>
+              <fo:table-row>
+                <fo:table-cell number-rows-spanned="3" border="solid 1pt red" id="cell3">
+                  <fo:block>cell3</fo:block>
+                </fo:table-cell>
+                <fo:table-cell background-color="orange" border="solid 1pt" id="cell4">
+                  <fo:block>
+                    <fo:block>cell4a</fo:block>
+                    <fo:block>cell4b</fo:block>
+                    <fo:block>cell4c</fo:block>
+                    <fo:block>cell4d</fo:block>
+                    <fo:block>cell4e</fo:block>
+                    <fo:block>cell4f</fo:block>
+                    <fo:block>cell4g</fo:block>
+                  </fo:block>
+                </fo:table-cell>
+              </fo:table-row>
+              <fo:table-row>
+                <fo:table-cell border="solid 1pt blue" id="cell5">
+                  <fo:block>cell5</fo:block>
+                </fo:table-cell>
+              </fo:table-row>
+              <fo:table-row>
+                <fo:table-cell border="solid 1pt green" id="cell6">
+                  <fo:block>cell6</fo:block>
+                </fo:table-cell>
+              </fo:table-row>
+            </fo:table-body>
+          </fo:table>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <!-- page 1 -->
+    <eval expected="1" xpath="count(//pageViewport[1]//block[@prod-id='cell3'])"/>
+    <eval expected="1" xpath="count(//pageViewport[1]//block[@prod-id='cell4'])"/>
+
+    <!-- page 2 -->
+    <eval expected="1" xpath="count(//pageViewport[2]//block[@prod-id='cell3'])"/>
+    <eval expected="1" xpath="count(//pageViewport[2]//block[@prod-id='cell4'])"/>
+    <eval expected="1" xpath="count(//pageViewport[2]//block[@prod-id='cell5'])"/>
+    <eval expected="1" xpath="count(//pageViewport[2]//block[@prod-id='cell6'])"/>
+  </checks>
+</testcase>