Bugzilla #43766: breaks generated by the merging algorithm for table rows containing...

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

diff --git a/src/java/org/apache/fop/layoutmgr/table/ActiveCell.java b/src/java/org/apache/fop/layoutmgr/table/ActiveCell.java
index 22c4f4191320306415cc6c6c7b1941dfed60f2ff..f1769158fcfbf404f427da05334a34321769883d 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/table/ActiveCell.java
+++ b/src/java/org/apache/fop/layoutmgr/table/ActiveCell.java
@@ -251,7 +251,7 @@ class ActiveCell {
      * @return true if this cell's first step is inferior or equal to the current one 
      */
     boolean hasStarted() {
-        return includedLength > 0;
+        return includedLength >= 0;
     }
 
     /**

diff --git a/status.xml b/status.xml
index 20df48aad2d62419ea0abc939b8b1a6d306497ce..5a605f55c8666edd1ceb73a3e464e36b3003cd81 100644 (file)
--- a/status.xml
+++ b/status.xml
@@ -28,6 +28,10 @@
 
   <changes>
     <release version="FOP Trunk">
+      <action context="Code" dev="VH" type="fix" fixes-bug="43766">
+        Bugfix: breaks generated by the merging algorithm for a table-row containing empty cells had always a
+        penalty of 900.
+      </action>
       <action context="Code" dev="JM" type="add" fixes-bug="43605" due-to="V. Schappert">
         Added methods for fo:page-number-citation(-last) in FOEventHandler.
       </action>

diff --git a/test/layoutengine/standard-testcases/table_empty-cells.xml b/test/layoutengine/standard-testcases/table_empty-cells.xml
new file mode 100644 (file)
index 0000000..9d93aaa
--- /dev/null
+++ b/test/layoutengine/standard-testcases/table_empty-cells.xml
@@ -0,0 +1,101 @@
+<?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 that tables with empty cells are handled correctly. There was a bug (#43766)
+      which caused every break possibility of a row containing an empty cell to have a 900 penalty.
+    </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="6cm" page-width="15cm"
+          margin-top="5mm" margin-bottom="5mm" margin-left="2cm" margin-right="2cm">
+          <fo:region-body margin-top="5mm" margin-bottom="5mm"/>
+          <fo:region-before extent="5mm" display-align="after"/>
+          <fo:region-after extent="5mm"/>
+        </fo:simple-page-master>
+      </fo:layout-master-set>
+      <fo:page-sequence master-reference="page" font-family="serif" font-size="12pt">
+        <fo:static-content flow-name="xsl-region-before">
+          <fo:block border-bottom="0.5pt solid black"/>
+        </fo:static-content>
+        <fo:static-content flow-name="xsl-region-after">
+          <fo:block border-top="0.5pt solid black"/>
+        </fo:static-content>
+        <fo:flow flow-name="xsl-region-body">
+          <fo:block space-after="60pt">Before the table</fo:block>
+          <fo:table width="100%" table-layout="fixed"
+            border-collapse="separate" border="1pt solid black">
+            <fo:table-column column-width="proportional-column-width(1)" number-columns-repeated="2"/>
+            <fo:table-body>
+              <fo:table-row>
+                <fo:table-cell border="1pt solid black">
+                  <fo:block>Cell 1.1</fo:block>
+                  <fo:block>Cell 1.1</fo:block>
+                  <fo:block>Cell 1.1</fo:block>
+                </fo:table-cell>
+                <fo:table-cell border="1pt solid blue">
+                  <fo:block/>
+                </fo:table-cell>
+              </fo:table-row>
+              <fo:table-row>
+                <fo:table-cell border="1pt solid black"><fo:block>Cell 2.1</fo:block></fo:table-cell>
+                <fo:table-cell border="1pt solid black"><fo:block>Cell 2.2</fo:block></fo:table-cell>
+              </fo:table-row>
+              <fo:table-row>
+                <fo:table-cell border="1pt solid black"><fo:block>Cell 3.1</fo:block></fo:table-cell>
+                <fo:table-cell border="1pt solid black"><fo:block>Cell 3.2</fo:block></fo:table-cell>
+              </fo:table-row>
+              <fo:table-row>
+                <fo:table-cell border="1pt solid black"><fo:block>Cell 4.1</fo:block></fo:table-cell>
+                <fo:table-cell border="1pt solid black"><fo:block>Cell 4.2</fo:block></fo:table-cell>
+              </fo:table-row>
+              <fo:table-row>
+                <fo:table-cell border="1pt solid black"><fo:block>Cell 5.1</fo:block></fo:table-cell>
+                <fo:table-cell border="1pt solid black"><fo:block>Cell 5.2</fo:block></fo:table-cell>
+              </fo:table-row>
+              <fo:table-row>
+                <fo:table-cell border="1pt solid black"><fo:block>Cell 6.1</fo:block></fo:table-cell>
+                <fo:table-cell border="1pt solid black"><fo:block>Cell 6.2</fo:block></fo:table-cell>
+              </fo:table-row>
+            </fo:table-body>
+          </fo:table>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <!-- Two pages -->
+    <eval expected="2" xpath="count(//pageViewport)"/>
+    <element-list category="breaker">
+      <skip>6</skip>
+      <box w="0"/>
+      <penalty p="900" w="2000"/>
+      <box w="14400"/>
+      <penalty p="0" w="2000"/>
+      <box w="14400"/>
+      <penalty p="0" w="2000"/>
+      <box w="16400"/>
+      <penalty p="0" w="0"/>
+      <skip>16</skip>
+    </element-list>
+  </checks>
+</testcase>