--- mml-datatypes.rng.original	Mon Feb 28 09:53:31 2005
+++ mml-datatypes.rng	Mon Feb 28 10:50:55 2005
@@ -71,7 +71,10 @@
 
 <define name="mml.namedspace.datatype">
  <choice>
-  <ref name="mml.length.datatype"/>
+  <!-- <ref name="mml.length.datatype"/> forbidden pattern list//ref -->
+  <data type="normalizedString">
+   <param name="pattern">[0-9]+(em|ex|px|in|cm|mm|pt|pc|%)?</param>
+  </data>
   <value>veryverythinmathspace</value>
   <value>verythinmathspace</value>
   <value>thinmathspace</value>
@@ -94,7 +97,8 @@
    <value>axis</value>
   </choice>
   <optional>
-   <ref name="mml.positiveinteger.datatype"/>
+   <!-- <ref name="mml.positiveinteger.datatype"/> forbidden pattern list//ref -->
+   <data type="positiveInteger"/>
   </optional>
  </list>
 </define>
@@ -130,8 +134,24 @@
   <oneOrMore>
    <choice>
     <value>auto</value>
-    <ref name="mml.length.datatype"/>
-    <ref name="mml.namedspace.datatype"/>
+    <!-- <ref name="mml.length.datatype"/> forbidden pattern list//ref -->
+    <data type="normalizedString">
+     <param name="pattern">[0-9]+(em|ex|px|in|cm|mm|pt|pc|%)?</param>
+    </data>
+    <!-- <ref name="mml.namedspace.datatype"/> forbidden pattern list//ref -->
+    <choice>
+     <!-- <ref name="mml.length.datatype"/> forbidden pattern list//ref -->
+     <data type="normalizedString">
+      <param name="pattern">[0-9]+(em|ex|px|in|cm|mm|pt|pc|%)?</param>
+     </data>
+     <value>veryverythinmathspace</value>
+     <value>verythinmathspace</value>
+     <value>thinmathspace</value>
+     <value>mediummathspace</value>
+     <value>thickmathspace</value>
+     <value>verythickmathspace</value>
+     <value>veryverythickmathspace</value>
+    </choice>
     <value>fit</value>
    </choice>
   </oneOrMore>
@@ -156,7 +176,10 @@
 <define name="mml.rowspacing.datatype">
  <list> <!-- ( number v-unit ) + -->
   <oneOrMore>
-   <ref name="mml.length.datatype"/>
+   <!-- <ref name="mml.length.datatype"/> forbidden pattern list//ref -->
+   <data type="normalizedString">
+    <param name="pattern">[0-9]+(em|ex|px|in|cm|mm|pt|pc|%)?</param>
+   </data>
   </oneOrMore>
  </list>
 </define>
@@ -164,8 +187,23 @@
 <define name="mml.columnspacing.datatype">
  <list> <!-- ( number h-unit | namedspace ) + -->
   <oneOrMore>
-   <ref name="mml.length.datatype"/>
-   <ref name="mml.namedspace.datatype"/>
+   <!-- <ref name="mml.length.datatype"/> forbidden pattern list//ref -->
+   <data type="normalizedString">
+    <param name="pattern">[0-9]+(em|ex|px|in|cm|mm|pt|pc|%)?</param>
+   </data>
+   <choice>
+    <!-- <ref name="mml.length.datatype"/> forbidden pattern list//ref -->
+    <data type="normalizedString">
+     <param name="pattern">[0-9]+(em|ex|px|in|cm|mm|pt|pc|%)?</param>
+    </data>
+    <value>veryverythinmathspace</value>
+    <value>verythinmathspace</value>
+    <value>thinmathspace</value>
+    <value>mediummathspace</value>
+    <value>thickmathspace</value>
+    <value>verythickmathspace</value>
+    <value>veryverythickmathspace</value>
+   </choice>
   </oneOrMore>
  </list>
 </define>
@@ -185,12 +223,42 @@
 <define name="mml.framespacing.datatype">
  <list> <!-- (number h-unit | namedspace) (number v-unit | namedspace) -->
   <choice>
-   <ref name="mml.length.datatype"/>
-   <ref name="mml.namedspace.datatype"/>
+   <!-- <ref name="mml.length.datatype"/> forbidden pattern list//ref -->
+   <data type="normalizedString">
+    <param name="pattern">[0-9]+(em|ex|px|in|cm|mm|pt|pc|%)?</param>
+   </data>
+   <choice>
+    <!-- <ref name="mml.length.datatype"/> forbidden pattern list//ref -->
+    <data type="normalizedString">
+     <param name="pattern">[0-9]+(em|ex|px|in|cm|mm|pt|pc|%)?</param>
+    </data>
+    <value>veryverythinmathspace</value>
+    <value>verythinmathspace</value>
+    <value>thinmathspace</value>
+    <value>mediummathspace</value>
+    <value>thickmathspace</value>
+    <value>verythickmathspace</value>
+    <value>veryverythickmathspace</value>
+   </choice>
   </choice>
   <choice>
-   <ref name="mml.length.datatype"/>
-   <ref name="mml.namedspace.datatype"/>
+   <!-- <ref name="mml.length.datatype"/> forbidden pattern list//ref -->
+   <data type="normalizedString">
+    <param name="pattern">[0-9]+(em|ex|px|in|cm|mm|pt|pc|%)?</param>
+   </data>
+   <choice>
+    <!-- <ref name="mml.length.datatype"/> forbidden pattern list//ref -->
+    <data type="normalizedString">
+     <param name="pattern">[0-9]+(em|ex|px|in|cm|mm|pt|pc|%)?</param>
+    </data>
+    <value>veryverythinmathspace</value>
+    <value>verythinmathspace</value>
+    <value>thinmathspace</value>
+    <value>mediummathspace</value>
+    <value>thickmathspace</value>
+    <value>verythickmathspace</value>
+    <value>veryverythickmathspace</value>
+   </choice>
   </choice>
  </list>
 </define>