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 #7869: abbr role wrongly copies an explanation from the previous one

Browse Source
This commit is contained in:
Takeshi KOMIYA 2020-06-27 03:04:28 +09:00
parent 03e85df617
commit 7efa9aebb1
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES
View File

@ -21,6 +21,8 @@ Bugs fixed
* #7839: autosummary: cannot handle umlauts in function names
* #7715: LaTeX: ``numfig_secnum_depth > 1`` leads to wrong figure links
* #7846: html theme: XML-invalid files were generated
* #7869: :rst:role:`abbr` role without an explanation will show the explanation
from the previous abbr role
Testing
--------

5
sphinx/roles.py
View File

@ -530,14 +530,15 @@ class Abbreviation(SphinxRole):
abbr_re = re.compile(r'\((.*)\)$', re.S)
def run(self) -> Tuple[List[Node], List[system_message]]:
options = self.options.copy()
matched = self.abbr_re.search(self.text)
if matched:
text = self.text[:matched.start()].strip()
self.options['explanation'] = matched.group(1)
options['explanation'] = matched.group(1)
else:
text = self.text
return [nodes.abbreviation(self.rawtext, text, **self.options)], []
return [nodes.abbreviation(self.rawtext, text, **options)], []
def index_role(typ: str, rawtext: str, text: str, lineno: int, inliner: Inliner,