aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorVincent Hennebert <vhennebert@apache.org>2013-10-31 20:06:34 +0000
committerVincent Hennebert <vhennebert@apache.org>2013-10-31 20:06:34 +0000
commit69f539c6f5fb7ef4b1ade45ad110901253772892 (patch)
tree70f089d1d26df95ac7cf644b4fa8976f84b2d774 /src
parentec479a36b29b2f3a99682825989af4c346974a3a (diff)
downloadxmlgraphics-fop-69f539c6f5fb7ef4b1ade45ad110901253772892.tar.gz
xmlgraphics-fop-69f539c6f5fb7ef4b1ade45ad110901253772892.zip
Take into account the inline-container's bpd in the alignment context
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_InlineContainer@1537612 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src')
-rw-r--r--src/java/org/apache/fop/layoutmgr/inline/InlineContainerLayoutManager.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/java/org/apache/fop/layoutmgr/inline/InlineContainerLayoutManager.java b/src/java/org/apache/fop/layoutmgr/inline/InlineContainerLayoutManager.java
index 85d21833b..669b88838 100644
--- a/src/java/org/apache/fop/layoutmgr/inline/InlineContainerLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/inline/InlineContainerLayoutManager.java
@@ -247,8 +247,10 @@ public class InlineContainerLayoutManager extends AbstractLayoutManager implemen
FontInfo fi = fobj.getFOEventHandler().getFontInfo();
FontTriplet[] fontkeys = ic.getCommonFont().getFontState(fi);
Font fs = fi.getFontInstance(fontkeys[0], ic.getCommonFont().fontSize.getValue(this));
- return new AlignmentContext(fs, ic.getLineHeight().getOptimum(this).getLength().getValue(this), // TODO
- context.getWritingMode());
+ return new AlignmentContext(contentAreaBPD,
+ ic.getAlignmentAdjust(), ic.getAlignmentBaseline(),
+ ic.getBaselineShift(), ic.getDominantBaseline(),
+ context.getAlignmentContext());
}
public boolean handleOverflow(int milliPoints) {