Remove glossStatus element oasis-tcs/dita#914

robander · Feb 29, 2024 · 5f78d43 · 5f78d43
1 parent e3290c8
commit 5f78d43
Show file tree

Hide file tree

Showing 8 changed files with 1 addition and 126 deletions.
diff --git a/doctypes/dtd/technicalContent/glossentry.mod b/doctypes/dtd/technicalContent/glossentry.mod
@@ -42,7 +42,6 @@
                        "glossAcronym"                                >
 <!ENTITY % glossSynonym
                        "glossSynonym"                                >
-<!ENTITY % glossStatus "glossStatus"                                 >
 <!ENTITY % glossSurfaceForm
                        "glossSurfaceForm"                            >
 <!ENTITY % glossUsage  "glossUsage"                                  >
@@ -120,8 +119,7 @@
 
 <!--                    LONG NAME: Glossary Body                   -->
 <!ENTITY % glossBody.content
-                       "((%glossStatus;)?,
-                         (%glossSurfaceForm;)?,
+                       "((%glossSurfaceForm;)?,
                          (%glossUsage;)?,
                          (%glossSymbol;)*,
                          (%note;)*,
@@ -187,17 +185,6 @@
 <!ATTLIST  glossSynonym %glossSynonym.attributes;>
 
 
-<!--                    LONG NAME: Glossary Status                 -->
-<!ENTITY % glossStatus.content
-                       "EMPTY"
->
-<!ENTITY % glossStatus.attributes
-              "%data-element-atts;"
->
-<!ELEMENT  glossStatus %glossStatus.content;>
-<!ATTLIST  glossStatus %glossStatus.attributes;>
-
-
 <!--                    LONG NAME: Glossary Surface Form           -->
 <!ENTITY % glossSurfaceForm.content
                        "(#PCDATA |
@@ -296,7 +283,6 @@
 <!ENTITY % glossAlt.content
                        "((%glossAcronym; |
                           %glossSynonym;)?,
-                         (%glossStatus;)?,
                          (%glossUsage;)?,
                          (%note;)*)"
 >
@@ -318,7 +304,6 @@
 <!ATTLIST  glossBody    class CDATA "- topic/body concept/conbody glossentry/glossBody ">
 <!ATTLIST  glossAcronym class CDATA "- topic/title concept/title glossentry/glossAcronym ">
 <!ATTLIST  glossSynonym class CDATA "- topic/title concept/title glossentry/glossSynonym ">
-<!ATTLIST  glossStatus  class CDATA "- topic/data concept/data glossentry/glossStatus ">
 <!ATTLIST  glossAlt     class CDATA "- topic/section concept/section glossentry/glossAlt ">
 <!ATTLIST  glossSurfaceForm class CDATA "- topic/p concept/p glossentry/glossSurfaceForm ">
 <!ATTLIST  glossSymbol  class CDATA "- topic/image concept/image glossentry/glossSymbol ">

diff --git a/doctypes/rng/technicalContent/glossentryMod.rng b/doctypes/rng/technicalContent/glossentryMod.rng
@@ -67,9 +67,6 @@ PUBLIC "-//OASIS//ELEMENTS DITA 2.0 Glossary Entry//EN"
     <define name="glossdef">
       <ref name="glossdef.element"/>
     </define>
-    <define name="glossStatus">
-      <ref name="glossStatus.element"/>
-    </define>
     <define name="glossSurfaceForm">
       <ref name="glossSurfaceForm.element"/>
     </define>
@@ -200,9 +197,6 @@ PUBLIC "-//OASIS//ELEMENTS DITA 2.0 Glossary Entry//EN"
     <div>
       <a:documentation> LONG NAME: Glossary Body </a:documentation>
       <define name="glossBody.content">
-        <optional>
-          <ref name="glossStatus"/>
-        </optional>
         <optional>
           <ref name="glossSurfaceForm"/>
         </optional>
@@ -313,27 +307,6 @@ PUBLIC "-//OASIS//ELEMENTS DITA 2.0 Glossary Entry//EN"
         <ref name="glossSynonym.attributes"/>
       </define>
 
-    </div>
-    <div>
-      <a:documentation> LONG NAME: Glossary Status </a:documentation>
-      <define name="glossStatus.content">
-        <empty/>
-      </define>
-      <define name="glossStatus.attributes">
-        <ref name="data-element-atts"/>
-      </define>
-      <define name="glossStatus.element">
-        <element name="glossStatus" dita:longName="Glossary Status">
-          <a:documentation>Identifies the usage status of a preferred or alternate term. If the status isn't specified, the &lt;glossterm> provides a preferred term and an alternate term provides an
-            allowed term.</a:documentation>
-          <ref name="glossStatus.attlist"/>
-          <ref name="glossStatus.content"/>
-        </element>
-      </define>
-      <define name="glossStatus.attlist" combine="interleave">
-        <ref name="glossStatus.attributes"/>
-      </define>
-
     </div>
     <div>
       <a:documentation> LONG NAME: Glossary Surface Form </a:documentation>
@@ -498,9 +471,6 @@ PUBLIC "-//OASIS//ELEMENTS DITA 2.0 Glossary Entry//EN"
             <ref name="glossSynonym"/>
           </choice>
         </optional>
-        <optional>
-          <ref name="glossStatus"/>
-        </optional>
         <optional>
           <ref name="glossUsage"/>
         </optional>
@@ -558,11 +528,6 @@ PUBLIC "-//OASIS//ELEMENTS DITA 2.0 Glossary Entry//EN"
         <attribute name="class" a:defaultValue="- topic/title concept/title glossentry/glossSynonym "/>
       </optional>
     </define>
-    <define name="glossStatus.attlist" combine="interleave">
-      <optional>
-        <attribute name="class" a:defaultValue="- topic/data concept/data glossentry/glossStatus "/>
-      </optional>
-    </define>
     <define name="glossAlt.attlist" combine="interleave">
       <optional>
         <attribute name="class" a:defaultValue="- topic/section concept/section glossentry/glossAlt "/>

diff --git a/specification/langRef/glosssary-elements.ditamap b/specification/langRef/glosssary-elements.ditamap
@@ -8,7 +8,6 @@
    <topicref keyref="elements-glossBody"/>
     <topicref keyref="elements-glossdef"/>
     <topicref keyref="elements-glossentry"/>
-   <topicref keyref="elements-glossStatus"/>
    <topicref keyref="elements-glossSurfaceForm"/>
    <topicref keyref="elements-glossSymbol"/>
    <topicref keyref="elements-glossSynonym"/>

diff --git a/specification/langRef/key-definitions-glosssary-elements.ditamap b/specification/langRef/key-definitions-glosssary-elements.ditamap
@@ -8,7 +8,6 @@
    <keydef href="technicalContent/glossAcronym.dita" keys="elements-glossAcronym"/>
    <keydef href="technicalContent/glossAlt.dita" keys="elements-glossAlt"/>
    <keydef href="technicalContent/glossBody.dita" keys="elements-glossBody"/>
-   <keydef href="technicalContent/glossStatus.dita" keys="elements-glossStatus"/>
    <keydef href="technicalContent/glossSurfaceForm.dita" keys="elements-glossSurfaceForm"/>
    <keydef href="technicalContent/glossSymbol.dita" keys="elements-glossSymbol"/>
    <keydef href="technicalContent/glossSynonym.dita" keys="elements-glossSynonym"/>

diff --git a/specification/langRef/quick-reference/technicalContent-elements-a-to-z.dita b/specification/langRef/quick-reference/technicalContent-elements-a-to-z.dita
@@ -91,7 +91,6 @@
         <sli><xref keyref="elements-glossAcronym"/></sli>
         <sli><xref keyref="elements-glossAlt"/></sli>
         <sli><xref keyref="elements-glossBody"/></sli>
-        <sli><xref keyref="elements-glossStatus"/></sli>
         <sli><xref keyref="elements-glossSurfaceForm"/></sli>
         <sli><xref keyref="elements-glossSymbol"/></sli>
         <sli><xref keyref="elements-glossSynonym"/></sli>

diff --git a/specification/langRef/technicalContent/glossStatus.dita b/specification/langRef/technicalContent/glossStatus.dita
diff --git a/specification/langRef/technicalContent/glossentry.dita b/specification/langRef/technicalContent/glossentry.dita
@@ -68,7 +68,6 @@
       because that suggests a trademark.&lt;/glossUsage>
     &lt;glossAlt>
       &lt;glossAcronym>UFD&lt;/glossAcronym>
-      &lt;glossStatus value="prohibited"/>
     &lt;/glossAlt>
     &lt;glossAlt id="memoryStick">
       &lt;glossSynonym>memory stick&lt;/glossSynonym>

diff --git a/specification/non-normative/elementsMerged.dita b/specification/non-normative/elementsMerged.dita
@@ -604,14 +604,6 @@
           <stentry>yes</stentry>
           <stentry/>
         </strow>
-        <strow>
-          <stentry><xmlelement>glossStatus</xmlelement></stentry>
-          <stentry><xmlelement>data</xmlelement></stentry>
-          <stentry>yes</stentry>
-          <stentry>block</stentry>
-          <stentry>no</stentry>
-          <stentry/>
-        </strow>
         <strow>
           <stentry><xmlelement>glossSurfaceForm</xmlelement></stentry>
           <stentry><xmlelement>p</xmlelement></stentry>