[Docutils-checkins] SF.net SVN: docutils:[9727] trunk/docutils

[<mi...@us...>]

Revision: 9727
          http://sourceforge.net/p/docutils/code/9727
Author:   milde
Date:     2024-06-05 10:29:13 +0000 (Wed, 05 Jun 2024)
Log Message:
-----------
Doctree validation: Drop category class `nodes.SubRoot`.

It was new in Docutils 0.22b.dev and is no longer required.

Modified Paths:
--------------
    trunk/docutils/docs/ref/doctree.txt
    trunk/docutils/docutils/nodes.py

Modified: trunk/docutils/docs/ref/doctree.txt
===================================================================
--- trunk/docutils/docs/ref/doctree.txt	2024-06-05 10:29:00 UTC (rev 9726)
+++ trunk/docutils/docs/ref/doctree.txt	2024-06-05 10:29:13 UTC (rev 9727)
@@ -180,7 +180,7 @@
   :simple: `\<title>`_, `\<subtitle>`_
   :compound: `\<decoration>`_, `\<docinfo>`_
 
-:Docutils classes: ``nodes.SubStructural``, ``nodes.SubRoot``
+:Docutils class: ``nodes.SubStructural``
 
 
 Decorative Elements

Modified: trunk/docutils/docutils/nodes.py
===================================================================
--- trunk/docutils/docutils/nodes.py	2024-06-05 10:29:00 UTC (rev 9726)
+++ trunk/docutils/docutils/nodes.py	2024-06-05 10:29:13 UTC (rev 9727)
@@ -1200,11 +1200,7 @@
     """
 
 
-class SubRoot:
-    """Elements that may only be children of the root element."""
-
-
-class SubStructural(SubRoot):
+class SubStructural:
     """`Structural subelements`__ are children of `Structural` elements.
 
     Most Structural elements accept only specific `SubStructural` elements.
@@ -1360,7 +1356,7 @@
 #  Meta-Data Element
 # ==================
 
-class meta(PreBibliographic, SubRoot, Element):
+class meta(PreBibliographic, SubStructural, Element):
     """Container for "invisible" bibliographic data, or meta-data."""
     valid_attributes = Element.valid_attributes + (
         'content', 'dir', 'http-equiv', 'lang', 'media', 'name', 'scheme')
@@ -1370,7 +1366,7 @@
 #  Bibliographic Elements
 # ========================
 
-class docinfo(SubRoot, Element):
+class docinfo(SubStructural, Element):
     """Container for displayed document meta-data."""
     content_model = (  # (%bibliographic.elements;)+
                      (Bibliographic, '+'),)
@@ -1406,7 +1402,7 @@
 class footer(Decorative, Element): pass
 
 
-class decoration(PreBibliographic, SubRoot, Element):
+class decoration(PreBibliographic, SubStructural, Element):
     """Container for `header` and `footer`."""
     content_model = (  # (header?, footer?)
                      (header, '?'),

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.