Merge pull request #924 from robander/state

Remove state element
oasis-tcs · Jun 11, 2024 · 5423457 · 5423457
2 parents 1b029b8 + 2ddac73
commit 5423457
Show file tree

Hide file tree

Showing 11 changed files with 29 additions and 113 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 "/>

diff --git a/specification/archSpec/base/adding-an-element-to-the-section-element.dita b/specification/archSpec/base/adding-an-element-to-the-section-element.dita
@@ -99,7 +99,6 @@
 &lt;!ENTITY % text "text">
 &lt;!ENTITY % tm "tm">
 &lt;!ENTITY % xref "xref">
-&lt;!ENTITY % state "state">
 &lt;!ENTITY % data "data">
 &lt;!ENTITY % foreign "foreign">
 &lt;!ENTITY % title "title">
@@ -137,7 +136,6 @@
                %text; |
                %tm; |
                %xref; |
-               %state; |
                %data; |
                %foreign; |
                %title; |

diff --git a/specification/langRef/base/state.dita b/specification/langRef/base/state.dita
diff --git a/specification/langRef/containers/specialization-elements.dita b/specification/langRef/containers/specialization-elements.dita
@@ -15,9 +15,7 @@
     <refbody>
         <section id="section_rmk_m2h_xyb">
             <p>There is little need to use these elements unless your content can take advantage of
-               the semantic distinction. For example, a discussion of signals on a gate of an
-               integrated logic circuit might use the <xmlelement>state</xmlelement> element to
-               represent either on or off conditions of that gate.</p>
+                the semantic distinction.</p>
         </section>
     </refbody>
 </reference>
diff --git a/specification/langRef/key-definitions-specialization-elements.ditamap b/specification/langRef/key-definitions-specialization-elements.ditamap
@@ -5,5 +5,4 @@
  <keydef href="base/data.dita" keys="elements-data"/>
  <keydef href="base/foreign.dita" keys="elements-foreign"/>
  <keydef href="base/no-topic-nesting.dita" keys="elements-no-topic-nesting"/>
- <keydef href="base/state.dita" keys="elements-state"/>
 </map>
diff --git a/specification/langRef/quick-reference/base-elements-a-to-z.dita b/specification/langRef/quick-reference/base-elements-a-to-z.dita
@@ -132,7 +132,6 @@
     <sli><xref keyref="elements-sli"/></sli>
     <sli><xref keyref="elements-sort-as"/></sli>
     <sli><xref keyref="elements-source"/></sli>
-    <sli><xref keyref="elements-state"/></sli>
     <sli><xref keyref="elements-stentry"/></sli>
     <sli><xref keyref="elements-sthead"/></sli>
     <sli><xref keyref="elements-strong"/></sli>

diff --git a/specification/langRef/specialization-elements.ditamap b/specification/langRef/specialization-elements.ditamap
@@ -6,6 +6,5 @@
   <topicref keyref="elements-data"/>
   <topicref keyref="elements-foreign"/>
   <topicref keyref="elements-no-topic-nesting"/>
-  <topicref keyref="elements-state"/>
  </topicref>
 </map>
diff --git a/specification/non-normative/changes-1.3-to-2.0/removed-elements.dita b/specification/non-normative/changes-1.3-to-2.0/removed-elements.dita
@@ -18,7 +18,15 @@
             </sthead>
             <strow>
               <stentry><xmlelement>boolean</xmlelement></stentry>
+              <stentry>Specialized <xmlelement>data</xmlelement> element if used for metadata, or
+                specialized <xmlelement>ph</xmlelement> or <xmlelement>keyword</xmlelement> if used
+                for document content</stentry>
+            </strow>
+            <strow>
               <stentry><xmlelement>state</xmlelement></stentry>
+              <stentry>Specialized <xmlelement>data</xmlelement> element if used for metadata, or
+                specialized <xmlelement>ph</xmlelement> or <xmlelement>keyword</xmlelement> if used
+                for document content</stentry>
             </strow>
             <strow>
               <stentry><xmlelement>data-about</xmlelement></stentry>
@@ -53,6 +61,10 @@
               <stentry><xmlelement>titlealt</xmlelement> (alternative
                 titles domain)</stentry>
             </strow>
+            <strow>
+              <stentry><xmlelement>unknown</xmlelement></stentry>
+              <stentry><xmlelement>foreign</xmlelement></stentry>
+            </strow>
           </simpletable></dd>
       </dlentry>
       <dlentry>

diff --git a/specification/non-normative/changes-1.3-to-2.0/replaced-in-standard.dita b/specification/non-normative/changes-1.3-to-2.0/replaced-in-standard.dita
@@ -28,8 +28,15 @@
 
                         <strow>
                             <stentry><xmlelement>boolean</xmlelement></stentry>
-                            <stentry><xmlelement>state value="yes|no"</xmlelement></stentry>
-                        </strow> <strow>
+                            <stentry><codeph>&lt;data name="boolean" value="yes|no"></codeph> or
+                            <codeph>&lt;ph outputclass="boolean">yes|no&lt;/ph></codeph></stentry>
+                        </strow>
+                <strow>
+                    <stentry><xmlelement>state</xmlelement></stentry>
+                    <stentry><codeph>&lt;data name="state-name" value="state-value"></codeph> or
+                            <codeph>&lt;ph
+                        outputclass="state-name">state-value&lt;/ph></codeph></stentry>
+                </strow> <strow>
                             <stentry><xmlelement>index-sort-as</xmlelement></stentry>
                             <stentry><xmlelement>sort-as</xmlelement></stentry>
                         </strow>
@@ -53,6 +60,10 @@
                                 domain. See <xref href="added-to-standard.dita"/> for more
                                 information.</stentry>
                         </strow>
+                <strow>
+                    <stentry><xmlelement>unknown</xmlelement></stentry>
+                    <stentry><xmlelement>foreign</xmlelement></stentry>
+                </strow>
 
 
             </simpletable>

diff --git a/specification/non-normative/elementsMerged.dita b/specification/non-normative/elementsMerged.dita
@@ -653,13 +653,6 @@
           <stentry>yes</stentry>
           <stentry/>
         </strow>
-        <strow>
-          <stentry><xmlelement>state</xmlelement></stentry>
-          <stentry>inline</stentry>
-          <stentry>yes</stentry>
-          <stentry><xmlatt>value</xmlatt> can specify translatable
-            content.</stentry>
-        </strow>
         <strow>
           <stentry><xmlelement>stentry</xmlelement></stentry>
           <stentry>block</stentry>