Merge pull request #2 from w3c/drop-fence

move fence and separator to legacy schema
w3c · Aug 23, 2024 · 05bf15b · 05bf15b
2 parents aff897b + 8c3682f
commit 05bf15b
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 47 deletions.
diff --git a/rnc/mathml4-core.rnc b/rnc/mathml4-core.rnc
@@ -210,8 +210,6 @@ mo = element mo {mo.attributes, token.content}
 mo.attributes = 
   MathMLPGlobalAttributes,
   attribute form {"prefix" | "infix" | "postfix"}?,
-  attribute fence {mathml-boolean}?,
-  attribute separator {mathml-boolean}?,
   attribute lspace {length-percentage}?,
   attribute rspace {length-percentage}?,
   attribute stretchy {mathml-boolean}?,

diff --git a/rnc/mathml4-legacy.rnc b/rnc/mathml4-legacy.rnc
@@ -70,12 +70,18 @@ DeprecatedTokenAtt =
   attribute color {color}?,
   attribute background {color}?,
   attribute mathsize {"small" | "normal" | "big" }?
-
+
+DeprecatedMoAtt =
+  attribute fence {mathml-boolean}?,
+  attribute separator {mathml-boolean}?
+
 mstyle.attributes &= DeprecatedTokenAtt
+mstyle.attributes &= DeprecatedMoAtt
 mglyph.attributes &= DeprecatedTokenAtt
 mn.attributes &= DeprecatedTokenAtt
 mi.attributes &= DeprecatedTokenAtt
 mo.attributes &= DeprecatedTokenAtt
+mo.attributes &= DeprecatedMoAtt
 mtext.attributes &= DeprecatedTokenAtt
 mspace.attributes &= DeprecatedTokenAtt
 ms.attributes &= DeprecatedTokenAtt

diff --git a/rnc/mathml4-presentation.rnc b/rnc/mathml4-presentation.rnc
@@ -198,7 +198,6 @@ mstyle.generalattributes =
   attribute dir {"ltr" | "rtl"}?,
   attribute equalcolumns {"true" | "false"}?,
   attribute equalrows {"true" | "false"}?,
-  attribute fence {"true" | "false"}?,
   attribute form {"prefix" | "infix" | "postfix"}?,
   attribute frame {linestyle}?,
   attribute framespacing {list {length-percentage, length-percentage}}?,
@@ -240,7 +239,6 @@ mstyle.generalattributes =
   attribute rquote {text}?,
   attribute rspace {length-percentage}?,
   attribute selection {positive-integer}?,
-  attribute separator {"true" | "false"}?,
   attribute separators {text}?,
   attribute shift {integer}?,
   attribute side {"left" | "right" | "leftoverlap" | "rightoverlap"}?,

diff --git a/rng/mathml4-core.rng b/rng/mathml4-core.rng
@@ -588,16 +588,6 @@
         </choice>
       </attribute>
     </optional>
-    <optional>
-      <attribute name="fence">
-        <ref name="mathml-boolean"/>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="separator">
-        <ref name="mathml-boolean"/>
-      </attribute>
-    </optional>
     <optional>
       <attribute name="lspace">
         <ref name="length-percentage"/>

diff --git a/rng/mathml4-legacy.rng b/rng/mathml4-legacy.rng
@@ -220,9 +220,24 @@
       </attribute>
     </optional>
   </define>
+  <define name="DeprecatedMoAtt">
+    <optional>
+      <attribute name="fence">
+        <ref name="mathml-boolean"/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="separator">
+        <ref name="mathml-boolean"/>
+      </attribute>
+    </optional>
+  </define>
   <define name="mstyle.attributes" combine="interleave">
     <ref name="DeprecatedTokenAtt"/>
   </define>
+  <define name="mstyle.attributes" combine="interleave">
+    <ref name="DeprecatedMoAtt"/>
+  </define>
   <define name="mglyph.attributes" combine="interleave">
     <ref name="DeprecatedTokenAtt"/>
   </define>
@@ -235,6 +250,9 @@
   <define name="mo.attributes" combine="interleave">
     <ref name="DeprecatedTokenAtt"/>
   </define>
+  <define name="mo.attributes" combine="interleave">
+    <ref name="DeprecatedMoAtt"/>
+  </define>
   <define name="mtext.attributes" combine="interleave">
     <ref name="DeprecatedTokenAtt"/>
   </define>

diff --git a/rng/mathml4-presentation.rng b/rng/mathml4-presentation.rng
@@ -687,14 +687,6 @@
         </choice>
       </attribute>
     </optional>
-    <optional>
-      <attribute name="fence">
-        <choice>
-          <value>true</value>
-          <value>false</value>
-        </choice>
-      </attribute>
-    </optional>
     <optional>
       <attribute name="form">
         <choice>
@@ -1010,14 +1002,6 @@
         <ref name="positive-integer"/>
       </attribute>
     </optional>
-    <optional>
-      <attribute name="separator">
-        <choice>
-          <value>true</value>
-          <value>false</value>
-        </choice>
-      </attribute>
-    </optional>
     <optional>
       <attribute name="separators"/>
     </optional>

diff --git a/xsd/mathml4-presentation.xsd b/xsd/mathml4-presentation.xsd
@@ -377,14 +377,6 @@
             </xs:restriction>
          </xs:simpleType>
       </xs:attribute>
-      <xs:attribute name="fence">
-         <xs:simpleType>
-            <xs:restriction base="xs:token">
-               <xs:enumeration value="true"/>
-               <xs:enumeration value="false"/>
-            </xs:restriction>
-         </xs:simpleType>
-      </xs:attribute>
       <xs:attribute name="form">
          <xs:simpleType>
             <xs:restriction base="xs:token">
@@ -678,14 +670,6 @@
       <xs:attribute name="rquote"/>
       <xs:attribute name="rspace" type="m:length-percentage"/>
       <xs:attribute name="selection" type="m:positive-integer"/>
-      <xs:attribute name="separator">
-         <xs:simpleType>
-            <xs:restriction base="xs:token">
-               <xs:enumeration value="true"/>
-               <xs:enumeration value="false"/>
-            </xs:restriction>
-         </xs:simpleType>
-      </xs:attribute>
       <xs:attribute name="separators"/>
       <xs:attribute name="shift" type="m:integer"/>
       <xs:attribute name="side">