Merge pull request #398 from robander/397

Remove audience/@othertype, audience/@otherjob, itemgroup #397
oasis-tcs · Oct 20, 2020 · bc7c4ef · bc7c4ef
2 parents ce094c0 + 4e7f28e
commit bc7c4ef
Show file tree

Hide file tree

Showing 11 changed files with 0 additions and 138 deletions.
diff --git a/doctypes/dtd/base/commonElements.ent b/doctypes/dtd/base/commonElements.ent
@@ -54,7 +54,6 @@
 <!ENTITY % ul          "ul"                                          >
 <!ENTITY % ol          "ol"                                          >
 <!ENTITY % li          "li"                                          >
-<!ENTITY % itemgroup   "itemgroup"                                   >
 <!ENTITY % dl          "dl"                                          >
 <!ENTITY % dlhead      "dlhead"                                      >
 <!ENTITY % dthd        "dthd"                                        >

diff --git a/doctypes/dtd/base/commonElements.mod b/doctypes/dtd/base/commonElements.mod
@@ -231,15 +231,6 @@
                %unknown;"
 >
 <!ENTITY % listitem.cnt
-              "#PCDATA |
-               %basic.block; |
-               %basic.ph; |
-               %data.elements.incl; |
-               %foreign.unknown.incl; |
-               %itemgroup; |
-               %txt.incl;"
->
-<!ENTITY % itemgroup.cnt
               "#PCDATA |
                %basic.block; |
                %basic.ph; |
@@ -355,7 +346,6 @@
                %basic.ph; |
                %data.elements.incl; |
                %foreign.unknown.incl; |
-               %itemgroup; |
                %txt.incl;"
 >
 <!ENTITY % pre.cnt
@@ -945,17 +935,6 @@
 <!ATTLIST  li %li.attributes;>
 
 
-<!--                    LONG NAME: Item Group                      -->
-<!ENTITY % itemgroup.content
-                       "(%itemgroup.cnt;)*"
->
-<!ENTITY % itemgroup.attributes
-              "%univ-atts;"
->
-<!ELEMENT  itemgroup %itemgroup.content;>
-<!ATTLIST  itemgroup %itemgroup.attributes;>
-
-
 <!--                    LONG NAME: Definition List                 -->
 <!ENTITY % dl.content
                        "((%data; |
@@ -1744,7 +1723,6 @@
 <!ATTLIST  index-see-also class CDATA "- topic/index-see-also ">
 <!ATTLIST  indexterm      class CDATA "- topic/indexterm "  >
 <!ATTLIST  index-base     class CDATA "- topic/index-base " >
-<!ATTLIST  itemgroup      class CDATA "- topic/itemgroup "  >
 <!ATTLIST  keyword        class CDATA "- topic/keyword "    >
 <!ATTLIST  li             class CDATA "- topic/li "         >
 <!ATTLIST  lines          class CDATA "- topic/lines "      >

diff --git a/doctypes/dtd/base/metaDecl.mod b/doctypes/dtd/base/metaDecl.mod
@@ -268,15 +268,9 @@
               "type
                           CDATA
                                     #IMPLIED
-               othertype
-                          CDATA
-                                    #IMPLIED
                job
                           CDATA
                                     #IMPLIED
-               otherjob
-                          CDATA
-                                    #IMPLIED
                experiencelevel
                           CDATA
                                     #IMPLIED

diff --git a/doctypes/rng/base/commonElementsMod.rng b/doctypes/rng/base/commonElementsMod.rng
@@ -135,9 +135,6 @@ PUBLIC "-//OASIS//ELEMENTS DITA 2.0 Common Elements//EN"
     <define name="index-see-also">
       <ref name="index-see-also.element"/>
     </define>
-    <define name="itemgroup">
-      <ref name="itemgroup.element"/>
-    </define>
     <define name="keyword">
       <ref name="keyword.element"/>
     </define>
@@ -574,17 +571,6 @@ PUBLIC "-//OASIS//ELEMENTS DITA 2.0 Common Elements//EN"
       <a:documentation> Predefined content model groups, based on the previous, element-only categories: txt.incl is appropriate for any mixed content definitions (those that have PCDATA) the context
         for blocks is implicitly an InfoMaster "containing_division" </a:documentation>
       <define name="listitem.cnt">
-        <choice>
-          <text/>
-          <ref name="basic.block"/>
-          <ref name="basic.ph"/>
-          <ref name="data.elements.incl"/>
-          <ref name="foreign.unknown.incl"/>
-          <ref name="itemgroup"/>
-          <ref name="txt.incl"/>
-        </choice>
-      </define>
-      <define name="itemgroup.cnt">
         <choice>
           <text/>
           <ref name="basic.block"/>
@@ -727,7 +713,6 @@ PUBLIC "-//OASIS//ELEMENTS DITA 2.0 Common Elements//EN"
           <ref name="basic.ph"/>
           <ref name="data.elements.incl"/>
           <ref name="foreign.unknown.incl"/>
-          <ref name="itemgroup"/>
           <ref name="txt.incl"/>
         </choice>
       </define>
@@ -1728,29 +1713,6 @@ PUBLIC "-//OASIS//ELEMENTS DITA 2.0 Common Elements//EN"
           <ref name="li.attributes"/>
         </define>
 
-      </div>
-      <div>
-        <a:documentation>LONG NAME: Item Group</a:documentation>
-        <define name="itemgroup.content">
-          <zeroOrMore>
-            <ref name="itemgroup.cnt"/>
-          </zeroOrMore>
-        </define>
-        <define name="itemgroup.attributes">
-          <ref name="univ-atts"/>
-        </define>
-        <define name="itemgroup.element">
-          <element name="itemgroup" dita:longName="Item Group">
-            <a:documentation>The &lt;itemgroup> element is reserved for use in specializations of DITA. As a container element, it can be used to sub-divide or organize elements that occur inside a
-              list item, definition, or parameter definition. Category: Specialization elements</a:documentation>
-            <ref name="itemgroup.attlist"/>
-            <ref name="itemgroup.content"/>
-          </element>
-        </define>
-        <define name="itemgroup.attlist" combine="interleave">
-          <ref name="itemgroup.attributes"/>
-        </define>
-
       </div>
       <div>
         <a:documentation>LONG NAME: Definition List</a:documentation>
@@ -3227,11 +3189,6 @@ PUBLIC "-//OASIS//ELEMENTS DITA 2.0 Common Elements//EN"
         <attribute name="class" a:defaultValue="- topic/index-see-also "/>
       </optional>
     </define>
-    <define name="itemgroup.attlist" combine="interleave">
-      <optional>
-        <attribute name="class" a:defaultValue="- topic/itemgroup "/>
-      </optional>
-    </define>
     <define name="keyword.attlist" combine="interleave">
       <optional>
         <attribute name="class" a:defaultValue="- topic/keyword "/>

diff --git a/doctypes/rng/base/metaDeclMod.rng b/doctypes/rng/base/metaDeclMod.rng
@@ -463,15 +463,9 @@ PUBLIC "-//OASIS//ELEMENTS DITA 2.0 Metadata//EN"
         <optional>
           <attribute name="type"/>
         </optional>
-        <optional>
-          <attribute name="othertype"/>
-        </optional>
         <optional>
           <attribute name="job"/>
         </optional>
-        <optional>
-          <attribute name="otherjob"/>
-        </optional>
         <optional>
           <attribute name="experiencelevel"/>
         </optional>

diff --git a/specification/langRef/base/audience.dita b/specification/langRef/base/audience.dita
@@ -20,10 +20,6 @@
           <xmlatt>experiencelevel</xmlatt> attribute. The <xmlelement>audience</xmlelement> element
         can be used to provide a more detailed definition of values used throughout the map or topic
         on the <xmlatt>audience</xmlatt> attribute.</p>
-      <p>Many of the attributes on the <xmlelement>audience</xmlelement> element have enumerated
-        values, which can be restricted by using constraints or extended by using associated
-        attributes. For instance, the <xmlatt>othertype</xmlatt> attribute can be used to extend the
-        audience type enumeration.</p>
     </section>
     <section id="attributes">
       <title>Attributes</title>
@@ -39,13 +35,6 @@
                 <keyword>administrator</keyword>, <keyword>programmer</keyword>,
                 <keyword>executive</keyword>, and <keyword>services</keyword>.</ph></dd>
         </dlentry>
-        <dlentry id="othertype">
-          <dt><xmlatt>othertype</xmlatt></dt>
-          <dd>Indicates an alternate audience type, when the type is not available in the
-              <xmlatt>type</xmlatt> attribute value list. This value is used as the user-provided
-            audience when the <xmlatt>type</xmlatt> attribute value is set to
-            &quot;other.&quot;</dd>
-        </dlentry>
         <dlentry id="job">
           <dt><xmlatt>job</xmlatt></dt>
           <dd>Specifies the high-level task the audience for the topic is trying to accomplish.
@@ -59,12 +48,6 @@
                 <keyword>evaluating</keyword>, <keyword>planning</keyword>, and
                 <keyword>migrating</keyword>.</ph></dd>
         </dlentry>
-        <dlentry id="otherjob">
-          <dt><xmlatt>otherjob</xmlatt></dt>
-          <dd>If the <xmlatt>job</xmlatt> attribute value is &quot;other&quot; the value of this
-            attribute is used to identify a kind of job other than the default ones provided by the
-              <xmlatt>job</xmlatt> attribute.</dd>
-        </dlentry>
         <dlentry id="experiencelevel">
           <dt><xmlatt>experiencelevel</xmlatt></dt>
           <dd>Indicates the level of experience the audience is assumed to possess. Different

diff --git a/specification/langRef/base/itemgroup.dita b/specification/langRef/base/itemgroup.dita
diff --git a/specification/langRef/key-definitions-specialization-elements.ditamap b/specification/langRef/key-definitions-specialization-elements.ditamap
@@ -5,7 +5,6 @@
  <keydef href="base/data.dita" keys="elements-data"/>
  <keydef href="base/data-about.dita" keys="elements-data-about"/>
  <keydef href="base/foreign.dita" keys="elements-foreign"/>
- <keydef href="base/itemgroup.dita" keys="elements-itemgroup"/>
  <keydef href="base/no-topic-nesting.dita" keys="elements-no-topic-nesting"/>
  <keydef href="base/state.dita" keys="elements-state"/>
  <keydef href="base/unknown.dita" keys="elements-unknown"/>

diff --git a/specification/langRef/quick-reference/base-elements-a-to-z.dita b/specification/langRef/quick-reference/base-elements-a-to-z.dita
@@ -77,7 +77,6 @@
     <sli><xref keyref="elements-index-see-also"/></sli>
     <sli><xref keyref="elements-index-see"/></sli>
     <sli><xref keyref="elements-indexterm"/></sli>
-    <sli><xref keyref="elements-itemgroup"/></sli>
     <sli><xref keyref="elements-keydef"/></sli>
     <sli><xref keyref="elements-keyword"/></sli>
     <sli><xref keyref="elements-keywords"/></sli>

diff --git a/specification/langRef/specialization-elements.ditamap b/specification/langRef/specialization-elements.ditamap
@@ -6,7 +6,6 @@
   <topicref keyref="elements-data"/>
   <topicref keyref="elements-data-about"/>
   <topicref keyref="elements-foreign"/>
-  <topicref keyref="elements-itemgroup"/>
   <topicref keyref="elements-no-topic-nesting"/>
   <topicref keyref="elements-state"/>
   <topicref keyref="elements-unknown"/>

diff --git a/specification/non-normative/elementsMerged.dita b/specification/non-normative/elementsMerged.dita
@@ -430,14 +430,6 @@ for this?</draft-comment>-->
           <stentry>yes</stentry>
           <stentry/>
         </strow>
-        <strow>
-          <stentry><xmlelement>itemgroup</xmlelement></stentry>
-          <stentry>N/A</stentry>
-          <stentry>inline</stentry>
-          <stentry>inline</stentry>
-          <stentry>yes</stentry>
-          <stentry/>
-        </strow>
         <strow>
           <stentry><xmlelement>keyword</xmlelement></stentry>
           <stentry>N/A</stentry>