Do not use <sup> and <sub> tags inside <pre> (parsed-literal blocks).

New approach: use <span class="subscript"> ... and CSS in literal blocks,
as <sup> and <sub> are explicitely forbidden in XHTML 1
http://www.w3.org/TR/xhtml1/#prohibitions
(but the validator does not check this)

Also: fix target in SVG image functional test.

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

1 files changed, 20 insertions, 20 deletions

diff --git a/docutils/test/functional/expected/standalone_rst_html4css1.html b/docutils/test/functional/expected/standalone_rst_html4css1.html
index ace5618b1..e7c2a4cbf 100644
--- a/docutils/test/functional/expected/standalone_rst_html4css1.html
+++ b/docutils/test/functional/expected/standalone_rst_html4css1.html
@@ -346,16 +346,16 @@ description.</p>
 <p>Literal blocks are indicated with a double-colon (&quot;::&quot;) at the end of
 the preceding paragraph (over there <tt class="docutils literal"><span class="pre">--&gt;</span></tt>).  They can be indented:</p>
 <pre class="literal-block">
-<span>if literal_block:
+if literal_block:
     text = 'is left as-is'
     spaces_and_linebreaks = 'are preserved'
-    markup_processing = None</span>
+    markup_processing = None
 </pre>
 <p>Or they can be quoted without indentation:</p>
 <pre class="literal-block">
-<span>&gt;&gt; Great idea!
+&gt;&gt; Great idea!
 &gt;
-&gt; Why didn't I think of that?</span>
+&gt; Why didn't I think of that?
 </pre>
 </div>
 <div class="section" id="line-blocks">
@@ -775,7 +775,7 @@ allowed (e.g. inside a directive).</p>
 <div class="compound">
 <p class="compound-first">Compound 2, a literal block:</p>
 <pre class="compound-middle literal-block">
-<span>Compound 2, literal.</span>
+Compound 2, literal.
 </pre>
 <p class="compound-last">Compound 2, this is a test.</p>
 </div>
@@ -784,8 +784,8 @@ allowed (e.g. inside a directive).</p>
 </div>
 <div class="compound">
 <pre class="compound-first literal-block">
-<span>Compound 4.
-This one starts with a literal block.</span>
+Compound 4.
+This one starts with a literal block.
 </pre>
 <p class="compound-last">Compound 4, a paragraph.</p>
 </div>
@@ -832,13 +832,13 @@ paragraph.</td>
 <div class="section" id="parsed-literal-blocks">
 <h3><a class="toc-backref" href="#id84">2.14.8&nbsp;&nbsp;&nbsp;Parsed Literal Blocks</a></h3>
 <pre class="literal-block">
-<span>This is a parsed literal block.
+This is a parsed literal block.
     This line is indented.  The next line is blank.
 
 Inline markup is supported, e.g. <em>emphasis</em>, <strong>strong</strong>, <tt class="docutils literal">literal
-text</tt>, <sub>sub-</sub> and <sup>super</sup>scripts,
+text</tt>, <span class="subscript">sub-</span> and <span class="superscript">super</span>scripts,
 inline formulas: <span class="formula"><i>A</i> = 2<i>π</i><i>r</i><sup>2</sup></span>,
-footnotes <a class="footnote-reference" href="#id8" id="id22">[1]</a>, <span class="target" id="hyperlink-targets">hyperlink targets</span>, and <a class="reference external" href="http://www.python.org/">references</a>.</span>
+footnotes <a class="footnote-reference" href="#id8" id="id22">[1]</a>, <span class="target" id="hyperlink-targets">hyperlink targets</span>, and <a class="reference external" href="http://www.python.org/">references</a>.
 </pre>
 </div>
 <div class="section" id="code">
@@ -850,14 +850,14 @@ is turned off using the <tt class="docutils literal"><span class="pre">syntax-hi
 conversions in order to get identical results with/without installed
 Pygments highlighter.)</p>
 <pre class="code python literal-block">
-<span>print 'This is Python code.'</span>
+print 'This is Python code.'
 </pre>
 <p>The <tt class="docutils literal"><span class="pre">:number-lines:</span></tt> option (with optional start value) generates line
 numbers:</p>
 <pre class="code python literal-block">
-<span><span class="ln"> 8 </span># print integers from 0 to 9:
+<span class="ln"> 8 </span># print integers from 0 to 9:
 <span class="ln"> 9 </span>for i in range(10):
-<span class="ln">10 </span>    print i</span>
+<span class="ln">10 </span>    print i
 </pre>
 <p>For inline code snippets, there is the <cite>code</cite> role, which can be used
 directly (the code will not be parsed/tagged, as the language is not known)
@@ -868,8 +868,8 @@ paragraph.</p>
 <p>The <tt class="docutils literal">:code:</tt> option of the <cite>include</cite> directive sets the included content
 as a code block, here the rst file <tt class="docutils literal">header_footer.txt</tt> with line numbers:</p>
 <pre class="code rst literal-block">
-<span><span class="ln">1 </span>.. header:: Document header
-<span class="ln">2 </span>.. footer:: Document footer</span>
+<span class="ln">1 </span>.. header:: Document header
+<span class="ln">2 </span>.. footer:: Document footer
 </pre>
 </div>
 </div>
@@ -1075,12 +1075,12 @@ crunchy, now would it?</td>
 <p>The following works in most browsers but does not validate
 (<tt class="docutils literal">&lt;style&gt;</tt> is only allowed in the document head):</p>
 <pre class="literal-block">
-<span>.. raw:: html
+.. raw:: html
 
   &lt;style type=&quot;text/css&quot;&gt;&lt;!--
    .green {color: green;}
    .sc {font-variant: small-caps;}
-   --&gt;&lt;/style&gt;</span>
+   --&gt;&lt;/style&gt;
 </pre>
 <p><span class="green sc" lang="en-gb">British colourful text in small-caps</span>.</p>
 </li>
@@ -1098,9 +1098,9 @@ PDF or Postscript formats for vector graphics instead.)</p>
 <ol class="loweralpha">
 <li><p class="first">The SVG image itself, e.g. fixed-size vs. scaling:</p>
 <pre class="literal-block">
-<span>width=&quot;280&quot;              viewBox=&quot;0 0 280 27&quot;
+width=&quot;280&quot;              viewBox=&quot;0 0 280 27&quot;
 height=&quot;27&quot;              width=&quot;100%&quot;
-                         height=&quot;100%&quot;</span>
+                         height=&quot;100%&quot;
 </pre>
 </li>
 <li><p class="first">The method used to put the image in the document.</p>
@@ -1151,7 +1151,7 @@ keeps the aspect ratio.)</p>
 <p>A scaling image 1 em high, right aligned:</p>
 </li>
 <li><p class="first">A scaling image 5 mm x 5 mm, centered, with hyperlink reference:</p>
-<a class="reference external image-reference" href="SVGImages_"><object class="align-center" data="../../../docs/user/rst/images/biohazard-scaling.svg" style="width: 5mm; height: 5mm;" type="image/svg+xml">../../../docs/user/rst/images/biohazard-scaling.svg</object></a>
+<a class="reference internal image-reference" href="#svg-images"><object class="align-center" data="../../../docs/user/rst/images/biohazard-scaling.svg" style="width: 5mm; height: 5mm;" type="image/svg+xml">../../../docs/user/rst/images/biohazard-scaling.svg</object></a>
 </li>
 <li><object class="first align-right" data="../../../docs/user/rst/images/biohazard.svg" style="width: 4cm; height: 2em;" type="image/svg+xml">
 ../../../docs/user/rst/images/biohazard.svg</object>