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 latex issue with references from inside parsed-literal (ref #3207)

Browse Source
This commit is contained in:
jfbu 2016-12-08 23:36:32 +01:00
parent b1abd4629b
commit e25cce1a64
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sphinx/writers/latex.py
View File

@ -2117,7 +2117,7 @@ class LaTeXTranslator(nodes.NodeVisitor):
self.body.append(r'\sphinxaccelerator{') self.body.append(r'\sphinxaccelerator{')
self.context.append('}') self.context.append('}')
elif classes and not self.in_title: elif classes and not self.in_title:
self.body.append(r'\DUrole{%s}{' % ','.join(classes)) self.body.append(r'\DUrole{\detokenize{%s}}{' % ','.join(classes))
self.context.append('}') self.context.append('}')
else: else:
self.context.append('') self.context.append('')

4
tests/test_build_latex.py
View File

@ -461,8 +461,8 @@ def test_reference_in_caption_and_codeblock_in_footnote(app, status, warning):
'\sphinxAtStartFootnote\n' '\sphinxAtStartFootnote\n'
'Foot note in longtable\n%\n\\end{footnotetext}' in result) 'Foot note in longtable\n%\n\\end{footnotetext}' in result)
assert ('This is a reference to the code-block in the footnote:\n' assert ('This is a reference to the code-block in the footnote:\n'
'{\hyperref[index:codeblockinfootnote]{\\sphinxcrossref{\\DUrole' '{\\hyperref[index:codeblockinfootnote]{\\sphinxcrossref{\\DUrole'
'{std,std-ref}{I am in a footnote}}}}') in result '{\\detokenize{std,std-ref}}{I am in a footnote}}}}') in result
assert ('&\nThis is one more footnote with some code in it ' assert ('&\nThis is one more footnote with some code in it '
'\\sphinxfootnotemark[10].\n\\\\') in result '\\sphinxfootnotemark[10].\n\\\\') in result
assert '\\begin{sphinxVerbatim}[commandchars=\\\\\\{\\}]' in result assert '\\begin{sphinxVerbatim}[commandchars=\\\\\\{\\}]' in result

8
tests/test_directive_code.py
View File

@ -80,10 +80,10 @@ def test_code_block_namedlink_latex(app, status, warning):
latex = (app.outdir / 'Python.tex').text(encoding='utf-8') latex = (app.outdir / 'Python.tex').text(encoding='utf-8')
label1 = '\def\sphinxLiteralBlockLabel{\label{caption:name-test-rb}}' label1 = '\def\sphinxLiteralBlockLabel{\label{caption:name-test-rb}}'
link1 = '\\hyperref[caption:name\\string-test\\string-rb]'\ link1 = '\\hyperref[caption:name\\string-test\\string-rb]'\
'{\\sphinxcrossref{\\DUrole{std,std-ref}{Ruby}}' '{\\sphinxcrossref{\\DUrole{\\detokenize{std,std-ref}}{Ruby}}'
label2 = '\def\sphinxLiteralBlockLabel{\label{namedblocks:some-ruby-code}}' label2 = '\def\sphinxLiteralBlockLabel{\label{namedblocks:some-ruby-code}}'
link2 = '\\hyperref[namedblocks:some\\string-ruby\\string-code]'\ link2 = '\\hyperref[namedblocks:some\\string-ruby\\string-code]'\
'{\\sphinxcrossref{\\DUrole{std,std-ref}{the ruby code}}}' '{\\sphinxcrossref{\\DUrole{\\detokenize{std,std-ref}}{the ruby code}}}'
assert label1 in latex assert label1 in latex
assert link1 in latex assert link1 in latex
assert label2 in latex assert label2 in latex
@ -275,10 +275,10 @@ def test_literalinclude_namedlink_latex(app, status, warning):
latex = (app.outdir / 'Python.tex').text(encoding='utf-8') latex = (app.outdir / 'Python.tex').text(encoding='utf-8')
label1 = '\def\sphinxLiteralBlockLabel{\label{caption:name-test-py}}' label1 = '\def\sphinxLiteralBlockLabel{\label{caption:name-test-py}}'
link1 = '\\hyperref[caption:name\\string-test\\string-py]'\ link1 = '\\hyperref[caption:name\\string-test\\string-py]'\
'{\\sphinxcrossref{\\DUrole{std,std-ref}{Python}}' '{\\sphinxcrossref{\\DUrole{\\detokenize{std,std-ref}}{Python}}'
label2 = '\def\sphinxLiteralBlockLabel{\label{namedblocks:some-python-code}}' label2 = '\def\sphinxLiteralBlockLabel{\label{namedblocks:some-python-code}}'
link2 = '\\hyperref[namedblocks:some\\string-python\\string-code]'\ link2 = '\\hyperref[namedblocks:some\\string-python\\string-code]'\
'{\\sphinxcrossref{\\DUrole{std,std-ref}{the python code}}}' '{\\sphinxcrossref{\\DUrole{\\detokenize{std,std-ref}}{the python code}}}'
assert label1 in latex assert label1 in latex
assert link1 in latex assert link1 in latex
assert label2 in latex assert label2 in latex