Remove glossScopeNote element oasis-tcs/dita#914

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

Hide file tree

Showing 7 changed files with 0 additions and 162 deletions.
diff --git a/doctypes/dtd/technicalContent/glossentry.mod b/doctypes/dtd/technicalContent/glossentry.mod
@@ -48,8 +48,6 @@
 <!ENTITY % glossSurfaceForm
                        "glossSurfaceForm"                            >
 <!ENTITY % glossUsage  "glossUsage"                                  >
-<!ENTITY % glossScopeNote
-                       "glossScopeNote"                              >
 <!ENTITY % glossSymbol "glossSymbol"                                 >
 <!ENTITY % glossAlt    "glossAlt"                                    >
 
@@ -127,7 +125,6 @@
                        "((%glossStatus;)?,
                          (%glossSurfaceForm;)?,
                          (%glossUsage;)?,
-                         (%glossScopeNote;)?,
                          (%glossSymbol;)*,
                          (%note;)*,
                          (%glossAlt;)*)"
@@ -275,35 +272,6 @@
 <!ATTLIST  glossUsage %glossUsage.attributes;>
 
 
-<!--                    LONG NAME: Glossary Scope Note             -->
-<!ENTITY % glossScopeNote.content
-                       "(%note.cnt;)*"
->
-<!ENTITY % glossScopeNote.attributes
-              "type
-                          (attention |
-                           caution |
-                           danger |
-                           fastpath |
-                           important |
-                           note |
-                           notice |
-                           other |
-                           remember |
-                           restriction |
-                           tip |
-                           warning |
-                           -dita-use-conref-target)
-                                    #IMPLIED
-               othertype
-                          CDATA
-                                    #IMPLIED
-               %univ-atts;"
->
-<!ELEMENT  glossScopeNote %glossScopeNote.content;>
-<!ATTLIST  glossScopeNote %glossScopeNote.attributes;>
-
-
 <!--                    LONG NAME: Glossary Symbol                 -->
 <!ENTITY % glossSymbol.content
                        "((%alt;)?,
@@ -383,7 +351,6 @@
 <!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  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 ">
 <!ATTLIST  glossUsage   class CDATA "- topic/note concept/note glossentry/glossUsage ">

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="glossScopeNote">
-      <ref name="glossScopeNote.element"/>
-    </define>
     <define name="glossShortForm">
       <ref name="glossShortForm.element"/>
     </define>
@@ -215,9 +212,6 @@ PUBLIC "-//OASIS//ELEMENTS DITA 2.0 Glossary Entry//EN"
         <optional>
           <ref name="glossUsage"/>
         </optional>
-        <optional>
-          <ref name="glossScopeNote"/>
-        </optional>
         <zeroOrMore>
           <ref name="glossSymbol"/>
         </zeroOrMore>
@@ -457,52 +451,6 @@ PUBLIC "-//OASIS//ELEMENTS DITA 2.0 Glossary Entry//EN"
         <ref name="glossUsage.attributes"/>
       </define>
 
-    </div>
-    <div>
-      <a:documentation> LONG NAME: Glossary Scope Note </a:documentation>
-      <define name="glossScopeNote.content">
-        <zeroOrMore>
-          <ref name="note.cnt"/>
-        </zeroOrMore>
-      </define>
-      <define name="glossScopeNote.attributes">
-        <optional>
-          <attribute name="type">
-            <choice>
-              <value>attention</value>
-              <value>caution</value>
-              <value>danger</value>
-              <value>fastpath</value>
-              <value>important</value>
-              <value>note</value>
-              <value>notice</value>
-              <value>other</value>
-              <value>remember</value>
-              <value>restriction</value>
-              <value>tip</value>
-              <value>warning</value>
-              <value>-dita-use-conref-target</value>
-            </choice>
-          </attribute>
-        </optional>
-        <optional>
-          <attribute name="othertype"/>
-        </optional>
-        <ref name="univ-atts"/>
-      </define>
-      <define name="glossScopeNote.element">
-        <element name="glossScopeNote" dita:longName="Glossary Scope Note">
-          <a:documentation>A clarification of the subject designated by the &lt;glossterm> such as examples of included or excluded companies or products. For instance, a scope note for
-            &#34;Linux&#34; might explain that the term doesn't apply to UNIX products and give some examples of Linux products that are included as well as UNIX products that are
-            excluded.</a:documentation>
-          <ref name="glossScopeNote.attlist"/>
-          <ref name="glossScopeNote.content"/>
-        </element>
-      </define>
-      <define name="glossScopeNote.attlist" combine="interleave">
-        <ref name="glossScopeNote.attributes"/>
-      </define>
-
     </div>
     <div>
       <a:documentation> LONG NAME: Glossary Symbol </a:documentation>
@@ -669,11 +617,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="glossScopeNote.attlist" combine="interleave">
-      <optional>
-        <attribute name="class" a:defaultValue="- topic/note concept/note glossentry/glossScopeNote "/>
-      </optional>
-    </define>
     <define name="glossSurfaceForm.attlist" combine="interleave">
       <optional>
         <attribute name="class" a:defaultValue="- topic/p concept/p glossentry/glossSurfaceForm "/>

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

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

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

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