Remove glossProperty element oasis-tcs/dita#914

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

Hide file tree

Showing 7 changed files with 0 additions and 126 deletions.
diff --git a/doctypes/dtd/technicalContent/glossentry.mod b/doctypes/dtd/technicalContent/glossentry.mod
@@ -45,8 +45,6 @@
 <!ENTITY % glossSynonym
                        "glossSynonym"                                >
 <!ENTITY % glossStatus "glossStatus"                                 >
-<!ENTITY % glossProperty
-                       "glossProperty"                               >
 <!ENTITY % glossSurfaceForm
                        "glossSurfaceForm"                            >
 <!ENTITY % glossUsage  "glossUsage"                                  >
@@ -127,7 +125,6 @@
 <!--                    LONG NAME: Glossary Body                   -->
 <!ENTITY % glossBody.content
                        "((%glossStatus;)?,
-                         (%glossProperty;)*,
                          (%glossSurfaceForm;)?,
                          (%glossUsage;)?,
                          (%glossScopeNote;)?,
@@ -233,17 +230,6 @@
 <!ATTLIST  glossStatus %glossStatus.attributes;>
 
 
-<!--                    LONG NAME: Glossary property               -->
-<!ENTITY % glossProperty.content
-                       "(%data.cnt;)*"
->
-<!ENTITY % glossProperty.attributes
-              "%data-element-atts;"
->
-<!ELEMENT  glossProperty %glossProperty.content;>
-<!ATTLIST  glossProperty %glossProperty.attributes;>
-
-
 <!--                    LONG NAME: Glossary Surface Form           -->
 <!ENTITY % glossSurfaceForm.content
                        "(#PCDATA |
@@ -373,7 +359,6 @@
                           %glossShortForm; |
                           %glossSynonym;)?,
                          (%glossStatus;)?,
-                         (%glossProperty;)*,
                          (%glossUsage;)?,
                          (%note;)*)"
 >
@@ -396,7 +381,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  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  glossScopeNote class CDATA "- topic/note concept/note glossentry/glossScopeNote ">

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="glossProperty">
-      <ref name="glossProperty.element"/>
-    </define>
     <define name="glossScopeNote">
       <ref name="glossScopeNote.element"/>
     </define>
@@ -212,9 +209,6 @@ PUBLIC "-//OASIS//ELEMENTS DITA 2.0 Glossary Entry//EN"
         <optional>
           <ref name="glossStatus"/>
         </optional>
-        <zeroOrMore>
-          <ref name="glossProperty"/>
-        </zeroOrMore>
         <optional>
           <ref name="glossSurfaceForm"/>
         </optional>
@@ -389,28 +383,6 @@ PUBLIC "-//OASIS//ELEMENTS DITA 2.0 Glossary Entry//EN"
         <ref name="glossStatus.attributes"/>
       </define>
 
-    </div>
-    <div>
-      <a:documentation> LONG NAME: Glossary Status </a:documentation>
-      <define name="glossProperty.content">
-        <zeroOrMore>
-          <ref name="data.cnt"/>
-        </zeroOrMore>
-      </define>
-      <define name="glossProperty.attributes">
-        <ref name="data-element-atts"/>
-      </define>
-      <define name="glossProperty.element">
-        <element name="glossProperty" dita:longName="Glossary property">
-          <a:documentation>The &lt;glossProperty> element is an extension point which allows additional details about the preferred term or its subject.</a:documentation>
-          <ref name="glossProperty.attlist"/>
-          <ref name="glossProperty.content"/>
-        </element>
-      </define>
-      <define name="glossProperty.attlist" combine="interleave">
-        <ref name="glossProperty.attributes"/>
-      </define>
-
     </div>
     <div>
       <a:documentation> LONG NAME: Glossary Surface Form </a:documentation>
@@ -625,9 +597,6 @@ PUBLIC "-//OASIS//ELEMENTS DITA 2.0 Glossary Entry//EN"
         <optional>
           <ref name="glossStatus"/>
         </optional>
-        <zeroOrMore>
-          <ref name="glossProperty"/>
-        </zeroOrMore>
         <optional>
           <ref name="glossUsage"/>
         </optional>
@@ -690,11 +659,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="glossProperty.attlist" combine="interleave">
-      <optional>
-        <attribute name="class" a:defaultValue="- topic/data concept/data glossentry/glossProperty "/>
-      </optional>
-    </define>
     <define name="glossStatus.attlist" combine="interleave">
       <optional>
         <attribute name="class" a:defaultValue="- topic/data concept/data glossentry/glossStatus "/>

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

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

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

diff --git a/specification/langRef/technicalContent/glossProperty.dita b/specification/langRef/technicalContent/glossProperty.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>glossProperty</xmlelement></stentry>
-          <stentry><xmlelement>data</xmlelement></stentry>
-          <stentry>yes</stentry>
-          <stentry>block</stentry>
-          <stentry>no</stentry>
-          <stentry/>
-        </strow>
         <strow>
           <stentry><xmlelement>glossScopeNote</xmlelement></stentry>
           <stentry><xmlelement>note</xmlelement></stentry>