From: <mi...@us...> - 2015-02-27 17:03:34
|
Revision: 7808 http://sourceforge.net/p/docutils/code/7808 Author: milde Date: 2015-02-27 17:03:32 +0000 (Fri, 27 Feb 2015) Log Message: ----------- Make the insertion of "admonition" class in the HTML writer (keeps doctree clean). Modified Paths: -------------- trunk/docutils/docutils/transforms/writer_aux.py trunk/docutils/docutils/writers/html4css1/__init__.py trunk/docutils/test/functional/expected/standalone_rst_html4css1.html trunk/docutils/test/functional/expected/standalone_rst_xhtml11.xhtml Modified: trunk/docutils/docutils/transforms/writer_aux.py =================================================================== --- trunk/docutils/docutils/transforms/writer_aux.py 2015-02-27 16:18:34 UTC (rev 7807) +++ trunk/docutils/docutils/transforms/writer_aux.py 2015-02-27 17:03:32 UTC (rev 7808) @@ -61,7 +61,7 @@ into generic admonitions, like this:: - <admonition classes="admonition note"> + <admonition classes="note"> <title> Note <paragraph> @@ -78,12 +78,11 @@ for node in self.document.traverse(nodes.Admonition): node_name = node.__class__.__name__ # Set class, so that we know what node this admonition came from. - node['classes'].append('admonition') + node['classes'].append(node_name) if not isinstance(node, nodes.admonition): # Specific admonition. Transform into a generic admonition. admonition = nodes.admonition(node.rawsource, *node.children, **node.attributes) title = nodes.title('', language.labels[node_name]) - node['classes'].append(node_name) admonition.insert(0, title) node.replace_self(admonition) Modified: trunk/docutils/docutils/writers/html4css1/__init__.py =================================================================== --- trunk/docutils/docutils/writers/html4css1/__init__.py 2015-02-27 16:18:34 UTC (rev 7807) +++ trunk/docutils/docutils/writers/html4css1/__init__.py 2015-02-27 17:03:32 UTC (rev 7808) @@ -505,6 +505,7 @@ self.depart_docinfo_item() def visit_admonition(self, node): + node['classes'].insert(0, 'admonition') self.body.append(self.starttag(node, 'div')) self.set_first_last(node) Modified: trunk/docutils/test/functional/expected/standalone_rst_html4css1.html =================================================================== --- trunk/docutils/test/functional/expected/standalone_rst_html4css1.html 2015-02-27 16:18:34 UTC (rev 7807) +++ trunk/docutils/test/functional/expected/standalone_rst_html4css1.html 2015-02-27 17:03:32 UTC (rev 7808) @@ -707,7 +707,7 @@ <p class="last">Strong prose may provoke extreme mental exertion. Reader discretion is strongly advised.</p> </div> -<div class="admonition-and-by-the-way admonition"> +<div class="admonition admonition-and-by-the-way"> <p class="first admonition-title">And, by the way...</p> <p class="last">You can make up your own admonition too.</p> </div> Modified: trunk/docutils/test/functional/expected/standalone_rst_xhtml11.xhtml =================================================================== --- trunk/docutils/test/functional/expected/standalone_rst_xhtml11.xhtml 2015-02-27 16:18:34 UTC (rev 7807) +++ trunk/docutils/test/functional/expected/standalone_rst_xhtml11.xhtml 2015-02-27 17:03:32 UTC (rev 7808) @@ -701,7 +701,7 @@ <p>Strong prose may provoke extreme mental exertion. Reader discretion is strongly advised.</p> </div> -<div class="admonition-and-by-the-way admonition"> +<div class="admonition admonition-and-by-the-way"> <p class="admonition-title">And, by the way...</p> <p>You can make up your own admonition too.</p> </div> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |