FOP-2311: revert changes from FOP-1069 that regresses shorthand property handling.

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

diff --git a/src/java/org/apache/fop/fo/properties/GenericShorthandParser.java b/src/java/org/apache/fop/fo/properties/GenericShorthandParser.java
index ac3d4d13a6b3a8e852a2f4f92834bf2129fb8691..5c7bf417775a1f2548b0ef304bd0869a8ca58e03 100644 (file)
--- a/src/java/org/apache/fop/fo/properties/GenericShorthandParser.java
+++ b/src/java/org/apache/fop/fo/properties/GenericShorthandParser.java
@@ -88,7 +88,8 @@ public class GenericShorthandParser implements ShorthandParser {
         while (iprop.hasNext() && prop == null) {
             Property p = (Property)iprop.next();
             prop = maker.convertShorthandProperty(propertyList, p, null);
-            propertyList.validatePropertyValue(p.getNCname(), prop, property);
+            // The following produces a regression, about which see FOP-2311.
+            // propertyList.validatePropertyValue(p.getNCname(), prop, property);
         }
         return prop;
     }

diff --git a/status.xml b/status.xml
index 91b9c78d3b871bcd13f4bc84ee0227e4993d69d3..a54bab8e6a325befe9c7a94828dcd92ad40fdb62 100644 (file)
--- a/status.xml
+++ b/status.xml
@@ -59,6 +59,9 @@
       documents. Example: the fix of marks layering will be such a case when it's done.
     -->
     <release version="FOP Trunk" date="01 November 2013">
+      <action context="Code" dev="GA" type="fix" fixes-bug="FOP-2311">
+          Eliminate regression to shorthand properties from Bugzilla 37114 (FOP-1069).
+      </action>
       <action context="Renderers" dev="GA" type="add" fixes-bug="FOP-2301">
           Enable support for PDF sub-page transitions.
       </action>