diff options
| author | Manuel Mall <manuel@apache.org> | 2007-01-11 13:51:28 +0000 |
|---|---|---|
| committer | Manuel Mall <manuel@apache.org> | 2007-01-11 13:51:28 +0000 |
| commit | b5c2cad08dc202898aae3be257a0c7ff6afcf0bb (patch) | |
| tree | ffaee0f3361998c058883ac4b8b9efa98c0505fc /src | |
| parent | edc6a56ccdef0f7edc74c52dc542697abeb12a02 (diff) | |
| download | xmlgraphics-fop-b5c2cad08dc202898aae3be257a0c7ff6afcf0bb.tar.gz xmlgraphics-fop-b5c2cad08dc202898aae3be257a0c7ff6afcf0bb.zip | |
Added support for line-height-shift-adjustment property
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@495222 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src')
| -rw-r--r-- | src/documentation/content/xdocs/compliance.ihtml | 6 | ||||
| -rw-r--r-- | src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java | 15 |
2 files changed, 12 insertions, 9 deletions
diff --git a/src/documentation/content/xdocs/compliance.ihtml b/src/documentation/content/xdocs/compliance.ihtml index 60b69b9b7..ac87a6f0b 100644 --- a/src/documentation/content/xdocs/compliance.ihtml +++ b/src/documentation/content/xdocs/compliance.ihtml @@ -3965,11 +3965,11 @@ <td class="no"> no </td> - <td class="no"> - no + <td class="yes"> + yes </td> <td align="center"> - + [0.93] Supported in fop-trunk only </td> </tr> <tr> diff --git a/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java b/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java index b3e1e33ba..f4480c4e9 100644 --- a/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java +++ b/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java @@ -447,12 +447,15 @@ public class LineLayoutManager extends InlineStackingLayoutManager if (!ac.usesInitialBaselineTable() || ac.getAlignmentBaselineIdentifier() != EN_BEFORE_EDGE && ac.getAlignmentBaselineIdentifier() != EN_AFTER_EDGE) { - int alignmentOffset = ac.getTotalAlignmentBaselineOffset(); - if (alignmentOffset + ac.getAltitude() > lineLead) { - lineLead = alignmentOffset + ac.getAltitude(); - } - if (ac.getDepth() - alignmentOffset > lineFollow) { - lineFollow = ac.getDepth() - alignmentOffset; + if (fobj.getLineHeightShiftAdjustment() == EN_CONSIDER_SHIFTS + || ac.getBaselineShiftValue() == 0) { + int alignmentOffset = ac.getTotalAlignmentBaselineOffset(); + if (alignmentOffset + ac.getAltitude() > lineLead) { + lineLead = alignmentOffset + ac.getAltitude(); + } + if (ac.getDepth() - alignmentOffset > lineFollow) { + lineFollow = ac.getDepth() - alignmentOffset; + } } } else { if (ac.getHeight() > maxIgnoredHeight) { |