IntenseWebs/sphinx
3
0
Fork 0
mirror of https://github.com/sphinx-doc/sphinx.git synced 2025-02-25 18:55:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix #6299: rst:directive directive generates waste space

Browse Source
This commit is contained in:
Takeshi KOMIYA 2019-04-12 21:06:15 +09:00
parent 11a4e47d62
commit 1900c729a3
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -79,6 +79,7 @@ Bugs fixed
is consisted by non-ASCII characters is consisted by non-ASCII characters
* #6213: ifconfig: contents after headings are not shown * #6213: ifconfig: contents after headings are not shown
* commented term in glossary directive is wrongly recognized * commented term in glossary directive is wrongly recognized
* #6299: rst domain: rst:directive directive generates waste space
Testing Testing
-------- --------

5
sphinx/domains/rst.py
View File

@ -80,7 +80,10 @@ def parse_directive(d):
if not m: if not m:
return (dir, '') return (dir, '')
parsed_dir, parsed_args = m.groups() parsed_dir, parsed_args = m.groups()
return (parsed_dir.strip(), ' ' + parsed_args.strip()) if parsed_args.strip():
return (parsed_dir.strip(), ' ' + parsed_args.strip())
else:
return (parsed_dir.strip(), '')
class ReSTDirective(ReSTMarkup): class ReSTDirective(ReSTMarkup):

5
tests/test_domain_rst.py
View File

@ -23,7 +23,7 @@ def test_parse_directive():
assert s == ('foö', '') assert s == ('foö', '')
s = parse_directive(' .. foö :: ') s = parse_directive(' .. foö :: ')
assert s == ('foö', ' ') assert s == ('foö', '')
s = parse_directive('.. foö:: args1 args2') s = parse_directive('.. foö:: args1 args2')
assert s == ('foö', ' args1 args2') assert s == ('foö', ' args1 args2')
@ -48,8 +48,7 @@ def test_rst_directive(app):
text = ".. rst:directive:: .. toctree::" text = ".. rst:directive:: .. toctree::"
doctree = restructuredtext.parse(app, text) doctree = restructuredtext.parse(app, text)
assert_node(doctree, (addnodes.index, assert_node(doctree, (addnodes.index,
[desc, ([desc_signature, ([desc_name, ".. toctree::"], [desc, ([desc_signature, desc_name, ".. toctree::"],
[desc_addname, " "])],
[desc_content, ()])])) [desc_content, ()])]))
assert_node(doctree[0], assert_node(doctree[0],
entries=[("single", "toctree (directive)", "directive-toctree", "", None)]) entries=[("single", "toctree (directive)", "directive-toctree", "", None)])