From 9150652350e26d71e8bac1229f4f1088b31801bc Mon Sep 17 00:00:00 2001 From: milde Date: Fri, 27 Feb 2015 17:03:32 +0000 Subject: [PATCH] Make the insertion of "admonition" class in the HTML writer (keeps doctree clean). git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk@7808 929543f6-e4f2-0310-98a6-ba3bd3dd1d04 --- docutils/docutils/transforms/writer_aux.py | 5 ++--- docutils/docutils/writers/html4css1/__init__.py | 1 + docutils/test/functional/expected/standalone_rst_html4css1.html | 2 +- docutils/test/functional/expected/standalone_rst_xhtml11.xhtml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docutils/docutils/transforms/writer_aux.py b/docutils/docutils/transforms/writer_aux.py index 96c0f7f40..9e9a65f93 100644 --- a/docutils/docutils/transforms/writer_aux.py +++ b/docutils/docutils/transforms/writer_aux.py @@ -61,7 +61,7 @@ class Admonitions(Transform): into generic admonitions, like this:: - + Note <paragraph> @@ -78,12 +78,11 @@ class Admonitions(Transform): 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) diff --git a/docutils/docutils/writers/html4css1/__init__.py b/docutils/docutils/writers/html4css1/__init__.py index 5580a0c15..9ceb7fde1 100644 --- a/docutils/docutils/writers/html4css1/__init__.py +++ b/docutils/docutils/writers/html4css1/__init__.py @@ -505,6 +505,7 @@ class HTMLTranslator(nodes.NodeVisitor): 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) diff --git a/docutils/test/functional/expected/standalone_rst_html4css1.html b/docutils/test/functional/expected/standalone_rst_html4css1.html index 83f4a5b36..339375df8 100644 --- a/docutils/test/functional/expected/standalone_rst_html4css1.html +++ b/docutils/test/functional/expected/standalone_rst_html4css1.html @@ -707,7 +707,7 @@ upon the style sheet and the browser or rendering software used.</p> <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> diff --git a/docutils/test/functional/expected/standalone_rst_xhtml11.xhtml b/docutils/test/functional/expected/standalone_rst_xhtml11.xhtml index 728ff4e9d..90b33f964 100644 --- a/docutils/test/functional/expected/standalone_rst_xhtml11.xhtml +++ b/docutils/test/functional/expected/standalone_rst_xhtml11.xhtml @@ -701,7 +701,7 @@ upon the style sheet and the browser or rendering software used.</p> <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> -- 2.11.4.GIT