bckfnn 2004/02/04 04:38:28
Modified: src/java/org/apache/fop/fo FOPropertyMapping.java
Log:
Add support for setting margin-[top,botton,left,right] by specifying
the "margin" shorthand property.
Revision Changes Path
1.10 +7 -2 xml-fop/src/java/org/apache/fop/fo/FOPropertyMapping.java
Index: FOPropertyMapping.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/FOPropertyMapping.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- FOPropertyMapping.java 3 Feb 2004 22:10:39 -0000 1.9
+++ FOPropertyMapping.java 4 Feb 2004 12:38:27 -0000 1.10
@@ -1188,24 +1188,28 @@
m = new LengthProperty.Maker(PR_MARGIN_TOP);
m.setInherited(false);
m.setDefault("0pt");
+ m.addShorthand(s_generics[PR_MARGIN]);
addPropertyMaker("margin-top", m);
// margin-bottom
m = new LengthProperty.Maker(PR_MARGIN_BOTTOM);
m.setInherited(false);
m.setDefault("0pt");
+ m.addShorthand(s_generics[PR_MARGIN]);
addPropertyMaker("margin-bottom", m);
// margin-left
m = new LengthProperty.Maker(PR_MARGIN_LEFT);
m.setInherited(false);
m.setDefault("0pt");
+ m.addShorthand(s_generics[PR_MARGIN]);
addPropertyMaker("margin-left", m);
// margin-right
m = new LengthProperty.Maker(PR_MARGIN_RIGHT);
m.setInherited(false);
m.setDefault("0pt");
+ m.addShorthand(s_generics[PR_MARGIN]);
addPropertyMaker("margin-right", m);
// space-before
@@ -2468,9 +2472,10 @@
addPropertyMaker("font", m);
// margin
- m = new ToBeImplementedProperty.Maker(PR_MARGIN);
+ m = new ListProperty.Maker(PR_MARGIN);
m.setInherited(false);
m.setDefault("");
+ m.setDatatypeParser(new BoxPropShorthandParser());
addPropertyMaker("margin", m);
// padding
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
