You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by ke...@apache.org on 2001/03/05 05:39:57 UTC
cvs commit: xml-fop/src/org/apache/fop/fo/flow Block.java Table.java TableBody.java TableCell.java TableRow.java
keiron 01/03/04 20:39:57
Modified: src/org/apache/fop/fo/flow Block.java Table.java
TableBody.java TableCell.java TableRow.java
Log:
properly adjusts the max height of table parts
when a footnote is added
table will not overlap with the footnote
Revision Changes Path
1.33 +4 -1 xml-fop/src/org/apache/fop/fo/flow/Block.java
Index: Block.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Block.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- Block.java 2001/03/04 21:34:51 1.32
+++ Block.java 2001/03/05 04:39:56 1.33
@@ -1,4 +1,4 @@
-/*-- $Id: Block.java,v 1.32 2001/03/04 21:34:51 klease Exp $ --
+/*-- $Id: Block.java,v 1.33 2001/03/05 04:39:56 keiron Exp $ --
============================================================================
The Apache Software License, Version 1.1
@@ -257,6 +257,9 @@
}
blockArea.end();
+
+ area.setMaxHeight(area.getMaxHeight() - spaceLeft + blockArea.getMaxHeight());
+
area.addChild(blockArea);
/* should this be combined into above? */
1.29 +4 -1 xml-fop/src/org/apache/fop/fo/flow/Table.java
Index: Table.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Table.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- Table.java 2001/03/04 21:34:51 1.28
+++ Table.java 2001/03/05 04:39:56 1.29
@@ -1,4 +1,4 @@
-/*-- $Id: Table.java,v 1.28 2001/03/04 21:34:51 klease Exp $ --
+/*-- $Id: Table.java,v 1.29 2001/03/05 04:39:56 keiron Exp $ --
============================================================================
The Apache Software License, Version 1.1
@@ -155,6 +155,7 @@
area.getIDReferences().configureID(id, area);
}
+ int spaceLeft = area.spaceLeft();
this.areaContainer =
new AreaContainer(propMgr.getFontState(area.getFontInfo()), 0, 0, area.getAllocationWidth(),
area.spaceLeft(), Position.STATIC);
@@ -223,6 +224,7 @@
}
addedHeader = true;
tableHeader.resetMarker();
+ area.setMaxHeight(area.getMaxHeight() - spaceLeft + this.areaContainer.getMaxHeight());
}
if (tableFooter != null && !this.omitFooterAtBreak && !addedFooter) {
if ((status = tableFooter.layout(areaContainer)).
@@ -271,6 +273,7 @@
} else {
bodyCount++;
}
+ area.setMaxHeight(area.getMaxHeight() - spaceLeft + this.areaContainer.getMaxHeight());
if (tableFooter != null && !this.omitFooterAtBreak) {
// move footer to bottom of area and move up body
// space before and after footer will make this wrong
1.30 +3 -1 xml-fop/src/org/apache/fop/fo/flow/TableBody.java
Index: TableBody.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/TableBody.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- TableBody.java 2001/03/04 21:34:51 1.29
+++ TableBody.java 2001/03/05 04:39:56 1.30
@@ -1,4 +1,4 @@
-/*-- $Id: TableBody.java,v 1.29 2001/03/04 21:34:51 klease Exp $ --
+/*-- $Id: TableBody.java,v 1.30 2001/03/05 04:39:56 keiron Exp $ --
============================================================================
The Apache Software License, Version 1.1
@@ -143,6 +143,7 @@
area.getIDReferences().configureID(id, area);
}
+ int spaceLeft = area.spaceLeft();
this.areaContainer = new AreaContainer(propMgr.getFontState(area.getFontInfo()),
-area.getBorderLeftWidth(),
-area.getBorderTopWidth() + area.getHeight(),
@@ -260,6 +261,7 @@
endKeepGroup = true;
}
lastRow = row;
+ area.setMaxHeight(area.getMaxHeight() - spaceLeft + this.areaContainer.getMaxHeight());
}
area.addChild(areaContainer);
areaContainer.end();
1.27 +3 -1 xml-fop/src/org/apache/fop/fo/flow/TableCell.java
Index: TableCell.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/TableCell.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- TableCell.java 2001/03/04 21:34:51 1.26
+++ TableCell.java 2001/03/05 04:39:57 1.27
@@ -1,4 +1,4 @@
-/*-- $Id: TableCell.java,v 1.26 2001/03/04 21:34:51 klease Exp $ --
+/*-- $Id: TableCell.java,v 1.27 2001/03/05 04:39:57 keiron Exp $ --
============================================================================
The Apache Software License, Version 1.1
@@ -163,6 +163,7 @@
area.getIDReferences().configureID(id,area);
}
+ int spaceLeft = area.spaceLeft();
this.areaContainer =
new AreaContainer(propMgr.getFontState(area.getFontInfo()),
startOffset - area.getBorderLeftWidth(),
@@ -195,6 +196,7 @@
return new Status(Status.AREA_FULL_SOME);
}
}
+ area.setMaxHeight(area.getMaxHeight() - spaceLeft + this.areaContainer.getMaxHeight());
}
areaContainer.end();
area.addChild(areaContainer);
1.38 +4 -1 xml-fop/src/org/apache/fop/fo/flow/TableRow.java
Index: TableRow.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/TableRow.java,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- TableRow.java 2001/03/04 21:34:52 1.37
+++ TableRow.java 2001/03/05 04:39:57 1.38
@@ -1,4 +1,4 @@
-/*-- $Id: TableRow.java,v 1.37 2001/03/04 21:34:52 klease Exp $ --
+/*-- $Id: TableRow.java,v 1.38 2001/03/05 04:39:57 keiron Exp $ --
============================================================================
The Apache Software License, Version 1.1
@@ -324,6 +324,7 @@
area.getIDReferences().configureID(id, area);
}
+ int spaceLeft = area.spaceLeft();
this.areaContainer = new AreaContainer(propMgr.getFontState(area.getFontInfo()),
-area.getBorderLeftWidth(),
-area.getBorderTopWidth(), area.getAllocationWidth(),
@@ -472,6 +473,8 @@
largestCellHeight = h;
}
}
+
+ area.setMaxHeight(area.getMaxHeight() - spaceLeft + this.areaContainer.getMaxHeight());
for (int i = 0; i < numChildren; i++) {
TableCell cell = (TableCell) children.elementAt(i);