From: Simon Steiner Date: Tue, 24 Sep 2019 14:11:21 +0000 (+0000) Subject: FOP-2883: Penalty cause table to flow into footer X-Git-Tag: fop-2_4~6 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=ccd9f65340c38010da0b96c2933abee9093fa984;p=xmlgraphics-fop.git FOP-2883: Penalty cause table to flow into footer git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1867463 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/fop-core/src/main/java/org/apache/fop/layoutmgr/table/TableStepper.java b/fop-core/src/main/java/org/apache/fop/layoutmgr/table/TableStepper.java index ff38d692e..136f9c4e3 100644 --- a/fop-core/src/main/java/org/apache/fop/layoutmgr/table/TableStepper.java +++ b/fop-core/src/main/java/org/apache/fop/layoutmgr/table/TableStepper.java @@ -277,7 +277,11 @@ public class TableStepper { if (penaltyOrGlueLen < 0) { if (keep.getPenalty() == KnuthElement.INFINITE) { - returnList.add(new KnuthGlue(0, -penaltyOrGlueLen, 0, new Position(null), true)); + if (boxLen > -penaltyOrGlueLen && boxLen < maxRemainingHeight) { + returnList.add(new KnuthGlue(boxLen, 0, 0, new Position(null), true)); + } else { + returnList.add(new KnuthGlue(0, -penaltyOrGlueLen, 0, new Position(null), true)); + } } else { returnList.add(new KnuthGlue(-penaltyOrGlueLen, 0, 0, new Position(null), true)); } diff --git a/fop/test/layoutengine/standard-testcases/table_border_padding_6.xml b/fop/test/layoutengine/standard-testcases/table_border_padding_6.xml new file mode 100755 index 000000000..6fd7f33cb --- /dev/null +++ b/fop/test/layoutengine/standard-testcases/table_border_padding_6.xml @@ -0,0 +1,275 @@ + + + + + +

+ This test checks border and padding conditionality on table. +

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 9. + + + + + + + + + + + + + + The interest rate on the loan is fixed when we send you the money. Once fixed it will not change for the duration of the loan. The estimated debt shown in Section 8 will not vary because the interest rate is fixed. + + + + + + + + + + + + + + + + + 10. + + + + + + + + + When you look at how the amount you owe goes up, remember also that property prices can go up or down, and this can affect the amount of money left over for you or your estate after the lifetime mortgage is repaid to AA=. + Based on the estimated value of your home now of £350,000 this example shows what the value of your home would be after 20 years if the value went up by 1% each year or went down by 1% each year. Remember also that the lifetime mortgage may run for more or less than 20 years. This is an example only and gives no guide to how much the value of your home will actually change. + If your home went up in value by 1% each year – it would be worth £427,067 after 20 years. + If your home went down in value by 1% each year – it would be worth £286,267 after 20 years. + + + + + + + + + + + + + + + + + 11. + + + + + + + + + + + + + + + + Fees payable to AA Equity Release Limited: + + + + + + + + + + + + + + + + Application fee + This is paid to AA= and is usually taken off the loan when we send you the money. If your mortgage doesn't complete, all we ask is that you pay any solicitor's fees we've incurred. + + + + + + + + + + + + + + + Discharge fee + This covers our cost for deregistering our interest in your property when the mortgage is repaid. The figure quoted is the current fee and you may have to pay more than this. + + + + + + + + + + + + + + + Other fees: + + + + + + + + + + + + + + + + Your solicitor’s fees + You will have to pay your own solicitor’s fees for any work conducted. The figure quoted is an estimate; the actual figure may be higher or lower, it is unlikely that you would be able to get a refund of this fee. + + + + + £500 + + + + + + + + Financial adviser’s fees + Your financial adviser may also charge you. The figure quoted is an estimate provided by your financial adviser; the actual figure may be higher or lower, it is unlikely that you would be able to get a refund of this fee. + + + + + £0.00 + + + + + + + You may have to pay other taxes or costs in addition to any fees shown here. + + + + + + + + + + + + + + + + + 12. + + + + + + + + + + + + + + test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test test + + + + + + + + + + + + + + + + + + + +