Skip to content

Commit fe2c084

Browse files
FOP-2877: Table row was inside footer
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1864605 13f79535-47bb-0310-9956-ffa450edef68
1 parent 3774fab commit fe2c084

File tree

5 files changed

+942
-3
lines changed

5 files changed

+942
-3
lines changed

Diff for: fop-core/src/main/java/org/apache/fop/layoutmgr/table/TableStepper.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
import org.apache.fop.layoutmgr.Keep;
3535
import org.apache.fop.layoutmgr.KnuthBlockBox;
3636
import org.apache.fop.layoutmgr.KnuthBox;
37+
import org.apache.fop.layoutmgr.KnuthElement;
3738
import org.apache.fop.layoutmgr.KnuthGlue;
3839
import org.apache.fop.layoutmgr.KnuthPenalty;
3940
import org.apache.fop.layoutmgr.LayoutContext;
@@ -275,7 +276,7 @@ public LinkedList getCombinedKnuthElementsForRowGroup(LayoutContext context, Eff
275276
step = getNextStep();
276277

277278
if (penaltyOrGlueLen < 0) {
278-
if (step < 0) {
279+
if (keep.getPenalty() == KnuthElement.INFINITE) {
279280
returnList.add(new KnuthGlue(0, -penaltyOrGlueLen, 0, new Position(null), true));
280281
} else {
281282
returnList.add(new KnuthGlue(-penaltyOrGlueLen, 0, 0, new Position(null), true));

Diff for: fop/test/layoutengine/standard-testcases/table_border_padding_3.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,6 @@
7676
</fo:root>
7777
</fo>
7878
<checks>
79-
<eval expected="test2" xpath="//pageViewport[2]//block/block[3]//word"/>
79+
<eval expected="test2" xpath="//pageViewport[3]//block/block[1]//word"/>
8080
</checks>
8181
</testcase>

0 commit comments

Comments
 (0)