diff options
| author | Georg Brandl <georg@python.org> | 2011-09-23 08:06:12 +0200 |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2011-09-23 08:06:12 +0200 |
| commit | 90ee1df433d7e6443eba29a5a0da9d49f7493cee (patch) | |
| tree | dc0673222fd1647eeb243aead5ae85b4a3c78303 /sphinx/domains/std.py | |
| parent | ecb925fcf2a2317974d394833c6ae97004c9c56d (diff) | |
| parent | 600b915d287a12ffdd68a29e15f9f10ff9461a67 (diff) | |
| download | sphinx-90ee1df433d7e6443eba29a5a0da9d49f7493cee.tar.gz | |
Merge with 1.0
Diffstat (limited to 'sphinx/domains/std.py')
| -rw-r--r-- | sphinx/domains/std.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sphinx/domains/std.py b/sphinx/domains/std.py index 9d5b0b0f..3af82e0c 100644 --- a/sphinx/domains/std.py +++ b/sphinx/domains/std.py @@ -321,7 +321,7 @@ class Glossary(Directive): return messages + [node] -token_re = re.compile('`([a-z_][a-z0-9_]*)`') +token_re = re.compile('`(\w+)`', re.U) def token_xrefs(text): retnodes = [] @@ -392,7 +392,8 @@ class StandardDomain(Domain): object_types = { 'term': ObjType(l_('glossary term'), 'term', searchprio=-1), 'token': ObjType(l_('grammar token'), 'token', searchprio=-1), - 'label': ObjType(l_('reference label'), 'ref', searchprio=-1), + 'label': ObjType(l_('reference label'), 'ref', 'keyword', + searchprio=-1), 'envvar': ObjType(l_('environment variable'), 'envvar'), 'cmdoption': ObjType(l_('program option'), 'option'), } |