From: Glenn Adams <gadams@apache.org>
Date: Fri, 1 Nov 2013 20:58:48 +0000 (+0000)
Subject: FOP-2311: revert changes from FOP-1069 that regresses shorthand property handling.
X-Git-Tag: fop-2_0~166
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=6714301a9c568f357ed749ade4f0796dfe8142e7;p=xmlgraphics-fop.git

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 ac3d4d13a..5c7bf4177 100644
--- 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 91b9c78d3..a54bab8e6 100644
--- 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>