From: <fwi...@us...> - 2006-01-22 16:17:18
|
Author: fwiemann Date: 2006-01-22 17:17:11 +0100 (Sun, 22 Jan 2006) New Revision: 4311 Modified: trunk/docutils/HISTORY.txt trunk/docutils/docutils/writers/html4css1/__init__.py trunk/docutils/docutils/writers/html4css1/html4css1.css trunk/docutils/docutils/writers/pep_html/pep.css trunk/docutils/test/functional/expected/dangerous.html trunk/docutils/test/functional/expected/standalone_rst_html4css1.html Log: fixed different rendering of address nodes; they are no longer enclosed in <pre> tags now Modified: trunk/docutils/HISTORY.txt =================================================================== --- trunk/docutils/HISTORY.txt 2006-01-22 02:52:31 UTC (rev 4310) +++ trunk/docutils/HISTORY.txt 2006-01-22 16:17:11 UTC (rev 4311) @@ -15,7 +15,12 @@ Changes Since 0.4 ================= +* docutils/writers/html4css1/__init__.py: + - Addresses are no longer enclosed in ``<pre>`` tags. + - Literal blocks are now rendered in a single line of HTML code. + + Release 0.4 (2006-01-09) ======================== Modified: trunk/docutils/docutils/writers/html4css1/__init__.py =================================================================== --- trunk/docutils/docutils/writers/html4css1/__init__.py 2006-01-22 02:52:31 UTC (rev 4310) +++ trunk/docutils/docutils/writers/html4css1/__init__.py 2006-01-22 16:17:11 UTC (rev 4311) @@ -407,6 +407,16 @@ encoded = self.encode(text) if self.in_mailto and self.settings.cloak_email_addresses: encoded = self.cloak_email(encoded) + preserve_space = 0 + parent = node.parent + while parent: + if parent.get('xml:space') == 'preserve': + preserve_space = 1 + break + parent = parent.parent + if preserve_space: + encoded = encoded.replace('\n', '<br />') + encoded = encoded.replace(' ', ' ') self.body.append(encoded) def depart_Text(self, node): @@ -428,10 +438,8 @@ def visit_address(self, node): self.visit_docinfo_item(node, 'address', meta=None) - self.body.append(self.starttag(node, 'pre', CLASS='address')) def depart_address(self, node): - self.body.append('\n</pre>\n') self.depart_docinfo_item() def visit_admonition(self, node, name=''): Modified: trunk/docutils/docutils/writers/html4css1/html4css1.css =================================================================== --- trunk/docutils/docutils/writers/html4css1/html4css1.css 2006-01-22 02:52:31 UTC (rev 4310) +++ trunk/docutils/docutils/writers/html4css1/html4css1.css 2006-01-22 16:17:11 UTC (rev 4311) @@ -206,12 +206,6 @@ p.topic-title { font-weight: bold } -pre.address { - margin-bottom: 0 ; - margin-top: 0 ; - font-family: serif ; - font-size: 100% } - pre.literal-block, pre.doctest-block { margin-left: 2em ; margin-right: 2em ; Modified: trunk/docutils/docutils/writers/pep_html/pep.css =================================================================== --- trunk/docutils/docutils/writers/pep_html/pep.css 2006-01-22 02:52:31 UTC (rev 4310) +++ trunk/docutils/docutils/writers/pep_html/pep.css 2006-01-22 16:17:11 UTC (rev 4311) @@ -269,12 +269,6 @@ font-family: sans-serif ; font-weight: bold } -pre.address { - margin-bottom: 0 ; - margin-top: 0 ; - font-family: serif ; - font-size: 100% } - pre.literal-block, pre.doctest-block { margin-left: 2em ; margin-right: 2em ; Modified: trunk/docutils/test/functional/expected/dangerous.html =================================================================== --- trunk/docutils/test/functional/expected/dangerous.html 2006-01-22 02:52:31 UTC (rev 4310) +++ trunk/docutils/test/functional/expected/dangerous.html 2006-01-22 16:17:11 UTC (rev 4311) @@ -21,27 +21,21 @@ <p class="system-message-title">System Message: WARNING/2 (<tt class="docutils">functional/input/dangerous.txt</tt>, line 4)</p> <p>"raw" directive disabled.</p> <pre class="literal-block"> -.. raw:: html - :file: /etc/passwd +.. raw:: html<br /> :file: /etc/passwd </pre> </div> <div class="system-message"> <p class="system-message-title">System Message: WARNING/2 (<tt class="docutils">functional/input/dangerous.txt</tt>, line 6)</p> <p>"raw" directive disabled.</p> <pre class="literal-block"> -.. raw:: html - :url: file:///etc/passwd +.. raw:: html<br /> :url: file:///etc/passwd </pre> </div> <div class="system-message"> <p class="system-message-title">System Message: WARNING/2 (<tt class="docutils">functional/input/dangerous.txt</tt>, line 8)</p> <p>"raw" directive disabled.</p> <pre class="literal-block"> -.. raw:: html - - <script> - that does something really nasty - </script> +.. raw:: html<br /><br /> <script><br /> that does something really nasty<br /> </script> </pre> </div> <div class="system-message"> Modified: trunk/docutils/test/functional/expected/standalone_rst_html4css1.html =================================================================== --- trunk/docutils/test/functional/expected/standalone_rst_html4css1.html 2006-01-22 02:52:31 UTC (rev 4310) +++ trunk/docutils/test/functional/expected/standalone_rst_html4css1.html 2006-01-22 16:17:11 UTC (rev 4311) @@ -29,12 +29,7 @@ <tr><th class="docinfo-name">Author:</th> <td>David Goodger</td></tr> <tr><th class="docinfo-name">Address:</th> -<td><pre class="address"> -123 Example Street -Example, EX Canada -A1B 2C3 -</pre> -</td></tr> +<td>123 Example Street<br />Example, EX Canada<br />A1B 2C3</td></tr> <tr><th class="docinfo-name">Contact:</th> <td><a class="first last reference" href="mailto:goodger@users.sourceforge.net">goodger@users.sourceforge.net</a></td></tr> <tr><th class="docinfo-name">Authors:</th> @@ -338,16 +333,11 @@ <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"> -if literal_block: - text = 'is left as-is' - spaces_and_linebreaks = 'are preserved' - markup_processing = None +if literal_block:<br /> text = 'is left as-is'<br /> spaces_and_linebreaks = 'are preserved'<br /> markup_processing = None </pre> <p>Or they can be quoted without indentation:</p> <pre class="literal-block"> ->> Great idea! -> -> Why didn't I think of that? +>> Great idea!<br />><br />> Why didn't I think of that? </pre> </div> <div class="section"> @@ -424,10 +414,7 @@ <div class="section"> <h2><a class="toc-backref" href="#id47" id="doctest-blocks" 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 ">>>" ->>> print '(cut and pasted from interactive Python sessions)' -(cut and pasted from interactive Python sessions) +>>> print 'Python-specific usage examples; begun with ">>>"'<br />Python-specific usage examples; begun with ">>>"<br />>>> print '(cut and pasted from interactive Python sessions)'<br />(cut and pasted from interactive Python sessions) </pre> </div> <div class="section"> @@ -725,8 +712,7 @@ </div> <div class="compound"> <pre class="compound-first literal-block"> -Compound 4. -This one starts with a literal block. +Compound 4.<br />This one starts with a literal block. </pre> <p class="compound-last">Compound 4, a paragraph.</p> </div> @@ -773,10 +759,7 @@ <div class="section"> <h3><a class="toc-backref" href="#id79" id="parsed-literal-blocks" name="parsed-literal-blocks">2.14.8 Parsed Literal Blocks</a></h3> <pre class="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"><span class="pre">literal</span> +This is a parsed literal block.<br /> This line is indented. The next line is blank.<br /><br />Inline markup is supported, e.g. <em>emphasis</em>, <strong>strong</strong>, <tt class="docutils literal"><span class="pre">literal</span> <span class="pre">text</span></tt>, footnotes <a class="footnote-reference" href="#id8" id="id21" name="id21">[1]</a>, <span class="target" id="id22">targets</span>, and <a class="reference" href="http://www.python.org/">references</a>. </pre> </div> |