From 101671ae44e1686680c80cd07b452aabeb88fb63 Mon Sep 17 00:00:00 2001
From: goodger <goodger@929543f6-e4f2-0310-98a6-ba3bd3dd1d04>
Date: Sat, 20 Apr 2002 03:01:52 +0000
Subject: Initial revision

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@18 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 docs/dev/pysource.dtd | 212 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 212 insertions(+)
 create mode 100644 docs/dev/pysource.dtd

(limited to 'docs/dev/pysource.dtd')

diff --git a/docs/dev/pysource.dtd b/docs/dev/pysource.dtd
new file mode 100644
index 000000000..463844a68
--- /dev/null
+++ b/docs/dev/pysource.dtd
@@ -0,0 +1,212 @@
+<!--
+======================================================================
+    Docutils Python Source DTD
+======================================================================
+:Author: David Goodger
+:Contact: goodger@users.sourceforge.net
+:Revision: $Revision$
+:Date: $Date$
+:Copyright: This DTD has been placed in the public domain.
+:Filename: pysource.dtd
+
+This DTD (document type definition) extends the Generic DTD (see
+below).
+
+More information about this DTD and the Docutils project can be found
+at http://docutils.sourceforge.net/.  The latest version of this DTD
+is available from http://docutils.sourceforge.net/spec/pysource.dtd.
+
+The proposed formal public identifier for this DTD is::
+
+    +//IDN python.org//DTD Docutils Python Source//EN//XML
+-->
+
+
+<!--
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    Parameter Entity Overrides
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+-->
+
+<!ENTITY % additional.structural.elements
+  " | package_section | module_section | class_section
+    | method_section | function_section | module_attribute_section
+    | class_attribute_section | instance_attribute_section ">
+
+<!ENTITY % additional.inline.elements
+  " | package | module | class | method | function
+    | variable | parameter | type
+    | module_attribute | class_attribute | instance_attribute
+    | exception_class | warning_class ">
+
+
+<!--
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    Generic DTD
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+This DTD extends the Docutils Generic DTD, available from
+http://docutils.sourceforge.net/spec/docutils.dtd.
+-->
+
+<!ENTITY % docutils PUBLIC
+    "+//IDN python.org//DTD Docutils Generic//EN//XML"
+    "docutils.dtd">
+%docutils;
+
+
+<!--
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    Additional Structural Elements
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+-->
+
+<!ELEMENT package_section (package, %structure.model;)>
+<!ATTLIST package_section %basic.atts;>
+
+<!ELEMENT module_section (module, %structure.model;)>
+<!ATTLIST module_section %basic.atts;>
+
+<!ELEMENT class_section
+    (class, inheritance_list?, parameter_list?, %structure.model;)>
+<!ATTLIST class_section %basic.atts;>
+
+<!ELEMENT method_section (method, parameter_list?, %structure.model;)>
+<!ATTLIST method_section %basic.atts;>
+
+<!ELEMENT function_section (function, parameter_list?, %structure.model;)>
+<!ATTLIST function_section %basic.atts;>
+
+<!ELEMENT module_attribute_section
+    (module_attribute, initial_value?, %structure.model;)>
+<!ATTLIST module_attribute_section %basic.atts;>
+
+<!ELEMENT class_attribute_section
+    (class_attribute, initial_value?, %structure.model;)>
+<!ATTLIST class_attribute_section %basic.atts;>
+
+<!ELEMENT instance_attribute_section
+    (instance_attribute, initial_value?, %structure.model;)>
+<!ATTLIST instance_attribute_section %basic.atts;>
+
+<!ELEMENT inheritance_list (class+)>
+<!ATTLIST inheritance_list %basic.atts;>
+
+<!ELEMENT parameter_list 
+    ((parameter_item+, optional_parameters*) | optional_parameters+)>
+<!ATTLIST parameter_list %basic.atts;>
+
+<!ELEMENT parameter_item ((parameter | parameter_tuple), parameter_default?)>
+<!ATTLIST parameter_item %basic.atts;>
+
+<!ELEMENT optional_parameters (parameter_item+, optional_parameters*)>
+<!ATTLIST optional_parameters %basic.atts;>
+
+<!ELEMENT parameter_tuple (parameter | parameter_tuple)+>
+<!ATTLIST parameter_tuple %basic.atts;>
+
+<!ELEMENT parameter_default (#PCDATA)>
+<!ATTLIST parameter_default %basic.atts;>
+
+<!ELEMENT initial_value (#PCDATA)>
+<!ATTLIST initial_value %basic.atts;>
+
+
+<!--
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    Additional Inline Elements
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+-->
+
+<!-- Also used as the `package_section` identifier/title. -->
+<!ELEMENT package (#PCDATA)>
+<!ATTLIST package
+    %basic.atts;
+    %link.atts;>
+
+<!-- Also used as the `module_section` identifier/title. -->
+<!ELEMENT module (#PCDATA)>
+<!ATTLIST module
+    %basic.atts;
+    %link.atts;>
+
+<!--
+Also used as the `class_section` identifier/title, and in the
+`inheritance` element.
+-->
+<!ELEMENT class (#PCDATA)>
+<!ATTLIST class
+    %basic.atts;
+    %link.atts;>
+
+<!-- Also used as the `method_section` identifier/title. -->
+<!ELEMENT method (#PCDATA)>
+<!ATTLIST method
+    %basic.atts;
+    %link.atts;>
+
+<!-- Also used as the `function_section` identifier/title. -->
+<!ELEMENT function (#PCDATA)>
+<!ATTLIST function
+    %basic.atts;
+    %link.atts;>
+
+<!--
+Also used as the `module_attribute_section` identifier/title. A module
+attribute is an exported module-level global variable.
+-->
+<!ELEMENT module_attribute (#PCDATA)>
+<!ATTLIST module_attribute
+    %basic.atts;
+    %link.atts;>
+
+<!-- Also used as the `class_attribute_section` identifier/title. -->
+<!ELEMENT class_attribute (#PCDATA)>
+<!ATTLIST class_attribute
+    %basic.atts;
+    %link.atts;>
+
+<!--
+Also used as the `instance_attribute_section` identifier/title.
+-->
+<!ELEMENT instance_attribute (#PCDATA)>
+<!ATTLIST instance_attribute
+    %basic.atts;
+    %link.atts;>
+
+<!ELEMENT variable (#PCDATA)>
+<!ATTLIST variable
+    %basic.atts;
+    %link.atts;>
+
+<!-- Also used in `parameter_list`. -->
+<!ELEMENT parameter (#PCDATA)>
+<!ATTLIST parameter
+    %basic.atts;
+    %link.atts;
+    excess_positional  %yesorno;  #IMPLIED
+    excess_keyword     %yesorno;  #IMPLIED>
+
+<!ELEMENT type (#PCDATA)>
+<!ATTLIST type
+    %basic.atts;
+    %link.atts;>
+
+<!ELEMENT exception_class (#PCDATA)>
+<!ATTLIST exception_class
+    %basic.atts;
+    %link.atts;>
+
+<!ELEMENT warning_class (#PCDATA)>
+<!ATTLIST warning_class
+    %basic.atts;
+    %link.atts;>
+
+
+<!--
+Local Variables:
+mode: sgml
+indent-tabs-mode: nil
+fill-column: 70
+End:
+-->
-- 
cgit v1.2.1


From 7dca77f3557441e3579aaba28e4d083615b549eb Mon Sep 17 00:00:00 2001
From: goodger <goodger@929543f6-e4f2-0310-98a6-ba3bd3dd1d04>
Date: Sun, 5 May 2002 15:39:21 +0000
Subject: *** empty log message ***

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@87 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 docs/dev/pysource.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/dev/pysource.dtd')

diff --git a/docs/dev/pysource.dtd b/docs/dev/pysource.dtd
index 463844a68..1a1aa6e8b 100644
--- a/docs/dev/pysource.dtd
+++ b/docs/dev/pysource.dtd
@@ -92,7 +92,7 @@ http://docutils.sourceforge.net/spec/docutils.dtd.
 <!ELEMENT inheritance_list (class+)>
 <!ATTLIST inheritance_list %basic.atts;>
 
-<!ELEMENT parameter_list 
+<!ELEMENT parameter_list
     ((parameter_item+, optional_parameters*) | optional_parameters+)>
 <!ATTLIST parameter_list %basic.atts;>
 
-- 
cgit v1.2.1


From fa47be81f29db06976116a9202f9150b06b0c9ef Mon Sep 17 00:00:00 2001
From: goodger <goodger@929543f6-e4f2-0310-98a6-ba3bd3dd1d04>
Date: Fri, 31 May 2002 00:51:44 +0000
Subject: Reworked based on ideas stolen from Tony Ibbs; updated.

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@164 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 docs/dev/pysource.dtd | 55 +++++++++++++++++++++++++++++++--------------------
 1 file changed, 34 insertions(+), 21 deletions(-)

(limited to 'docs/dev/pysource.dtd')

diff --git a/docs/dev/pysource.dtd b/docs/dev/pysource.dtd
index 1a1aa6e8b..7fa920363 100644
--- a/docs/dev/pysource.dtd
+++ b/docs/dev/pysource.dtd
@@ -61,37 +61,50 @@ http://docutils.sourceforge.net/spec/docutils.dtd.
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 -->
 
-<!ELEMENT package_section (package, %structure.model;)>
+<!ELEMENT package_section (package, fullname?, %structure.model;)>
 <!ATTLIST package_section %basic.atts;>
 
-<!ELEMENT module_section (module, %structure.model;)>
+<!ELEMENT module_section (module, fullname?, %structure.model;)>
 <!ATTLIST module_section %basic.atts;>
 
 <!ELEMENT class_section
-    (class, inheritance_list?, parameter_list?, %structure.model;)>
+    (class, inheritance_list?, fullname?, subclasses?, %structure.model;)>
 <!ATTLIST class_section %basic.atts;>
 
-<!ELEMENT method_section (method, parameter_list?, %structure.model;)>
+<!ELEMENT method_section
+    (method, parameter_list?, fullname?, overrides?, %structure.model;)>
 <!ATTLIST method_section %basic.atts;>
 
-<!ELEMENT function_section (function, parameter_list?, %structure.model;)>
+<!ELEMENT function_section
+    (function, parameter_list?, fullname?, %structure.model;)>
 <!ATTLIST function_section %basic.atts;>
 
 <!ELEMENT module_attribute_section
-    (module_attribute, initial_value?, %structure.model;)>
+    (module_attribute, initial_value?, fullname?, %structure.model;)>
 <!ATTLIST module_attribute_section %basic.atts;>
 
 <!ELEMENT class_attribute_section
-    (class_attribute, initial_value?, %structure.model;)>
+    (class_attribute, initial_value?, fullname?, overrides?,
+     %structure.model;)>
 <!ATTLIST class_attribute_section %basic.atts;>
 
 <!ELEMENT instance_attribute_section
-    (instance_attribute, initial_value?, %structure.model;)>
+    (instance_attribute, initial_value?, fullname?, overrides?,
+     %structure.model;)>
 <!ATTLIST instance_attribute_section %basic.atts;>
 
+<!ELEMENT fullname (package | module | class | method | function)+>
+<!ATTLIST fullname %basic.atts;>
+
+<!ELEMENT overrides (fullname+)>
+<!ATTLIST overrides %basic.atts;>
+
 <!ELEMENT inheritance_list (class+)>
 <!ATTLIST inheritance_list %basic.atts;>
 
+<!ELEMENT subclasses (class+)>
+<!ATTLIST subclasses %basic.atts;>
+
 <!ELEMENT parameter_list
     ((parameter_item+, optional_parameters*) | optional_parameters+)>
 <!ATTLIST parameter_list %basic.atts;>
@@ -122,13 +135,13 @@ http://docutils.sourceforge.net/spec/docutils.dtd.
 <!ELEMENT package (#PCDATA)>
 <!ATTLIST package
     %basic.atts;
-    %link.atts;>
+    %reference.atts;>
 
 <!-- Also used as the `module_section` identifier/title. -->
 <!ELEMENT module (#PCDATA)>
 <!ATTLIST module
     %basic.atts;
-    %link.atts;>
+    %reference.atts;>
 
 <!--
 Also used as the `class_section` identifier/title, and in the
@@ -137,19 +150,19 @@ Also used as the `class_section` identifier/title, and in the
 <!ELEMENT class (#PCDATA)>
 <!ATTLIST class
     %basic.atts;
-    %link.atts;>
+    %reference.atts;>
 
 <!-- Also used as the `method_section` identifier/title. -->
 <!ELEMENT method (#PCDATA)>
 <!ATTLIST method
     %basic.atts;
-    %link.atts;>
+    %reference.atts;>
 
 <!-- Also used as the `function_section` identifier/title. -->
 <!ELEMENT function (#PCDATA)>
 <!ATTLIST function
     %basic.atts;
-    %link.atts;>
+    %reference.atts;>
 
 <!--
 Also used as the `module_attribute_section` identifier/title. A module
@@ -158,13 +171,13 @@ attribute is an exported module-level global variable.
 <!ELEMENT module_attribute (#PCDATA)>
 <!ATTLIST module_attribute
     %basic.atts;
-    %link.atts;>
+    %reference.atts;>
 
 <!-- Also used as the `class_attribute_section` identifier/title. -->
 <!ELEMENT class_attribute (#PCDATA)>
 <!ATTLIST class_attribute
     %basic.atts;
-    %link.atts;>
+    %reference.atts;>
 
 <!--
 Also used as the `instance_attribute_section` identifier/title.
@@ -172,35 +185,35 @@ Also used as the `instance_attribute_section` identifier/title.
 <!ELEMENT instance_attribute (#PCDATA)>
 <!ATTLIST instance_attribute
     %basic.atts;
-    %link.atts;>
+    %reference.atts;>
 
 <!ELEMENT variable (#PCDATA)>
 <!ATTLIST variable
     %basic.atts;
-    %link.atts;>
+    %reference.atts;>
 
 <!-- Also used in `parameter_list`. -->
 <!ELEMENT parameter (#PCDATA)>
 <!ATTLIST parameter
     %basic.atts;
-    %link.atts;
+    %reference.atts;
     excess_positional  %yesorno;  #IMPLIED
     excess_keyword     %yesorno;  #IMPLIED>
 
 <!ELEMENT type (#PCDATA)>
 <!ATTLIST type
     %basic.atts;
-    %link.atts;>
+    %reference.atts;>
 
 <!ELEMENT exception_class (#PCDATA)>
 <!ATTLIST exception_class
     %basic.atts;
-    %link.atts;>
+    %reference.atts;>
 
 <!ELEMENT warning_class (#PCDATA)>
 <!ATTLIST warning_class
     %basic.atts;
-    %link.atts;>
+    %reference.atts;>
 
 
 <!--
-- 
cgit v1.2.1


From 0e8a50000a0064dd14910bfe641b459e86f7013c Mon Sep 17 00:00:00 2001
From: goodger <goodger@929543f6-e4f2-0310-98a6-ba3bd3dd1d04>
Date: Sat, 1 Jun 2002 01:35:06 +0000
Subject: fiddling

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@166 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 docs/dev/pysource.dtd | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'docs/dev/pysource.dtd')

diff --git a/docs/dev/pysource.dtd b/docs/dev/pysource.dtd
index 7fa920363..f81de795d 100644
--- a/docs/dev/pysource.dtd
+++ b/docs/dev/pysource.dtd
@@ -68,11 +68,13 @@ http://docutils.sourceforge.net/spec/docutils.dtd.
 <!ATTLIST module_section %basic.atts;>
 
 <!ELEMENT class_section
-    (class, inheritance_list?, fullname?, subclasses?, %structure.model;)>
+    (class, inheritance_list?, fullname?, subclasses?,
+     %structure.model;)>
 <!ATTLIST class_section %basic.atts;>
 
 <!ELEMENT method_section
-    (method, parameter_list?, fullname?, overrides?, %structure.model;)>
+    (method, parameter_list?, fullname?, overrides?,
+     %structure.model;)>
 <!ATTLIST method_section %basic.atts;>
 
 <!ELEMENT function_section
@@ -109,7 +111,8 @@ http://docutils.sourceforge.net/spec/docutils.dtd.
     ((parameter_item+, optional_parameters*) | optional_parameters+)>
 <!ATTLIST parameter_list %basic.atts;>
 
-<!ELEMENT parameter_item ((parameter | parameter_tuple), parameter_default?)>
+<!ELEMENT parameter_item
+    ((parameter | parameter_tuple), parameter_default?)>
 <!ATTLIST parameter_item %basic.atts;>
 
 <!ELEMENT optional_parameters (parameter_item+, optional_parameters*)>
-- 
cgit v1.2.1


From b24a391ecebe5f31ba0129fdecf2aadbef595f5b Mon Sep 17 00:00:00 2001
From: goodger <goodger@929543f6-e4f2-0310-98a6-ba3bd3dd1d04>
Date: Sat, 17 Aug 2002 01:31:15 +0000
Subject: updated

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@553 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 docs/dev/pysource.dtd | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

(limited to 'docs/dev/pysource.dtd')

diff --git a/docs/dev/pysource.dtd b/docs/dev/pysource.dtd
index f81de795d..758ce05bc 100644
--- a/docs/dev/pysource.dtd
+++ b/docs/dev/pysource.dtd
@@ -21,14 +21,13 @@ The proposed formal public identifier for this DTD is::
     +//IDN python.org//DTD Docutils Python Source//EN//XML
 -->
 
-
 <!--
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     Parameter Entity Overrides
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 -->
 
-<!ENTITY % additional.structural.elements
+<!ENTITY % additional.section.elements
   " | package_section | module_section | class_section
     | method_section | function_section | module_attribute_section
     | class_attribute_section | instance_attribute_section ">
@@ -39,7 +38,6 @@ The proposed formal public identifier for this DTD is::
     | module_attribute | class_attribute | instance_attribute
     | exception_class | warning_class ">
 
-
 <!--
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     Generic DTD
@@ -54,10 +52,9 @@ http://docutils.sourceforge.net/spec/docutils.dtd.
     "docutils.dtd">
 %docutils;
 
-
 <!--
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    Additional Structural Elements
+    Additional Section Elements
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 -->
 
@@ -127,7 +124,6 @@ http://docutils.sourceforge.net/spec/docutils.dtd.
 <!ELEMENT initial_value (#PCDATA)>
 <!ATTLIST initial_value %basic.atts;>
 
-
 <!--
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     Additional Inline Elements
@@ -218,7 +214,6 @@ Also used as the `instance_attribute_section` identifier/title.
     %basic.atts;
     %reference.atts;>
 
-
 <!--
 Local Variables:
 mode: sgml
-- 
cgit v1.2.1


From f534ae91e6ef5e0d5fcb9c042027086f32925eb4 Mon Sep 17 00:00:00 2001
From: goodger <goodger@929543f6-e4f2-0310-98a6-ba3bd3dd1d04>
Date: Fri, 23 Aug 2002 01:56:39 +0000
Subject: working out some ideas

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@580 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 docs/dev/pysource.dtd | 43 ++++++++++++++++++++++++++++++++++---------
 1 file changed, 34 insertions(+), 9 deletions(-)

(limited to 'docs/dev/pysource.dtd')

diff --git a/docs/dev/pysource.dtd b/docs/dev/pysource.dtd
index 758ce05bc..bb61fb2ff 100644
--- a/docs/dev/pysource.dtd
+++ b/docs/dev/pysource.dtd
@@ -34,7 +34,7 @@ The proposed formal public identifier for this DTD is::
 
 <!ENTITY % additional.inline.elements
   " | package | module | class | method | function
-    | variable | parameter | type
+    | variable | parameter | type | attribute
     | module_attribute | class_attribute | instance_attribute
     | exception_class | warning_class ">
 
@@ -58,10 +58,12 @@ http://docutils.sourceforge.net/spec/docutils.dtd.
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 -->
 
-<!ELEMENT package_section (package, fullname?, %structure.model;)>
+<!ELEMENT package_section
+    (package, fullname?, import_list?, %structure.model;)>
 <!ATTLIST package_section %basic.atts;>
 
-<!ELEMENT module_section (module, fullname?, %structure.model;)>
+<!ELEMENT module_section
+    (module, fullname?, import_list?, %structure.model;)>
 <!ATTLIST module_section %basic.atts;>
 
 <!ELEMENT class_section
@@ -79,24 +81,32 @@ http://docutils.sourceforge.net/spec/docutils.dtd.
 <!ATTLIST function_section %basic.atts;>
 
 <!ELEMENT module_attribute_section
-    (module_attribute, initial_value?, fullname?, %structure.model;)>
+    (attribute, initial_value?, fullname?, %structure.model;)>
 <!ATTLIST module_attribute_section %basic.atts;>
 
 <!ELEMENT class_attribute_section
-    (class_attribute, initial_value?, fullname?, overrides?,
+    (attribute, initial_value?, fullname?, overrides?,
      %structure.model;)>
 <!ATTLIST class_attribute_section %basic.atts;>
 
 <!ELEMENT instance_attribute_section
-    (instance_attribute, initial_value?, fullname?, overrides?,
+    (attribute, initial_value?, fullname?, overrides?,
      %structure.model;)>
 <!ATTLIST instance_attribute_section %basic.atts;>
 
-<!ELEMENT fullname (package | module | class | method | function)+>
+<!ELEMENT fullname
+    (package | module | class | method | function | attribute)+>
 <!ATTLIST fullname %basic.atts;>
 
-<!ELEMENT overrides (fullname+)>
-<!ATTLIST overrides %basic.atts;>
+<!ELEMENT import_list (import_item+)>
+<!ATTLIST import_list %basic.atts;>
+
+<!--
+Support ``import module``, ``import module as alias``, ``from module
+import identifier``, and ``from module import identifier as alias``.
+-->
+<!ELEMENT import_item (fullname, identifier?, alias?)>
+<!ATTLIST import_item %basic.atts;>
 
 <!ELEMENT inheritance_list (class+)>
 <!ATTLIST inheritance_list %basic.atts;>
@@ -121,6 +131,9 @@ http://docutils.sourceforge.net/spec/docutils.dtd.
 <!ELEMENT parameter_default (#PCDATA)>
 <!ATTLIST parameter_default %basic.atts;>
 
+<!ELEMENT overrides (fullname+)>
+<!ATTLIST overrides %basic.atts;>
+
 <!ELEMENT initial_value (#PCDATA)>
 <!ATTLIST initial_value %basic.atts;>
 
@@ -163,6 +176,18 @@ Also used as the `class_section` identifier/title, and in the
     %basic.atts;
     %reference.atts;>
 
+<!--
+??? Use this instead of the ``*_attribute`` elements below?  Add a
+"type" attribute to differentiate?
+
+Also used as the identifier/title for `module_attribute_section`,
+`class_attribute_section`, and `instance_attribute_section`.
+-->
+<!ELEMENT attribute (#PCDATA)>
+<!ATTLIST attribute
+    %basic.atts;
+    %reference.atts;>
+
 <!--
 Also used as the `module_attribute_section` identifier/title. A module
 attribute is an exported module-level global variable.
-- 
cgit v1.2.1


From 794964358a1bb001f592d7e7c8b77559fe9ad24f Mon Sep 17 00:00:00 2001
From: goodger <goodger@929543f6-e4f2-0310-98a6-ba3bd3dd1d04>
Date: Tue, 24 Sep 2002 02:21:48 +0000
Subject: Changed public identifier to docutils.sf.net.

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@715 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 docs/dev/pysource.dtd | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'docs/dev/pysource.dtd')

diff --git a/docs/dev/pysource.dtd b/docs/dev/pysource.dtd
index bb61fb2ff..02d754358 100644
--- a/docs/dev/pysource.dtd
+++ b/docs/dev/pysource.dtd
@@ -16,9 +16,9 @@ More information about this DTD and the Docutils project can be found
 at http://docutils.sourceforge.net/.  The latest version of this DTD
 is available from http://docutils.sourceforge.net/spec/pysource.dtd.
 
-The proposed formal public identifier for this DTD is::
+The formal public identifier for this DTD is::
 
-    +//IDN python.org//DTD Docutils Python Source//EN//XML
+    +//IDN docutils.sourceforge.net//DTD Docutils Python Source//EN//XML
 -->
 
 <!--
-- 
cgit v1.2.1


From 673c882e62ff706d8706218bfe74c203c46c87f5 Mon Sep 17 00:00:00 2001
From: goodger <goodger@929543f6-e4f2-0310-98a6-ba3bd3dd1d04>
Date: Thu, 28 Nov 2002 03:45:11 +0000
Subject: updated

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@983 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 docs/dev/pysource.dtd | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'docs/dev/pysource.dtd')

diff --git a/docs/dev/pysource.dtd b/docs/dev/pysource.dtd
index 02d754358..79a074cec 100644
--- a/docs/dev/pysource.dtd
+++ b/docs/dev/pysource.dtd
@@ -29,7 +29,8 @@ The formal public identifier for this DTD is::
 
 <!ENTITY % additional.section.elements
   " | package_section | module_section | class_section
-    | method_section | function_section | module_attribute_section
+    | method_section | function_section
+    | module_attribute_section | function_attribute_section
     | class_attribute_section | instance_attribute_section ">
 
 <!ENTITY % additional.inline.elements
@@ -84,6 +85,10 @@ http://docutils.sourceforge.net/spec/docutils.dtd.
     (attribute, initial_value?, fullname?, %structure.model;)>
 <!ATTLIST module_attribute_section %basic.atts;>
 
+<!ELEMENT function_attribute_section
+    (attribute, initial_value?, fullname?, %structure.model;)>
+<!ATTLIST function_attribute_section %basic.atts;>
+
 <!ELEMENT class_attribute_section
     (attribute, initial_value?, fullname?, overrides?,
      %structure.model;)>
@@ -94,6 +99,11 @@ http://docutils.sourceforge.net/spec/docutils.dtd.
      %structure.model;)>
 <!ATTLIST instance_attribute_section %basic.atts;>
 
+<!--
+    Section Subelements
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+-->
+
 <!ELEMENT fullname
     (package | module | class | method | function | attribute)+>
 <!ATTLIST fullname %basic.atts;>
-- 
cgit v1.2.1


From 6c18a0548558d3eefb532ef613a49533328dd357 Mon Sep 17 00:00:00 2001
From: wiemann <wiemann@929543f6-e4f2-0310-98a6-ba3bd3dd1d04>
Date: Sat, 5 Jun 2004 19:32:15 +0000
Subject: updated

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@2223 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 docs/dev/pysource.dtd | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'docs/dev/pysource.dtd')

diff --git a/docs/dev/pysource.dtd b/docs/dev/pysource.dtd
index 79a074cec..fb8af4091 100644
--- a/docs/dev/pysource.dtd
+++ b/docs/dev/pysource.dtd
@@ -14,7 +14,8 @@ below).
 
 More information about this DTD and the Docutils project can be found
 at http://docutils.sourceforge.net/.  The latest version of this DTD
-is available from http://docutils.sourceforge.net/spec/pysource.dtd.
+is available from
+http://docutils.sourceforge.net/docs/dev/pysource.dtd.
 
 The formal public identifier for this DTD is::
 
@@ -45,7 +46,7 @@ The formal public identifier for this DTD is::
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 This DTD extends the Docutils Generic DTD, available from
-http://docutils.sourceforge.net/spec/docutils.dtd.
+http://docutils.sourceforge.net/docs/ref/docutils.dtd.
 -->
 
 <!ENTITY % docutils PUBLIC
-- 
cgit v1.2.1