Remove state element from rng/dtd oasis-tcs#922

robander · Jun 11, 2024 · 2ddac73 · 2ddac73
1 parent ac385f8
commit 2ddac73
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 57 deletions.
diff --git a/doctypes/dtd/base/commonElements.mod b/doctypes/dtd/base/commonElements.mod
@@ -55,8 +55,7 @@
                %term; |
                %text; |
                %tm; |
-               %xref; |
-               %state;"
+               %xref;"
 >
 <!ENTITY % basic.block
               "%audio; |
@@ -88,8 +87,7 @@
                %q; |
                %term; |
                %text; |
-               %tm; |
-               %state;"
+               %tm;"
 >
 <!ENTITY % basic.ph.noxref
               "%basic.ph.noxref.nocite; |
@@ -103,8 +101,7 @@
                %q; |
                %term; |
                %text; |
-               %xref; |
-               %state;"
+               %xref;"
 >
 <!ENTITY % basic.block.notbl
               "%audio; |
@@ -1091,23 +1088,6 @@
 <!ELEMENT  tm %tm.content;>
 <!ATTLIST  tm %tm.attributes;>
 
-<!--                    LONG NAME: State                           -->
-<!ENTITY % state.content
-                       "EMPTY"
->
-<!ENTITY % state.attributes
-              "name
-                          CDATA
-                                    #REQUIRED
-               value
-                          CDATA
-                                    #REQUIRED
-               %univ-atts;"
->
-<!ELEMENT  state %state.content;>
-<!ATTLIST  state %state.attributes;>
-
-
 <!--                    LONG NAME: Image Data                      -->
 <!ENTITY % image.content
                        "((%alt;)?,
@@ -1782,7 +1762,6 @@
 <!ATTLIST  simpletable    class CDATA "- topic/simpletable ">
 <!ATTLIST  sl             class CDATA "- topic/sl "         >
 <!ATTLIST  sli            class CDATA "- topic/sli "        >
-<!ATTLIST  state          class CDATA "- topic/state "      >
 <!ATTLIST  stentry        class CDATA "- topic/stentry "    >
 <!ATTLIST  sthead         class CDATA "- topic/sthead "     >
 <!ATTLIST  strow          class CDATA "- topic/strow "      >

diff --git a/doctypes/rng/base/commonElementsMod.rng b/doctypes/rng/base/commonElementsMod.rng
@@ -192,9 +192,6 @@ PUBLIC "-//OASIS//ELEMENTS DITA 2.0 Common Elements//EN"
     <define name="simpletable">
       <ref name="simpletable.element"/>
     </define>
-    <define name="state">
-      <ref name="state.element"/>
-    </define>
     <define name="stentry">
       <ref name="stentry.element"/>
     </define>
@@ -352,7 +349,6 @@ PUBLIC "-//OASIS//ELEMENTS DITA 2.0 Common Elements//EN"
           <ref name="text"/>
           <ref name="tm"/>
           <ref name="xref"/>
-          <ref name="state"/>
         </choice>
       </define>
       <define name="basic.block">
@@ -394,7 +390,6 @@ PUBLIC "-//OASIS//ELEMENTS DITA 2.0 Common Elements//EN"
           <ref name="term"/>
           <ref name="text"/>
           <ref name="tm"/>
-          <ref name="state"/>
         </choice>
       </define>
       <define name="basic.ph.noxref">
@@ -413,7 +408,6 @@ PUBLIC "-//OASIS//ELEMENTS DITA 2.0 Common Elements//EN"
           <ref name="term"/>
           <ref name="text"/>
           <ref name="xref"/>
-          <ref name="state"/>
         </choice>
       </define>
       <define name="basic.block.notbl">
@@ -1982,28 +1976,6 @@ PUBLIC "-//OASIS//ELEMENTS DITA 2.0 Common Elements//EN"
           <ref name="tm.attributes"/>
         </define>
 
-      </div>
-      <div>
-        <a:documentation xml:space="preserve">LONG NAME: State</a:documentation>
-        <define name="state.content">
-          <empty/>
-        </define>
-        <define name="state.attributes">
-          <attribute name="name"/>
-          <attribute name="value"/>
-          <ref name="univ-atts"/>
-        </define>
-        <define name="state.element">
-          <element name="state" dita:longName="State">
-            <a:documentation></a:documentation>
-            <ref name="state.attlist"/>
-            <ref name="state.content"/>
-          </element>
-        </define>
-        <define name="state.attlist" combine="interleave">
-          <ref name="state.attributes"/>
-        </define>
-
       </div>
       <div>
         <a:documentation>LONG NAME: Image</a:documentation>
@@ -3283,11 +3255,6 @@ PUBLIC "-//OASIS//ELEMENTS DITA 2.0 Common Elements//EN"
         <attribute name="class" a:defaultValue="- topic/sli "/>
       </optional>
     </define>
-    <define name="state.attlist" combine="interleave">
-      <optional>
-        <attribute name="class" a:defaultValue="- topic/state "/>
-      </optional>
-    </define>
     <define name="stentry.attlist" combine="interleave">
       <optional>
         <attribute name="class" a:defaultValue="- topic/stentry "/>