Remove glossShortForm element oasis-tcs/dita#914

robander · Feb 29, 2024 · e3290c8 · e3290c8
1 parent 74613e9
commit e3290c8
Show file tree

Hide file tree

Showing 7 changed files with 0 additions and 136 deletions.
diff --git a/doctypes/dtd/technicalContent/glossentry.mod b/doctypes/dtd/technicalContent/glossentry.mod
@@ -40,8 +40,6 @@
 <!ENTITY % glossBody   "glossBody"                                   >
 <!ENTITY % glossAcronym
                        "glossAcronym"                                >
-<!ENTITY % glossShortForm
-                       "glossShortForm"                              >
 <!ENTITY % glossSynonym
                        "glossSynonym"                                >
 <!ENTITY % glossStatus "glossStatus"                                 >
@@ -162,33 +160,6 @@
 <!ATTLIST  glossAcronym %glossAcronym.attributes;>
 
 
-<!--                    LONG NAME: Glossary Short Form             -->
-<!ENTITY % glossShortForm.content
-                       "(#PCDATA |
-                         %keyword; |
-                         %term; |
-                         %text; |
-                         %tm; |
-                         %ph;)*"
->
-<!ENTITY % glossShortForm.attributes
-              "%id-atts;
-               %localization-atts;
-               base
-                          CDATA
-                                    #IMPLIED
-               %base-attribute-extensions;
-               outputclass
-                          CDATA
-                                    #IMPLIED
-               rev
-                          CDATA
-                                    #IMPLIED"
->
-<!ELEMENT  glossShortForm %glossShortForm.content;>
-<!ATTLIST  glossShortForm %glossShortForm.attributes;>
-
-
 <!--                    LONG NAME: Glossary Synonym                -->
 <!ENTITY % glossSynonym.content
                        "(#PCDATA |
@@ -324,7 +295,6 @@
 <!--                    LONG NAME: Glossary Alternate Form         -->
 <!ENTITY % glossAlt.content
                        "((%glossAcronym; |
-                          %glossShortForm; |
                           %glossSynonym;)?,
                          (%glossStatus;)?,
                          (%glossUsage;)?,
@@ -347,7 +317,6 @@
 <!ATTLIST  glossdef     class CDATA "- topic/abstract concept/abstract glossentry/glossdef ">
 <!ATTLIST  glossBody    class CDATA "- topic/body concept/conbody glossentry/glossBody ">
 <!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  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="glossShortForm">
-      <ref name="glossShortForm.element"/>
-    </define>
     <define name="glossStatus">
       <ref name="glossStatus.element"/>
     </define>
@@ -276,46 +273,6 @@ PUBLIC "-//OASIS//ELEMENTS DITA 2.0 Glossary Entry//EN"
         <ref name="glossAcronym.attributes"/>
       </define>
 
-    </div>
-    <div>
-      <a:documentation> LONG NAME: Glossary Short Form </a:documentation>
-      <define name="glossShortForm.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="glossShortForm.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="glossShortForm.element">
-        <element name="glossShortForm" dita:longName="Glossary Short Form">
-          <a:documentation>The &lt;glossShortForm> element provides a shorter alternative to the primary term specified in the &lt;glossterm> element.</a:documentation>
-          <ref name="glossShortForm.attlist"/>
-          <ref name="glossShortForm.content"/>
-        </element>
-      </define>
-      <define name="glossShortForm.attlist" combine="interleave">
-        <ref name="glossShortForm.attributes"/>
-      </define>
-
     </div>
     <div>
       <a:documentation> LONG NAME: Glossary Synonym </a:documentation>
@@ -538,7 +495,6 @@ PUBLIC "-//OASIS//ELEMENTS DITA 2.0 Glossary Entry//EN"
         <optional>
           <choice>
             <ref name="glossAcronym"/>
-            <ref name="glossShortForm"/>
             <ref name="glossSynonym"/>
           </choice>
         </optional>
@@ -597,11 +553,6 @@ PUBLIC "-//OASIS//ELEMENTS DITA 2.0 Glossary Entry//EN"
         <attribute name="class" a:defaultValue="- topic/title concept/title glossentry/glossAcronym "/>
       </optional>
     </define>
-    <define name="glossShortForm.attlist" combine="interleave">
-      <optional>
-        <attribute name="class" a:defaultValue="- topic/title concept/title glossentry/glossShortForm "/>
-      </optional>
-    </define>
     <define name="glossSynonym.attlist" combine="interleave">
       <optional>
         <attribute name="class" a:defaultValue="- topic/title concept/title glossentry/glossSynonym "/>

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-glossShortForm"/>
    <topicref keyref="elements-glossStatus"/>
    <topicref keyref="elements-glossSurfaceForm"/>
    <topicref keyref="elements-glossSymbol"/>

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/glossShortForm.dita" keys="elements-glossShortForm"/>
    <keydef href="technicalContent/glossStatus.dita" keys="elements-glossStatus"/>
    <keydef href="technicalContent/glossSurfaceForm.dita" keys="elements-glossSurfaceForm"/>
    <keydef href="technicalContent/glossSymbol.dita" keys="elements-glossSymbol"/>

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-glossShortForm"/></sli>
         <sli><xref keyref="elements-glossStatus"/></sli>
         <sli><xref keyref="elements-glossSurfaceForm"/></sli>
         <sli><xref keyref="elements-glossSymbol"/></sli>

diff --git a/specification/langRef/technicalContent/glossShortForm.dita b/specification/langRef/technicalContent/glossShortForm.dita
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>glossShortForm</xmlelement></stentry>
-          <stentry><xmlelement>title</xmlelement></stentry>
-          <stentry>yes</stentry>
-          <stentry>block</stentry>
-          <stentry>yes</stentry>
-          <stentry/>
-        </strow>
         <strow>
           <stentry><xmlelement>glossStatus</xmlelement></stentry>
           <stentry><xmlelement>data</xmlelement></stentry>