From: Steve Coffman <gears@apache.org>
Date: Tue, 16 May 2000 19:53:11 +0000 (+0000)
Subject: This patch applies Jordan Naftolin's fix for extra space being added to the bottom... 
X-Git-Tag: pre-columns~516
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=ea778ff1f7256c3a8fbc55796d317af1bd5cc624;p=xmlgraphics-fop.git

This patch applies Jordan Naftolin's fix for extra space being added to the bottom of tables. It also fixes the border.fo so the year is "2000" rather than "20000". Heh.


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

diff --git a/docs/examples/fo/border.fo b/docs/examples/fo/border.fo
index 919f291b4..ac1b3415d 100644
--- a/docs/examples/fo/border.fo
+++ b/docs/examples/fo/border.fo
@@ -41,7 +41,7 @@
             </fo:block-container>
             <fo:block-container border-color="black" border-style="solid" border-width="1pt" height="0.5cm" width="2.5cm" top="1.7cm" left="14cm" padding="2pt" position="absolute">
                 <fo:block text-align="start" space-after.optimum="3pt" line-height="15pt" font-family="sans-serif" font-size="10pt">
-					01/01/20000
+					01/01/2000
 				</fo:block>
             </fo:block-container>
             <fo:block-container border-color="black" border-style="solid" border-width="1pt" height="0.5cm" width="2.5cm" top="1.2cm" left="16.5cm" padding="2pt" position="absolute">
diff --git a/src/org/apache/fop/fo/flow/TableBody.java b/src/org/apache/fop/fo/flow/TableBody.java
index 440a53b4a..494f59718 100644
--- a/src/org/apache/fop/fo/flow/TableBody.java
+++ b/src/org/apache/fop/fo/flow/TableBody.java
@@ -156,6 +156,11 @@ public class TableBody extends FObj {
 		area.increaseHeight(areaContainer.getHeight());
 		return status;
 	    }
+		// if this is not the last row, add display space
+		if(i!=numChildren-1)
+		{
+			areaContainer.addDisplaySpace(row.getLargestCellHeight());
+		}
 	}
 	area.addChild(areaContainer);
 	areaContainer.end();
diff --git a/src/org/apache/fop/fo/flow/TableRow.java b/src/org/apache/fop/fo/flow/TableRow.java
index 5fd80a5ad..79c37bf69 100644
--- a/src/org/apache/fop/fo/flow/TableRow.java
+++ b/src/org/apache/fop/fo/flow/TableRow.java
@@ -202,7 +202,7 @@ public class TableRow extends FObj {
 	area.addChild(areaContainer);
 	areaContainer.end();
         area.setHeight(largestCellHeight);
-	area.addDisplaySpace(largestCellHeight);
+
 	// bug fix from Eric Schaeffer
 	//area.increaseHeight(largestCellHeight);
 
@@ -220,4 +220,8 @@ public class TableRow extends FObj {
     public int getAreaHeight() {
 	return areaContainer.getHeight();
     }
+	public int getLargestCellHeight()
+	{
+		return largestCellHeight;
+	}
 }