Fix a bug where the specified value was inherite for percentages on

line-height. It is only for numbers that the specified is inherited.

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

diff --git a/src/java/org/apache/fop/fo/FOPropertyMapping.java b/src/java/org/apache/fop/fo/FOPropertyMapping.java
index 5cf6d2bdc985800e2d2f31e5123a225da72250ef..4b0d50bc64e1ff4c6728ab66f8b4c813ac178808 100644 (file)
--- a/src/java/org/apache/fop/fo/FOPropertyMapping.java
+++ b/src/java/org/apache/fop/fo/FOPropertyMapping.java
@@ -1587,7 +1587,7 @@ public class FOPropertyMapping implements Constants {
         m.useGeneric(genericSpace);
         m.setInherited(true);
         m.setDefault("normal", true);
-        m.addKeyword("normal", "1.2em");
+        m.addKeyword("normal", "1.2");
         m.setPercentBase(LengthBase.FONTSIZE);
         addPropertyMaker("line-height", m);
 

diff --git a/src/java/org/apache/fop/fo/properties/LineHeightPropertyMaker.java b/src/java/org/apache/fop/fo/properties/LineHeightPropertyMaker.java
index 6c2da7dc33a5335b888b324b188a0ff8cd433e14..e1fa1215acc07130f4b20e2af5b7dd865cbaa5d5 100644 (file)
--- a/src/java/org/apache/fop/fo/properties/LineHeightPropertyMaker.java
+++ b/src/java/org/apache/fop/fo/properties/LineHeightPropertyMaker.java
@@ -41,17 +41,6 @@ public class LineHeightPropertyMaker extends SpaceProperty.Maker {
         super(propId);
     }
 
-    /**
-     * Make a property as normal, and save the specified value.
-     * @see PropertyMaker#make(PropertyList, String, FObj)
-     */
-    public Property make(PropertyList propertyList, String value,
-                         FObj fo) throws PropertyException {
-        Property p = super.make(propertyList, value, fo);
-        p.setSpecifiedValue(checkValueKeywords(value));
-        return p;
-    }
-    
     /**
      * Recalculate the line-height value based on the nearest specified
      * value.
@@ -77,6 +66,9 @@ public class LineHeightPropertyMaker extends SpaceProperty.Maker {
         Numeric numval = p.getNumeric();
         if (numval != null && numval.getDimension() == 0) {
             p = new PercentLength(numval.getNumericValue(), getPercentBase(fo,propertyList));
+            Property spaceProp = super.convertProperty(p, propertyList, fo);
+            spaceProp.setSpecifiedValue(String.valueOf(numval.getNumericValue()));
+            return spaceProp;
         }
         return super.convertProperty(p, propertyList, fo);
     }