bckfnn 2004/10/29 05:36:50
Modified: src/java/org/apache/fop/fo FOPropertyMapping.java
Log:
Moved white-space-treatment from shorthands to "block and line related".
Revision Changes Path
1.36 +12 -12 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.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- FOPropertyMapping.java 29 Oct 2004 11:19:35 -0000 1.35
+++ FOPropertyMapping.java 29 Oct 2004 12:36:50 -0000 1.36
@@ -1582,6 +1582,17 @@
m.setDefault("treat-as-space");
addPropertyMaker("linefeed-treatment", m);
+ // white-space-treatment
+ m = new EnumProperty.Maker(PR_WHITE_SPACE_TREATMENT);
+ m.setInherited(true);
+ m.addEnum("ignore", makeEnumProperty(IGNORE, "IGNORE"));
+ m.addEnum("preserve", makeEnumProperty(PRESERVE, "PRESERVE"));
+ m.addEnum("ignore-if-before-linefeed",
makeEnumProperty(IGNORE_IF_BEFORE_LINEFEED, "IGNORE_IF_BEFORE_LINEFEED"));
+ m.addEnum("ignore-if-after-linefeed",
makeEnumProperty(IGNORE_IF_AFTER_LINEFEED, "IGNORE_IF_AFTER_LINEFEED"));
+ m.addEnum("ignore-if-surrounding-linefeed",
makeEnumProperty(IGNORE_IF_SURROUNDING_LINEFEED, "IGNORE_IF_SURROUNDING_LINEFEED"));
+ m.setDefault("ignore-if-surrounding-linefeed");
+ addPropertyMaker("white-space-treatment", m);
+
// text-align TODO: make it a StringProperty with enums.
m = new EnumProperty.Maker(PR_TEXT_ALIGN);
m.setInherited(true);
@@ -2660,17 +2671,6 @@
m.addEnum("bottom", makeEnumProperty(BOTTOM, "BOTTOM"));
m.setDefault("baseline");
addPropertyMaker("vertical-align", m);
-
- // white-space-treatment
- m = new EnumProperty.Maker(PR_WHITE_SPACE_TREATMENT);
- m.setInherited(true);
- m.addEnum("ignore", makeEnumProperty(IGNORE, "IGNORE"));
- m.addEnum("preserve", makeEnumProperty(PRESERVE, "PRESERVE"));
- m.addEnum("ignore-if-before-linefeed",
makeEnumProperty(IGNORE_IF_BEFORE_LINEFEED, "IGNORE_IF_BEFORE_LINEFEED"));
- m.addEnum("ignore-if-after-linefeed",
makeEnumProperty(IGNORE_IF_AFTER_LINEFEED, "IGNORE_IF_AFTER_LINEFEED"));
- m.addEnum("ignore-if-surrounding-linefeed",
makeEnumProperty(IGNORE_IF_SURROUNDING_LINEFEED, "IGNORE_IF_SURROUNDING_LINEFEED"));
- m.setDefault("ignore-if-surrounding-linefeed");
- addPropertyMaker("white-space-treatment", m);
// xml:lang
m = new ToBeImplementedProperty.Maker(PR_XML_LANG);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
