From 16d93f50fb2d6c0be1076201993ecc3469ea7606 Mon Sep 17 00:00:00 2001 From: Finn Bock Date: Wed, 4 Feb 2004 12:38:27 +0000 Subject: [PATCH] Add support for setting margin-[top,botton,left,right] by specifying the "margin" shorthand property. git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@197324 13f79535-47bb-0310-9956-ffa450edef68 --- src/java/org/apache/fop/fo/FOPropertyMapping.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/java/org/apache/fop/fo/FOPropertyMapping.java b/src/java/org/apache/fop/fo/FOPropertyMapping.java index dfdca62ef..7703121e8 100644 --- a/src/java/org/apache/fop/fo/FOPropertyMapping.java +++ b/src/java/org/apache/fop/fo/FOPropertyMapping.java @@ -1188,24 +1188,28 @@ public class FOPropertyMapping implements Constants { 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 @@ public class FOPropertyMapping implements Constants { 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 -- 2.39.5