summaryrefslogtreecommitdiff
path: root/docutils
diff options
context:
space:
mode:
authorwiemann <wiemann@929543f6-e4f2-0310-98a6-ba3bd3dd1d04>2005-02-11 10:11:46 +0000
committerwiemann <wiemann@929543f6-e4f2-0310-98a6-ba3bd3dd1d04>2005-02-11 10:11:46 +0000
commit4d2a6510ab6584ca5f87a79bf8494dcd7d14562d (patch)
treec12e2f8e3bba184d06bbfa54ba5dc1e3198f89f7 /docutils
parent718e6ce322d4ab379fd07f368937b65a7e35104f (diff)
downloaddocutils-4d2a6510ab6584ca5f87a79bf8494dcd7d14562d.tar.gz
made span.option contain option variable as well
git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk@2957 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
Diffstat (limited to 'docutils')
-rw-r--r--docutils/docutils/writers/html4css1.py6
-rw-r--r--docutils/test/functional/expected/standalone_rst_html4css1.html6
2 files changed, 7 insertions, 5 deletions
diff --git a/docutils/docutils/writers/html4css1.py b/docutils/docutils/writers/html4css1.py
index 526886764..809ff53a0 100644
--- a/docutils/docutils/writers/html4css1.py
+++ b/docutils/docutils/writers/html4css1.py
@@ -934,8 +934,10 @@ class HTMLTranslator(nodes.NodeVisitor):
def visit_option(self, node):
if self.context[-1]:
self.body.append(', ')
+ self.body.append(self.starttag(node, 'span', '', CLASS='option'))
def depart_option(self, node):
+ self.body.append('</span>')
self.context[-1] += 1
def visit_option_argument(self, node):
@@ -979,10 +981,10 @@ class HTMLTranslator(nodes.NodeVisitor):
self.body.append('</tr>\n')
def visit_option_string(self, node):
- self.body.append(self.starttag(node, 'span', '', CLASS='option'))
+ pass
def depart_option_string(self, node):
- self.body.append('</span>')
+ pass
def visit_organization(self, node):
self.visit_docinfo_item(node, 'organization')
diff --git a/docutils/test/functional/expected/standalone_rst_html4css1.html b/docutils/test/functional/expected/standalone_rst_html4css1.html
index 18d3495ab..7297c9221 100644
--- a/docutils/test/functional/expected/standalone_rst_html4css1.html
+++ b/docutils/test/functional/expected/standalone_rst_html4css1.html
@@ -292,14 +292,14 @@ doesn't get stripped away.)</p>
<kbd><span class="option">-a</span></kbd></td>
<td>command-line option &quot;a&quot;</td></tr>
<tr><td>
-<kbd><span class="option">-b</span> <var>file</var></kbd></td>
+<kbd><span class="option">-b <var>file</var></span></kbd></td>
<td>options can have arguments
and long descriptions</td></tr>
<tr><td>
<kbd><span class="option">--long</span></kbd></td>
<td>options can be long also</td></tr>
<tr><td>
-<kbd><span class="option">--input</span>=<var>file</var></kbd></td>
+<kbd><span class="option">--input=<var>file</var></span></kbd></td>
<td>long options can also have
arguments</td></tr>
<tr><td colspan="2">
@@ -316,7 +316,7 @@ regardless of where it starts.</p>
<kbd><span class="option">-v</span>, <span class="option">--verbose</span></kbd></td>
<td>Commonly-seen: short &amp; long options.</td></tr>
<tr><td colspan="2">
-<kbd><span class="option">-1</span> <var>file</var>, <span class="option">--one</span>=<var>file</var>, <span class="option">--two</span> <var>file</var></kbd></td>
+<kbd><span class="option">-1 <var>file</var></span>, <span class="option">--one=<var>file</var></span>, <span class="option">--two <var>file</var></span></kbd></td>
</tr>
<tr><td>&nbsp;</td><td>Multiple options with arguments.</td></tr>
<tr><td>