Moved white-space-treatment from shorthands to "block and line related".

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198113 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/java/org/apache/fop/fo/FOPropertyMapping.java b/src/java/org/apache/fop/fo/FOPropertyMapping.java
index 2f3306b17d1660b4b81794cb5915010c05345afd..cdecce0ef0242dbc6c7f945a00dcf1d8182a70e8 100644 (file)
--- a/src/java/org/apache/fop/fo/FOPropertyMapping.java
+++ b/src/java/org/apache/fop/fo/FOPropertyMapping.java
@@ -1582,6 +1582,17 @@ public class FOPropertyMapping implements Constants {
         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);
@@ -2661,17 +2672,6 @@ public class FOPropertyMapping implements Constants {
         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);
         m.setInherited(true);