Author: felixwiemann Date: 2005-09-18 18:03:19 +0200 (Sun, 18 Sep 2005) New Revision: 3887 Modified: branches/transforms/docutils/docs/ref/transforms.txt branches/transforms/docutils/docutils/transforms/references.py branches/transforms/docutils/test/functional/expected/standalone_rst_html4css1.html branches/transforms/docutils/test/functional/expected/standalone_rst_pseudoxml.txt Log: reverted last check-in; it was committed to "transforms" branch instead of trunk, and it causes conflicts when merging to trunk; I'll redo that change after merging the "transforms" branch into the trunk in order to avoid unnecessary merge-work Modified: branches/transforms/docutils/docs/ref/transforms.txt =================================================================== --- branches/transforms/docutils/docs/ref/transforms.txt 2005-09-18 15:53:04 UTC (rev 3886) +++ branches/transforms/docutils/docs/ref/transforms.txt 2005-09-18 16:03:19 UTC (rev 3887) @@ -60,6 +60,8 @@ references.InternalTargets standalone (r), pep (r) 660 +references.DanglingReferences standalone (r), pep (r) 680 + parts.SectNum "sectnum" (d/p) 710 parts.Contents "contents" (d/p), 720 @@ -75,8 +77,6 @@ universal.ExposeInternals Reader (r) 840 -references.DanglingReferences standalone (r), pep (r) 850 - universal.Messages Writer (w) 860 universal.FilterMessages Writer (w) 870 Modified: branches/transforms/docutils/docutils/transforms/references.py =================================================================== --- branches/transforms/docutils/docutils/transforms/references.py 2005-09-18 15:53:04 UTC (rev 3886) +++ branches/transforms/docutils/docutils/transforms/references.py 2005-09-18 16:03:19 UTC (rev 3887) @@ -780,7 +780,7 @@ unreferenced targets. """ - default_priority = 850 + default_priority = 680 def apply(self): visitor = DanglingReferencesVisitor( Modified: branches/transforms/docutils/test/functional/expected/standalone_rst_html4css1.html =================================================================== --- branches/transforms/docutils/test/functional/expected/standalone_rst_html4css1.html 2005-09-18 15:53:04 UTC (rev 3886) +++ branches/transforms/docutils/test/functional/expected/standalone_rst_html4css1.html 2005-09-18 16:03:19 UTC (rev 3887) @@ -88,67 +88,67 @@ <div class="contents topic" id="table-of-contents"> <p class="topic-title first"><a name="table-of-contents">Table of Contents</a></p> <ul class="auto-toc simple"> -<li><a class="reference" href="#structural-elements" id="id25" name="id25">1 Structural Elements</a><ul class="auto-toc"> -<li><a class="reference" href="#section-title" id="id26" name="id26">1.1 Section Title</a></li> -<li><a class="reference" href="#empty-section" id="id27" name="id27">1.2 Empty Section</a></li> -<li><a class="reference" href="#transitions" id="id28" name="id28">1.3 Transitions</a></li> +<li><a class="reference" href="#structural-elements" id="id33" name="id33">1 Structural Elements</a><ul class="auto-toc"> +<li><a class="reference" href="#section-title" id="id34" name="id34">1.1 Section Title</a></li> +<li><a class="reference" href="#empty-section" id="id35" name="id35">1.2 Empty Section</a></li> +<li><a class="reference" href="#transitions" id="id36" name="id36">1.3 Transitions</a></li> </ul> </li> -<li><a class="reference" href="#body-elements" id="id29" name="id29">2 Body Elements</a><ul class="auto-toc"> -<li><a class="reference" href="#paragraphs" id="id30" name="id30">2.1 Paragraphs</a><ul class="auto-toc"> -<li><a class="reference" href="#inline-markup" id="id31" name="id31">2.1.1 Inline Markup</a></li> +<li><a class="reference" href="#body-elements" id="id37" name="id37">2 Body Elements</a><ul class="auto-toc"> +<li><a class="reference" href="#paragraphs" id="id38" name="id38">2.1 Paragraphs</a><ul class="auto-toc"> +<li><a class="reference" href="#inline-markup" id="id39" name="id39">2.1.1 Inline Markup</a></li> </ul> </li> -<li><a class="reference" href="#bullet-lists" id="id32" name="id32">2.2 Bullet Lists</a></li> -<li><a class="reference" href="#enumerated-lists" id="id33" name="id33">2.3 Enumerated Lists</a></li> -<li><a class="reference" href="#definition-lists" id="id34" name="id34">2.4 Definition Lists</a></li> -<li><a class="reference" href="#field-lists" id="id35" name="id35">2.5 Field Lists</a></li> -<li><a class="reference" href="#option-lists" id="id36" name="id36">2.6 Option Lists</a></li> -<li><a class="reference" href="#literal-blocks" id="id37" name="id37">2.7 Literal Blocks</a></li> -<li><a class="reference" href="#line-blocks" id="id38" name="id38">2.8 Line Blocks</a></li> -<li><a class="reference" href="#block-quotes" id="id39" name="id39">2.9 Block Quotes</a></li> -<li><a class="reference" href="#doctest-blocks" id="id40" name="id40">2.10 Doctest Blocks</a></li> -<li><a class="reference" href="#footnotes" id="id41" name="id41">2.11 Footnotes</a></li> -<li><a class="reference" href="#citations" id="id42" name="id42">2.12 Citations</a></li> -<li><a class="reference" href="#targets" id="id43" name="id43">2.13 Targets</a><ul class="auto-toc"> -<li><a class="reference" href="#duplicate-target-names" id="id44" name="id44">2.13.1 Duplicate Target Names</a></li> -<li><a class="reference" href="#id18" id="id45" name="id45">2.13.2 Duplicate Target Names</a></li> +<li><a class="reference" href="#bullet-lists" id="id40" name="id40">2.2 Bullet Lists</a></li> +<li><a class="reference" href="#enumerated-lists" id="id41" name="id41">2.3 Enumerated Lists</a></li> +<li><a class="reference" href="#definition-lists" id="id42" name="id42">2.4 Definition Lists</a></li> +<li><a class="reference" href="#field-lists" id="id43" name="id43">2.5 Field Lists</a></li> +<li><a class="reference" href="#option-lists" id="id44" name="id44">2.6 Option Lists</a></li> +<li><a class="reference" href="#literal-blocks" id="id45" name="id45">2.7 Literal Blocks</a></li> +<li><a class="reference" href="#line-blocks" id="id46" name="id46">2.8 Line Blocks</a></li> +<li><a class="reference" href="#block-quotes" id="id47" name="id47">2.9 Block Quotes</a></li> +<li><a class="reference" href="#doctest-blocks" id="id48" name="id48">2.10 Doctest Blocks</a></li> +<li><a class="reference" href="#footnotes" id="id49" name="id49">2.11 Footnotes</a></li> +<li><a class="reference" href="#citations" id="id50" name="id50">2.12 Citations</a></li> +<li><a class="reference" href="#targets" id="id51" name="id51">2.13 Targets</a><ul class="auto-toc"> +<li><a class="reference" href="#duplicate-target-names" id="id52" name="id52">2.13.1 Duplicate Target Names</a></li> +<li><a class="reference" href="#id18" id="id53" name="id53">2.13.2 Duplicate Target Names</a></li> </ul> </li> -<li><a class="reference" href="#directives" id="id46" name="id46">2.14 Directives</a><ul class="auto-toc"> -<li><a class="reference" href="#document-parts" id="id47" name="id47">2.14.1 Document Parts</a></li> -<li><a class="reference" href="#images" id="id48" name="id48">2.14.2 Images</a></li> -<li><a class="reference" href="#admonitions" id="id49" name="id49">2.14.3 Admonitions</a></li> -<li><a class="reference" href="#topics-sidebars-and-rubrics" id="id50" name="id50">2.14.4 Topics, Sidebars, and Rubrics</a></li> -<li><a class="reference" href="#target-footnotes" id="id51" name="id51">2.14.5 Target Footnotes</a></li> -<li><a class="reference" href="#replacement-text" id="id52" name="id52">2.14.6 Replacement Text</a></li> -<li><a class="reference" href="#compound-paragraph" id="id53" name="id53">2.14.7 Compound Paragraph</a></li> +<li><a class="reference" href="#directives" id="id54" name="id54">2.14 Directives</a><ul class="auto-toc"> +<li><a class="reference" href="#document-parts" id="id55" name="id55">2.14.1 Document Parts</a></li> +<li><a class="reference" href="#images" id="id56" name="id56">2.14.2 Images</a></li> +<li><a class="reference" href="#admonitions" id="id57" name="id57">2.14.3 Admonitions</a></li> +<li><a class="reference" href="#topics-sidebars-and-rubrics" id="id58" name="id58">2.14.4 Topics, Sidebars, and Rubrics</a></li> +<li><a class="reference" href="#target-footnotes" id="id59" name="id59">2.14.5 Target Footnotes</a></li> +<li><a class="reference" href="#replacement-text" id="id60" name="id60">2.14.6 Replacement Text</a></li> +<li><a class="reference" href="#compound-paragraph" id="id61" name="id61">2.14.7 Compound Paragraph</a></li> </ul> </li> -<li><a class="reference" href="#substitution-definitions" id="id54" name="id54">2.15 Substitution Definitions</a></li> -<li><a class="reference" href="#comments" id="id55" name="id55">2.16 Comments</a></li> -<li><a class="reference" href="#raw-text" id="id56" name="id56">2.17 Raw text</a></li> -<li><a class="reference" href="#colspanning-tables" id="id57" name="id57">2.18 Colspanning tables</a></li> -<li><a class="reference" href="#rowspanning-tables" id="id58" name="id58">2.19 Rowspanning tables</a></li> -<li><a class="reference" href="#complex-tables" id="id59" name="id59">2.20 Complex tables</a></li> -<li><a class="reference" href="#list-tables" id="id60" name="id60">2.21 List Tables</a></li> +<li><a class="reference" href="#substitution-definitions" id="id62" name="id62">2.15 Substitution Definitions</a></li> +<li><a class="reference" href="#comments" id="id63" name="id63">2.16 Comments</a></li> +<li><a class="reference" href="#raw-text" id="id64" name="id64">2.17 Raw text</a></li> +<li><a class="reference" href="#colspanning-tables" id="id65" name="id65">2.18 Colspanning tables</a></li> +<li><a class="reference" href="#rowspanning-tables" id="id66" name="id66">2.19 Rowspanning tables</a></li> +<li><a class="reference" href="#complex-tables" id="id67" name="id67">2.20 Complex tables</a></li> +<li><a class="reference" href="#list-tables" id="id68" name="id68">2.21 List Tables</a></li> </ul> </li> -<li><a class="reference" href="#error-handling" id="id61" name="id61">3 Error Handling</a></li> +<li><a class="reference" href="#error-handling" id="id69" name="id69">3 Error Handling</a></li> </ul> </div> <div class="section" id="structural-elements"> -<h1><a class="toc-backref" href="#id25" name="structural-elements">1 Structural Elements</a></h1> +<h1><a class="toc-backref" href="#id33" name="structural-elements">1 Structural Elements</a></h1> <div class="section" id="section-title"> -<h2 class="with-subtitle"><a class="toc-backref" href="#id26" name="section-title">1.1 Section Title</a></h2> +<h2 class="with-subtitle"><a class="toc-backref" href="#id34" name="section-title">1.1 Section Title</a></h2> <h2 class="section-subtitle" id="section-subtitle"><span class="section-subtitle">Section Subtitle</span></h2> <p>That's it, the text just above this line.</p> </div> <div class="section" id="empty-section"> -<h2><a class="toc-backref" href="#id27" name="empty-section">1.2 Empty Section</a></h2> +<h2><a class="toc-backref" href="#id35" name="empty-section">1.2 Empty Section</a></h2> </div> <div class="section" id="transitions"> -<h2><a class="toc-backref" href="#id28" name="transitions">1.3 Transitions</a></h2> +<h2><a class="toc-backref" href="#id36" name="transitions">1.3 Transitions</a></h2> <p>Here's a transition:</p> <hr class="docutils" /> <p>It divides the section. Transitions may also occur between sections:</p> @@ -156,12 +156,12 @@ </div> <hr class="docutils" /> <div class="section" id="body-elements"> -<h1><a class="toc-backref" href="#id29" name="body-elements">2 Body Elements</a></h1> +<h1><a class="toc-backref" href="#id37" name="body-elements">2 Body Elements</a></h1> <div class="section" id="paragraphs"> -<h2><a class="toc-backref" href="#id30" name="paragraphs">2.1 Paragraphs</a></h2> +<h2><a class="toc-backref" href="#id38" name="paragraphs">2.1 Paragraphs</a></h2> <p>A paragraph.</p> <div class="section" id="inline-markup"> -<h3><a class="toc-backref" href="#id31" name="inline-markup">2.1.1 Inline Markup</a></h3> +<h3><a class="toc-backref" href="#id39" name="inline-markup">2.1.1 Inline Markup</a></h3> <p>Paragraphs contain text and may contain inline markup: <em>emphasis</em>, <strong>strong emphasis</strong>, <tt class="docutils literal"><span class="pre">inline</span> <span class="pre">literals</span></tt>, standalone hyperlinks (<a class="reference" href="http://www.python.org">http://www.python.org</a>), external hyperlinks (<a class="reference" href="http://www.python.org/">Python</a> <a class="footnote-reference" href="#id21" id="id22" name="id22">[5]</a>), internal @@ -192,7 +192,7 @@ </div> </div> <div class="section" id="bullet-lists"> -<h2><a class="toc-backref" href="#id32" name="bullet-lists">2.2 Bullet Lists</a></h2> +<h2><a class="toc-backref" href="#id40" name="bullet-lists">2.2 Bullet Lists</a></h2> <ul> <li><p class="first">A bullet list</p> <ul class="simple"> @@ -217,7 +217,7 @@ </ul> </div> <div class="section" id="enumerated-lists"> -<h2><a class="toc-backref" href="#id33" name="enumerated-lists">2.3 Enumerated Lists</a></h2> +<h2><a class="toc-backref" href="#id41" name="enumerated-lists">2.3 Enumerated Lists</a></h2> <ol class="arabic"> <li><p class="first">Arabic numerals.</p> <ol class="loweralpha simple"> @@ -250,7 +250,7 @@ </ol> </div> <div class="section" id="definition-lists"> -<h2><a class="toc-backref" href="#id34" name="definition-lists">2.4 Definition Lists</a></h2> +<h2><a class="toc-backref" href="#id42" name="definition-lists">2.4 Definition Lists</a></h2> <dl class="docutils"> <dt>Term</dt> <dd>Definition</dd> @@ -265,7 +265,7 @@ </dl> </div> <div class="section" id="field-lists"> -<h2><a class="toc-backref" href="#id35" name="field-lists">2.5 Field Lists</a></h2> +<h2><a class="toc-backref" href="#id43" name="field-lists">2.5 Field Lists</a></h2> <table class="docutils field-list" frame="void" rules="none"> <col class="field-name" /> <col class="field-body" /> @@ -288,7 +288,7 @@ </table> </div> <div class="section" id="option-lists"> -<h2><a class="toc-backref" href="#id36" name="option-lists">2.6 Option Lists</a></h2> +<h2><a class="toc-backref" href="#id44" name="option-lists">2.6 Option Lists</a></h2> <p>For listing command-line options:</p> <table class="docutils option-list" frame="void" rules="none"> <col class="option" /> @@ -334,7 +334,7 @@ description.</p> </div> <div class="section" id="literal-blocks"> -<h2><a class="toc-backref" href="#id37" name="literal-blocks">2.7 Literal Blocks</a></h2> +<h2><a class="toc-backref" href="#id45" name="literal-blocks">2.7 Literal Blocks</a></h2> <p>Literal blocks are indicated with a double-colon ("::") at the end of the preceding paragraph (over there <tt class="docutils literal"><span class="pre">--></span></tt>). They can be indented:</p> <pre class="literal-block"> @@ -351,7 +351,7 @@ </pre> </div> <div class="section" id="line-blocks"> -<h2><a class="toc-backref" href="#id38" name="line-blocks">2.8 Line Blocks</a></h2> +<h2><a class="toc-backref" href="#id46" name="line-blocks">2.8 Line Blocks</a></h2> <p>This section tests line blocks. Line blocks are body elements which consist of lines and other line blocks. Nested line blocks cause indentation.</p> @@ -410,7 +410,7 @@ </blockquote> </div> <div class="section" id="block-quotes"> -<h2><a class="toc-backref" href="#id39" name="block-quotes">2.9 Block Quotes</a></h2> +<h2><a class="toc-backref" href="#id47" name="block-quotes">2.9 Block Quotes</a></h2> <p>Block quotes consist of indented body elements:</p> <blockquote> <p>My theory by A. Elk. Brackets Miss, brackets. This theory goes @@ -422,7 +422,7 @@ </blockquote> </div> <div class="section" id="doctest-blocks"> -<h2><a class="toc-backref" href="#id40" name="doctest-blocks">2.10 Doctest Blocks</a></h2> +<h2><a class="toc-backref" href="#id48" name="doctest-blocks">2.10 Doctest Blocks</a></h2> <pre class="doctest-block"> >>> print 'Python-specific usage examples; begun with ">>>"' Python-specific usage examples; begun with ">>>" @@ -431,7 +431,7 @@ </pre> </div> <div class="section" id="footnotes"> -<h2><a class="toc-backref" href="#id41" name="footnotes">2.11 Footnotes</a></h2> +<h2><a class="toc-backref" href="#id49" name="footnotes">2.11 Footnotes</a></h2> <table class="docutils footnote" frame="void" id="id6" rules="none"> <colgroup><col class="label" /><col /></colgroup> <tbody valign="top"> @@ -478,12 +478,12 @@ <colgroup><col class="label" /><col /></colgroup> <tbody valign="top"> <tr><td class="label"><a name="id13">[4]</a></td><td>Here's an unreferenced footnote, with a reference to a -nonexistent footnote: <a href="#id69" name="id70"><span class="problematic" id="id70">[5]_</span></a>.</td></tr> +nonexistent footnote: <a href="#id25" name="id26"><span class="problematic" id="id26">[5]_</span></a>.</td></tr> </tbody> </table> </div> <div class="section" id="citations"> -<h2><a class="toc-backref" href="#id42" name="citations">2.12 Citations</a></h2> +<h2><a class="toc-backref" href="#id50" name="citations">2.12 Citations</a></h2> <table class="docutils citation" frame="void" id="cit2002" rules="none"> <colgroup><col class="label" /><col /></colgroup> <tbody valign="top"> @@ -491,11 +491,11 @@ rendered separately and differently from footnotes.</td></tr> </tbody> </table> -<p>Here's a reference to the above, <a class="citation-reference" href="#cit2002" id="id15" name="id15">[CIT2002]</a>, and a <a href="#id71" name="id72"><span class="problematic" id="id72">[nonexistent]_</span></a> +<p>Here's a reference to the above, <a class="citation-reference" href="#cit2002" id="id15" name="id15">[CIT2002]</a>, and a <a href="#id27" name="id28"><span class="problematic" id="id28">[nonexistent]_</span></a> citation.</p> </div> <div class="section" id="targets"> -<span id="another-target"></span><h2><a class="toc-backref" href="#id43" name="targets">2.13 Targets</a></h2> +<span id="another-target"></span><h2><a class="toc-backref" href="#id51" name="targets">2.13 Targets</a></h2> <p id="example">This paragraph is pointed to by the explicit "example" target. A reference can be found under <a class="reference" href="#inline-markup">Inline Markup</a>, above. <a class="reference" href="#inline-hyperlink-targets">Inline hyperlink targets</a> are also possible.</p> @@ -505,45 +505,45 @@ "<a class="reference" href="http://www.python.org/">Python</a> <a class="footnote-reference" href="#id21" id="id23" name="id23">[5]</a>".</p> <p>Targets may be indirect and anonymous. Thus <a class="reference" href="#targets">this phrase</a> may also refer to the <a class="reference" href="#targets">Targets</a> section.</p> -<p>Here's a <a href="#id73" name="id74"><span class="problematic" id="id74">`hyperlink reference without a target`_</span></a>, which generates an +<p>Here's a <a href="#id29" name="id30"><span class="problematic" id="id30">`hyperlink reference without a target`_</span></a>, which generates an error.</p> <div class="section" id="duplicate-target-names"> -<h3><a class="toc-backref" href="#id44" name="duplicate-target-names">2.13.1 Duplicate Target Names</a></h3> +<h3><a class="toc-backref" href="#id52" name="duplicate-target-names">2.13.1 Duplicate Target Names</a></h3> <p>Duplicate names in section headers or other implicit targets will generate "info" (level-1) system messages. Duplicate names in explicit targets will generate "warning" (level-2) system messages.</p> </div> <div class="section" id="id18"> -<h3><a class="toc-backref" href="#id45" name="id18">2.13.2 Duplicate Target Names</a></h3> +<h3><a class="toc-backref" href="#id53" name="id18">2.13.2 Duplicate Target Names</a></h3> <p>Since there are two "Duplicate Target Names" section headers, we cannot uniquely refer to either of them by name. If we try to (like -this: <a href="#id75" name="id76"><span class="problematic" id="id76">`Duplicate Target Names`_</span></a>), an error is generated.</p> +this: <a href="#id31" name="id32"><span class="problematic" id="id32">`Duplicate Target Names`_</span></a>), an error is generated.</p> </div> </div> <div class="section" id="directives"> -<h2><a class="toc-backref" href="#id46" name="directives">2.14 Directives</a></h2> +<h2><a class="toc-backref" href="#id54" name="directives">2.14 Directives</a></h2> <div class="contents local topic" id="contents"> <ul class="auto-toc simple"> -<li><a class="reference" href="#document-parts" id="id62" name="id62">2.14.1 Document Parts</a></li> -<li><a class="reference" href="#images" id="id63" name="id63">2.14.2 Images</a></li> -<li><a class="reference" href="#admonitions" id="id64" name="id64">2.14.3 Admonitions</a></li> -<li><a class="reference" href="#topics-sidebars-and-rubrics" id="id65" name="id65">2.14.4 Topics, Sidebars, and Rubrics</a></li> -<li><a class="reference" href="#target-footnotes" id="id66" name="id66">2.14.5 Target Footnotes</a></li> -<li><a class="reference" href="#replacement-text" id="id67" name="id67">2.14.6 Replacement Text</a></li> -<li><a class="reference" href="#compound-paragraph" id="id68" name="id68">2.14.7 Compound Paragraph</a></li> +<li><a class="reference" href="#document-parts" id="id70" name="id70">2.14.1 Document Parts</a></li> +<li><a class="reference" href="#images" id="id71" name="id71">2.14.2 Images</a></li> +<li><a class="reference" href="#admonitions" id="id72" name="id72">2.14.3 Admonitions</a></li> +<li><a class="reference" href="#topics-sidebars-and-rubrics" id="id73" name="id73">2.14.4 Topics, Sidebars, and Rubrics</a></li> +<li><a class="reference" href="#target-footnotes" id="id74" name="id74">2.14.5 Target Footnotes</a></li> +<li><a class="reference" href="#replacement-text" id="id75" name="id75">2.14.6 Replacement Text</a></li> +<li><a class="reference" href="#compound-paragraph" id="id76" name="id76">2.14.7 Compound Paragraph</a></li> </ul> </div> <p>These are just a sample of the many reStructuredText Directives. For others, please see <a class="reference" href="http://docutils.sourceforge.net/docs/ref/rst/directives.html">http://docutils.sourceforge.net/docs/ref/rst/directives.html</a>.</p> <div class="section" id="document-parts"> -<h3><a class="toc-backref" href="#id62" name="document-parts">2.14.1 Document Parts</a></h3> +<h3><a class="toc-backref" href="#id70" name="document-parts">2.14.1 Document Parts</a></h3> <p>An example of the "contents" directive can be seen above this section (a local, untitled table of <a class="reference" href="#contents">contents</a>) and at the beginning of the document (a document-wide <a class="reference" href="#table-of-contents">table of contents</a>).</p> </div> <div class="section" id="images"> -<h3><a class="toc-backref" href="#id63" name="images">2.14.2 Images</a></h3> +<h3><a class="toc-backref" href="#id71" name="images">2.14.2 Images</a></h3> <p>An image directive (also clickable -- a hyperlink reference):</p> <a class="reference image-reference" href="#directives"><img alt="../../../docs/user/rst/images/title.png" class="class1 class2" src="../../../docs/user/rst/images/title.png" /></a> <p>Image with multiple IDs:</p> @@ -605,7 +605,7 @@ <img alt="../../../docs/user/rst/images/biohazard.png" src="../../../docs/user/rst/images/biohazard.png" style="height: 3cm;" /> </div> <div class="section" id="admonitions"> -<h3><a class="toc-backref" href="#id64" name="admonitions">2.14.3 Admonitions</a></h3> +<h3><a class="toc-backref" href="#id72" name="admonitions">2.14.3 Admonitions</a></h3> <div class="attention"> <p class="first admonition-title">Attention!</p> <p class="last">Directives at large.</p> @@ -654,7 +654,7 @@ </div> </div> <div class="section" id="topics-sidebars-and-rubrics"> -<h3><a class="toc-backref" href="#id65" name="topics-sidebars-and-rubrics">2.14.4 Topics, Sidebars, and Rubrics</a></h3> +<h3><a class="toc-backref" href="#id73" name="topics-sidebars-and-rubrics">2.14.4 Topics, Sidebars, and Rubrics</a></h3> <div class="sidebar"> <p class="first sidebar-title">Sidebar Title</p> <p class="sidebar-subtitle">Optional Subtitle</p> @@ -671,7 +671,7 @@ <p class="rubric">This is a rubric</p> </div> <div class="section" id="target-footnotes"> -<h3><a class="toc-backref" href="#id66" name="target-footnotes">2.14.5 Target Footnotes</a></h3> +<h3><a class="toc-backref" href="#id74" name="target-footnotes">2.14.5 Target Footnotes</a></h3> <table class="docutils footnote" frame="void" id="id21" rules="none"> <colgroup><col class="label" /><col /></colgroup> <tbody valign="top"> @@ -680,11 +680,11 @@ </table> </div> <div class="section" id="replacement-text"> -<h3><a class="toc-backref" href="#id67" name="replacement-text">2.14.6 Replacement Text</a></h3> +<h3><a class="toc-backref" href="#id75" name="replacement-text">2.14.6 Replacement Text</a></h3> <p>I recommend you try <a class="reference" href="http://www.python.org/">Python, <em>the</em> best language around</a> <a class="footnote-reference" href="#id21" id="id24" name="id24">[5]</a>.</p> </div> <div class="section" id="compound-paragraph"> -<h3><a class="toc-backref" href="#id68" name="compound-paragraph">2.14.7 Compound Paragraph</a></h3> +<h3><a class="toc-backref" href="#id76" name="compound-paragraph">2.14.7 Compound Paragraph</a></h3> <div class="some-class compound"> <p class="compound-first">Compound 1, paragraph 1.</p> <p class="compound-middle">Compound 1, paragraph 2.</p> @@ -752,12 +752,12 @@ </div> </div> <div class="section" id="substitution-definitions"> -<h2><a class="toc-backref" href="#id54" name="substitution-definitions">2.15 Substitution Definitions</a></h2> +<h2><a class="toc-backref" href="#id62" name="substitution-definitions">2.15 Substitution Definitions</a></h2> <p>An inline image (<img alt="EXAMPLE" src="../../../docs/user/rst/images/biohazard.png" />) example:</p> <p>(Substitution definitions are not visible in the HTML source.)</p> </div> <div class="section" id="comments"> -<h2><a class="toc-backref" href="#id55" name="comments">2.16 Comments</a></h2> +<h2><a class="toc-backref" href="#id63" name="comments">2.16 Comments</a></h2> <p>Here's one:</p> <!-- Comments begin with two dots and a space. Anything may follow, except for the syntax of footnotes, hyperlink @@ -767,13 +767,13 @@ <p>(View the HTML source to see the comment.)</p> </div> <div class="section" id="raw-text"> -<h2><a class="toc-backref" href="#id56" name="raw-text">2.17 Raw text</a></h2> +<h2><a class="toc-backref" href="#id64" name="raw-text">2.17 Raw text</a></h2> <p>This does not necessarily look nice, because there may be missing white space.</p> <p>It's just there to freeze the behavior.</p> A test.Second test.<div class="myclass">Another test with myclass set.</div><p>This is the <span class="myrawroleclass">fourth test</span> with myrawroleclass set.</p> Fifth test in HTML.<br />Line two.</div> <div class="section" id="colspanning-tables"> -<h2><a class="toc-backref" href="#id57" name="colspanning-tables">2.18 Colspanning tables</a></h2> +<h2><a class="toc-backref" href="#id65" name="colspanning-tables">2.18 Colspanning tables</a></h2> <p>This table has a cell spanning two columns:</p> <table border="1" class="docutils"> <colgroup> @@ -811,7 +811,7 @@ </table> </div> <div class="section" id="rowspanning-tables"> -<h2><a class="toc-backref" href="#id58" name="rowspanning-tables">2.19 Rowspanning tables</a></h2> +<h2><a class="toc-backref" href="#id66" name="rowspanning-tables">2.19 Rowspanning tables</a></h2> <p>Here's a table with cells spanning several rows:</p> <table border="1" class="docutils"> <colgroup> @@ -844,7 +844,7 @@ </table> </div> <div class="section" id="complex-tables"> -<h2><a class="toc-backref" href="#id59" name="complex-tables">2.20 Complex tables</a></h2> +<h2><a class="toc-backref" href="#id67" name="complex-tables">2.20 Complex tables</a></h2> <p>Here's a complex table, which should test all features.</p> <table border="1" class="docutils"> <colgroup> @@ -893,7 +893,7 @@ </table> </div> <div class="section" id="list-tables"> -<h2><a class="toc-backref" href="#id60" name="list-tables">2.21 List Tables</a></h2> +<h2><a class="toc-backref" href="#id68" name="list-tables">2.21 List Tables</a></h2> <p>Here's a list table exercising all features:</p> <table border="1" class="test docutils"> <caption>list table with integral header</caption> @@ -927,7 +927,7 @@ </div> </div> <div class="section" id="error-handling"> -<h1><a class="toc-backref" href="#id61" name="error-handling">3 Error Handling</a></h1> +<h1><a class="toc-backref" href="#id69" name="error-handling">3 Error Handling</a></h1> <p>Any errors caught during processing will generate system messages.</p> <p>There should be five messages in the following, auto-generated section, "Docutils System Messages":</p> @@ -938,17 +938,17 @@ <div class="system-message" id="id19"> <p class="system-message-title">System Message: <a name="id19">ERROR/3</a> (<tt class="docutils">functional/input/data/standard.txt</tt>, line 100); <em><a href="#id20">backlink</a></em></p> Undefined substitution referenced: "problematic".</div> -<div class="system-message" id="id69"> -<p class="system-message-title">System Message: <a name="id69">ERROR/3</a> (<tt class="docutils">functional/input/standalone_rst_html4css1.txt</tt>, line 354); <em><a href="#id70">backlink</a></em></p> +<div class="system-message" id="id25"> +<p class="system-message-title">System Message: <a name="id25">ERROR/3</a> (<tt class="docutils">functional/input/standalone_rst_html4css1.txt</tt>, line 354); <em><a href="#id26">backlink</a></em></p> Unknown target name: "5".</div> -<div class="system-message" id="id71"> -<p class="system-message-title">System Message: <a name="id71">ERROR/3</a> (<tt class="docutils">functional/input/data/standard.txt</tt>, line 363); <em><a href="#id72">backlink</a></em></p> +<div class="system-message" id="id27"> +<p class="system-message-title">System Message: <a name="id27">ERROR/3</a> (<tt class="docutils">functional/input/data/standard.txt</tt>, line 363); <em><a href="#id28">backlink</a></em></p> Unknown target name: "nonexistent".</div> -<div class="system-message" id="id73"> -<p class="system-message-title">System Message: <a name="id73">ERROR/3</a> (<tt class="docutils">functional/input/data/standard.txt</tt>, line 390); <em><a href="#id74">backlink</a></em></p> +<div class="system-message" id="id29"> +<p class="system-message-title">System Message: <a name="id29">ERROR/3</a> (<tt class="docutils">functional/input/data/standard.txt</tt>, line 390); <em><a href="#id30">backlink</a></em></p> Unknown target name: "hyperlink reference without a target".</div> -<div class="system-message" id="id75"> -<p class="system-message-title">System Message: <a name="id75">ERROR/3</a> (<tt class="docutils">functional/input/data/standard.txt</tt>, line 403); <em><a href="#id76">backlink</a></em></p> +<div class="system-message" id="id31"> +<p class="system-message-title">System Message: <a name="id31">ERROR/3</a> (<tt class="docutils">functional/input/data/standard.txt</tt>, line 403); <em><a href="#id32">backlink</a></em></p> Duplicate target name, cannot be used as a unique reference: "duplicate target names".</div> </div> </div> Modified: branches/transforms/docutils/test/functional/expected/standalone_rst_pseudoxml.txt =================================================================== --- branches/transforms/docutils/test/functional/expected/standalone_rst_pseudoxml.txt 2005-09-18 15:53:04 UTC (rev 3886) +++ branches/transforms/docutils/test/functional/expected/standalone_rst_pseudoxml.txt 2005-09-18 16:03:19 UTC (rev 3887) @@ -91,238 +91,238 @@ <bullet_list classes="auto-toc"> <list_item> <paragraph> - <reference ids="id25" refid="structural-elements"> + <reference ids="id33" refid="structural-elements"> <generated classes="sectnum"> 1 Structural Elements <bullet_list classes="auto-toc"> <list_item> <paragraph> - <reference ids="id26" refid="section-title"> + <reference ids="id34" refid="section-title"> <generated classes="sectnum"> 1.1 Section Title <list_item> <paragraph> - <reference ids="id27" refid="empty-section"> + <reference ids="id35" refid="empty-section"> <generated classes="sectnum"> 1.2 Empty Section <list_item> <paragraph> - <reference ids="id28" refid="transitions"> + <reference ids="id36" refid="transitions"> <generated classes="sectnum"> 1.3 Transitions <list_item> <paragraph> - <reference ids="id29" refid="body-elements"> + <reference ids="id37" refid="body-elements"> <generated classes="sectnum"> 2 Body Elements <bullet_list classes="auto-toc"> <list_item> <paragraph> - <reference ids="id30" refid="paragraphs"> + <reference ids="id38" refid="paragraphs"> <generated classes="sectnum"> 2.1 Paragraphs <bullet_list classes="auto-toc"> <list_item> <paragraph> - <reference ids="id31" refid="inline-markup"> + <reference ids="id39" refid="inline-markup"> <generated classes="sectnum"> 2.1.1 Inline Markup <list_item> <paragraph> - <reference ids="id32" refid="bullet-lists"> + <reference ids="id40" refid="bullet-lists"> <generated classes="sectnum"> 2.2 Bullet Lists <list_item> <paragraph> - <reference ids="id33" refid="enumerated-lists"> + <reference ids="id41" refid="enumerated-lists"> <generated classes="sectnum"> 2.3 Enumerated Lists <list_item> <paragraph> - <reference ids="id34" refid="definition-lists"> + <reference ids="id42" refid="definition-lists"> <generated classes="sectnum"> 2.4 Definition Lists <list_item> <paragraph> - <reference ids="id35" refid="field-lists"> + <reference ids="id43" refid="field-lists"> <generated classes="sectnum"> 2.5 Field Lists <list_item> <paragraph> - <reference ids="id36" refid="option-lists"> + <reference ids="id44" refid="option-lists"> <generated classes="sectnum"> 2.6 Option Lists <list_item> <paragraph> - <reference ids="id37" refid="literal-blocks"> + <reference ids="id45" refid="literal-blocks"> <generated classes="sectnum"> 2.7 Literal Blocks <list_item> <paragraph> - <reference ids="id38" refid="line-blocks"> + <reference ids="id46" refid="line-blocks"> <generated classes="sectnum"> 2.8 Line Blocks <list_item> <paragraph> - <reference ids="id39" refid="block-quotes"> + <reference ids="id47" refid="block-quotes"> <generated classes="sectnum"> 2.9 Block Quotes <list_item> <paragraph> - <reference ids="id40" refid="doctest-blocks"> + <reference ids="id48" refid="doctest-blocks"> <generated classes="sectnum"> 2.10 Doctest Blocks <list_item> <paragraph> - <reference ids="id41" refid="footnotes"> + <reference ids="id49" refid="footnotes"> <generated classes="sectnum"> 2.11 Footnotes <list_item> <paragraph> - <reference ids="id42" refid="citations"> + <reference ids="id50" refid="citations"> <generated classes="sectnum"> 2.12 Citations <list_item> <paragraph> - <reference ids="id43" refid="targets"> + <reference ids="id51" refid="targets"> <generated classes="sectnum"> 2.13 Targets <bullet_list classes="auto-toc"> <list_item> <paragraph> - <reference ids="id44" refid="duplicate-target-names"> + <reference ids="id52" refid="duplicate-target-names"> <generated classes="sectnum"> 2.13.1 Duplicate Target Names <list_item> <paragraph> - <reference ids="id45" refid="id18"> + <reference ids="id53" refid="id18"> <generated classes="sectnum"> 2.13.2 Duplicate Target Names <list_item> <paragraph> - <reference ids="id46" refid="directives"> + <reference ids="id54" refid="directives"> <generated classes="sectnum"> 2.14 Directives <bullet_list classes="auto-toc"> <list_item> <paragraph> - <reference ids="id47" refid="document-parts"> + <reference ids="id55" refid="document-parts"> <generated classes="sectnum"> 2.14.1 Document Parts <list_item> <paragraph> - <reference ids="id48" refid="images"> + <reference ids="id56" refid="images"> <generated classes="sectnum"> 2.14.2 Images <list_item> <paragraph> - <reference ids="id49" refid="admonitions"> + <reference ids="id57" refid="admonitions"> <generated classes="sectnum"> 2.14.3 Admonitions <list_item> <paragraph> - <reference ids="id50" refid="topics-sidebars-and-rubrics"> + <reference ids="id58" refid="topics-sidebars-and-rubrics"> <generated classes="sectnum"> 2.14.4 Topics, Sidebars, and Rubrics <list_item> <paragraph> - <reference ids="id51" refid="target-footnotes"> + <reference ids="id59" refid="target-footnotes"> <generated classes="sectnum"> 2.14.5 Target Footnotes <list_item> <paragraph> - <reference ids="id52" refid="replacement-text"> + <reference ids="id60" refid="replacement-text"> <generated classes="sectnum"> 2.14.6 Replacement Text <list_item> <paragraph> - <reference ids="id53" refid="compound-paragraph"> + <reference ids="id61" refid="compound-paragraph"> <generated classes="sectnum"> 2.14.7 Compound Paragraph <list_item> <paragraph> - <reference ids="id54" refid="substitution-definitions"> + <reference ids="id62" refid="substitution-definitions"> <generated classes="sectnum"> 2.15 Substitution Definitions <list_item> <paragraph> - <reference ids="id55" refid="comments"> + <reference ids="id63" refid="comments"> <generated classes="sectnum"> 2.16 Comments <list_item> <paragraph> - <reference ids="id56" refid="raw-text"> + <reference ids="id64" refid="raw-text"> <generated classes="sectnum"> 2.17 Raw text <list_item> <paragraph> - <reference ids="id57" refid="colspanning-tables"> + <reference ids="id65" refid="colspanning-tables"> <generated classes="sectnum"> 2.18 Colspanning tables <list_item> <paragraph> - <reference ids="id58" refid="rowspanning-tables"> + <reference ids="id66" refid="rowspanning-tables"> <generated classes="sectnum"> 2.19 Rowspanning tables <list_item> <paragraph> - <reference ids="id59" refid="complex-tables"> + <reference ids="id67" refid="complex-tables"> <generated classes="sectnum"> 2.20 Complex tables <list_item> <paragraph> - <reference ids="id60" refid="list-tables"> + <reference ids="id68" refid="list-tables"> <generated classes="sectnum"> 2.21 List Tables <list_item> <paragraph> - <reference ids="id61" refid="error-handling"> + <reference ids="id69" refid="error-handling"> <generated classes="sectnum"> 3 Error Handling <section ids="structural-elements" names="structural elements"> - <title auto="1" refid="id25"> + <title auto="1" refid="id33"> <generated classes="sectnum"> 1 Structural Elements <section ids="section-title" names="section title"> - <title auto="1" refid="id26"> + <title auto="1" refid="id34"> <generated classes="sectnum"> 1.1 Section Title @@ -331,12 +331,12 @@ <paragraph> That's it, the text just above this line. <section ids="empty-section" names="empty section"> - <title auto="1" refid="id27"> + <title auto="1" refid="id35"> <generated classes="sectnum"> 1.2 Empty Section <section ids="transitions" names="transitions"> - <title auto="1" refid="id28"> + <title auto="1" refid="id36"> <generated classes="sectnum"> 1.3 Transitions @@ -347,19 +347,19 @@ It divides the section. Transitions may also occur between sections: <transition> <section ids="body-elements" names="body elements"> - <title auto="1" refid="id29"> + <title auto="1" refid="id37"> <generated classes="sectnum"> 2 Body Elements <section ids="paragraphs" names="paragraphs"> - <title auto="1" refid="id30"> + <title auto="1" refid="id38"> <generated classes="sectnum"> 2.1 Paragraphs <paragraph> A paragraph. <section ids="inline-markup" names="inline markup"> - <title auto="1" refid="id31"> + <title auto="1" refid="id39"> <generated classes="sectnum"> 2.1.1 Inline Markup @@ -484,7 +484,7 @@ option was supplied, there should be a live link to PEP 258 here. <section ids="bullet-lists" names="bullet lists"> - <title auto="1" refid="id32"> + <title auto="1" refid="id40"> <generated classes="sectnum"> 2.2 Bullet Lists @@ -528,7 +528,7 @@ <comment xml:space="preserve"> Even if this item contains a target and a comment. <section ids="enumerated-lists" names="enumerated lists"> - <title auto="1" refid="id33"> + <title auto="1" refid="id41"> <generated classes="sectnum"> 2.3 Enumerated Lists @@ -577,7 +577,7 @@ <paragraph> iv <section ids="definition-lists" names="definition lists"> - <title auto="1" refid="id34"> + <title auto="1" refid="id42"> <generated classes="sectnum"> 2.4 Definition Lists @@ -615,7 +615,7 @@ <paragraph> Definition <section ids="field-lists" names="field lists"> - <title auto="1" refid="id35"> + <title auto="1" refid="id43"> <generated classes="sectnum"> 2.5 Field Lists @@ -649,7 +649,7 @@ about credits but just for ensuring that the class attribute doesn't get stripped away.) <section ids="option-lists" names="option lists"> - <title auto="1" refid="id36"> + <title auto="1" refid="id44"> <generated classes="sectnum"> 2.6 Option Lists @@ -762,7 +762,7 @@ There must be at least two spaces between the option and the description. <section ids="literal-blocks" names="literal blocks"> - <title auto="1" refid="id37"> + <title auto="1" refid="id45"> <generated classes="sectnum"> 2.7 Literal Blocks @@ -784,7 +784,7 @@ > > Why didn't I think of that? <section ids="line-blocks" names="line blocks"> - <title auto="1" refid="id38"> + <title auto="1" refid="id46"> <generated classes="sectnum"> 2.8 Line Blocks @@ -862,7 +862,7 @@ <line> Singing... <section ids="block-quotes" names="block quotes"> - <title auto="1" refid="id39"> + <title auto="1" refid="id47"> <generated classes="sectnum"> 2.9 Block Quotes @@ -878,7 +878,7 @@ <attribution> Anne Elk (Miss) <section ids="doctest-blocks" names="doctest blocks"> - <title auto="1" refid="id40"> + <title auto="1" refid="id48"> <generated classes="sectnum"> 2.10 Doctest Blocks @@ -888,7 +888,7 @@ >>> print '(cut and pasted from interactive Python sessions)' (cut and pasted from interactive Python sessions) <section ids="footnotes" names="footnotes"> - <title auto="1" refid="id41"> + <title auto="1" refid="id49"> <generated classes="sectnum"> 2.11 Footnotes @@ -948,11 +948,11 @@ <paragraph> Here's an unreferenced footnote, with a reference to a nonexistent footnote: - <problematic ids="id70" refid="id69"> + <problematic ids="id26" refid="id25"> [5]_ . <section ids="citations" names="citations"> - <title auto="1" refid="id42"> + <title auto="1" refid="id50"> <generated classes="sectnum"> 2.12 Citations @@ -967,13 +967,13 @@ <citation_reference ids="id15" refid="cit2002"> CIT2002 , and a - <problematic ids="id72" refid="id71"> + <problematic ids="id28" refid="id27"> [nonexistent]_ citation. <target refid="another-target"> <section ids="targets another-target" names="targets another target"> - <title auto="1" refid="id43"> + <title auto="1" refid="id51"> <generated classes="sectnum"> 2.13 Targets @@ -1018,12 +1018,12 @@ <target anonymous="1" ids="id17" refid="targets"> <paragraph> Here's a - <problematic ids="id74" refid="id73"> + <problematic ids="id30" refid="id29"> `hyperlink reference without a target`_ , which generates an error. <section dupnames="duplicate target names" ids="duplicate-target-names"> - <title auto="1" refid="id44"> + <title auto="1" refid="id52"> <generated classes="sectnum"> 2.13.1 Duplicate Target Names @@ -1032,7 +1032,7 @@ generate "info" (level-1) system messages. Duplicate names in explicit targets will generate "warning" (level-2) system messages. <section dupnames="duplicate target names" ids="id18"> - <title auto="1" refid="id45"> + <title auto="1" refid="id53"> <generated classes="sectnum"> 2.13.2 Duplicate Target Names @@ -1040,11 +1040,11 @@ Since there are two "Duplicate Target Names" section headers, we cannot uniquely refer to either of them by name. If we try to (like this: - <problematic ids="id76" refid="id75"> + <problematic ids="id32" refid="id31"> `Duplicate Target Names`_ ), an error is generated. <section ids="directives" names="directives"> - <title auto="1" refid="id46"> + <title auto="1" refid="id54"> <generated classes="sectnum"> 2.14 Directives @@ -1052,43 +1052,43 @@ <bullet_list classes="auto-toc"> <list_item> <paragraph> - <reference ids="id62" refid="document-parts"> + <reference ids="id70" refid="document-parts"> <generated classes="sectnum"> 2.14.1 Document Parts <list_item> <paragraph> - <reference ids="id63" refid="images"> + <reference ids="id71" refid="images"> <generated classes="sectnum"> 2.14.2 Images <list_item> <paragraph> - <reference ids="id64" refid="admonitions"> + <reference ids="id72" refid="admonitions"> <generated classes="sectnum"> 2.14.3 Admonitions <list_item> <paragraph> - <reference ids="id65" refid="topics-sidebars-and-rubrics"> + <reference ids="id73" refid="topics-sidebars-and-rubrics"> <generated classes="sectnum"> 2.14.4 Topics, Sidebars, and Rubrics <list_item> <paragraph> - <reference ids="id66" refid="target-footnotes"> + <reference ids="id74" refid="target-footnotes"> <generated classes="sectnum"> 2.14.5 Target Footnotes <list_item> <paragraph> - <reference ids="id67" refid="replacement-text"> + <reference ids="id75" refid="replacement-text"> <generated classes="sectnum"> 2.14.6 Replacement Text <list_item> <paragraph> - <reference ids="id68" re... [truncated message content] |