Remove glossAlternateFor element oasis-tcs/dita#914

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

Hide file tree

Showing 7 changed files with 93 additions and 316 deletions.
diff --git a/doctypes/dtd/technicalContent/glossentry.mod b/doctypes/dtd/technicalContent/glossentry.mod
@@ -56,8 +56,6 @@
                        "glossScopeNote"                              >
 <!ENTITY % glossSymbol "glossSymbol"                                 >
 <!ENTITY % glossAlt    "glossAlt"                                    >
-<!ENTITY % glossAlternateFor
-                       "glossAlternateFor"                           >
 
 <!-- ============================================================= -->
 <!--                    ELEMENT DECLARATIONS                       -->
@@ -391,8 +389,7 @@
                          (%glossStatus;)?,
                          (%glossProperty;)*,
                          (%glossUsage;)?,
-                         (%note;)*,
-                         (%glossAlternateFor;)*)"
+                         (%note;)*)"
 >
 <!ENTITY % glossAlt.attributes
               "%univ-atts;"
@@ -401,35 +398,6 @@
 <!ATTLIST  glossAlt %glossAlt.attributes;>
 
 
-<!--                    LONG NAME: Glossary - Alternate For        -->
-<!ENTITY % glossAlternateFor.content
-                       "EMPTY"
->
-<!ENTITY % glossAlternateFor.attributes
-              "href
-                          CDATA
-                                    #IMPLIED
-               keyref
-                          CDATA
-                                    #IMPLIED
-               type
-                          CDATA
-                                    #IMPLIED
-               format
-                          CDATA
-                                    #IMPLIED
-               scope
-                          (external |
-                           local |
-                           peer |
-                           -dita-use-conref-target)
-                                    #IMPLIED
-               %univ-atts;"
->
-<!ELEMENT  glossAlternateFor %glossAlternateFor.content;>
-<!ATTLIST  glossAlternateFor %glossAlternateFor.attributes;>
-
-
 
 <!-- ============================================================= -->
 <!--             SPECIALIZATION ATTRIBUTE DECLARATIONS             -->
@@ -446,7 +414,6 @@
 <!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 ">
-<!ATTLIST  glossAlternateFor class CDATA "- topic/xref concept/xref glossentry/glossAlternateFor ">
 <!ATTLIST  glossScopeNote class CDATA "- topic/note concept/note glossentry/glossScopeNote ">
 <!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
@@ -61,9 +61,6 @@ PUBLIC "-//OASIS//ELEMENTS DITA 2.0 Glossary Entry//EN"
     <define name="glossAlt">
       <ref name="glossAlt.element"/>
     </define>
-    <define name="glossAlternateFor">
-      <ref name="glossAlternateFor.element"/>
-    </define>
     <define name="glossBody">
       <ref name="glossBody.element"/>
     </define>
@@ -664,9 +661,6 @@ PUBLIC "-//OASIS//ELEMENTS DITA 2.0 Glossary Entry//EN"
         <zeroOrMore>
           <ref name="note"/>
         </zeroOrMore>
-        <zeroOrMore>
-          <ref name="glossAlternateFor"/>
-        </zeroOrMore>
       </define>
       <define name="glossAlt.attributes">
         <ref name="univ-atts"/>
@@ -684,48 +678,6 @@ PUBLIC "-//OASIS//ELEMENTS DITA 2.0 Glossary Entry//EN"
       </define>
 
     </div>
-    <div>
-      <a:documentation> LONG NAME: Glossary - Alternate For </a:documentation>
-      <define name="glossAlternateFor.content">
-        <empty/>
-      </define>
-      <define name="glossAlternateFor.attributes">
-        <optional>
-          <attribute name="href"/>
-        </optional>
-        <optional>
-          <attribute name="keyref"/>
-        </optional>
-        <optional>
-          <attribute name="type"/>
-        </optional>
-        <optional>
-          <attribute name="format"/>
-        </optional>
-        <optional>
-          <attribute name="scope">
-            <choice>
-              <value>external</value>
-              <value>local</value>
-              <value>peer</value>
-              <value>-dita-use-conref-target</value>
-            </choice>
-          </attribute>
-        </optional>
-        <ref name="univ-atts"/>
-      </define>
-      <define name="glossAlternateFor.element">
-        <element name="glossAlternateFor" dita:longName="Glossary - Alternate For">
-          <a:documentation>The &lt;glossAlternateFor> element indicates when a variant term has a relationship to another variant term as well as to the preferred term.</a:documentation>
-          <ref name="glossAlternateFor.attlist"/>
-          <ref name="glossAlternateFor.content"/>
-        </element>
-      </define>
-      <define name="glossAlternateFor.attlist" combine="interleave">
-        <ref name="glossAlternateFor.attributes"/>
-      </define>
-
-    </div>
   </div>
   <div>
     <a:documentation>SPECIALIZATION ATTRIBUTE DECLARATIONS</a:documentation>
@@ -785,11 +737,6 @@ PUBLIC "-//OASIS//ELEMENTS DITA 2.0 Glossary Entry//EN"
         <attribute name="class" a:defaultValue="- topic/section concept/section glossentry/glossAlt "/>
       </optional>
     </define>
-    <define name="glossAlternateFor.attlist" combine="interleave">
-      <optional>
-        <attribute name="class" a:defaultValue="- topic/xref concept/xref glossentry/glossAlternateFor "/>
-      </optional>
-    </define>
     <define name="glossScopeNote.attlist" combine="interleave">
       <optional>
         <attribute name="class" a:defaultValue="- topic/note concept/note glossentry/glossScopeNote "/>

diff --git a/specification/langRef/glosssary-elements.ditamap b/specification/langRef/glosssary-elements.ditamap
@@ -5,7 +5,6 @@
   <topicref href="containers/glossentry-elements.dita">
    <topicref keyref="elements-glossAcronym"/>
    <topicref keyref="elements-glossAlt"/>
-   <topicref keyref="elements-glossAlternateFor"/>
    <topicref keyref="elements-glossBody"/>
     <topicref keyref="elements-glossdef"/>
     <topicref keyref="elements-glossentry"/>

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

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

diff --git a/specification/langRef/technicalContent/glossAlternateFor.dita b/specification/langRef/technicalContent/glossAlternateFor.dita