Support for [letter|word]-spacing properties with a value of 'normal'.

The value returned will be an Constants.NORMAL enum.

PR:
Obtained from:
Submitted by:
Reviewed by:


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

1 files changed, 11 insertions, 3 deletions

diff --git a/src/java/org/apache/fop/fo/properties/CompoundPropertyMaker.java b/src/java/org/apache/fop/fo/properties/CompoundPropertyMaker.java
index 9e4de0684..bcb686bc5 100644
--- a/src/java/org/apache/fop/fo/properties/CompoundPropertyMaker.java
+++ b/src/java/org/apache/fop/fo/properties/CompoundPropertyMaker.java
@@ -122,10 +122,14 @@ public class CompoundPropertyMaker extends PropertyMaker {
      * input value
      */
     protected Property checkEnumValues(String value) {
+        Property result = null;
         if (shorthandMaker != null) {
-            return shorthandMaker.checkEnumValues(value);
+            result = shorthandMaker.checkEnumValues(value);
         }
-        return null;
+        if (result == null) {
+            result = super.checkEnumValues(value);
+        }
+        return result;
     }
 
     /**
@@ -190,7 +194,11 @@ public class CompoundPropertyMaker extends PropertyMaker {
      * @throws FOPException for invalid or inconsisten FO input
      */
     public Property make(PropertyList propertyList) throws FOPException {
-        return makeCompound(propertyList, propertyList.getParentFObj());       
+        if (defaultValue != null) {
+            return make(propertyList, defaultValue, propertyList.getParentFObj());
+        } else {
+            return makeCompound(propertyList, propertyList.getParentFObj());
+        }
     }
     
     /**