Added "sidebar", "rubric", "attribution", "admonition", "superscript", "subscript", and "inline" elements.

git-svn-id: https://svn.code.sf.net/p/docutils/code/trunk/docutils@1337 929543f6-e4f2-0310-98a6-ba3bd3dd1d04

1 files changed, 16 insertions, 7 deletions

diff --git a/docs/ref/docutils.dtd b/docs/ref/docutils.dtd
index 3fec9ed4e..06fe4bf55 100644
--- a/docs/ref/docutils.dtd
+++ b/docs/ref/docutils.dtd
@@ -116,11 +116,11 @@ resolve to either an internal or external reference.
 <!ENTITY % additional.body.elements "">
 <!ENTITY % body.elements
   " paragraph | literal_block | doctest_block | line_block | block_quote
-    | table | figure | image | footnote | citation
+    | table | figure | image | footnote | citation | rubric
     | bullet_list | enumerated_list | definition_list | field_list
     | option_list
     | attention | caution | danger | error | hint | important | note
-    | tip | warning
+    | tip | warning | admonition
     | target | substitution_definition | comment | pending
     | system_message | raw
     %additional.body.elements; ">
@@ -130,8 +130,8 @@ resolve to either an internal or external reference.
   " emphasis | strong | literal
     | reference | footnote_reference | citation_reference
     | substitution_reference | title_reference
-    | abbreviation | acronym
-    | problematic | generated
+    | abbreviation | acronym | subscript | superscript
+    | inline | problematic | generated
     | target | image | raw
     %additional.inline.elements; ">
 
@@ -368,9 +368,12 @@ or " ") or the text between option arguments (typically either "," or
     %basic.atts;
     %fixedspace.att;>
 
-<!ELEMENT block_quote (%body.elements;)+>
+<!ELEMENT block_quote ((%body.elements;)+, attribution?)>
 <!ATTLIST block_quote %basic.atts;>
 
+<!ELEMENT attribution %text.model;>
+<!ATTLIST attribution %basic.atts;>
+
 <!ELEMENT doctest_block %text.model;>
 <!ATTLIST doctest_block
     %basic.atts;
@@ -403,6 +406,9 @@ or " ") or the text between option arguments (typically either "," or
 <!ELEMENT warning (%body.elements;)+>
 <!ATTLIST warning %basic.atts;>
 
+<!ELEMENT admonition (title, (%body.elements;)+)>
+<!ATTLIST admonition %basic.atts;>
+
 <!ELEMENT footnote (label?, (%body.elements;)+)>
 <!ATTLIST footnote
     %basic.atts;
@@ -417,6 +423,9 @@ or " ") or the text between option arguments (typically either "," or
 <!ELEMENT label (#PCDATA)>
 <!ATTLIST label %basic.atts;>
 
+<!ELEMENT rubric %text.model;>
+<!ATTLIST rubric %basic.atts;>
+
 <!-- Empty except when used as an inline element. -->
 <!ELEMENT target %text.model;>
 <!ATTLIST target
@@ -542,8 +551,8 @@ following caveats:
 <!ELEMENT subscript %text.model;>
 <!ATTLIST subscript %basic.atts;>
 
-<!ELEMENT phrase %text.model;>
-<!ATTLIST phrase %basic.atts;>
+<!ELEMENT inline %text.model;>
+<!ATTLIST inline %basic.atts;>
 
 <!ELEMENT problematic %text.model;>
 <!ATTLIST problematic