Removed property values as discussed: http://marc.theaimsgroup.com/?t=112985465700004&r=1&w=2

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@328060 13f79535-47bb-0310-9956-ffa450edef68

3 files changed, 1 insertions, 67 deletions

diff --git a/src/documentation/content/xdocs/compliance.ihtml b/src/documentation/content/xdocs/compliance.ihtml
index a17400701..4b30ca026 100644
--- a/src/documentation/content/xdocs/compliance.ihtml
+++ b/src/documentation/content/xdocs/compliance.ihtml
@@ -3903,7 +3903,7 @@
       <td align="left">
         <ul>
           <li>
-            [Trunk] TODO TBD
+            [Trunk] value "line-height" not supported
           </li>
         </ul>
       </td>
diff --git a/src/java/org/apache/fop/fo/FOPropertyMapping.java b/src/java/org/apache/fop/fo/FOPropertyMapping.java
index a41672bb0..a47aaa4ad 100644
--- a/src/java/org/apache/fop/fo/FOPropertyMapping.java
+++ b/src/java/org/apache/fop/fo/FOPropertyMapping.java
@@ -1345,10 +1345,6 @@ public class FOPropertyMapping implements Constants {
         m.addEnum("alphabetic", getEnumProperty(EN_ALPHABETIC, "ALPHABETIC"));
         m.addEnum("hanging", getEnumProperty(EN_HANGING, "HANGING"));
         m.addEnum("mathematical", getEnumProperty(EN_MATHEMATICAL, "MATHEMATICAL"));
-        m.addEnum("top", getEnumProperty(EN_TOP, "TOP"));
-        m.addEnum("bottom", getEnumProperty(EN_BOTTOM, "BOTTOM"));
-        m.addEnum("text-top", getEnumProperty(EN_TEXT_TOP, "TEXT_TOP"));
-        m.addEnum("text-bottom", getEnumProperty(EN_TEXT_BOTTOM, "TEXT_BOTTOM"));
         m.setDefault("auto");
         m.setPercentBase(LengthBase.ALIGNMENT_ADJUST);
         m.addShorthand(s_generics[PR_VERTICAL_ALIGN]);
@@ -1369,10 +1365,6 @@ public class FOPropertyMapping implements Constants {
         m.addEnum("alphabetic", getEnumProperty(EN_ALPHABETIC, "ALPHABETIC"));
         m.addEnum("hanging", getEnumProperty(EN_HANGING, "HANGING"));
         m.addEnum("mathematical", getEnumProperty(EN_MATHEMATICAL, "MATHEMATICAL"));
-        m.addEnum("top", getEnumProperty(EN_TOP, "TOP"));
-        m.addEnum("bottom", getEnumProperty(EN_BOTTOM, "BOTTOM"));
-        m.addEnum("text-top", getEnumProperty(EN_TEXT_TOP, "TEXT_TOP"));
-        m.addEnum("text-bottom", getEnumProperty(EN_TEXT_BOTTOM, "TEXT_BOTTOM"));
         m.setDefault("auto");
         m.addShorthand(s_generics[PR_VERTICAL_ALIGN]);
         addPropertyMaker("alignment-baseline", m);
diff --git a/src/java/org/apache/fop/layoutmgr/inline/AlignmentContext.java b/src/java/org/apache/fop/layoutmgr/inline/AlignmentContext.java
index ae294c44f..1c081392f 100644
--- a/src/java/org/apache/fop/layoutmgr/inline/AlignmentContext.java
+++ b/src/java/org/apache/fop/layoutmgr/inline/AlignmentContext.java
@@ -236,34 +236,6 @@ public class AlignmentContext implements Constants {
             case EN_MATHEMATICAL:
                 this.alignmentBaselineIdentifier = alignmentBaseline;
                 break;
-            case EN_TOP:
-                if (isHorizontalWritingMode()) {
-                    this.alignmentBaselineIdentifier = EN_BEFORE_EDGE;
-                } else {
-                    this.alignmentBaselineIdentifier = getDominantBaselineIdentifier();
-                }
-                break;
-            case EN_BOTTOM:
-                if (isHorizontalWritingMode()) {
-                    this.alignmentBaselineIdentifier = EN_AFTER_EDGE;
-                } else {
-                    this.alignmentBaselineIdentifier = getDominantBaselineIdentifier();
-                }
-                break;
-            case EN_TEXT_TOP:
-                if (isHorizontalWritingMode()) {
-                    this.alignmentBaselineIdentifier = EN_TEXT_BEFORE_EDGE;
-                } else {
-                    this.alignmentBaselineIdentifier = getDominantBaselineIdentifier();
-                }
-                break;
-            case EN_TEXT_BOTTOM:
-                if (isHorizontalWritingMode()) {
-                    this.alignmentBaselineIdentifier = EN_TEXT_AFTER_EDGE;
-                } else {
-                    this.alignmentBaselineIdentifier = getDominantBaselineIdentifier();
-                }
-                break;
         }
     }
 
@@ -297,36 +269,6 @@ public class AlignmentContext implements Constants {
                 alignmentPoint = beforeEdge 
                                     - actualBaselineTable.getBaseline(alignmentAdjust.getEnum());
                 break;
-            case EN_TOP: // fall through
-                if (isHorizontalWritingMode()) {
-                    alignmentPoint = 0;
-                } else {
-                    alignmentPoint = beforeEdge;
-                }
-                break;
-            case EN_BOTTOM:
-                if (isHorizontalWritingMode()) {
-                    alignmentPoint = beforeEdge - actualBaselineTable.getBaseline(EN_AFTER_EDGE);
-                } else {
-                    alignmentPoint = beforeEdge;
-                }
-                break;
-            case EN_TEXT_TOP:
-                if (isHorizontalWritingMode()) {
-                    alignmentPoint = beforeEdge 
-                                        - actualBaselineTable.getBaseline(EN_TEXT_BEFORE_EDGE);
-                } else {
-                    alignmentPoint = beforeEdge;
-                }
-                break;
-            case EN_TEXT_BOTTOM:
-                if (isHorizontalWritingMode()) {
-                    alignmentPoint = beforeEdge 
-                                        - actualBaselineTable.getBaseline(EN_TEXT_AFTER_EDGE);
-                } else {
-                    alignmentPoint = beforeEdge;
-                }
-                break;
             default:
                 alignmentPoint = beforeEdge
                     + alignmentAdjust.getValue(new SimplePercentBaseContext(null