Obide by Docutils `node['prefix'] and node['suffix']`

This commit is contained in:
jfbu 2018-06-20 18:11:11 +02:00
parent a08321f962
commit dbb04d0a33
2 changed files with 14 additions and 13 deletions

View File

@ -1530,9 +1530,10 @@ class LaTeXTranslator(nodes.NodeVisitor):
self.body.append('\\begin{enumerate}\n') self.body.append('\\begin{enumerate}\n')
self.body.append('\\def\\the%s{%s{%s}}\n' % (enum, style, enum)) self.body.append('\\def\\the%s{%s{%s}}\n' % (enum, style, enum))
self.body.append('\\def\\label%s{\\the%s.}\n' % (enum, enum)) self.body.append('\\def\\label%s{%s\\the%s %s}\n' %
self.body.append('\\makeatletter\\def\\p@%s{\\p@%s\\the%s.}\\makeatother\n' % (enum, node['prefix'], enum, node['suffix']))
(enumnext, enum, enum)) self.body.append('\\makeatletter\\def\\p@%s{\\p@%s %s\\the%s %s}\\makeatother\n' %
(enumnext, enum, node['prefix'], enum, node['suffix']))
if 'start' in node: if 'start' in node:
self.body.append('\\setcounter{%s}{%d}\n' % (enum, node['start'] - 1)) self.body.append('\\setcounter{%s}{%d}\n' % (enum, node['start'] - 1))
if self.table: if self.table:

View File

@ -1230,24 +1230,24 @@ def test_latex_nested_enumerated_list(app, status, warning):
result = (app.outdir / 'test.tex').text(encoding='utf8') result = (app.outdir / 'test.tex').text(encoding='utf8')
assert ('\\def\\theenumi{\\arabic{enumi}}\n' assert ('\\def\\theenumi{\\arabic{enumi}}\n'
'\\def\\labelenumi{\\theenumi.}\n' '\\def\\labelenumi{\\theenumi .}\n'
'\\makeatletter\\def\\p@enumii{\\p@enumi\\theenumi.}\\makeatother\n' '\\makeatletter\\def\\p@enumii{\\p@enumi \\theenumi .}\\makeatother\n'
'\\setcounter{enumi}{4}\n' in result) '\\setcounter{enumi}{4}\n' in result)
assert ('\\def\\theenumii{\\alph{enumii}}\n' assert ('\\def\\theenumii{\\alph{enumii}}\n'
'\\def\\labelenumii{\\theenumii.}\n' '\\def\\labelenumii{\\theenumii .}\n'
'\\makeatletter\\def\\p@enumiii{\\p@enumii\\theenumii.}\\makeatother\n' '\\makeatletter\\def\\p@enumiii{\\p@enumii \\theenumii .}\\makeatother\n'
'\\setcounter{enumii}{3}\n' in result) '\\setcounter{enumii}{3}\n' in result)
assert ('\\def\\theenumiii{\\arabic{enumiii}}\n' assert ('\\def\\theenumiii{\\arabic{enumiii}}\n'
'\\def\\labelenumiii{\\theenumiii.}\n' '\\def\\labelenumiii{\\theenumiii )}\n'
'\\makeatletter\\def\\p@enumiv{\\p@enumiii\\theenumiii.}\\makeatother\n' '\\makeatletter\\def\\p@enumiv{\\p@enumiii \\theenumiii )}\\makeatother\n'
'\\setcounter{enumiii}{9}\n' in result) '\\setcounter{enumiii}{9}\n' in result)
assert ('\\def\\theenumiv{\\arabic{enumiv}}\n' assert ('\\def\\theenumiv{\\arabic{enumiv}}\n'
'\\def\\labelenumiv{\\theenumiv.}\n' '\\def\\labelenumiv{(\\theenumiv )}\n'
'\\makeatletter\\def\\p@enumv{\\p@enumiv\\theenumiv.}\\makeatother\n' '\\makeatletter\\def\\p@enumv{\\p@enumiv (\\theenumiv )}\\makeatother\n'
'\\setcounter{enumiv}{23}\n' in result) '\\setcounter{enumiv}{23}\n' in result)
assert ('\\def\\theenumii{\\roman{enumii}}\n' assert ('\\def\\theenumii{\\roman{enumii}}\n'
'\\def\\labelenumii{\\theenumii.}\n' '\\def\\labelenumii{\\theenumii .}\n'
'\\makeatletter\\def\\p@enumiii{\\p@enumii\\theenumii.}\\makeatother\n' '\\makeatletter\\def\\p@enumiii{\\p@enumii \\theenumii .}\\makeatother\n'
'\\setcounter{enumii}{2}\n' in result) '\\setcounter{enumii}{2}\n' in result)