From 6ef73d67bae51fbcf6a3cae9ec876c772ecca9dc Mon Sep 17 00:00:00 2001
From: Jeremias Maerki <jeremias@apache.org>
Date: Fri, 23 Mar 2007 14:37:19 +0000
Subject: [PATCH] Some more comments for RowPainter. Additional test that
 checks that no cell paints more than one area in that case. Because if you
 remove one or more of the checks now newly commented, you get multiple areas.

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@521744 13f79535-47bb-0310-9956-ffa450edef68
---
 .../apache/fop/layoutmgr/table/GridUnit.java  | 13 +++
 .../fop/layoutmgr/table/RowPainter.java       |  6 +-
 .../table-cell_span-combinations.xml          | 84 +++++++++++++++++++
 3 files changed, 102 insertions(+), 1 deletion(-)
 create mode 100644 test/layoutengine/standard-testcases/table-cell_span-combinations.xml

diff --git a/src/java/org/apache/fop/layoutmgr/table/GridUnit.java b/src/java/org/apache/fop/layoutmgr/table/GridUnit.java
index b472acf49..beb41f35b 100644
--- a/src/java/org/apache/fop/layoutmgr/table/GridUnit.java
+++ b/src/java/org/apache/fop/layoutmgr/table/GridUnit.java
@@ -345,11 +345,24 @@ public class GridUnit {
         buffer.append("GridUnit:");
         if (colSpanIndex > 0) {
             buffer.append(" colSpan=").append(colSpanIndex);
+            if (isLastGridUnitColSpan()) {
+                buffer.append("(last)");
+            }
         }
         if (rowSpanIndex > 0) {
             buffer.append(" rowSpan=").append(rowSpanIndex);
+            if (isLastGridUnitRowSpan()) {
+                buffer.append("(last)");
+            }
         }
         buffer.append(" startCol=").append(startCol);
+        if (!isPrimary() && getPrimary() != null) {
+            buffer.append(" primary=").append(getPrimary().getStartRow());
+            buffer.append("/").append(getPrimary().getStartCol());
+            if (getPrimary().getCell() != null) {
+                buffer.append(" id=" + getPrimary().getCell().getId());
+            }
+        }
         buffer.append(" flags=").append(Integer.toBinaryString(flags));
         return buffer.toString();
     }
diff --git a/src/java/org/apache/fop/layoutmgr/table/RowPainter.java b/src/java/org/apache/fop/layoutmgr/table/RowPainter.java
index 3e298d71c..1c640f973 100644
--- a/src/java/org/apache/fop/layoutmgr/table/RowPainter.java
+++ b/src/java/org/apache/fop/layoutmgr/table/RowPainter.java
@@ -266,11 +266,15 @@ class RowPainter {
                 PrimaryGridUnit gu = primaryGridUnits[i];
                 if (gu == null
                         && !currentGU.isEmpty()
-                        && currentGU.getColSpanIndex() == 0
+                        && currentGU.getColSpanIndex() == 0 
                         && currentGU.isLastGridUnitColSpan()
                         && (forcedFlush || currentGU.isLastGridUnitRowSpan())) {
+                    //Grid unit to be painted is not the primary
+                    //the checks above make sure no cell is painted more than once
                     gu = currentGU.getPrimary();
                 }
+                
+                //gu can still be null if we're talking about an EmptyGridUnit, for example
                 if (gu != null) {
                     addAreasForCell(gu, start[i], end[i],
                             lastRow,
diff --git a/test/layoutengine/standard-testcases/table-cell_span-combinations.xml b/test/layoutengine/standard-testcases/table-cell_span-combinations.xml
new file mode 100644
index 000000000..fc2357e9f
--- /dev/null
+++ b/test/layoutengine/standard-testcases/table-cell_span-combinations.xml
@@ -0,0 +1,84 @@
+<?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 spanned cells (especially that no cell generates more than one area).
+    </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%" border-collapse="separate">
+            <fo:table-column column-width="proportional-column-width(1)"/>
+            <fo:table-column column-width="proportional-column-width(1)"/>
+            <fo:table-column column-width="proportional-column-width(1)"/>
+            <fo:table-column column-width="proportional-column-width(1)"/>
+            <fo:table-column column-width="proportional-column-width(1)"/>
+            <fo:table-body>
+              <fo:table-row>
+                <fo:table-cell id="cell1" number-columns-spanned="4" border="solid 0.5pt">
+                  <fo:block>cell1</fo:block>
+                </fo:table-cell>
+                <fo:table-cell id="cell2" number-rows-spanned="3" display-align="center" border="solid 0.5pt">
+                  <fo:block text-align="center">cell2</fo:block>
+                </fo:table-cell>
+              </fo:table-row>
+              <fo:table-row>
+                <fo:table-cell id="cell3" number-rows-spanned="3" border="solid 0.5pt">
+                  <fo:block>cell3</fo:block>
+                </fo:table-cell>
+                <fo:table-cell id="cell4" number-columns-spanned="2" number-rows-spanned="2" border="solid 0.5pt"  background-color="lightgray">
+                  <fo:block>cell4</fo:block>
+                </fo:table-cell>
+              </fo:table-row>
+              <fo:table-row>
+                <fo:table-cell id="cell5" border="solid 0.5pt">
+                  <fo:block>cell5</fo:block>
+                </fo:table-cell>
+              </fo:table-row>
+              <fo:table-row>
+                <fo:table-cell id="cell6" number-columns-spanned="4" border="solid 0.5pt">
+                  <fo:block text-align="end">cell6</fo:block>
+                </fo:table-cell>
+              </fo:table-row>
+            </fo:table-body>
+          </fo:table>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <eval expected="1" xpath="count(//pageViewport)"/>
+    <eval expected="1" xpath="count(//block[@prod-id = 'cell1'])"/>
+    <eval expected="1" xpath="count(//block[@prod-id = 'cell2'])"/>
+    <eval expected="1" xpath="count(//block[@prod-id = 'cell3'])"/>
+    <eval expected="1" xpath="count(//block[@prod-id = 'cell4'])"/>
+    <eval expected="1" xpath="count(//block[@prod-id = 'cell5'])"/>
+    <eval expected="1" xpath="count(//block[@prod-id = 'cell6'])"/>
+    <eval expected="45200" xpath="//block[@prod-id = 'cell2']/@bpd"/>
+    <eval expected="29800" xpath="//block[@prod-id = 'cell4']/@bpd"/>
+  </checks>
+</testcase>
-- 
2.39.5