aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVincent Hennebert <vhennebert@apache.org>2007-11-21 12:23:59 +0000
committerVincent Hennebert <vhennebert@apache.org>2007-11-21 12:23:59 +0000
commitb035ca72ae33279c2d1988a1a1768d4b8a815928 (patch)
treefd66af54a070d5c18ecce20e9cee12dc3631ac0b
parente190f45154f7a94ff850ca02947c9fcffeb280f1 (diff)
downloadxmlgraphics-fop-b035ca72ae33279c2d1988a1a1768d4b8a815928.tar.gz
xmlgraphics-fop-b035ca72ae33279c2d1988a1a1768d4b8a815928.zip
Bugfix: the last element generated by the merging algorithm may now be a glue
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@597052 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--src/java/org/apache/fop/layoutmgr/table/TableContentLayoutManager.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/java/org/apache/fop/layoutmgr/table/TableContentLayoutManager.java b/src/java/org/apache/fop/layoutmgr/table/TableContentLayoutManager.java
index f299dc229..c08216480 100644
--- a/src/java/org/apache/fop/layoutmgr/table/TableContentLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/table/TableContentLayoutManager.java
@@ -232,7 +232,8 @@ public class TableContentLayoutManager implements PercentBaseContext {
// Break after the table's last row
// TODO should eventually be handled at the table level
if (breakBetween != Constants.EN_AUTO) {
- if (returnList.size() > 0) {
+ if (returnList.size() > 0 && ((ListElement) returnList.getLast()).isPenalty()) {
+ // May be a glue if the unbroken height is greater than the broken heights
BreakElement breakPoss = (BreakElement) returnList.getLast();
breakPoss.setPenaltyValue(-KnuthPenalty.INFINITE);
breakPoss.setBreakClass(breakBetween);