Author: gadams
Date: Fri Nov  1 20:58:48 2013
New Revision: 1538062

URL: http://svn.apache.org/r1538062
Log:
FOP-2311: revert changes from FOP-1069 that regresses shorthand property 
handling.

Modified:
    
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/GenericShorthandParser.java
    xmlgraphics/fop/trunk/status.xml

Modified: 
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/GenericShorthandParser.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/GenericShorthandParser.java?rev=1538062&r1=1538061&r2=1538062&view=diff
==============================================================================
--- 
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/GenericShorthandParser.java
 (original)
+++ 
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/GenericShorthandParser.java
 Fri Nov  1 20:58:48 2013
@@ -88,7 +88,8 @@ public class GenericShorthandParser impl
         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;
     }

Modified: xmlgraphics/fop/trunk/status.xml
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/status.xml?rev=1538062&r1=1538061&r2=1538062&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/status.xml (original)
+++ xmlgraphics/fop/trunk/status.xml Fri Nov  1 20:58:48 2013
@@ -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>



---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to