Added support for the background-position shorthand.

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

2 files changed, 66 insertions, 2 deletions

diff --git a/src/java/org/apache/fop/fo/FOPropertyMapping.java b/src/java/org/apache/fop/fo/FOPropertyMapping.java
index 1e7095554..0e8a21f80 100644
--- a/src/java/org/apache/fop/fo/FOPropertyMapping.java
+++ b/src/java/org/apache/fop/fo/FOPropertyMapping.java
@@ -23,6 +23,7 @@ import java.util.Map;
 
 import org.apache.fop.datatypes.LengthBase;
 import org.apache.fop.fo.expr.PropertyException;
+import org.apache.fop.fo.properties.BackgroundPositionShorthandParser;
 import org.apache.fop.fo.properties.BorderSpacingShorthandParser;
 import org.apache.fop.fo.properties.BorderWidthPropertyMaker;
 import org.apache.fop.fo.properties.BoxPropShorthandParser;
@@ -727,6 +728,7 @@ public class FOPropertyMapping implements Constants {
         m.addKeyword("center", "50%");
         m.addKeyword("right", "100%");
         m.setPercentBase(LengthBase.IMAGE_BACKGROUND_POSITION_HORIZONTAL);
+        m.addShorthand(s_generics[PR_BACKGROUND_POSITION]);
         addPropertyMaker("background-position-horizontal", m);
 
         // background-position-vertical
@@ -737,6 +739,7 @@ public class FOPropertyMapping implements Constants {
         m.addKeyword("center", "50%");
         m.addKeyword("bottom", "100%");
         m.setPercentBase(LengthBase.IMAGE_BACKGROUND_POSITION_VERTICAL);
+        m.addShorthand(s_generics[PR_BACKGROUND_POSITION]);
         addPropertyMaker("background-position-vertical", m);
 
         // border-before-color
@@ -2618,9 +2621,10 @@ public class FOPropertyMapping implements Constants {
         addPropertyMaker("background", m);
 
         // background-position
-        m  = new ToBeImplementedProperty.Maker(PR_BACKGROUND_POSITION);
+        m  = new ListProperty.Maker(PR_BACKGROUND_POSITION);
         m.setInherited(false);
-        m.setDefault("0%");
+        m.setDefault("0% 0%");
+        m.setDatatypeParser(new BackgroundPositionShorthandParser());
         addPropertyMaker("background-position", m);
 
         // border
diff --git a/src/java/org/apache/fop/fo/properties/BackgroundPositionShorthandParser.java b/src/java/org/apache/fop/fo/properties/BackgroundPositionShorthandParser.java
new file mode 100644
index 000000000..ee42e845a
--- /dev/null
+++ b/src/java/org/apache/fop/fo/properties/BackgroundPositionShorthandParser.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2006 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/* $Id$ */
+
+package org.apache.fop.fo.properties;
+
+import java.util.List;
+import org.apache.fop.fo.Constants;
+import org.apache.fop.fo.PropertyList;
+import org.apache.fop.fo.expr.PropertyException;
+
+/**
+ * A shorthand parser for the background-position shorthand
+ */
+
+public class BackgroundPositionShorthandParser extends GenericShorthandParser {
+
+    /**
+     * @see org.apache.fop.fo.properties.ShorthandParser#getValueForProperty()
+     */
+    public Property getValueForProperty(int propId,
+                                               Property property,
+                                               PropertyMaker maker,
+                                               PropertyList propertyList)
+                    throws PropertyException {
+        
+        int index = -1;
+        List propList = property.getList();
+        if (propId == Constants.PR_BACKGROUND_POSITION_HORIZONTAL) {
+            index = 0;
+        } else if (propId == Constants.PR_BACKGROUND_POSITION_VERTICAL) {
+            index = 1;
+            if (propList.size() == 1) {
+                /* only background-position-horizontal specified 
+                 * through the shorthand:
+                 * background-position-vertical=50% (see: XSL-FO 1.0 -- 7.29.2)
+                 */
+                return maker.make(propertyList, "50%", propertyList.getParentFObj());
+            }
+        }
+        if (index >= 0) {
+            return (Property) propList.get(index);
+        } // else: invalid index? shouldn't happen...
+        return null;
+    }
+}