Remove glossAbbreviation element oasis-tcs/dita#914

robander · Feb 29, 2024 · 64c1d3a · 64c1d3a
1 parent 300740e
commit 64c1d3a
Show file tree

Hide file tree

Showing 10 changed files with 1 addition and 155 deletions.
diff --git a/doctypes/dtd/technicalContent/glossentry.mod b/doctypes/dtd/technicalContent/glossentry.mod
@@ -38,8 +38,6 @@
 <!ENTITY % glossterm   "glossterm"                                   >
 <!ENTITY % glossdef    "glossdef"                                    >
 <!ENTITY % glossBody   "glossBody"                                   >
-<!ENTITY % glossAbbreviation
-                       "glossAbbreviation"                           >
 <!ENTITY % glossAcronym
                        "glossAcronym"                                >
 <!ENTITY % glossShortForm
@@ -148,34 +146,6 @@
 <!ELEMENT  glossBody %glossBody.content;>
 <!ATTLIST  glossBody %glossBody.attributes;>
 
-
-<!--                    LONG NAME: Glossary Abbreviation           -->
-<!ENTITY % glossAbbreviation.content
-                       "(#PCDATA |
-                         %keyword; |
-                         %term; |
-                         %text; |
-                         %tm; |
-                         %ph;)*"
->
-<!ENTITY % glossAbbreviation.attributes
-              "%id-atts;
-               %localization-atts;
-               base
-                          CDATA
-                                    #IMPLIED
-               %base-attribute-extensions;
-               outputclass
-                          CDATA
-                                    #IMPLIED
-               rev
-                          CDATA
-                                    #IMPLIED"
->
-<!ELEMENT  glossAbbreviation %glossAbbreviation.content;>
-<!ATTLIST  glossAbbreviation %glossAbbreviation.attributes;>
-
-
 <!--                    LONG NAME: Glossary Acronym                -->
 <!ENTITY % glossAcronym.content
                        "(#PCDATA |
@@ -415,8 +385,7 @@
 
 <!--                    LONG NAME: Glossary Alternate Form         -->
 <!ENTITY % glossAlt.content
-                       "((%glossAbbreviation; |
-                          %glossAcronym; |
+                       "((%glossAcronym; |
                           %glossShortForm; |
                           %glossSynonym;)?,
                          (%glossStatus;)?,
@@ -470,7 +439,6 @@
 <!ATTLIST  glossterm    class CDATA "- topic/title concept/title glossentry/glossterm ">
 <!ATTLIST  glossdef     class CDATA "- topic/abstract concept/abstract glossentry/glossdef ">
 <!ATTLIST  glossBody    class CDATA "- topic/body concept/conbody glossentry/glossBody ">
-<!ATTLIST  glossAbbreviation class CDATA "- topic/title concept/title glossentry/glossAbbreviation ">
 <!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 ">

diff --git a/doctypes/rng/technicalContent/glossentryMod.rng b/doctypes/rng/technicalContent/glossentryMod.rng
@@ -55,9 +55,6 @@ PUBLIC "-//OASIS//ELEMENTS DITA 2.0 Glossary Entry//EN"
   </div>
   <div>
     <a:documentation>ELEMENT TYPE NAME PATTERNS</a:documentation>
-    <define name="glossAbbreviation">
-      <ref name="glossAbbreviation.element"/>
-    </define>
     <define name="glossAcronym">
       <ref name="glossAcronym.element"/>
     </define>
@@ -260,46 +257,6 @@ PUBLIC "-//OASIS//ELEMENTS DITA 2.0 Glossary Entry//EN"
         <ref name="glossBody.attributes"/>
       </define>
 
-    </div>
-    <div>
-      <a:documentation> LONG NAME: Glossary Abbreviation </a:documentation>
-      <define name="glossAbbreviation.content">
-        <zeroOrMore>
-          <choice>
-            <text/>
-            <ref name="keyword"/>
-            <ref name="term"/>
-            <ref name="text" dita:since="1.3"/>
-            <ref name="tm"/>
-            <ref name="ph" dita:since="2.0" />
-          </choice>
-        </zeroOrMore>
-      </define>
-      <define name="glossAbbreviation.attributes">
-        <ref name="id-atts"/>
-        <ref name="localization-atts"/>
-        <optional>
-          <attribute name="base"/>
-        </optional>
-        <ref name="base-attribute-extensions"/>
-        <optional>
-          <attribute name="outputclass"/>
-        </optional>
-        <optional>
-          <attribute name="rev"/>
-        </optional>
-      </define>
-      <define name="glossAbbreviation.element">
-        <element name="glossAbbreviation" dita:longName="Glossary Abbreviation">
-          <a:documentation>The &lt;glossAbbreviation> element provides an abbreviated form of the term contained in a &lt;glossterm> element. </a:documentation>
-          <ref name="glossAbbreviation.attlist"/>
-          <ref name="glossAbbreviation.content"/>
-        </element>
-      </define>
-      <define name="glossAbbreviation.attlist" combine="interleave">
-        <ref name="glossAbbreviation.attributes"/>
-      </define>
-
     </div>
     <div>
       <a:documentation> LONG NAME: Glossary Acronym </a:documentation>
@@ -690,7 +647,6 @@ PUBLIC "-//OASIS//ELEMENTS DITA 2.0 Glossary Entry//EN"
       <define name="glossAlt.content">
         <optional>
           <choice>
-            <ref name="glossAbbreviation"/>
             <ref name="glossAcronym"/>
             <ref name="glossShortForm"/>
             <ref name="glossSynonym"/>
@@ -794,11 +750,6 @@ PUBLIC "-//OASIS//ELEMENTS DITA 2.0 Glossary Entry//EN"
         <attribute name="class" a:defaultValue="- topic/body concept/conbody glossentry/glossBody "/>
       </optional>
     </define>
-    <define name="glossAbbreviation.attlist" combine="interleave">
-      <optional>
-        <attribute name="class" a:defaultValue="- topic/title concept/title glossentry/glossAbbreviation "/>
-      </optional>
-    </define>
     <define name="glossAcronym.attlist" combine="interleave">
       <optional>
         <attribute name="class" a:defaultValue="- topic/title concept/title glossentry/glossAcronym "/>

diff --git a/specification/archSpec/technicalContent/dita-glossarygroup-topic.dita b/specification/archSpec/technicalContent/dita-glossarygroup-topic.dita
@@ -45,11 +45,6 @@
     &lt;glossentry id="apple-corp">
       &lt;glossterm>Apple Inc.&lt;/glossterm>
       &lt;glossdef>An American multinational technology company headquartered in Cupertino, California.&lt;/glossdef>
-      &lt;glossBody>
-        &lt;glossAlt>
-          &lt;glossAbbreviation>APPL&lt;/glossAbbreviation>
-        &lt;/glossAlt>
-      &lt;/glossBody>
     &lt;/glossentry>
   <b>&lt;/glossgroup></b>
   ... (groups B to Y here ) ...

diff --git a/specification/langRef/glosssary-elements.ditamap b/specification/langRef/glosssary-elements.ditamap
@@ -3,7 +3,6 @@
 <map id="glosssentry-elements">
  <title>Glossentry elements</title>
   <topicref href="containers/glossentry-elements.dita">
-   <topicref keyref="elements-glossAbbreviation"/>
    <topicref keyref="elements-glossAcronym"/>
    <topicref keyref="elements-glossAlt"/>
    <topicref keyref="elements-glossAlternateFor"/>

diff --git a/specification/langRef/key-definitions-glosssary-elements.ditamap b/specification/langRef/key-definitions-glosssary-elements.ditamap
@@ -5,7 +5,6 @@
    <keydef href="technicalContent/glossentry.dita" keys="elements-glossentry"/>
    <keydef href="technicalContent/glossterm.dita" keys="elements-glossterm"/>
    <keydef href="technicalContent/glossdef.dita" keys="elements-glossdef"/>
-   <keydef href="technicalContent/glossAbbreviation.dita" keys="elements-glossAbbreviation"/>
    <keydef href="technicalContent/glossAcronym.dita" keys="elements-glossAcronym"/>
    <keydef href="technicalContent/glossAlt.dita" keys="elements-glossAlt"/>
    <keydef href="technicalContent/glossAlternateFor.dita" keys="elements-glossAlternateFor"/>

diff --git a/specification/langRef/quick-reference/technicalContent-elements-a-to-z.dita b/specification/langRef/quick-reference/technicalContent-elements-a-to-z.dita
@@ -88,7 +88,6 @@
         <sli><xref keyref="elements-fragment"/></sli>
         <sli><xref keyref="elements-fragref"/></sli>
         <sli><xref keyref="elements-frontmatter"/></sli>
-        <sli><xref keyref="elements-glossAbbreviation"/></sli>
         <sli><xref keyref="elements-glossAcronym"/></sli>
         <sli><xref keyref="elements-glossAlt"/></sli>
         <sli><xref keyref="elements-glossAlternateFor"/></sli>

diff --git a/specification/langRef/technicalContent/glossAbbreviation.dita b/specification/langRef/technicalContent/glossAbbreviation.dita
diff --git a/specification/langRef/technicalContent/glossAlt.dita b/specification/langRef/technicalContent/glossAlt.dita
@@ -64,10 +64,6 @@
     &lt;glossAlt></b>
       &lt;glossSynonym>America&lt;/glossSynonym>
       &lt;glossUsage>Do not use; the American continents include other countries.&lt;/glossUsage>
-    <b>&lt;/glossAlt>
-    &lt;glossAlt></b>
-      &lt;glossAbbreviation>the States&lt;/glossAbbreviation>
-      &lt;glossUsage>Informal. Typically used by English speakers outside of the country.&lt;/glossUsage>
     <b>&lt;/glossAlt></b>
   &lt;/glossBody><b>
 &lt;/glossentry>

diff --git a/specification/langRef/technicalContent/glossentry.dita b/specification/langRef/technicalContent/glossentry.dita
@@ -75,17 +75,6 @@
       &lt;glossSynonym>memory stick&lt;/glossSynonym>
       &lt;glossUsage>This is a colloquial term.&lt;/glossUsage>
     &lt;/glossAlt>
-    &lt;glossAlt>
-      &lt;glossAbbreviation>stick&lt;/glossAbbreviation>
-      &lt;glossStatus value="prohibited"/>
-      &lt;glossUsage>This is too colloquial.&lt;/glossUsage>
-      &lt;glossAlternateFor href="#usbfd/memoryStick"/>
-    &lt;/glossAlt>
-    &lt;glossAlt>
-      &lt;glossAbbreviation>flash&lt;/glossAbbreviation>
-      &lt;glossStatus value="prohibited"/>
-      &lt;glossUsage>This short form is ambiguous.&lt;/glossUsage>
-    &lt;/glossAlt>
   &lt;/glossBody><b>
 &lt;/glossentry>
 </b></codeblock>

diff --git a/specification/non-normative/elementsMerged.dita b/specification/non-normative/elementsMerged.dita
@@ -585,14 +585,6 @@
           <stentry>Translatable content?</stentry>
           <stentry>Notes</stentry>
         </sthead>
-        <strow>
-          <stentry><xmlelement>glossAbbreviation</xmlelement></stentry>
-          <stentry><xmlelement>title</xmlelement></stentry>
-          <stentry>yes</stentry>
-          <stentry>block</stentry>
-          <stentry>yes</stentry>
-          <stentry/>
-        </strow>
         <strow>
           <stentry><xmlelement>glossAcronym</xmlelement></stentry>
           <stentry><xmlelement>title</xmlelement></stentry>