jeremias 2005/01/12 03:36:30 Modified: src/java/org/apache/fop/fo/properties PropertyMaker.java Log: Fix for keyword substitutions for enum properties. Check came too late evaluating the substituted value to a string instead of an enum value. (I found the problem in writing-mode) Revision Changes Path 1.12 +4 -4 xml-fop/src/java/org/apache/fop/fo/properties/PropertyMaker.java Index: PropertyMaker.java =================================================================== RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/PropertyMaker.java,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- PropertyMaker.java 28 Oct 2004 15:21:54 -0000 1.11 +++ PropertyMaker.java 12 Jan 2005 11:36:30 -0000 1.12 @@ -400,11 +400,11 @@ newProp = getSubprop(newProp, propId & Constants.COMPOUND_MASK); } } else { - newProp = checkEnumValues(value); + // Check for keyword shorthand values to be substituted. + pvalue = checkValueKeywords(pvalue); + newProp = checkEnumValues(pvalue); } if (newProp == null) { - // Check for keyword shorthand values to be substituted. - pvalue = checkValueKeywords(value); // Override parsePropertyValue in each subclass of Property.Maker newProp = PropertyParser.parse(pvalue, new PropertyInfo(this,
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]