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

1 files changed, 34 insertions, 21 deletions

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;>
 
 
 <!--