Use the position shorthand for [absolute|relative]-position.

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@197925 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 d8cde86d798cd518a3b084391f673244a4747d2c..016f051de5e90140975d51a4186a0b898a7d2594 100644 (file)
--- a/src/java/org/apache/fop/fo/FOPropertyMapping.java
+++ b/src/java/org/apache/fop/fo/FOPropertyMapping.java
@@ -39,6 +39,7 @@ import org.apache.fop.fo.properties.LengthRangeProperty;
 import org.apache.fop.fo.properties.LineHeightPropertyMaker;
 import org.apache.fop.fo.properties.ListProperty;
 import org.apache.fop.fo.properties.NumberProperty;
+import org.apache.fop.fo.properties.PositionShorthandParser;
 import org.apache.fop.fo.properties.Property;
 import org.apache.fop.fo.properties.PropertyMaker;
 import org.apache.fop.fo.properties.ShorthandParser;
@@ -511,6 +512,7 @@ public class FOPropertyMapping implements Constants {
         m.addEnum("fixed", makeEnumProperty(FIXED, "FIXED"));
         m.addEnum("absolute", makeEnumProperty(ABSOLUTE, "ABSOLUTE"));
         m.setDefault("auto");
+        m.addShorthand(s_generics[PR_POSITION]);
         addPropertyMaker("absolute-position", m);
 
         // top
@@ -1257,7 +1259,8 @@ public class FOPropertyMapping implements Constants {
         m  = new ToBeImplementedProperty.Maker(PR_RELATIVE_POSITION);
         m.setInherited(false);
         m.setDefault("static");
-        addPropertyMaker("relative-position", m);
+        m.addShorthand(s_generics[PR_POSITION]);
+               addPropertyMaker("relative-position", m);
     }
         
     private void createAreaAlignmentProperties() {
@@ -2503,6 +2506,7 @@ public class FOPropertyMapping implements Constants {
         m.addEnum("absolute", makeEnumProperty(ABSOLUTE, "ABSOLUTE"));
         m.addEnum("fixed", makeEnumProperty(FIXED, "FIXED"));
         m.setDefault("static");
+        m.setDatatypeParser(new PositionShorthandParser());
         addPropertyMaker("position", m);
 
         // size