oasis-tcs#397 cleanup item, remove sectiondiv from grammar

robander · May 24, 2021 · 01e3b3f · 01e3b3f
1 parent 978dac2
commit 01e3b3f
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 74 deletions.
diff --git a/doctypes/dtd/base/topic.mod b/doctypes/dtd/base/topic.mod
@@ -143,20 +143,10 @@
                %basic.ph; |
                %data.elements.incl; |
                %foreign.unknown.incl; |
-               %sectiondiv; |
                %title; |
                %txt.incl;"
 >
 <!ENTITY % section.notitle.cnt
-              "#PCDATA |
-               %basic.block; |
-               %basic.ph; |
-               %data.elements.incl; |
-               %foreign.unknown.incl; |
-               %sectiondiv; |
-               %txt.incl;"
->
-<!ENTITY % sectiondiv.cnt
               "#PCDATA |
                %basic.block; |
                %basic.ph; |
@@ -302,18 +292,6 @@
 <!ATTLIST  section %section.attributes;>
 
 
-<!--                    LONG NAME: Section division                -->
-<!ENTITY % sectiondiv.content
-                       "(%sectiondiv.cnt; |
-                         %sectiondiv;)*"
->
-<!ENTITY % sectiondiv.attributes
-              "%univ-atts;"
->
-<!ELEMENT  sectiondiv %sectiondiv.content;>
-<!ATTLIST  sectiondiv %sectiondiv.attributes;>
-
-
 <!--                    LONG NAME: prolog                          -->
 <!ENTITY % prolog.content
                        "((%titlealt;)*,
@@ -461,7 +439,6 @@
 <!ATTLIST  prolog         class CDATA "- topic/prolog "     >
 <!ATTLIST  related-links   class CDATA "- topic/related-links ">
 <!ATTLIST  section        class CDATA "- topic/section "    >
-<!ATTLIST  sectiondiv     class CDATA "- topic/sectiondiv " >
 <!ATTLIST  topic          class CDATA "- topic/topic "      >
 
 <!-- ================== End of DITA Topic Module ==================== -->

diff --git a/doctypes/dtd/base/topicDefn.ent b/doctypes/dtd/base/topicDefn.ent
@@ -42,7 +42,6 @@
 <!ENTITY % no-topic-nesting
                        "no-topic-nesting"                            >
 <!ENTITY % section     "section"                                     >
-<!ENTITY % sectiondiv  "sectiondiv"                                  >
 <!ENTITY % prolog      "prolog"                                      >
 <!ENTITY % related-links
                        "related-links"                               >

diff --git a/doctypes/rng/base/topicMod.rng b/doctypes/rng/base/topicMod.rng
@@ -108,10 +108,6 @@ PUBLIC "-//OASIS//ELEMENTS DITA 2.0 Topic//EN"
     <define name="section">
       <ref name="section.element"/>
     </define>
-    <define name="sectiondiv">
-      <ref name="sectiondiv.element"/>
-    </define>
-
 
   </div>
   <div>
@@ -162,24 +158,11 @@ PUBLIC "-//OASIS//ELEMENTS DITA 2.0 Topic//EN"
         <ref name="basic.ph"/>
         <ref name="data.elements.incl"/>
         <ref name="foreign.unknown.incl"/>
-        <ref name="sectiondiv"/>
         <ref name="title"/>
         <ref name="txt.incl"/>
       </choice>
     </define>
     <define name="section.notitle.cnt">
-      <choice>
-        <text/>
-        <ref name="basic.block"/>
-        <ref name="basic.ph"/>
-        <ref name="data.elements.incl"/>
-        <ref name="foreign.unknown.incl"/>
-        <ref name="sectiondiv"/>
-        <ref name="txt.incl"/>
-      </choice>
-    </define>
-    <define name="sectiondiv.cnt">
-      <a:documentation>sectiondiv also includes sectiondiv</a:documentation>
       <choice>
         <text/>
         <ref name="basic.block"/>
@@ -444,34 +427,6 @@ PUBLIC "-//OASIS//ELEMENTS DITA 2.0 Topic//EN"
         <ref name="section.attributes"/>
       </define>
 
-    </div>
-    <div>
-      <a:documentation>LONG NAME: Section division</a:documentation>
-
-      <define name="sectiondiv.content">
-        <zeroOrMore>
-          <choice>
-            <ref name="sectiondiv.cnt"/>
-            <ref name="sectiondiv"/>
-          </choice>
-        </zeroOrMore>
-      </define>
-      <define name="sectiondiv.attributes">
-        <ref name="univ-atts"/>
-      </define>
-      <define name="sectiondiv.element">
-        <element name="sectiondiv" dita:longName="Section division">
-          <a:documentation>The &lt;sectiondiv> element allows logical grouping of content within a section. There is no additional semantic associated with the sectiondiv element, aside from its
-            function as a container for other content. The sectiondiv element does not contain a title; the lowest level of titled content within a topic is the section itself. If additional hierarchy
-            is required, nested topics should be used in place of the section.</a:documentation>
-          <ref name="sectiondiv.attlist"/>
-          <ref name="sectiondiv.content"/>
-        </element>
-      </define>
-      <define name="sectiondiv.attlist" combine="interleave">
-        <ref name="sectiondiv.attributes"/>
-      </define>
-
     </div>
     <div>
       <a:documentation>PROLOG (METADATA FOR TOPICS)</a:documentation>
@@ -824,11 +779,6 @@ PUBLIC "-//OASIS//ELEMENTS DITA 2.0 Topic//EN"
         <attribute name="class" a:defaultValue="- topic/section "/>
       </optional>
     </define>
-    <define name="sectiondiv.attlist" combine="interleave">
-      <optional>
-        <attribute name="class" a:defaultValue="- topic/sectiondiv "/>
-      </optional>
-    </define>
     <define name="topic.attlist" combine="interleave">
       <optional>
         <attribute name="class" a:defaultValue="- topic/topic "/>