chrisg 2002/07/01 12:11:54 Modified: . Tag: fop-0_20_2-maintain CHANGES src/codegen Tag: fop-0_20_2-maintain foproperties.xml Added: src/org/apache/fop/fo Tag: fop-0_20_2-maintain MarginShorthandParser.java Log: Implemented margin shorthand Submitted by: Peter Kullmann <[EMAIL PROTECTED]> Revision Changes Path No revision No revision 1.10.2.20 +2 -1 xml-fop/CHANGES Index: CHANGES =================================================================== RCS file: /home/cvs/xml-fop/CHANGES,v retrieving revision 1.10.2.19 retrieving revision 1.10.2.20 diff -u -r1.10.2.19 -r1.10.2.20 --- CHANGES 10 Jun 2002 23:56:30 -0000 1.10.2.19 +++ CHANGES 1 Jul 2002 19:11:54 -0000 1.10.2.20 @@ -53,7 +53,8 @@ (thanks to Arnd Beissner and Brian O'Kelley) - Added support for comma-separated values for the font-family property Submitted by: Oleg Tkachenko <[EMAIL PROTECTED]> - +- Implemented margin shorthand + Submitted by: Peter Kullmann <[EMAIL PROTECTED]> ============================================================================== Done since 0.20.2 release No revision No revision 1.25.2.4 +6 -2 xml-fop/src/codegen/foproperties.xml Index: foproperties.xml =================================================================== RCS file: /home/cvs/xml-fop/src/codegen/foproperties.xml,v retrieving revision 1.25.2.3 retrieving revision 1.25.2.4 diff -u -r1.25.2.3 -r1.25.2.4 --- foproperties.xml 23 Apr 2002 22:22:52 -0000 1.25.2.3 +++ foproperties.xml 1 Jul 2002 19:11:54 -0000 1.25.2.4 @@ -829,24 +829,28 @@ <inherited>false</inherited> <datatype>Length</datatype> <default>0pt</default> + <shorthand>margin</shorthand> </property> <property> <name>margin-bottom</name> <inherited>false</inherited> <datatype>Length</datatype> <default>0pt</default> + <shorthand>margin</shorthand> </property> <property> <name>margin-left</name> <inherited>false</inherited> <datatype>Length</datatype> <default>0pt</default> + <shorthand>margin</shorthand> </property> <property> <name>margin-right</name> <inherited>false</inherited> <datatype>Length</datatype> <default>0pt</default> + <shorthand>margin</shorthand> </property> <property> <name>space-before</name> @@ -2090,8 +2094,8 @@ <property> <name>margin</name> <inherited>false</inherited> - <datatype>ToBeImplemented</datatype> - <default></default> + <datatype>List</datatype> + <datatype-parser>MarginShorthandParser</datatype-parser> </property> <property> <name>padding</name> No revision No revision 1.1.2.1 +97 -0 xml-fop/src/org/apache/fop/fo/Attic/MarginShorthandParser.java
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]