Remove glossPartOfSpeech element oasis-tcs/dita#914

robander · Feb 29, 2024 · 8fd24bc · 8fd24bc
1 parent e77d49f
commit 8fd24bc
Show file tree

Hide file tree

Showing 11 changed files with 1 addition and 129 deletions.
diff --git a/doctypes/dtd/technicalContent/glossentry.mod b/doctypes/dtd/technicalContent/glossentry.mod
@@ -44,8 +44,6 @@
                        "glossShortForm"                              >
 <!ENTITY % glossSynonym
                        "glossSynonym"                                >
-<!ENTITY % glossPartOfSpeech
-                       "glossPartOfSpeech"                           >
 <!ENTITY % glossStatus "glossStatus"                                 >
 <!ENTITY % glossProperty
                        "glossProperty"                               >
@@ -128,8 +126,7 @@
 
 <!--                    LONG NAME: Glossary Body                   -->
 <!ENTITY % glossBody.content
-                       "((%glossPartOfSpeech;)?,
-                         (%glossStatus;)?,
+                       "((%glossStatus;)?,
                          (%glossProperty;)*,
                          (%glossSurfaceForm;)?,
                          (%glossUsage;)?,
@@ -225,17 +222,6 @@
 <!ATTLIST  glossSynonym %glossSynonym.attributes;>
 
 
-<!--                    LONG NAME: Part of Speech                  -->
-<!ENTITY % glossPartOfSpeech.content
-                       "EMPTY"
->
-<!ENTITY % glossPartOfSpeech.attributes
-              "%data-element-atts;"
->
-<!ELEMENT  glossPartOfSpeech %glossPartOfSpeech.content;>
-<!ATTLIST  glossPartOfSpeech %glossPartOfSpeech.attributes;>
-
-
 <!--                    LONG NAME: Glossary Status                 -->
 <!ENTITY % glossStatus.content
                        "EMPTY"
@@ -410,7 +396,6 @@
 <!ATTLIST  glossAcronym class CDATA "- topic/title concept/title glossentry/glossAcronym ">
 <!ATTLIST  glossShortForm class CDATA "- topic/title concept/title glossentry/glossShortForm ">
 <!ATTLIST  glossSynonym class CDATA "- topic/title concept/title glossentry/glossSynonym ">
-<!ATTLIST  glossPartOfSpeech class CDATA "- topic/data concept/data glossentry/glossPartOfSpeech ">
 <!ATTLIST  glossProperty class CDATA "- topic/data concept/data glossentry/glossProperty ">
 <!ATTLIST  glossStatus  class CDATA "- topic/data concept/data glossentry/glossStatus ">
 <!ATTLIST  glossAlt     class CDATA "- topic/section concept/section glossentry/glossAlt ">

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="glossPartOfSpeech">
-      <ref name="glossPartOfSpeech.element"/>
-    </define>
     <define name="glossProperty">
       <ref name="glossProperty.element"/>
     </define>
@@ -212,9 +209,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="glossPartOfSpeech"/>
-        </optional>
         <optional>
           <ref name="glossStatus"/>
         </optional>
@@ -374,27 +368,6 @@ PUBLIC "-//OASIS//ELEMENTS DITA 2.0 Glossary Entry//EN"
         <ref name="glossSynonym.attributes"/>
       </define>
 
-    </div>
-    <div>
-      <a:documentation> LONG NAME: Part of Speech </a:documentation>
-      <define name="glossPartOfSpeech.content">
-        <empty/>
-      </define>
-      <define name="glossPartOfSpeech.attributes">
-        <ref name="data-element-atts"/>
-      </define>
-      <define name="glossPartOfSpeech.element">
-        <element name="glossPartOfSpeech" dita:longName="Part of Speech">
-          <a:documentation>Identifies the part of speech for the preferred and alternate terms. Alternate terms must have the same part of speech as the preferred term because all terms in the
-            glossentry topic designate the same subject. If the part of speech isn't specified, the default is a noun for the standard enumeration.</a:documentation>
-          <ref name="glossPartOfSpeech.attlist"/>
-          <ref name="glossPartOfSpeech.content"/>
-        </element>
-      </define>
-      <define name="glossPartOfSpeech.attlist" combine="interleave">
-        <ref name="glossPartOfSpeech.attributes"/>
-      </define>
-
     </div>
     <div>
       <a:documentation> LONG NAME: Glossary Status </a:documentation>
@@ -717,11 +690,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="glossPartOfSpeech.attlist" combine="interleave">
-      <optional>
-        <attribute name="class" a:defaultValue="- topic/data concept/data glossentry/glossPartOfSpeech "/>
-      </optional>
-    </define>
     <define name="glossProperty.attlist" combine="interleave">
       <optional>
         <attribute name="class" a:defaultValue="- topic/data concept/data glossentry/glossProperty "/>

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-glossPartOfSpeech"/>
    <topicref keyref="elements-glossProperty"/>
    <topicref keyref="elements-glossScopeNote"/>
    <topicref keyref="elements-glossShortForm"/>

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/glossPartOfSpeech.dita" keys="elements-glossPartOfSpeech"/>
    <keydef href="technicalContent/glossProperty.dita" keys="elements-glossProperty"/>
    <keydef href="technicalContent/glossScopeNote.dita" keys="elements-glossScopeNote"/>
    <keydef href="technicalContent/glossShortForm.dita" keys="elements-glossShortForm"/>

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-glossPartOfSpeech"/></sli>
         <sli><xref keyref="elements-glossProperty"/></sli>
         <sli><xref keyref="elements-glossScopeNote"/></sli>
         <sli><xref keyref="elements-glossShortForm"/></sli>

diff --git a/specification/langRef/technicalContent/glossBody.dita b/specification/langRef/technicalContent/glossBody.dita
@@ -34,7 +34,6 @@
     typically contains electrolytes such as sodium, potassium, and
     chloride, and a high percentage of sugar to restore energy.&lt;/glossdef>
   <b>&lt;glossBody></b>
-    &lt;glossPartOfSpeech value="noun"/>
     &lt;glossAlt>
       &lt;glossSynonym>energy drink&lt;/glossSynonym>
     &lt;/glossAlt>

diff --git a/specification/langRef/technicalContent/glossPartOfSpeech.dita b/specification/langRef/technicalContent/glossPartOfSpeech.dita
diff --git a/specification/langRef/technicalContent/glossScopeNote.dita b/specification/langRef/technicalContent/glossScopeNote.dita
@@ -51,7 +51,6 @@
   &lt;glossterm>Linux operating system&lt;/glossterm>
   &lt;glossdef>An operating system based on the kernel created by Linus Torvald.&lt;/glossdef>
   &lt;glossBody>
-    &lt;glossPartOfSpeech value="noun"/>
     <b>&lt;glossScopeNote>This term does not apply to the Linux Open Source Project that
        develops Linux distributions, but only to the distributions themselves.  Examples 
        of Linux operating systems include RedHat, SuSE, and Ubuntu. &lt;/glossScopeNote></b>

diff --git a/specification/langRef/technicalContent/glossUsage.dita b/specification/langRef/technicalContent/glossUsage.dita
@@ -41,7 +41,6 @@
   &lt;glossterm>soft drink&lt;/glossterm>
   &lt;glossdef>A nonalcoholic drink, especially one that is carbonated.&lt;/glossdef>
   &lt;glossBody>
-    &lt;glossPartOfSpeech value="noun"/>
     &lt;glossAlt>
       &lt;glossSynonym>pop&lt;/glossSynonym>
       <b>&lt;glossUsage>Used primarily in the North and Midwest&lt;/glossUsage></b>

diff --git a/specification/langRef/technicalContent/glossentry.dita b/specification/langRef/technicalContent/glossentry.dita
@@ -64,7 +64,6 @@
   &lt;glossterm>USB flash drive&lt;/glossterm>
   &lt;glossdef>A small portable drive.&lt;/glossdef>
   &lt;glossBody>
-    &lt;glossPartOfSpeech value="noun"/>
     &lt;glossUsage>Do not use this term in upper case (for example,  in "USB Flash Drive")
       because that suggests a trademark.&lt;/glossUsage>
     &lt;glossAlt>

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>glossPartOfSpeech</xmlelement></stentry>
-          <stentry><xmlelement>data</xmlelement></stentry>
-          <stentry>yes</stentry>
-          <stentry>block</stentry>
-          <stentry>no</stentry>
-          <stentry/>
-        </strow>
         <strow>
           <stentry><xmlelement>glossProperty</xmlelement></stentry>
           <stentry><xmlelement>data</xmlelement></stentry>