From: Felix W. <fel...@us...> - 2004-11-26 16:51:56
|
Update of /cvsroot/docutils/docutils/test/functional/expected In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25829/expected Modified Files: standalone_rst_html4css1.html standalone_rst_latex.tex Log Message: added test for ``raw`` role and directive Index: standalone_rst_html4css1.html =================================================================== RCS file: /cvsroot/docutils/docutils/test/functional/expected/standalone_rst_html4css1.html,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- standalone_rst_html4css1.html 26 Nov 2004 09:32:56 -0000 1.25 +++ standalone_rst_html4css1.html 26 Nov 2004 16:51:46 -0000 1.26 @@ -123,12 +123,13 @@ </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="#colspanning-tables" id="id56" name="id56">2.17 Colspanning tables</a></li> -<li><a class="reference" href="#rowspanning-tables" id="id57" name="id57">2.18 Rowspanning tables</a></li> -<li><a class="reference" href="#complex-tables" id="id58" name="id58">2.19 Complex tables</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> </ul> </li> -<li><a class="reference" href="#error-handling" id="id59" name="id59">3 Error Handling</a></li> +<li><a class="reference" href="#error-handling" id="id60" name="id60">3 Error Handling</a></li> </ul> </div> <div class="section" id="structural-elements"> @@ -471,7 +472,7 @@ <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="#id67" name="id68"><span class="problematic" id="id68">[5]_</span></a>.</td></tr> +nonexistent footnote: <a href="#id68" name="id69"><span class="problematic" id="id69">[5]_</span></a>.</td></tr> </tbody> </table> </div> @@ -484,7 +485,7 @@ 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="#id69" name="id70"><span class="problematic" id="id70">[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="#id70" name="id71"><span class="problematic" id="id71">[nonexistent]_</span></a> citation.</p> </div> <div class="section" id="targets"> @@ -498,7 +499,7 @@ "<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="#id71" name="id72"><span class="problematic" id="id72">`hyperlink reference without a target`_</span></a>, which generates an +<p>Here's a <a href="#id72" name="id73"><span class="problematic" id="id73">`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> @@ -510,33 +511,33 @@ <h3><a class="toc-backref" href="#id45" 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="#id73" name="id74"><span class="problematic" id="id74">`Duplicate Target Names`_</span></a>), an error is generated.</p> +this: <a href="#id74" name="id75"><span class="problematic" id="id75">`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> <div class="contents topic" id="contents"> <ul class="auto-toc simple"> -<li><a class="reference" href="#document-parts" id="id60" name="id60">2.14.1 Document Parts</a></li> -<li><a class="reference" href="#images" id="id61" name="id61">2.14.2 Images</a></li> -<li><a class="reference" href="#admonitions" id="id62" name="id62">2.14.3 Admonitions</a></li> -<li><a class="reference" href="#topics-sidebars-and-rubrics" id="id63" name="id63">2.14.4 Topics, Sidebars, and Rubrics</a></li> -<li><a class="reference" href="#target-footnotes" id="id64" name="id64">2.14.5 Target Footnotes</a></li> -<li><a class="reference" href="#replacement-text" id="id65" name="id65">2.14.6 Replacement Text</a></li> -<li><a class="reference" href="#compound-paragraph" id="id66" name="id66">2.14.7 Compound Paragraph</a></li> +<li><a class="reference" href="#document-parts" id="id61" name="id61">2.14.1 Document Parts</a></li> +<li><a class="reference" href="#images" id="id62" name="id62">2.14.2 Images</a></li> +<li><a class="reference" href="#admonitions" id="id63" name="id63">2.14.3 Admonitions</a></li> +<li><a class="reference" href="#topics-sidebars-and-rubrics" id="id64" name="id64">2.14.4 Topics, Sidebars, and Rubrics</a></li> +<li><a class="reference" href="#target-footnotes" id="id65" name="id65">2.14.5 Target Footnotes</a></li> +<li><a class="reference" href="#replacement-text" id="id66" name="id66">2.14.6 Replacement Text</a></li> +<li><a class="reference" href="#compound-paragraph" id="id67" name="id67">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="#id60" name="document-parts">2.14.1 Document Parts</a></h3> +<h3><a class="toc-backref" href="#id61" 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="#id61" name="images">2.14.2 Images</a></h3> +<h3><a class="toc-backref" href="#id62" name="images">2.14.2 Images</a></h3> <p>An image directive (also clickable -- a hyperlink reference):</p> <p><a class="reference" href="#directives"><img alt="../../../docs/user/rst/images/title.png" src="../../../docs/user/rst/images/title.png" /></a></p> <p>A figure directive:</p> @@ -566,7 +567,7 @@ </div> </div> <div class="section" id="admonitions"> -<h3><a class="toc-backref" href="#id62" name="admonitions">2.14.3 Admonitions</a></h3> +<h3><a class="toc-backref" href="#id63" 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> @@ -615,7 +616,7 @@ </div> </div> <div class="section" id="topics-sidebars-and-rubrics"> -<h3><a class="toc-backref" href="#id63" name="topics-sidebars-and-rubrics">2.14.4 Topics, Sidebars, and Rubrics</a></h3> +<h3><a class="toc-backref" href="#id64" 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> @@ -632,7 +633,7 @@ <p class="rubric">This is a rubric</p> </div> <div class="section" id="target-footnotes"> -<h3><a class="toc-backref" href="#id64" name="target-footnotes">2.14.5 Target Footnotes</a></h3> +<h3><a class="toc-backref" href="#id65" 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"> @@ -641,11 +642,11 @@ </table> </div> <div class="section" id="replacement-text"> -<h3><a class="toc-backref" href="#id65" name="replacement-text">2.14.6 Replacement Text</a></h3> +<h3><a class="toc-backref" href="#id66" 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="#id66" name="compound-paragraph">2.14.7 Compound Paragraph</a></h3> +<h3><a class="toc-backref" href="#id67" 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> @@ -727,8 +728,14 @@ Double-dashes - - "- -" - - must be escaped somehow in HTML output. --> <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> +<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="#id56" name="colspanning-tables">2.17 Colspanning tables</a></h2> +<h2><a class="toc-backref" href="#id57" 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> @@ -766,7 +773,7 @@ </table> </div> <div class="section" id="rowspanning-tables"> -<h2><a class="toc-backref" href="#id57" name="rowspanning-tables">2.18 Rowspanning tables</a></h2> +<h2><a class="toc-backref" href="#id58" 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> @@ -802,7 +809,7 @@ </table> </div> <div class="section" id="complex-tables"> -<h2><a class="toc-backref" href="#id58" name="complex-tables">2.19 Complex tables</a></h2> +<h2><a class="toc-backref" href="#id59" 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> @@ -852,7 +859,7 @@ </div> </div> <div class="section" id="error-handling"> -<h1><a class="toc-backref" href="#id59" name="error-handling">3 Error Handling</a></h1> +<h1><a class="toc-backref" href="#id60" 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> @@ -863,17 +870,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 94); <em><a href="#id20">backlink</a></em></p> Undefined substitution referenced: "problematic".</div> -<div class="system-message" id="id67"> -<p class="system-message-title">System Message: <a name="id67">ERROR/3</a> (<tt class="docutils">functional/input/standalone_rst_html4css1.txt</tt>, line 348); <em><a href="#id68">backlink</a></em></p> +<div class="system-message" id="id68"> +<p class="system-message-title">System Message: <a name="id68">ERROR/3</a> (<tt class="docutils">functional/input/standalone_rst_html4css1.txt</tt>, line 348); <em><a href="#id69">backlink</a></em></p> Unknown target name: "5".</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/data/standard.txt</tt>, line 357); <em><a href="#id70">backlink</a></em></p> +<div class="system-message" id="id70"> +<p class="system-message-title">System Message: <a name="id70">ERROR/3</a> (<tt class="docutils">functional/input/data/standard.txt</tt>, line 357); <em><a href="#id71">backlink</a></em></p> Unknown target name: "nonexistent".</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 382); <em><a href="#id72">backlink</a></em></p> +<div class="system-message" id="id72"> +<p class="system-message-title">System Message: <a name="id72">ERROR/3</a> (<tt class="docutils">functional/input/data/standard.txt</tt>, line 382); <em><a href="#id73">backlink</a></em></p> Unknown target name: "hyperlink reference without a target".</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 395); <em><a href="#id74">backlink</a></em></p> +<div class="system-message" id="id74"> +<p class="system-message-title">System Message: <a name="id74">ERROR/3</a> (<tt class="docutils">functional/input/data/standard.txt</tt>, line 395); <em><a href="#id75">backlink</a></em></p> Duplicate target name, cannot be used as a unique reference: "duplicate target names".</div> </div> </div> Index: standalone_rst_latex.tex =================================================================== RCS file: /cvsroot/docutils/docutils/test/functional/expected/standalone_rst_latex.tex,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- standalone_rst_latex.tex 26 Nov 2004 09:32:56 -0000 1.27 +++ standalone_rst_latex.tex 26 Nov 2004 16:51:46 -0000 1.28 @@ -204,7 +204,9 @@ \item {} \href{\#comments}{2.16~~~Comments} -\item {} \href{\#colspanning-tables}{2.17~~~Colspanning tables} +\item {} \href{\#raw-text}{2.17~~~Raw text} + +\item {} \href{\#colspanning-tables}{2.18~~~Colspanning tables} \end{list} @@ -1153,9 +1155,22 @@ %___________________________________________________________________________ +\hypertarget{raw-text}{} +\pdfbookmark[1]{2.17~~~Raw text}{raw-text} +\subsection*{2.17~~~Raw text} + +This does not necessarily look nice, because there may be missing white space. + +It's just there to freeze the behavior. +A test.Second test.Another test with myclass set. +This is the fourth test with myrawroleclass set. +Fifth test in LaTeX.\\Line two. + +%___________________________________________________________________________ + \hypertarget{colspanning-tables}{} -\pdfbookmark[1]{2.17~~~Colspanning tables}{colspanning-tables} -\subsection*{2.17~~~Colspanning tables} +\pdfbookmark[1]{2.18~~~Colspanning tables}{colspanning-tables} +\subsection*{2.18~~~Colspanning tables} This table has a cell spanning two columns: |