diff options
| author | Takeshi KOMIYA <i.tkomiya@gmail.com> | 2020-06-03 18:59:11 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-03 18:59:11 +0300 |
| commit | 1b28f6f027cbd003c66636e390aae5a97c10288a (patch) | |
| tree | cee0ff88d1b51b12c754a84bfb11cb4441c5c1b5 | |
| parent | 7140d85fc421b1d281a801eaf8aff96691a111cd (diff) | |
| parent | 1e7d9269e935d8e2e7cf6d962a3179b5f46a7263 (diff) | |
Merge pull request #7770 from bubba/option-directive-square-brackets
Let option directive support args in the form of foo[=bar]
| -rw-r--r-- | sphinx/domains/std.py | 2 | ||||
| -rw-r--r-- | tests/roots/test-root/objects.txt | 4 | ||||
| -rw-r--r-- | tests/test_build_html.py | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/sphinx/domains/std.py b/sphinx/domains/std.py index 6dc597022..fbbed3a6b 100644 --- a/sphinx/domains/std.py +++ b/sphinx/domains/std.py @@ -43,7 +43,7 @@ logger = logging.getLogger(__name__) # RE for option descriptions -option_desc_re = re.compile(r'((?:/|--|-|\+)?[^\s=]+)(=?\s*.*)') +option_desc_re = re.compile(r'((?:/|--|-|\+)?[^\s=[]+)(=?\s*.*)') # RE for grammar tokens token_re = re.compile(r'`(\w+)`', re.U) diff --git a/tests/roots/test-root/objects.txt b/tests/roots/test-root/objects.txt index f713e076c..adb090a44 100644 --- a/tests/roots/test-root/objects.txt +++ b/tests/roots/test-root/objects.txt @@ -180,7 +180,9 @@ Others .. option:: arg -Link to :option:`perl +p`, :option:`--ObjC++`, :option:`--plugin.option`, :option:`create-auth-token` and :option:`arg` +.. option:: -j[=N] + +Link to :option:`perl +p`, :option:`--ObjC++`, :option:`--plugin.option`, :option:`create-auth-token`, :option:`arg` and :option:`-j` .. program:: hg diff --git a/tests/test_build_html.py b/tests/test_build_html.py index b3406b74c..8d616adaf 100644 --- a/tests/test_build_html.py +++ b/tests/test_build_html.py @@ -331,6 +331,8 @@ def test_html4_output(app, status, warning): 'create-auth-token'), (".//a[@class='reference internal'][@href='#cmdoption-perl-arg-arg']/code/span", 'arg'), + (".//a[@class='reference internal'][@href='#cmdoption-perl-j']/code/span", + '-j'), (".//a[@class='reference internal'][@href='#cmdoption-hg-arg-commit']/code/span", 'hg'), (".//a[@class='reference internal'][@href='#cmdoption-hg-arg-commit']/code/span", |