Menu
▾
▴
[Docutils-checkins] SF.net SVN: docutils:[7807] trunk/docutils
|
From: <mi...@us...> - 2015-02-27 16:18:41
|
Revision: 7807
http://sourceforge.net/p/docutils/code/7807
Author: milde
Date: 2015-02-27 16:18:34 +0000 (Fri, 27 Feb 2015)
Log Message:
-----------
Use the "admonition" class argument for all admonitions
(allows easier styling).
Modified Paths:
--------------
trunk/docutils/docutils/transforms/writer_aux.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:12:21 UTC (rev 7806)
+++ trunk/docutils/docutils/transforms/writer_aux.py 2015-02-27 16:18:34 UTC (rev 7807)
@@ -61,7 +61,7 @@
into generic admonitions, like this::
- <admonition classes="note">
+ <admonition classes="admonition note">
<title>
Note
<paragraph>
@@ -78,11 +78,12 @@
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(node_name)
+ node['classes'].append('admonition')
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/test/functional/expected/standalone_rst_html4css1.html
===================================================================
--- trunk/docutils/test/functional/expected/standalone_rst_html4css1.html 2015-02-27 16:12:21 UTC (rev 7806)
+++ trunk/docutils/test/functional/expected/standalone_rst_html4css1.html 2015-02-27 16:18:34 UTC (rev 7807)
@@ -665,27 +665,27 @@
</div>
<div class="section" id="admonitions">
<h3><a class="toc-backref" href="#id79">2.14.3 Admonitions</a></h3>
-<div class="attention">
+<div class="admonition attention">
<p class="first admonition-title">Attention!</p>
<p class="last">Directives at large.</p>
</div>
-<div class="caution">
+<div class="admonition caution">
<p class="first admonition-title">Caution!</p>
<p class="last">Don't take any wooden nickels.</p>
</div>
-<div class="danger">
+<div class="admonition danger">
<p class="first admonition-title">!DANGER!</p>
<p class="last">Mad scientist at work!</p>
</div>
-<div class="error">
+<div class="admonition error">
<p class="first admonition-title">Error</p>
<p class="last">Does not compute.</p>
</div>
-<div class="hint">
+<div class="admonition hint">
<p class="first admonition-title">Hint</p>
<p class="last">It's bigger than a bread box.</p>
</div>
-<div class="important">
+<div class="admonition important">
<p class="first admonition-title">Important</p>
<ul class="last simple">
<li>Wash behind your ears.</li>
@@ -694,15 +694,15 @@
<li>Back up your data.</li>
</ul>
</div>
-<div class="note">
+<div class="admonition note">
<p class="first admonition-title">Note</p>
<p class="last">This is a note.</p>
</div>
-<div class="tip">
+<div class="admonition tip">
<p class="first admonition-title">Tip</p>
<p class="last">15% if the service is good.</p>
</div>
-<div class="warning">
+<div class="admonition warning">
<p class="first admonition-title">Warning</p>
<p class="last">Strong prose may provoke extreme mental exertion.
Reader discretion is strongly advised.</p>
Modified: trunk/docutils/test/functional/expected/standalone_rst_xhtml11.xhtml
===================================================================
--- trunk/docutils/test/functional/expected/standalone_rst_xhtml11.xhtml 2015-02-27 16:12:21 UTC (rev 7806)
+++ trunk/docutils/test/functional/expected/standalone_rst_xhtml11.xhtml 2015-02-27 16:18:34 UTC (rev 7807)
@@ -659,27 +659,27 @@
</div>
<div class="section" id="admonitions">
<h3><a class="toc-backref" href="#id90"><span class="sectnum">2.14.3</span> Admonitions</a></h3>
-<div class="attention">
+<div class="admonition attention">
<p class="admonition-title">Attention!</p>
<p>Directives at large.</p>
</div>
-<div class="caution">
+<div class="admonition caution">
<p class="admonition-title">Caution!</p>
<p>Don't take any wooden nickels.</p>
</div>
-<div class="danger">
+<div class="admonition danger">
<p class="admonition-title">!DANGER!</p>
<p>Mad scientist at work!</p>
</div>
-<div class="error">
+<div class="admonition error">
<p class="admonition-title">Error</p>
<p>Does not compute.</p>
</div>
-<div class="hint">
+<div class="admonition hint">
<p class="admonition-title">Hint</p>
<p>It's bigger than a bread box.</p>
</div>
-<div class="important">
+<div class="admonition important">
<p class="admonition-title">Important</p>
<ul class="simple">
<li><p>Wash behind your ears.</p></li>
@@ -688,15 +688,15 @@
<li><p>Back up your data.</p></li>
</ul>
</div>
-<div class="note">
+<div class="admonition note">
<p class="admonition-title">Note</p>
<p>This is a note.</p>
</div>
-<div class="tip">
+<div class="admonition tip">
<p class="admonition-title">Tip</p>
<p>15% if the service is good.</p>
</div>
-<div class="warning">
+<div class="admonition warning">
<p class="admonition-title">Warning</p>
<p>Strong prose may provoke extreme mental exertion.
Reader discretion is strongly advised.</p>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
