From b5c2cad08dc202898aae3be257a0c7ff6afcf0bb Mon Sep 17 00:00:00 2001
From: Manuel Mall <manuel@apache.org>
Date: Thu, 11 Jan 2007 13:51:28 +0000
Subject: 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
---
 src/documentation/content/xdocs/compliance.ihtml          |  6 +++---
 .../apache/fop/layoutmgr/inline/LineLayoutManager.java    | 15 +++++++++------
 2 files changed, 12 insertions(+), 9 deletions(-)

(limited to 'src')

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">
-        &nbsp;
+        [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) {
-- 
cgit v1.2.3