From: Glen Mazza <gmazza@apache.org>
Date: Mon, 22 Dec 2003 21:37:44 +0000 (+0000)
Subject: PR:
X-Git-Tag: Root_Temp_KnuthStylePageBreaking~971
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=f357129bee376a97cee3603350ed801d424bd128;p=xmlgraphics-fop.git

PR:
Obtained from:
Submitted by:
Reviewed by:
1.) renamed enumgen.xsl to longer but hopefully clearer
prop-val-enum-interfaces.xsl

2.) Moved Constants.java from fo.properties to fo package, to reduce the
need for layout and renderers to import directly from the properties package.


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

diff --git a/build.xml b/build.xml
index be7a67677..d907a3501 100644
--- a/build.xml
+++ b/build.xml
@@ -209,7 +209,6 @@ list of possible build targets.
     <property name="colorkw.xml" value="${build.codegen}/colorkw.xml"/>
 
     <property name="properties.xsl" value="${build.codegen}/properties.xsl"/>
-    <property name="enumgen.xsl" value="${build.codegen}/enumgen.xsl"/>
     <property name="propinc.xsl" value="${build.codegen}/propinc.xsl"/>
     <property name="src.charlist.xsl" value="${src.codegen}/code-point-mapping.xsl"/>
     <property name="encodings.xml" value="${build.codegen}/encodings.xml"/>
@@ -355,7 +354,7 @@ list of possible build targets.
         out="${build.gensrc}/${replacestring}/fo/properties/fo_${ignore_this}"/>
     <style in="${foproperties.xml}" style="${build.codegen}/fo-property-mapping.xsl"
         out="${build.gensrc}/${replacestring}/fo/properties/FOPropertyMapping.java"/>
-    <style in="${foproperties.xml}" style="${enumgen.xsl}"
+    <style in="${foproperties.xml}" style="${build.codegen}/prop-val-enum-interfaces.xsl"
         out="${build.gensrc}/${replacestring}/fo/properties/foenums_${ignore_this}"/>
     <style in="${encodings.xml}" style="${charlist.xsl}"
         out="${build.gensrc}/${replacestring}/fonts//CodePointMapping.java"/>
diff --git a/src/codegen/enumgen.xsl b/src/codegen/enumgen.xsl
deleted file mode 100644
index e21366c3b..000000000
--- a/src/codegen/enumgen.xsl
+++ /dev/null
@@ -1,208 +0,0 @@
-<!--
-$Id$
-============================================================================
-                   The Apache Software License, Version 1.1
-============================================================================
-
-Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modifica-
-tion, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-3. The end-user documentation included with the redistribution, if any, must
-   include the following acknowledgment: "This product includes software
-   developed by the Apache Software Foundation (http://www.apache.org/)."
-   Alternately, this acknowledgment may appear in the software itself, if
-   and wherever such third-party acknowledgments normally appear.
-
-4. The names "FOP" and "Apache Software Foundation" must not be used to
-   endorse or promote products derived from this software without prior
-   written permission. For written permission, please contact
-   apache@apache.org.
-
-5. Products derived from this software may not be called "Apache", nor may
-   "Apache" appear in their name, without prior written permission of the
-   Apache Software Foundation.
-
-THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
-INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU-
-DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
-OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-============================================================================
-
-This software consists of voluntary contributions made by many individuals
-on behalf of the Apache Software Foundation and was originally created by
-James Tauber <jtauber@jtauber.com>. For more information on the Apache
-Software Foundation, please see <http://www.apache.org/>.
---> 
-<xsl:stylesheet version="1.0"
-                xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:lxslt="http://xml.apache.org/xslt"
-                xmlns:redirect="org.apache.xalan.xslt.extensions.Redirect"
-                extension-element-prefixes="redirect">
-
-<xsl:include href="./propinc.xsl"/>
-
-<xsl:output method="text" />
-
-<!-- zap text content -->
-<xsl:template match="text()"/>
-
-<xsl:template match="property[not(@type='generic')]">
-  <xsl:variable name="classname">
-    <xsl:choose>
-      <xsl:when test="class-name">
-        <xsl:value-of select="class-name"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:call-template name="makeClassName">
-          <xsl:with-param name="propstr" select="name"/>
-        </xsl:call-template>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-  <xsl:variable name="bEnum">
-    <xsl:call-template name="hasEnum"/>
-  </xsl:variable>
-  <xsl:variable name="bSubpropEnum">
-    <xsl:call-template name="hasSubpropEnum"/>
-  </xsl:variable>
-
-  <xsl:if test="$bEnum='true' or contains($bSubpropEnum, 'true')">
-    <redirect:write select="concat($classname, '.java')">
-      <xsl:text>package org.apache.fop.fo.properties;
-</xsl:text>
-      <!-- Handle enumeration values -->
-      <xsl:text>
-    public interface </xsl:text>
-      <xsl:value-of select="$classname"/>
-      <xsl:if test="use-generic and $bEnum='true'">
-        <xsl:text> extends </xsl:text>
-        <xsl:value-of select="use-generic"/>
-        <xsl:text>.Enums</xsl:text>
-      </xsl:if>
-      <xsl:text> {</xsl:text>
-      <xsl:for-each select="enumeration/value">
-        <xsl:text>
-        int </xsl:text>
-        <xsl:value-of select="@const"/>
-        <xsl:text> = Constants.</xsl:text>
-        <xsl:value-of select="@const"/>
-        <xsl:text>;</xsl:text>
-      </xsl:for-each>
-      <xsl:if test="contains($bSubpropEnum, 'true')">
-        <xsl:call-template name="genSubpropEnum"/>
-      </xsl:if>
-      <xsl:text> }
-</xsl:text>
-    </redirect:write>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template name="genSubpropEnum">
-  <xsl:param name="prop" select="."/>
-  <xsl:choose>
-    <xsl:when test="$prop/compound/subproperty/enumeration">
-      <xsl:for-each select="compound/subproperty[enumeration]">
-        <xsl:text>
-    public interface </xsl:text>
-        <xsl:value-of select="name"/>
-        <xsl:text> {
-</xsl:text>
-        <xsl:for-each select="enumeration/value">
-          <xsl:text>
-        int </xsl:text>
-          <xsl:value-of select="@const"/>
-          <xsl:text> = Constants.</xsl:text>
-          <xsl:value-of select="@const"/>
-          <xsl:text>;</xsl:text>
-        </xsl:for-each>
-        <xsl:text>
-    }
-</xsl:text>
-      </xsl:for-each>
-    </xsl:when>
-    <xsl:when test="$prop/use-generic">
-      <xsl:call-template name="inhspenums">
-        <xsl:with-param name="prop" select="key('genericref', $prop/use-generic)"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:when test="$prop/compound/subproperty/use-generic">
-      <!-- generate "interface <subprop> extends <gensubprop>.Enums" -->
-      <xsl:for-each select="$prop/compound/subproperty[use-generic]">
-        <xsl:variable name="bSpEnum">
-          <xsl:call-template name="hasEnum">
-            <xsl:with-param name="prop"
-              select="key('genericref', use-generic)"/>
-          </xsl:call-template>
-        </xsl:variable>
-        <xsl:if test="$bSpEnum='true'">
-          <xsl:text>
-    public interface </xsl:text>
-          <xsl:value-of select="name"/>
-          <xsl:text> extends </xsl:text>
-          <xsl:value-of select="use-generic"/>
-          <xsl:text>.Enums { }
-</xsl:text>
-        </xsl:if>
-      </xsl:for-each>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:text>
-        false</xsl:text>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="inhspenums">
-  <xsl:param name="prop"/>
-  <xsl:variable name="generic_name">
-    <xsl:choose>
-      <xsl:when test="$prop/class-name">
-        <xsl:value-of select="$prop/class-name"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:call-template name="makeClassName">
-          <xsl:with-param name="propstr" select="$prop/name"/>
-        </xsl:call-template>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-  <!-- generate "interface <subprop> extends <genprop>.<subprop>" -->
-  <xsl:for-each select="$prop/compound/subproperty[enumeration]">
-    <xsl:variable name="spname">
-      <xsl:call-template name="makeClassName">
-        <xsl:with-param name="propstr" select="name"/>
-      </xsl:call-template>
-    </xsl:variable>
-    <xsl:text>
-        public interface </xsl:text>
-    <xsl:value-of select="$spname"/>
-    <xsl:text> extends </xsl:text>
-    <xsl:value-of select="$generic_name"/>
-    <xsl:text>.Enums.</xsl:text>
-    <xsl:value-of select="$spname"/>
-    <xsl:text> { }</xsl:text>
-  </xsl:for-each>
-
-  <xsl:if test="$prop/use-generic">
-    <xsl:call-template name="inhspenums">
-      <xsl:with-param name="prop" select="key('genericref', $prop/use-generic)"/>
-    </xsl:call-template>
-  </xsl:if>
-</xsl:template>
-
-</xsl:stylesheet>
diff --git a/src/codegen/fo-property-mapping.xsl b/src/codegen/fo-property-mapping.xsl
index 33e7e2f91..c51a08bda 100644
--- a/src/codegen/fo-property-mapping.xsl
+++ b/src/codegen/fo-property-mapping.xsl
@@ -104,6 +104,7 @@ package org.apache.fop.fo.properties;
 
 import java.util.HashMap;
 import java.util.Set;
+import org.apache.fop.fo.Constants;
 import org.apache.fop.fo.Property;
 //import org.apache.fop.svg.*;
 
diff --git a/src/codegen/prop-val-enum-interfaces.xsl b/src/codegen/prop-val-enum-interfaces.xsl
new file mode 100644
index 000000000..8f942f4d8
--- /dev/null
+++ b/src/codegen/prop-val-enum-interfaces.xsl
@@ -0,0 +1,211 @@
+<!--
+$Id$
+============================================================================
+                   The Apache Software License, Version 1.1
+============================================================================
+
+Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modifica-
+tion, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+3. The end-user documentation included with the redistribution, if any, must
+   include the following acknowledgment: "This product includes software
+   developed by the Apache Software Foundation (http://www.apache.org/)."
+   Alternately, this acknowledgment may appear in the software itself, if
+   and wherever such third-party acknowledgments normally appear.
+
+4. The names "FOP" and "Apache Software Foundation" must not be used to
+   endorse or promote products derived from this software without prior
+   written permission. For written permission, please contact
+   apache@apache.org.
+
+5. Products derived from this software may not be called "Apache", nor may
+   "Apache" appear in their name, without prior written permission of the
+   Apache Software Foundation.
+
+THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU-
+DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+============================================================================
+
+This software consists of voluntary contributions made by many individuals
+on behalf of the Apache Software Foundation and was originally created by
+James Tauber <jtauber@jtauber.com>. For more information on the Apache
+Software Foundation, please see <http://www.apache.org/>.
+--> 
+<xsl:stylesheet version="1.0"
+                xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                xmlns:lxslt="http://xml.apache.org/xslt"
+                xmlns:redirect="org.apache.xalan.xslt.extensions.Redirect"
+                extension-element-prefixes="redirect">
+
+<xsl:include href="./propinc.xsl"/>
+
+<xsl:output method="text" />
+
+<!-- zap text content -->
+<xsl:template match="text()"/>
+
+<xsl:template match="property[not(@type='generic')]">
+  <xsl:variable name="classname">
+    <xsl:choose>
+      <xsl:when test="class-name">
+        <xsl:value-of select="class-name"/>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:call-template name="makeClassName">
+          <xsl:with-param name="propstr" select="name"/>
+        </xsl:call-template>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:variable>
+  <xsl:variable name="bEnum">
+    <xsl:call-template name="hasEnum"/>
+  </xsl:variable>
+  <xsl:variable name="bSubpropEnum">
+    <xsl:call-template name="hasSubpropEnum"/>
+  </xsl:variable>
+
+  <xsl:if test="$bEnum='true' or contains($bSubpropEnum, 'true')">
+    <redirect:write select="concat($classname, '.java')">
+      <xsl:text>package org.apache.fop.fo.properties;
+
+import org.apache.fop.fo.Constants;
+
+</xsl:text>
+      <!-- Handle enumeration values -->
+      <xsl:text>
+    public interface </xsl:text>
+      <xsl:value-of select="$classname"/>
+      <xsl:if test="use-generic and $bEnum='true'">
+        <xsl:text> extends </xsl:text>
+        <xsl:value-of select="use-generic"/>
+        <xsl:text>.Enums</xsl:text>
+      </xsl:if>
+      <xsl:text> {</xsl:text>
+      <xsl:for-each select="enumeration/value">
+        <xsl:text>
+        int </xsl:text>
+        <xsl:value-of select="@const"/>
+        <xsl:text> = Constants.</xsl:text>
+        <xsl:value-of select="@const"/>
+        <xsl:text>;</xsl:text>
+      </xsl:for-each>
+      <xsl:if test="contains($bSubpropEnum, 'true')">
+        <xsl:call-template name="genSubpropEnum"/>
+      </xsl:if>
+      <xsl:text> }
+</xsl:text>
+    </redirect:write>
+  </xsl:if>
+</xsl:template>
+
+<xsl:template name="genSubpropEnum">
+  <xsl:param name="prop" select="."/>
+  <xsl:choose>
+    <xsl:when test="$prop/compound/subproperty/enumeration">
+      <xsl:for-each select="compound/subproperty[enumeration]">
+        <xsl:text>
+    public interface </xsl:text>
+        <xsl:value-of select="name"/>
+        <xsl:text> {
+</xsl:text>
+        <xsl:for-each select="enumeration/value">
+          <xsl:text>
+        int </xsl:text>
+          <xsl:value-of select="@const"/>
+          <xsl:text> = Constants.</xsl:text>
+          <xsl:value-of select="@const"/>
+          <xsl:text>;</xsl:text>
+        </xsl:for-each>
+        <xsl:text>
+    }
+</xsl:text>
+      </xsl:for-each>
+    </xsl:when>
+    <xsl:when test="$prop/use-generic">
+      <xsl:call-template name="inhspenums">
+        <xsl:with-param name="prop" select="key('genericref', $prop/use-generic)"/>
+      </xsl:call-template>
+    </xsl:when>
+    <xsl:when test="$prop/compound/subproperty/use-generic">
+      <!-- generate "interface <subprop> extends <gensubprop>.Enums" -->
+      <xsl:for-each select="$prop/compound/subproperty[use-generic]">
+        <xsl:variable name="bSpEnum">
+          <xsl:call-template name="hasEnum">
+            <xsl:with-param name="prop"
+              select="key('genericref', use-generic)"/>
+          </xsl:call-template>
+        </xsl:variable>
+        <xsl:if test="$bSpEnum='true'">
+          <xsl:text>
+    public interface </xsl:text>
+          <xsl:value-of select="name"/>
+          <xsl:text> extends </xsl:text>
+          <xsl:value-of select="use-generic"/>
+          <xsl:text>.Enums { }
+</xsl:text>
+        </xsl:if>
+      </xsl:for-each>
+    </xsl:when>
+    <xsl:otherwise>
+      <xsl:text>
+        false</xsl:text>
+    </xsl:otherwise>
+  </xsl:choose>
+</xsl:template>
+
+<xsl:template name="inhspenums">
+  <xsl:param name="prop"/>
+  <xsl:variable name="generic_name">
+    <xsl:choose>
+      <xsl:when test="$prop/class-name">
+        <xsl:value-of select="$prop/class-name"/>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:call-template name="makeClassName">
+          <xsl:with-param name="propstr" select="$prop/name"/>
+        </xsl:call-template>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:variable>
+  <!-- generate "interface <subprop> extends <genprop>.<subprop>" -->
+  <xsl:for-each select="$prop/compound/subproperty[enumeration]">
+    <xsl:variable name="spname">
+      <xsl:call-template name="makeClassName">
+        <xsl:with-param name="propstr" select="name"/>
+      </xsl:call-template>
+    </xsl:variable>
+    <xsl:text>
+        public interface </xsl:text>
+    <xsl:value-of select="$spname"/>
+    <xsl:text> extends </xsl:text>
+    <xsl:value-of select="$generic_name"/>
+    <xsl:text>.Enums.</xsl:text>
+    <xsl:value-of select="$spname"/>
+    <xsl:text> { }</xsl:text>
+  </xsl:for-each>
+
+  <xsl:if test="$prop/use-generic">
+    <xsl:call-template name="inhspenums">
+      <xsl:with-param name="prop" select="key('genericref', $prop/use-generic)"/>
+    </xsl:call-template>
+  </xsl:if>
+</xsl:template>
+
+</xsl:stylesheet>
diff --git a/src/codegen/properties.xsl b/src/codegen/properties.xsl
index c0edfa00d..83969ee91 100644
--- a/src/codegen/properties.xsl
+++ b/src/codegen/properties.xsl
@@ -311,6 +311,7 @@ Software Foundation, please see <http://www.apache.org/>.
 
     <redirect:write select="concat($classname, '.java')">
       <xsl:text>package org.apache.fop.fo.properties;
+import org.apache.fop.fo.Constants;
 </xsl:text>
       <xsl:if test=".//keyword-equiv or ./name[.='generic-color']">
         <xsl:text>
diff --git a/src/java/org/apache/fop/datatypes/CondLength.java b/src/java/org/apache/fop/datatypes/CondLength.java
index 07e817db9..25804cfec 100644
--- a/src/java/org/apache/fop/datatypes/CondLength.java
+++ b/src/java/org/apache/fop/datatypes/CondLength.java
@@ -51,7 +51,7 @@
 package org.apache.fop.datatypes;
 
 import org.apache.fop.fo.Property;
-import org.apache.fop.fo.properties.Constants;
+import org.apache.fop.fo.Constants;
 
 /**
  * A space quantity in XSL (space-before, space-after).
diff --git a/src/java/org/apache/fop/fo/Constants.java b/src/java/org/apache/fop/fo/Constants.java
new file mode 100644
index 000000000..ac3d8ad15
--- /dev/null
+++ b/src/java/org/apache/fop/fo/Constants.java
@@ -0,0 +1,489 @@
+/* $Id$
+ * ============================================================================
+ *                    The Apache Software License, Version 1.1
+ * ============================================================================
+ *
+ * Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modifica-
+ * tion, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * 3. The end-user documentation included with the redistribution, if any, must
+ *    include the following acknowledgment: "This product includes software
+ *    developed by the Apache Software Foundation (http://www.apache.org/)."
+ *    Alternately, this acknowledgment may appear in the software itself, if
+ *    and wherever such third-party acknowledgments normally appear.
+ *
+ * 4. The names "FOP" and "Apache Software Foundation" must not be used to
+ *    endorse or promote products derived from this software without prior
+ *    written permission. For written permission, please contact
+ *    apache@apache.org.
+ *
+ * 5. Products derived from this software may not be called "Apache", nor may
+ *    "Apache" appear in their name, without prior written permission of the
+ *    Apache Software Foundation.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU-
+ * DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ============================================================================
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * on behalf of the Apache Software Foundation and was originally created by
+ * James Tauber <jtauber@jtauber.com>. For more information on the Apache
+ * Software Foundation, please see <http://www.apache.org/>.
+*/
+package org.apache.fop.fo;
+
+public interface Constants {
+
+    // element constants
+    int FO_BASIC_LINK = 1;
+    int FO_BIDI_OVERRIDE = 2;
+    int FO_BLOCK = 3;
+    int FO_BLOCK_CONTAINER = 4;
+    int FO_CHARACTER = 5;
+    int FO_COLOR_PROFILE = 6;
+    int FO_CONDITIONAL_PAGE_MASTER_REFERENCE = 7;
+    int FO_DECLARATION = 8;
+    int FO_EXTERNAL_GRAPHIC = 9;
+    int FO_FLOAT = 10;
+    int FO_FLOW = 11;
+    int FO_FOOTNOTE = 12;
+    int FO_FOOTNOTE_BODY = 13;
+    int FO_INITIAL_PROPERTY_SET = 14;
+    int FO_INLINE = 15;
+    int FO_INLINE_CONTAINER = 16;
+    int FO_INSTREAM_FOREIGN_OBJECT = 17;
+    int FO_LAYOUT_MASTER_SET = 18;
+    int FO_LEADER = 19;
+    int FO_LIST_BLOCK = 20;
+    int FO_LIST_ITEM = 21;
+    int FO_LIST_ITEM_BODY = 22;
+    int FO_LIST_ITEM_LABEL = 23;
+    int FO_MARKER = 24;
+    int FO_MULTI_CASE = 25;
+    int FO_MULTI_PROPERTIES = 26;
+    int FO_MULTI_PROPERTY_SET = 27;
+    int FO_MULTI_SWITCH = 28;
+    int FO_MULTI_TOGGLE = 29;
+    int FO_PAGE_NUMBER = 30;
+    int FO_PAGE_NUMBER_CITATION = 31;
+    int FO_PAGE_SEQUENCE = 32;
+    int FO_PAGE_SEQUENCE_MASTER = 33;
+    int FO_REGION_AFTER = 34;
+    int FO_REGION_BEFORE = 35;
+    int FO_REGION_BODY = 36;
+    int FO_REGION_END = 37;
+    int FO_REGION_START = 38;
+    int FO_REPEATABLE_PAGE_MASTER_ALTERNATIVES = 39;
+    int FO_REPEATABLE_PAGE_MASTER_REFERENCE = 40;
+    int FO_RETRIEVE_MARKER = 41;
+    int FO_ROOT = 42;
+    int FO_SIMPLE_PAGE_MASTER = 43;
+    int FO_SINGLE_PAGE_MASTER_REFERENCE = 44;
+    int FO_STATIC_CONTENT = 45;
+    int FO_TABLE = 46;
+    int FO_TABLE_AND_CAPTION = 47;
+    int FO_TABLE_BODY = 48;
+    int FO_TABLE_CAPTION = 49;
+    int FO_TABLE_CELL = 50;
+    int FO_TABLE_COLUMN = 51;
+    int FO_TABLE_FOOTER = 52;
+    int FO_TABLE_HEADER = 53;
+    int FO_TABLE_ROW = 54;
+    int FO_TITLE = 55;
+    int FO_WRAPPER = 56;
+    int ELEMENT_COUNT = 56;
+    
+    // Masks
+    int COMPOUND_SHIFT = 9;
+    int PROPERTY_MASK = (1 << COMPOUND_SHIFT)-1;
+    int COMPOUND_MASK = ~PROPERTY_MASK;
+
+    // property constants
+    int PR_ABSOLUTE_POSITION = 1;
+    int PR_ACTIVE_STATE = 2;
+    int PR_ALIGNMENT_ADJUST = 3;
+    int PR_ALIGNMENT_BASELINE = 4;
+    int PR_AUTO_RESTORE = 5;
+    int PR_AZIMUTH = 6;
+    int PR_BACKGROUND = 7;
+    int PR_BACKGROUND_ATTACHMENT = 8;
+    int PR_BACKGROUND_COLOR = 9;
+    int PR_BACKGROUND_IMAGE = 10;
+    int PR_BACKGROUND_POSITION = 11;
+    int PR_BACKGROUND_POSITION_HORIZONTAL = 12;
+    int PR_BACKGROUND_POSITION_VERTICAL = 13;
+    int PR_BACKGROUND_REPEAT = 14;
+    int PR_BASELINE_SHIFT = 15;
+    int PR_BLANK_OR_NOT_BLANK = 16;
+    int PR_BLOCK_PROGRESSION_DIMENSION = 17;
+    int PR_BORDER = 18;
+    int PR_BORDER_AFTER_COLOR = 19;
+    int PR_BORDER_AFTER_PRECEDENCE = 20;
+    int PR_BORDER_AFTER_STYLE = 21;
+    int PR_BORDER_AFTER_WIDTH = 22;
+    int PR_BORDER_BEFORE_COLOR = 23;
+    int PR_BORDER_BEFORE_PRECEDENCE = 24;
+    int PR_BORDER_BEFORE_STYLE = 25;
+    int PR_BORDER_BEFORE_WIDTH = 26;
+    int PR_BORDER_BOTTOM = 27;
+    int PR_BORDER_BOTTOM_COLOR = 28;
+    int PR_BORDER_BOTTOM_STYLE = 29;
+    int PR_BORDER_BOTTOM_WIDTH = 30;
+    int PR_BORDER_COLLAPSE = 31;
+    int PR_BORDER_COLOR = 32;
+    int PR_BORDER_END_COLOR = 33;
+    int PR_BORDER_END_PRECEDENCE = 34;
+    int PR_BORDER_END_STYLE = 35;
+    int PR_BORDER_END_WIDTH = 36;
+    int PR_BORDER_LEFT = 37;
+    int PR_BORDER_LEFT_COLOR = 38;
+    int PR_BORDER_LEFT_STYLE = 39;
+    int PR_BORDER_LEFT_WIDTH = 40;
+    int PR_BORDER_RIGHT = 41;
+    int PR_BORDER_RIGHT_COLOR = 42;
+    int PR_BORDER_RIGHT_STYLE = 43;
+    int PR_BORDER_RIGHT_WIDTH = 44;
+    int PR_BORDER_SEPARATION = 45;
+    int PR_BORDER_SPACING = 46;
+    int PR_BORDER_START_COLOR = 47;
+    int PR_BORDER_START_PRECEDENCE = 48;
+    int PR_BORDER_START_STYLE = 49;
+    int PR_BORDER_START_WIDTH = 50;
+    int PR_BORDER_STYLE = 51;
+    int PR_BORDER_TOP = 52;
+    int PR_BORDER_TOP_COLOR = 53;
+    int PR_BORDER_TOP_STYLE = 54;
+    int PR_BORDER_TOP_WIDTH = 55;
+    int PR_BORDER_WIDTH = 56;
+    int PR_BOTTOM = 57;
+    int PR_BREAK_AFTER = 58;
+    int PR_BREAK_BEFORE = 59;
+    int PR_CAPTION_SIDE = 60;
+    int PR_CASE_NAME = 61;
+    int PR_CASE_TITLE = 62;
+    int PR_CHARACTER = 63;
+    int PR_CLEAR = 64;
+    int PR_CLIP = 65;
+    int PR_COLOR = 66;
+    int PR_COLOR_PROFILE_NAME = 67;
+    int PR_COLUMN_COUNT = 68;
+    int PR_COLUMN_GAP = 69;
+    int PR_COLUMN_NUMBER = 70;
+    int PR_COLUMN_WIDTH = 71;
+    int PR_CONTENT_HEIGHT = 72;
+    int PR_CONTENT_TYPE = 73;
+    int PR_CONTENT_WIDTH = 74;
+    int PR_COUNTRY = 75;
+    int PR_CUE = 76;
+    int PR_CUE_AFTER = 77;
+    int PR_CUE_BEFORE = 78;
+    int PR_DESTINATION_PLACEMENT_OFFSET = 79;
+    int PR_DIRECTION = 80;
+    int PR_DISPLAY_ALIGN = 81;
+    int PR_DOMINANT_BASELINE = 82;
+    int PR_ELEVATION = 83;
+    int PR_EMPTY_CELLS = 84;
+    int PR_END_INDENT = 85;
+    int PR_ENDS_ROW = 86;
+    int PR_EXTENT = 87;
+    int PR_EXTERNAL_DESTINATION = 88;
+    int PR_FLOAT = 89;
+    int PR_FLOW_NAME = 90;
+    int PR_FONT = 91;
+    int PR_FONT_FAMILY = 92;
+    int PR_FONT_SELECTION_STRATEGY = 93;
+    int PR_FONT_SIZE = 94;
+    int PR_FONT_SIZE_ADJUST = 95;
+    int PR_FONT_STRETCH = 96;
+    int PR_FONT_STYLE = 97;
+    int PR_FONT_VARIANT = 98;
+    int PR_FONT_WEIGHT = 99;
+    int PR_FORCE_PAGE_COUNT = 100;
+    int PR_FORMAT = 101;
+    int PR_GLYPH_ORIENTATION_HORIZONTAL = 102;
+    int PR_GLYPH_ORIENTATION_VERTICAL = 103;
+    int PR_GROUPING_SEPARATOR = 104;
+    int PR_GROUPING_SIZE = 105;
+    int PR_HEIGHT = 106;
+    int PR_HYPHENATE = 107;
+    int PR_HYPHENATION_CHARACTER = 108;
+    int PR_HYPHENATION_KEEP = 109;
+    int PR_HYPHENATION_LADDER_COUNT = 110;
+    int PR_HYPHENATION_PUSH_CHARACTER_COUNT = 111;
+    int PR_HYPHENATION_REMAIN_CHARACTER_COUNT = 112;
+    int PR_ID = 113;
+    int PR_INDICATE_DESTINATION = 114;
+    int PR_INITIAL_PAGE_NUMBER = 115;
+    int PR_INLINE_PROGRESSION_DIMENSION = 116;
+    int PR_INTERNAL_DESTINATION = 117;
+    int PR_KEEP_TOGETHER = 118;
+    int PR_KEEP_WITH_NEXT = 119;
+    int PR_KEEP_WITH_PREVIOUS = 120;
+    int PR_LANGUAGE = 121;
+    int PR_LAST_LINE_END_INDENT = 122;
+    int PR_LEADER_ALIGNMENT = 123;
+    int PR_LEADER_LENGTH = 124;
+    int PR_LEADER_PATTERN = 125;
+    int PR_LEADER_PATTERN_WIDTH = 126;
+    int PR_LEFT = 127;
+    int PR_LETTER_SPACING = 128;
+    int PR_LETTER_VALUE = 129;
+    int PR_LINEFEED_TREATMENT = 130;
+    int PR_LINE_HEIGHT = 131;
+    int PR_LINE_HEIGHT_SHIFT_ADJUSTMENT = 132;
+    int PR_LINE_STACKING_STRATEGY = 133;
+    int PR_MARGIN = 134;
+    int PR_MARGIN_BOTTOM = 135;
+    int PR_MARGIN_LEFT = 136;
+    int PR_MARGIN_RIGHT = 137;
+    int PR_MARGIN_TOP = 138;
+    int PR_MARKER_CLASS_NAME = 139;
+    int PR_MASTER_NAME = 140;
+    int PR_MASTER_REFERENCE = 141;
+    int PR_MAX_HEIGHT = 142;
+    int PR_MAXIMUM_REPEATS = 143;
+    int PR_MAX_WIDTH = 144;
+    int PR_MEDIA_USAGE = 145;
+    int PR_MIN_HEIGHT = 146;
+    int PR_MIN_WIDTH = 147;
+    int PR_NUMBER_COLUMNS_REPEATED = 148;
+    int PR_NUMBER_COLUMNS_SPANNED = 149;
+    int PR_NUMBER_ROWS_SPANNED = 150;
+    int PR_ODD_OR_EVEN = 151;
+    int PR_ORPHANS = 152;
+    int PR_OVERFLOW = 153;
+    int PR_PADDING = 154;
+    int PR_PADDING_AFTER = 155;
+    int PR_PADDING_BEFORE = 156;
+    int PR_PADDING_BOTTOM = 157;
+    int PR_PADDING_END = 158;
+    int PR_PADDING_LEFT = 159;
+    int PR_PADDING_RIGHT = 160;
+    int PR_PADDING_START = 161;
+    int PR_PADDING_TOP = 162;
+    int PR_PAGE_BREAK_AFTER = 163;
+    int PR_PAGE_BREAK_BEFORE = 164;
+    int PR_PAGE_BREAK_INSIDE = 165;
+    int PR_PAGE_HEIGHT = 166;
+    int PR_PAGE_POSITION = 167;
+    int PR_PAGE_WIDTH = 168;
+    int PR_PAUSE = 169;
+    int PR_PAUSE_AFTER = 170;
+    int PR_PAUSE_BEFORE = 171;
+    int PR_PITCH = 172;
+    int PR_PITCH_RANGE = 173;
+    int PR_PLAY_DURING = 174;
+    int PR_POSITION = 175;
+    int PR_PRECEDENCE = 176;
+    int PR_PROVISIONAL_DISTANCE_BETWEEN_STARTS = 177;
+    int PR_PROVISIONAL_LABEL_SEPARATION = 178;
+    int PR_REFERENCE_ORIENTATION = 179;
+    int PR_REF_ID = 180;
+    int PR_REGION_NAME = 181;
+    int PR_RELATIVE_ALIGN = 182;
+    int PR_RELATIVE_POSITION = 183;
+    int PR_RENDERING_INTENT = 184;
+    int PR_RETRIEVE_BOUNDARY = 185;
+    int PR_RETRIEVE_CLASS_NAME = 186;
+    int PR_RETRIEVE_POSITION = 187;
+    int PR_RICHNESS = 188;
+    int PR_RIGHT = 189;
+    int PR_ROLE = 190;
+    int PR_RULE_STYLE = 191;
+    int PR_RULE_THICKNESS = 192;
+    int PR_SCALING = 193;
+    int PR_SCALING_METHOD = 194;
+    int PR_SCORE_SPACES = 195;
+    int PR_SCRIPT = 196;
+    int PR_SHOW_DESTINATION = 197;
+    int PR_SIZE = 198;
+    int PR_SOURCE_DOCUMENT = 199;
+    int PR_SPACE_AFTER = 200;
+    int PR_SPACE_BEFORE = 201;
+    int PR_SPACE_END = 202;
+    int PR_SPACE_START = 203;
+    int PR_SPACE_TREATMENT = 204;
+    int PR_SPAN = 205;
+    int PR_SPEAK = 206;
+    int PR_SPEAK_HEADER = 207;
+    int PR_SPEAK_NUMERAL = 208;
+    int PR_SPEAK_PUNCTUATION = 209;
+    int PR_SPEECH_RATE = 210;
+    int PR_SRC = 211;
+    int PR_START_INDENT = 212;
+    int PR_STARTING_STATE = 213;
+    int PR_STARTS_ROW = 214;
+    int PR_STRESS = 215;
+    int PR_SUPPRESS_AT_LINE_BREAK = 216;
+    int PR_SWITCH_TO = 217;
+    int PR_TABLE_LAYOUT = 218;
+    int PR_TABLE_OMIT_FOOTER_AT_BREAK = 219;
+    int PR_TABLE_OMIT_HEADER_AT_BREAK = 220;
+    int PR_TARGET_PRESENTATION_CONTEXT = 221;
+    int PR_TARGET_PROCESSING_CONTEXT = 222;
+    int PR_TARGET_STYLESHEET = 223;
+    int PR_TEXT_ALIGN = 224;
+    int PR_TEXT_ALIGN_LAST = 225;
+    int PR_TEXT_ALTITUDE = 226;
+    int PR_TEXT_DECORATION = 227;
+    int PR_TEXT_DEPTH = 228;
+    int PR_TEXT_INDENT = 229;
+    int PR_TEXT_SHADOW = 230;
+    int PR_TEXT_TRANSFORM = 231;
+    int PR_TOP = 232;
+    int PR_TREAT_AS_WORD_SPACE = 233;
+    int PR_UNICODE_BIDI = 234;
+    int PR_VERTICAL_ALIGN = 235;
+    int PR_VISIBILITY = 236;
+    int PR_VOICE_FAMILY = 237;
+    int PR_VOLUME = 238;
+    int PR_WHITE_SPACE_COLLAPSE = 239;
+    int PR_WHITE_SPACE_TREATMENT = 240;
+    int PR_WIDOWS = 241;
+    int PR_WIDTH = 242;
+    int PR_WORD_SPACING = 243;
+    int PR_WRAP_OPTION = 244;
+    int PR_WRITING_MODE = 245;
+    int PR_XML_LANG = 246;
+    int PR_Z_INDEX = 247;
+    int PROPERTY_COUNT = 247;
+    
+    // compound property constants
+    int CP_BLOCK_PROGRESSION_DIRECTION = 1 << COMPOUND_SHIFT;
+    int CP_CONDITIONALITY = 2 << COMPOUND_SHIFT;
+    int CP_INLINE_PROGRESSION_DIRECTION = 3 << COMPOUND_SHIFT;
+    int CP_LENGTH = 4 << COMPOUND_SHIFT;
+    int CP_MAXIMUM = 5 << COMPOUND_SHIFT;
+    int CP_MINIMUM = 6 << COMPOUND_SHIFT;
+    int CP_OPTIMUM = 7 << COMPOUND_SHIFT;
+    int CP_PRECEDENCE = 8 << COMPOUND_SHIFT;
+    int CP_WITHIN_COLUMN = 9 << COMPOUND_SHIFT;
+    int CP_WITHIN_LINE = 10 << COMPOUND_SHIFT;
+    int CP_WITHIN_PAGE = 11 << COMPOUND_SHIFT;
+
+    // Enumeration constants
+    int ABSOLUTE = 1;
+    int ABSOLUTE_COLORMETRIC = 2;
+    int AFTER = 3;
+    int ALL = 4;
+    int ALPHABETIC = 5;
+    int ALWAYS = 6;
+    int ANY = 7;
+    int AUTO = 8;
+    int BASELINE = 9;
+    int BEFORE = 10;
+    int BLANK = 11;
+    int BLINK = 12;
+    int BOTTOM = 13;
+    int CAPITALIZE = 14;
+    int CENTER = 15;
+    int COLLAPSE = 16;
+    int COLUMN = 17;
+    int DASHED = 18;
+    int DISCARD = 19;
+    int DOCUMENT = 20;
+    int DOTS = 21;
+    int DOTTED = 22;
+    int DOUBLE = 23;
+    int END = 24;
+    int END_ON_EVEN = 25;
+    int END_ON_ODD = 26;
+    int ERROR_IF_OVERFLOW = 27;
+    int EVEN = 28;
+    int EVEN_PAGE = 29;
+    int FALSE = 30;
+    int FIC = 31;
+    int FIRST = 32;
+    int FIXED = 33;
+    int FORCE = 34;
+    int FSWP = 35;
+    int GROOVE = 36;
+    int HIDDEN = 37;
+    int IGNORE = 38;
+    int IGNORE_IF_AFTER_LINEFEED = 39;
+    int IGNORE_IF_BEFORE_LINEFEED = 40;
+    int IGNORE_IF_SURROUNDING_LINEFEED = 41;
+    int INSET = 42;
+    int JUSTIFY = 43;
+    int LAST = 44;
+    int LEFT = 45;
+    int LEWP = 46;
+    int LINE_THROUGH = 47;
+    int LOWERCASE = 48;
+    int LR_TB = 49;
+    int LSWP = 50;
+    int MIDDLE = 51;
+    int NO_BLINK = 52;
+    int NO_FORCE = 53;
+    int NO_LINE_THROUGH = 54;
+    int NO_OVERLINE = 55;
+    int NO_UNDERLINE = 56;
+    int NO_WRAP = 57;
+    int NON_UNIFORM = 58;
+    int NONE = 59;
+    int NOREPEAT = 60;
+    int NORMAL = 61;
+    int NOT_BLANK = 62;
+    int ODD = 63;
+    int ODD_PAGE = 64;
+    int OUTSET = 65;
+    int OVERLINE = 66;
+    int PAGE = 67;
+    int PAGE_SEQUENCE = 68;
+    int PERCEPTUAL = 69;
+    int PRESERVE = 70;
+    int REFERENCE_AREA = 71;
+    int RELATIVE = 72;
+    int RELATIVE_COLOMETRIC = 73;
+    int REPEAT = 74;
+    int REPEATX = 75;
+    int REPEATY = 76;
+    int REST = 77;
+    int RETAIN = 78;
+    int RIDGE = 79;
+    int RIGHT = 80;
+    int RL_TB = 81;
+    int RULE = 82;
+    int SATURATION = 83;
+    int SCROLL = 84;
+    int SEPARATE = 85;
+    int SMALL_CAPS = 86;
+    int SOLID = 87;
+    int SPACE = 88;
+    int START = 89;
+    int STATIC = 90;
+    int SUB = 91;
+    int SUPER = 92;
+    int TB_RL = 93;
+    int TEXT_BOTTOM = 94;
+    int TEXT_TOP = 95;
+    int TOP = 96;
+    int TRADITIONAL = 97;
+    int TREAT_AS_SPACE = 98;
+    int TREAT_AS_ZERO_WIDTH_SPACE = 99;
+    int TRUE = 100;
+    int UNDERLINE = 101;
+    int UNIFORM = 102;
+    int UPPERCASE = 103;
+    int USECONTENT = 104;
+    int VISIBLE = 105;
+    int WRAP = 106;
+
+}
diff --git a/src/java/org/apache/fop/fo/FObj.java b/src/java/org/apache/fop/fo/FObj.java
index 9e72a1590..1f5fcaadd 100644
--- a/src/java/org/apache/fop/fo/FObj.java
+++ b/src/java/org/apache/fop/fo/FObj.java
@@ -59,7 +59,7 @@ import java.util.Set;
 
 import org.apache.fop.apps.FOPException;
 import org.apache.fop.fo.flow.Marker;
-import org.apache.fop.fo.properties.Constants;
+import org.apache.fop.fo.Constants;
 import org.apache.fop.fo.properties.FOPropertyMapping;
 import org.xml.sax.Attributes;
 
diff --git a/src/java/org/apache/fop/fo/Property.java b/src/java/org/apache/fop/fo/Property.java
index 8f922efa6..30c323d03 100644
--- a/src/java/org/apache/fop/fo/Property.java
+++ b/src/java/org/apache/fop/fo/Property.java
@@ -61,7 +61,7 @@ import org.apache.fop.datatypes.Space;
 import org.apache.fop.fo.expr.Numeric;
 import org.apache.fop.fo.expr.PropertyParser;
 import org.apache.fop.fo.expr.PropertyInfo;
-import org.apache.fop.fo.properties.Constants;
+import org.apache.fop.fo.Constants;
 import org.apache.fop.fo.properties.FOPropertyMapping;
 import org.apache.fop.apps.FOPException;
 import java.util.Vector;
diff --git a/src/java/org/apache/fop/fo/PropertyList.java b/src/java/org/apache/fop/fo/PropertyList.java
index 6c4485f66..0038a42e9 100644
--- a/src/java/org/apache/fop/fo/PropertyList.java
+++ b/src/java/org/apache/fop/fo/PropertyList.java
@@ -57,7 +57,7 @@ import org.xml.sax.Attributes;
 // FOP
 import org.apache.fop.apps.FOPException;
 import org.apache.fop.fo.Property.Maker;
-import org.apache.fop.fo.properties.Constants;
+import org.apache.fop.fo.Constants;
 import org.apache.fop.fo.properties.FOPropertyMapping;
 import org.apache.fop.fo.properties.WritingMode;
 
diff --git a/src/java/org/apache/fop/fo/PropertyManager.java b/src/java/org/apache/fop/fo/PropertyManager.java
index 2fad54b89..eaa51451f 100644
--- a/src/java/org/apache/fop/fo/PropertyManager.java
+++ b/src/java/org/apache/fop/fo/PropertyManager.java
@@ -67,7 +67,7 @@ import org.apache.fop.traits.BlockProps;
 import org.apache.fop.traits.InlineProps;
 import org.apache.fop.traits.SpaceVal;
 import org.apache.fop.traits.LayoutProps; // keep, break, span, space?
-import org.apache.fop.fo.properties.Constants;
+import org.apache.fop.fo.Constants;
 import org.apache.fop.fo.properties.Span;
 import org.apache.fop.fonts.FontMetrics;
 import org.apache.fop.fo.properties.CommonHyphenation;
diff --git a/src/java/org/apache/fop/fo/flow/Block.java b/src/java/org/apache/fop/fo/flow/Block.java
index 44d1203a0..b1ae2a9f0 100644
--- a/src/java/org/apache/fop/fo/flow/Block.java
+++ b/src/java/org/apache/fop/fo/flow/Block.java
@@ -62,7 +62,7 @@ import org.apache.fop.fo.FObj;
 import org.apache.fop.fo.FObjMixed;
 import org.apache.fop.fo.RecursiveCharIterator;
 import org.apache.fop.fo.FOTreeVisitor;
-import org.apache.fop.fo.properties.Constants;
+import org.apache.fop.fo.Constants;
 import org.apache.fop.fo.properties.CommonAccessibility;
 import org.apache.fop.fo.properties.CommonAural;
 import org.apache.fop.fo.properties.CommonBackground;
diff --git a/src/java/org/apache/fop/fo/flow/TableRow.java b/src/java/org/apache/fop/fo/flow/TableRow.java
index 786ce1f0c..1ae293c00 100644
--- a/src/java/org/apache/fop/fo/flow/TableRow.java
+++ b/src/java/org/apache/fop/fo/flow/TableRow.java
@@ -61,7 +61,7 @@ import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FObj;
 import org.apache.fop.fo.Property;
 import org.apache.fop.fo.FOTreeVisitor;
-import org.apache.fop.fo.properties.Constants;
+import org.apache.fop.fo.Constants;
 
 import org.apache.fop.fo.properties.CommonAccessibility;
 import org.apache.fop.fo.properties.CommonAural;
diff --git a/src/java/org/apache/fop/fo/properties/CommonBorderAndPadding.java b/src/java/org/apache/fop/fo/properties/CommonBorderAndPadding.java
index b332f2825..077b9033c 100644
--- a/src/java/org/apache/fop/fo/properties/CommonBorderAndPadding.java
+++ b/src/java/org/apache/fop/fo/properties/CommonBorderAndPadding.java
@@ -50,6 +50,7 @@
  */
 package org.apache.fop.fo.properties;
 
+import org.apache.fop.fo.Constants;
 import org.apache.fop.datatypes.ColorType;
 import org.apache.fop.datatypes.CondLength;
 
diff --git a/src/java/org/apache/fop/fo/properties/Constants.java b/src/java/org/apache/fop/fo/properties/Constants.java
deleted file mode 100644
index b5be55044..000000000
--- a/src/java/org/apache/fop/fo/properties/Constants.java
+++ /dev/null
@@ -1,489 +0,0 @@
-/* $Id$
- * ============================================================================
- *                    The Apache Software License, Version 1.1
- * ============================================================================
- *
- * Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modifica-
- * tion, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- *
- * 3. The end-user documentation included with the redistribution, if any, must
- *    include the following acknowledgment: "This product includes software
- *    developed by the Apache Software Foundation (http://www.apache.org/)."
- *    Alternately, this acknowledgment may appear in the software itself, if
- *    and wherever such third-party acknowledgments normally appear.
- *
- * 4. The names "FOP" and "Apache Software Foundation" must not be used to
- *    endorse or promote products derived from this software without prior
- *    written permission. For written permission, please contact
- *    apache@apache.org.
- *
- * 5. Products derived from this software may not be called "Apache", nor may
- *    "Apache" appear in their name, without prior written permission of the
- *    Apache Software Foundation.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU-
- * DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * ============================================================================
- *
- * This software consists of voluntary contributions made by many individuals
- * on behalf of the Apache Software Foundation and was originally created by
- * James Tauber <jtauber@jtauber.com>. For more information on the Apache
- * Software Foundation, please see <http://www.apache.org/>.
-*/
-package org.apache.fop.fo.properties;
-
-public interface Constants {
-
-    // element constants
-    int FO_BASIC_LINK = 1;
-    int FO_BIDI_OVERRIDE = 2;
-    int FO_BLOCK = 3;
-    int FO_BLOCK_CONTAINER = 4;
-    int FO_CHARACTER = 5;
-    int FO_COLOR_PROFILE = 6;
-    int FO_CONDITIONAL_PAGE_MASTER_REFERENCE = 7;
-    int FO_DECLARATION = 8;
-    int FO_EXTERNAL_GRAPHIC = 9;
-    int FO_FLOAT = 10;
-    int FO_FLOW = 11;
-    int FO_FOOTNOTE = 12;
-    int FO_FOOTNOTE_BODY = 13;
-    int FO_INITIAL_PROPERTY_SET = 14;
-    int FO_INLINE = 15;
-    int FO_INLINE_CONTAINER = 16;
-    int FO_INSTREAM_FOREIGN_OBJECT = 17;
-    int FO_LAYOUT_MASTER_SET = 18;
-    int FO_LEADER = 19;
-    int FO_LIST_BLOCK = 20;
-    int FO_LIST_ITEM = 21;
-    int FO_LIST_ITEM_BODY = 22;
-    int FO_LIST_ITEM_LABEL = 23;
-    int FO_MARKER = 24;
-    int FO_MULTI_CASE = 25;
-    int FO_MULTI_PROPERTIES = 26;
-    int FO_MULTI_PROPERTY_SET = 27;
-    int FO_MULTI_SWITCH = 28;
-    int FO_MULTI_TOGGLE = 29;
-    int FO_PAGE_NUMBER = 30;
-    int FO_PAGE_NUMBER_CITATION = 31;
-    int FO_PAGE_SEQUENCE = 32;
-    int FO_PAGE_SEQUENCE_MASTER = 33;
-    int FO_REGION_AFTER = 34;
-    int FO_REGION_BEFORE = 35;
-    int FO_REGION_BODY = 36;
-    int FO_REGION_END = 37;
-    int FO_REGION_START = 38;
-    int FO_REPEATABLE_PAGE_MASTER_ALTERNATIVES = 39;
-    int FO_REPEATABLE_PAGE_MASTER_REFERENCE = 40;
-    int FO_RETRIEVE_MARKER = 41;
-    int FO_ROOT = 42;
-    int FO_SIMPLE_PAGE_MASTER = 43;
-    int FO_SINGLE_PAGE_MASTER_REFERENCE = 44;
-    int FO_STATIC_CONTENT = 45;
-    int FO_TABLE = 46;
-    int FO_TABLE_AND_CAPTION = 47;
-    int FO_TABLE_BODY = 48;
-    int FO_TABLE_CAPTION = 49;
-    int FO_TABLE_CELL = 50;
-    int FO_TABLE_COLUMN = 51;
-    int FO_TABLE_FOOTER = 52;
-    int FO_TABLE_HEADER = 53;
-    int FO_TABLE_ROW = 54;
-    int FO_TITLE = 55;
-    int FO_WRAPPER = 56;
-    int ELEMENT_COUNT = 56;
-    
-    // Masks
-    int COMPOUND_SHIFT = 9;
-    int PROPERTY_MASK = (1 << COMPOUND_SHIFT)-1;
-    int COMPOUND_MASK = ~PROPERTY_MASK;
-
-    // property constants
-    int PR_ABSOLUTE_POSITION = 1;
-    int PR_ACTIVE_STATE = 2;
-    int PR_ALIGNMENT_ADJUST = 3;
-    int PR_ALIGNMENT_BASELINE = 4;
-    int PR_AUTO_RESTORE = 5;
-    int PR_AZIMUTH = 6;
-    int PR_BACKGROUND = 7;
-    int PR_BACKGROUND_ATTACHMENT = 8;
-    int PR_BACKGROUND_COLOR = 9;
-    int PR_BACKGROUND_IMAGE = 10;
-    int PR_BACKGROUND_POSITION = 11;
-    int PR_BACKGROUND_POSITION_HORIZONTAL = 12;
-    int PR_BACKGROUND_POSITION_VERTICAL = 13;
-    int PR_BACKGROUND_REPEAT = 14;
-    int PR_BASELINE_SHIFT = 15;
-    int PR_BLANK_OR_NOT_BLANK = 16;
-    int PR_BLOCK_PROGRESSION_DIMENSION = 17;
-    int PR_BORDER = 18;
-    int PR_BORDER_AFTER_COLOR = 19;
-    int PR_BORDER_AFTER_PRECEDENCE = 20;
-    int PR_BORDER_AFTER_STYLE = 21;
-    int PR_BORDER_AFTER_WIDTH = 22;
-    int PR_BORDER_BEFORE_COLOR = 23;
-    int PR_BORDER_BEFORE_PRECEDENCE = 24;
-    int PR_BORDER_BEFORE_STYLE = 25;
-    int PR_BORDER_BEFORE_WIDTH = 26;
-    int PR_BORDER_BOTTOM = 27;
-    int PR_BORDER_BOTTOM_COLOR = 28;
-    int PR_BORDER_BOTTOM_STYLE = 29;
-    int PR_BORDER_BOTTOM_WIDTH = 30;
-    int PR_BORDER_COLLAPSE = 31;
-    int PR_BORDER_COLOR = 32;
-    int PR_BORDER_END_COLOR = 33;
-    int PR_BORDER_END_PRECEDENCE = 34;
-    int PR_BORDER_END_STYLE = 35;
-    int PR_BORDER_END_WIDTH = 36;
-    int PR_BORDER_LEFT = 37;
-    int PR_BORDER_LEFT_COLOR = 38;
-    int PR_BORDER_LEFT_STYLE = 39;
-    int PR_BORDER_LEFT_WIDTH = 40;
-    int PR_BORDER_RIGHT = 41;
-    int PR_BORDER_RIGHT_COLOR = 42;
-    int PR_BORDER_RIGHT_STYLE = 43;
-    int PR_BORDER_RIGHT_WIDTH = 44;
-    int PR_BORDER_SEPARATION = 45;
-    int PR_BORDER_SPACING = 46;
-    int PR_BORDER_START_COLOR = 47;
-    int PR_BORDER_START_PRECEDENCE = 48;
-    int PR_BORDER_START_STYLE = 49;
-    int PR_BORDER_START_WIDTH = 50;
-    int PR_BORDER_STYLE = 51;
-    int PR_BORDER_TOP = 52;
-    int PR_BORDER_TOP_COLOR = 53;
-    int PR_BORDER_TOP_STYLE = 54;
-    int PR_BORDER_TOP_WIDTH = 55;
-    int PR_BORDER_WIDTH = 56;
-    int PR_BOTTOM = 57;
-    int PR_BREAK_AFTER = 58;
-    int PR_BREAK_BEFORE = 59;
-    int PR_CAPTION_SIDE = 60;
-    int PR_CASE_NAME = 61;
-    int PR_CASE_TITLE = 62;
-    int PR_CHARACTER = 63;
-    int PR_CLEAR = 64;
-    int PR_CLIP = 65;
-    int PR_COLOR = 66;
-    int PR_COLOR_PROFILE_NAME = 67;
-    int PR_COLUMN_COUNT = 68;
-    int PR_COLUMN_GAP = 69;
-    int PR_COLUMN_NUMBER = 70;
-    int PR_COLUMN_WIDTH = 71;
-    int PR_CONTENT_HEIGHT = 72;
-    int PR_CONTENT_TYPE = 73;
-    int PR_CONTENT_WIDTH = 74;
-    int PR_COUNTRY = 75;
-    int PR_CUE = 76;
-    int PR_CUE_AFTER = 77;
-    int PR_CUE_BEFORE = 78;
-    int PR_DESTINATION_PLACEMENT_OFFSET = 79;
-    int PR_DIRECTION = 80;
-    int PR_DISPLAY_ALIGN = 81;
-    int PR_DOMINANT_BASELINE = 82;
-    int PR_ELEVATION = 83;
-    int PR_EMPTY_CELLS = 84;
-    int PR_END_INDENT = 85;
-    int PR_ENDS_ROW = 86;
-    int PR_EXTENT = 87;
-    int PR_EXTERNAL_DESTINATION = 88;
-    int PR_FLOAT = 89;
-    int PR_FLOW_NAME = 90;
-    int PR_FONT = 91;
-    int PR_FONT_FAMILY = 92;
-    int PR_FONT_SELECTION_STRATEGY = 93;
-    int PR_FONT_SIZE = 94;
-    int PR_FONT_SIZE_ADJUST = 95;
-    int PR_FONT_STRETCH = 96;
-    int PR_FONT_STYLE = 97;
-    int PR_FONT_VARIANT = 98;
-    int PR_FONT_WEIGHT = 99;
-    int PR_FORCE_PAGE_COUNT = 100;
-    int PR_FORMAT = 101;
-    int PR_GLYPH_ORIENTATION_HORIZONTAL = 102;
-    int PR_GLYPH_ORIENTATION_VERTICAL = 103;
-    int PR_GROUPING_SEPARATOR = 104;
-    int PR_GROUPING_SIZE = 105;
-    int PR_HEIGHT = 106;
-    int PR_HYPHENATE = 107;
-    int PR_HYPHENATION_CHARACTER = 108;
-    int PR_HYPHENATION_KEEP = 109;
-    int PR_HYPHENATION_LADDER_COUNT = 110;
-    int PR_HYPHENATION_PUSH_CHARACTER_COUNT = 111;
-    int PR_HYPHENATION_REMAIN_CHARACTER_COUNT = 112;
-    int PR_ID = 113;
-    int PR_INDICATE_DESTINATION = 114;
-    int PR_INITIAL_PAGE_NUMBER = 115;
-    int PR_INLINE_PROGRESSION_DIMENSION = 116;
-    int PR_INTERNAL_DESTINATION = 117;
-    int PR_KEEP_TOGETHER = 118;
-    int PR_KEEP_WITH_NEXT = 119;
-    int PR_KEEP_WITH_PREVIOUS = 120;
-    int PR_LANGUAGE = 121;
-    int PR_LAST_LINE_END_INDENT = 122;
-    int PR_LEADER_ALIGNMENT = 123;
-    int PR_LEADER_LENGTH = 124;
-    int PR_LEADER_PATTERN = 125;
-    int PR_LEADER_PATTERN_WIDTH = 126;
-    int PR_LEFT = 127;
-    int PR_LETTER_SPACING = 128;
-    int PR_LETTER_VALUE = 129;
-    int PR_LINEFEED_TREATMENT = 130;
-    int PR_LINE_HEIGHT = 131;
-    int PR_LINE_HEIGHT_SHIFT_ADJUSTMENT = 132;
-    int PR_LINE_STACKING_STRATEGY = 133;
-    int PR_MARGIN = 134;
-    int PR_MARGIN_BOTTOM = 135;
-    int PR_MARGIN_LEFT = 136;
-    int PR_MARGIN_RIGHT = 137;
-    int PR_MARGIN_TOP = 138;
-    int PR_MARKER_CLASS_NAME = 139;
-    int PR_MASTER_NAME = 140;
-    int PR_MASTER_REFERENCE = 141;
-    int PR_MAX_HEIGHT = 142;
-    int PR_MAXIMUM_REPEATS = 143;
-    int PR_MAX_WIDTH = 144;
-    int PR_MEDIA_USAGE = 145;
-    int PR_MIN_HEIGHT = 146;
-    int PR_MIN_WIDTH = 147;
-    int PR_NUMBER_COLUMNS_REPEATED = 148;
-    int PR_NUMBER_COLUMNS_SPANNED = 149;
-    int PR_NUMBER_ROWS_SPANNED = 150;
-    int PR_ODD_OR_EVEN = 151;
-    int PR_ORPHANS = 152;
-    int PR_OVERFLOW = 153;
-    int PR_PADDING = 154;
-    int PR_PADDING_AFTER = 155;
-    int PR_PADDING_BEFORE = 156;
-    int PR_PADDING_BOTTOM = 157;
-    int PR_PADDING_END = 158;
-    int PR_PADDING_LEFT = 159;
-    int PR_PADDING_RIGHT = 160;
-    int PR_PADDING_START = 161;
-    int PR_PADDING_TOP = 162;
-    int PR_PAGE_BREAK_AFTER = 163;
-    int PR_PAGE_BREAK_BEFORE = 164;
-    int PR_PAGE_BREAK_INSIDE = 165;
-    int PR_PAGE_HEIGHT = 166;
-    int PR_PAGE_POSITION = 167;
-    int PR_PAGE_WIDTH = 168;
-    int PR_PAUSE = 169;
-    int PR_PAUSE_AFTER = 170;
-    int PR_PAUSE_BEFORE = 171;
-    int PR_PITCH = 172;
-    int PR_PITCH_RANGE = 173;
-    int PR_PLAY_DURING = 174;
-    int PR_POSITION = 175;
-    int PR_PRECEDENCE = 176;
-    int PR_PROVISIONAL_DISTANCE_BETWEEN_STARTS = 177;
-    int PR_PROVISIONAL_LABEL_SEPARATION = 178;
-    int PR_REFERENCE_ORIENTATION = 179;
-    int PR_REF_ID = 180;
-    int PR_REGION_NAME = 181;
-    int PR_RELATIVE_ALIGN = 182;
-    int PR_RELATIVE_POSITION = 183;
-    int PR_RENDERING_INTENT = 184;
-    int PR_RETRIEVE_BOUNDARY = 185;
-    int PR_RETRIEVE_CLASS_NAME = 186;
-    int PR_RETRIEVE_POSITION = 187;
-    int PR_RICHNESS = 188;
-    int PR_RIGHT = 189;
-    int PR_ROLE = 190;
-    int PR_RULE_STYLE = 191;
-    int PR_RULE_THICKNESS = 192;
-    int PR_SCALING = 193;
-    int PR_SCALING_METHOD = 194;
-    int PR_SCORE_SPACES = 195;
-    int PR_SCRIPT = 196;
-    int PR_SHOW_DESTINATION = 197;
-    int PR_SIZE = 198;
-    int PR_SOURCE_DOCUMENT = 199;
-    int PR_SPACE_AFTER = 200;
-    int PR_SPACE_BEFORE = 201;
-    int PR_SPACE_END = 202;
-    int PR_SPACE_START = 203;
-    int PR_SPACE_TREATMENT = 204;
-    int PR_SPAN = 205;
-    int PR_SPEAK = 206;
-    int PR_SPEAK_HEADER = 207;
-    int PR_SPEAK_NUMERAL = 208;
-    int PR_SPEAK_PUNCTUATION = 209;
-    int PR_SPEECH_RATE = 210;
-    int PR_SRC = 211;
-    int PR_START_INDENT = 212;
-    int PR_STARTING_STATE = 213;
-    int PR_STARTS_ROW = 214;
-    int PR_STRESS = 215;
-    int PR_SUPPRESS_AT_LINE_BREAK = 216;
-    int PR_SWITCH_TO = 217;
-    int PR_TABLE_LAYOUT = 218;
-    int PR_TABLE_OMIT_FOOTER_AT_BREAK = 219;
-    int PR_TABLE_OMIT_HEADER_AT_BREAK = 220;
-    int PR_TARGET_PRESENTATION_CONTEXT = 221;
-    int PR_TARGET_PROCESSING_CONTEXT = 222;
-    int PR_TARGET_STYLESHEET = 223;
-    int PR_TEXT_ALIGN = 224;
-    int PR_TEXT_ALIGN_LAST = 225;
-    int PR_TEXT_ALTITUDE = 226;
-    int PR_TEXT_DECORATION = 227;
-    int PR_TEXT_DEPTH = 228;
-    int PR_TEXT_INDENT = 229;
-    int PR_TEXT_SHADOW = 230;
-    int PR_TEXT_TRANSFORM = 231;
-    int PR_TOP = 232;
-    int PR_TREAT_AS_WORD_SPACE = 233;
-    int PR_UNICODE_BIDI = 234;
-    int PR_VERTICAL_ALIGN = 235;
-    int PR_VISIBILITY = 236;
-    int PR_VOICE_FAMILY = 237;
-    int PR_VOLUME = 238;
-    int PR_WHITE_SPACE_COLLAPSE = 239;
-    int PR_WHITE_SPACE_TREATMENT = 240;
-    int PR_WIDOWS = 241;
-    int PR_WIDTH = 242;
-    int PR_WORD_SPACING = 243;
-    int PR_WRAP_OPTION = 244;
-    int PR_WRITING_MODE = 245;
-    int PR_XML_LANG = 246;
-    int PR_Z_INDEX = 247;
-    int PROPERTY_COUNT = 247;
-    
-    // compound property constants
-    int CP_BLOCK_PROGRESSION_DIRECTION = 1 << COMPOUND_SHIFT;
-    int CP_CONDITIONALITY = 2 << COMPOUND_SHIFT;
-    int CP_INLINE_PROGRESSION_DIRECTION = 3 << COMPOUND_SHIFT;
-    int CP_LENGTH = 4 << COMPOUND_SHIFT;
-    int CP_MAXIMUM = 5 << COMPOUND_SHIFT;
-    int CP_MINIMUM = 6 << COMPOUND_SHIFT;
-    int CP_OPTIMUM = 7 << COMPOUND_SHIFT;
-    int CP_PRECEDENCE = 8 << COMPOUND_SHIFT;
-    int CP_WITHIN_COLUMN = 9 << COMPOUND_SHIFT;
-    int CP_WITHIN_LINE = 10 << COMPOUND_SHIFT;
-    int CP_WITHIN_PAGE = 11 << COMPOUND_SHIFT;
-
-    // Enumeration constants
-    int ABSOLUTE = 1;
-    int ABSOLUTE_COLORMETRIC = 2;
-    int AFTER = 3;
-    int ALL = 4;
-    int ALPHABETIC = 5;
-    int ALWAYS = 6;
-    int ANY = 7;
-    int AUTO = 8;
-    int BASELINE = 9;
-    int BEFORE = 10;
-    int BLANK = 11;
-    int BLINK = 12;
-    int BOTTOM = 13;
-    int CAPITALIZE = 14;
-    int CENTER = 15;
-    int COLLAPSE = 16;
-    int COLUMN = 17;
-    int DASHED = 18;
-    int DISCARD = 19;
-    int DOCUMENT = 20;
-    int DOTS = 21;
-    int DOTTED = 22;
-    int DOUBLE = 23;
-    int END = 24;
-    int END_ON_EVEN = 25;
-    int END_ON_ODD = 26;
-    int ERROR_IF_OVERFLOW = 27;
-    int EVEN = 28;
-    int EVEN_PAGE = 29;
-    int FALSE = 30;
-    int FIC = 31;
-    int FIRST = 32;
-    int FIXED = 33;
-    int FORCE = 34;
-    int FSWP = 35;
-    int GROOVE = 36;
-    int HIDDEN = 37;
-    int IGNORE = 38;
-    int IGNORE_IF_AFTER_LINEFEED = 39;
-    int IGNORE_IF_BEFORE_LINEFEED = 40;
-    int IGNORE_IF_SURROUNDING_LINEFEED = 41;
-    int INSET = 42;
-    int JUSTIFY = 43;
-    int LAST = 44;
-    int LEFT = 45;
-    int LEWP = 46;
-    int LINE_THROUGH = 47;
-    int LOWERCASE = 48;
-    int LR_TB = 49;
-    int LSWP = 50;
-    int MIDDLE = 51;
-    int NO_BLINK = 52;
-    int NO_FORCE = 53;
-    int NO_LINE_THROUGH = 54;
-    int NO_OVERLINE = 55;
-    int NO_UNDERLINE = 56;
-    int NO_WRAP = 57;
-    int NON_UNIFORM = 58;
-    int NONE = 59;
-    int NOREPEAT = 60;
-    int NORMAL = 61;
-    int NOT_BLANK = 62;
-    int ODD = 63;
-    int ODD_PAGE = 64;
-    int OUTSET = 65;
-    int OVERLINE = 66;
-    int PAGE = 67;
-    int PAGE_SEQUENCE = 68;
-    int PERCEPTUAL = 69;
-    int PRESERVE = 70;
-    int REFERENCE_AREA = 71;
-    int RELATIVE = 72;
-    int RELATIVE_COLOMETRIC = 73;
-    int REPEAT = 74;
-    int REPEATX = 75;
-    int REPEATY = 76;
-    int REST = 77;
-    int RETAIN = 78;
-    int RIDGE = 79;
-    int RIGHT = 80;
-    int RL_TB = 81;
-    int RULE = 82;
-    int SATURATION = 83;
-    int SCROLL = 84;
-    int SEPARATE = 85;
-    int SMALL_CAPS = 86;
-    int SOLID = 87;
-    int SPACE = 88;
-    int START = 89;
-    int STATIC = 90;
-    int SUB = 91;
-    int SUPER = 92;
-    int TB_RL = 93;
-    int TEXT_BOTTOM = 94;
-    int TEXT_TOP = 95;
-    int TOP = 96;
-    int TRADITIONAL = 97;
-    int TREAT_AS_SPACE = 98;
-    int TREAT_AS_ZERO_WIDTH_SPACE = 99;
-    int TRUE = 100;
-    int UNDERLINE = 101;
-    int UNIFORM = 102;
-    int UPPERCASE = 103;
-    int USECONTENT = 104;
-    int VISIBLE = 105;
-    int WRAP = 106;
-
-}
diff --git a/src/java/org/apache/fop/layoutmgr/PageLayoutManager.java b/src/java/org/apache/fop/layoutmgr/PageLayoutManager.java
index d023527cc..bdc72a8ad 100644
--- a/src/java/org/apache/fop/layoutmgr/PageLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/PageLayoutManager.java
@@ -81,7 +81,7 @@ import org.apache.fop.fo.pagination.StaticContent;
 import org.apache.fop.fo.properties.CommonBackground;
 import org.apache.fop.fo.properties.CommonBorderAndPadding;
 import org.apache.fop.fo.properties.CommonMarginBlock;
-import org.apache.fop.fo.properties.Constants;
+import org.apache.fop.fo.Constants;
 import org.apache.fop.fo.properties.Overflow;
 
 import java.util.ArrayList;
diff --git a/src/java/org/apache/fop/render/rtf/RTFHandler.java b/src/java/org/apache/fop/render/rtf/RTFHandler.java
index f8ffe0640..ce21c4d8c 100644
--- a/src/java/org/apache/fop/render/rtf/RTFHandler.java
+++ b/src/java/org/apache/fop/render/rtf/RTFHandler.java
@@ -78,7 +78,7 @@ import org.apache.fop.fo.flow.TableRow;
 import org.apache.fop.fo.pagination.Flow;
 import org.apache.fop.fo.pagination.PageSequence;
 import org.apache.fop.fo.pagination.SimplePageMaster;
-import org.apache.fop.fo.properties.Constants;
+import org.apache.fop.fo.Constants;
 import org.apache.fop.fo.Property;
 import org.apache.fop.fo.LengthProperty;
 import org.apache.fop.apps.Document;
diff --git a/src/java/org/apache/fop/render/rtf/TableAttributesConverter.java b/src/java/org/apache/fop/render/rtf/TableAttributesConverter.java
index ed14fd446..3eda1b35a 100644
--- a/src/java/org/apache/fop/render/rtf/TableAttributesConverter.java
+++ b/src/java/org/apache/fop/render/rtf/TableAttributesConverter.java
@@ -59,7 +59,7 @@ import org.apache.avalon.framework.logger.ConsoleLogger;
 import org.apache.fop.apps.FOPException;
 import org.apache.fop.fo.EnumProperty;
 import org.apache.fop.fo.expr.NCnameProperty;
-import org.apache.fop.fo.properties.Constants;
+import org.apache.fop.fo.Constants;
 import org.apache.fop.fo.LengthProperty;
 import org.apache.fop.fo.ListProperty;
 import org.apache.fop.fo.PropertyList;
diff --git a/src/java/org/apache/fop/render/rtf/TextAttributesConverter.java b/src/java/org/apache/fop/render/rtf/TextAttributesConverter.java
index 088d253fc..6abd4897c 100644
--- a/src/java/org/apache/fop/render/rtf/TextAttributesConverter.java
+++ b/src/java/org/apache/fop/render/rtf/TextAttributesConverter.java
@@ -55,7 +55,7 @@ import org.apache.avalon.framework.logger.Logger;
 import org.apache.avalon.framework.logger.ConsoleLogger;
 import org.apache.fop.apps.FOPException;
 import org.apache.fop.fo.EnumProperty;
-import org.apache.fop.fo.properties.Constants;
+import org.apache.fop.fo.Constants;
 import org.apache.fop.fo.LengthProperty;
 import org.apache.fop.fo.PropertyList;
 import org.apache.fop.fo.SpaceProperty;
diff --git a/src/java/org/apache/fop/traits/LayoutProps.java b/src/java/org/apache/fop/traits/LayoutProps.java
index efc266bac..c183e5a1a 100644
--- a/src/java/org/apache/fop/traits/LayoutProps.java
+++ b/src/java/org/apache/fop/traits/LayoutProps.java
@@ -50,7 +50,7 @@
  */ 
 package org.apache.fop.traits;
 
-import org.apache.fop.fo.properties.Constants;
+import org.apache.fop.fo.Constants;
 
 /**
  * Store properties affecting layout: break-before, break-after, keeps, span.
diff --git a/src/java/org/apache/fop/traits/SpaceVal.java b/src/java/org/apache/fop/traits/SpaceVal.java
index b34ef7f0c..bdb038ee2 100644
--- a/src/java/org/apache/fop/traits/SpaceVal.java
+++ b/src/java/org/apache/fop/traits/SpaceVal.java
@@ -53,7 +53,7 @@ package org.apache.fop.traits;
 import org.apache.fop.datatypes.Space;
 
 import org.apache.fop.fo.Property;
-import org.apache.fop.fo.properties.Constants;
+import org.apache.fop.fo.Constants;
 
 /**
  * Store a single Space property value in simplified form, with all