diff options
| author | Simon Pepping <spepping@apache.org> | 2006-10-11 14:19:28 +0000 |
|---|---|---|
| committer | Simon Pepping <spepping@apache.org> | 2006-10-11 14:19:28 +0000 |
| commit | 4d444be7c1175608f9a0f6207744459a41e00780 (patch) | |
| tree | 1fe37aa28fd997299129cd048fe22aeb2fdd0898 /src/java/org/apache/fop/layoutmgr | |
| parent | febbe8b3adeb574edbe19e0a58192740dfaf8cc8 (diff) | |
| download | xmlgraphics-fop-4d444be7c1175608f9a0f6207744459a41e00780.tar.gz xmlgraphics-fop-4d444be7c1175608f9a0f6207744459a41e00780.zip | |
FilledArea now properly applies the variation factor, when a page
number citation is resolved. It (and each InlineArea) may have an
adjustingInfo object for that purpose. Adapted leader_toc testcase to
the new, correct, results; removed page-number-citation_forward-ref
testcase because it duplicates the leader_toc testcase.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@462812 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/java/org/apache/fop/layoutmgr')
| -rw-r--r-- | src/java/org/apache/fop/layoutmgr/inline/LeaderLayoutManager.java | 1 | ||||
| -rw-r--r-- | src/java/org/apache/fop/layoutmgr/inline/LeafNodeLayoutManager.java | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/java/org/apache/fop/layoutmgr/inline/LeaderLayoutManager.java b/src/java/org/apache/fop/layoutmgr/inline/LeaderLayoutManager.java index 1f47e7c39..9e64ea534 100644 --- a/src/java/org/apache/fop/layoutmgr/inline/LeaderLayoutManager.java +++ b/src/java/org/apache/fop/layoutmgr/inline/LeaderLayoutManager.java @@ -253,6 +253,7 @@ public class LeaderLayoutManager extends LeafNodeLayoutManager { // create the AreaInfo object to store the computed values areaInfo = new AreaInfo((short) 0, ipd, false, context.getAlignmentContext()); + curArea.setAdjustingInfo(ipd.max - ipd.opt, ipd.opt - ipd.min, 0); addKnuthElementsForBorderPaddingStart(seq); diff --git a/src/java/org/apache/fop/layoutmgr/inline/LeafNodeLayoutManager.java b/src/java/org/apache/fop/layoutmgr/inline/LeafNodeLayoutManager.java index 20f8a0571..b730ab0cf 100644 --- a/src/java/org/apache/fop/layoutmgr/inline/LeafNodeLayoutManager.java +++ b/src/java/org/apache/fop/layoutmgr/inline/LeafNodeLayoutManager.java @@ -255,6 +255,7 @@ public abstract class LeafNodeLayoutManager extends AbstractLayoutManager - areaInfo.ipdArea.opt)); } area.setIPD(width); + area.setAdjustment(width - areaInfo.ipdArea.opt); } /** @see org.apache.fop.layoutmgr.LayoutManager#getNextKnuthElements(LayoutContext, int) */ |