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

Merge branch 'stable'

Browse Source
This commit is contained in:
Takeshi KOMIYA 2017-02-15 01:42:20 +09:00
commit c62a0ad765
4 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -108,6 +108,7 @@ Bugs fixed
* #3394: When ``'pointsize'`` is not ``10pt``, Japanese ``'manual'`` document * #3394: When ``'pointsize'`` is not ``10pt``, Japanese ``'manual'`` document
gets wrong PDF page dimensions gets wrong PDF page dimensions
* #3399: quickstart: conf.py was not overwritten by template * #3399: quickstart: conf.py was not overwritten by template
* #3366: option directive does not allow punctuations
Testing Testing
-------- --------

2
sphinx/domains/std.py
View File

@ -45,7 +45,7 @@ logger = logging.getLogger(__name__)
# RE for option descriptions # RE for option descriptions
option_desc_re = re.compile(r'((?:/|--|-|\+)?[-\.?@#_a-zA-Z0-9]+)(=?\s*.*)') option_desc_re = re.compile(r'((?:/|--|-|\+)?[-+\.?@#_a-zA-Z0-9]+)(=?\s*.*)')
# RE for grammar tokens # RE for grammar tokens
token_re = re.compile('`(\w+)`', re.U) token_re = re.compile('`(\w+)`', re.U)

4
tests/root/objects.txt
View File

@ -172,13 +172,15 @@ Others
.. option:: +p .. option:: +p
.. option:: --ObjC++
.. option:: --plugin.option .. option:: --plugin.option
.. option:: create-auth-token .. option:: create-auth-token
.. option:: arg .. option:: arg
Link to :option:`perl +p`, :option:`--plugin.option`, :option:`create-auth-token` and :option:`arg` Link to :option:`perl +p`, :option:`--ObjC++`, :option:`--plugin.option`, :option:`create-auth-token` and :option:`arg`
.. program:: hg .. program:: hg

2
tests/test_build_html.py
View File

@ -347,6 +347,8 @@ def test_static_output(app):
'perl'), 'perl'),
(".//a[@class='reference internal'][@href='#cmdoption-perl-arg-p']/code/span", (".//a[@class='reference internal'][@href='#cmdoption-perl-arg-p']/code/span",
'\+p'), '\+p'),
(".//a[@class='reference internal'][@href='#cmdoption-perl-objc']/code/span",
'--ObjC\\+\\+'),
(".//a[@class='reference internal'][@href='#cmdoption-perl-plugin-option']/code/span", (".//a[@class='reference internal'][@href='#cmdoption-perl-plugin-option']/code/span",
'--plugin.option'), '--plugin.option'),
(".//a[@class='reference internal'][@href='#cmdoption-perl-arg-create-auth-token']" (".//a[@class='reference internal'][@href='#cmdoption-perl-arg-create-auth-token']"