mirror of
https://github.com/sphinx-doc/sphinx.git
synced 2025-02-25 18:55:22 -06:00
Fix #2265: babel is used in spite of disabling it on `latex_elements
`
This commit is contained in:
parent
18daa75b7f
commit
9b21115146
2
CHANGES
2
CHANGES
@ -4,6 +4,8 @@ Release 1.3.6 (in development)
|
||||
Bugs fixed
|
||||
----------
|
||||
|
||||
* #2265: Fix babel is used in spite of disabling it on ``latex_elements``
|
||||
|
||||
|
||||
Release 1.3.5 (released Jan 24, 2016)
|
||||
=====================================
|
||||
|
@ -346,11 +346,6 @@ class LaTeXTranslator(nodes.NodeVisitor):
|
||||
return '\\usepackage{%s}' % (packagename,)
|
||||
usepackages = (declare_package(*p) for p in builder.usepackages)
|
||||
self.elements['usepackages'] += "\n".join(usepackages)
|
||||
if getattr(document.settings, 'contentsname', None):
|
||||
self.elements['contentsname'] = \
|
||||
self.babel_renewcommand(builder, '\\contentsname',
|
||||
document.settings.contentsname)
|
||||
self.elements['numfig_format'] = self.generate_numfig_format(builder)
|
||||
# allow the user to override them all
|
||||
self.elements.update(builder.config.latex_elements)
|
||||
if self.elements['extraclassoptions']:
|
||||
@ -363,6 +358,11 @@ class LaTeXTranslator(nodes.NodeVisitor):
|
||||
else:
|
||||
self.elements['tocdepth'] = ('\\setcounter{tocdepth}{%d}' %
|
||||
(document['tocdepth'] - 1))
|
||||
if getattr(document.settings, 'contentsname', None):
|
||||
self.elements['contentsname'] = \
|
||||
self.babel_renewcommand(builder, '\\contentsname',
|
||||
document.settings.contentsname)
|
||||
self.elements['numfig_format'] = self.generate_numfig_format(builder)
|
||||
|
||||
self.highlighter = highlighting.PygmentsBridge(
|
||||
'latex',
|
||||
|
@ -267,6 +267,25 @@ def test_numref_with_language_ja(app, status, warning):
|
||||
assert '\\hyperref[baz:code22]{Code-\\ref{baz:code22}}' in result
|
||||
|
||||
|
||||
@with_app(buildername='latex', testroot='numfig',
|
||||
confoverrides={'numfig': True, 'language': 'ru', 'latex_elements': {'babel': ''}})
|
||||
def test_numref_on_bable_disabled(app, status, warning):
|
||||
app.builder.build_all()
|
||||
result = (app.outdir / 'Python.tex').text(encoding='utf8')
|
||||
print(result)
|
||||
print(status.getvalue())
|
||||
print(warning.getvalue())
|
||||
assert '\\renewcommand{\\figurename}{Fig. }' in result
|
||||
assert '\\renewcommand{\\tablename}{Table }' in result
|
||||
assert '\\SetupFloatingEnvironment{literal-block}{name=Listing }' in result
|
||||
assert '\\hyperref[index:fig1]{Fig. \\ref{index:fig1}}' in result
|
||||
assert '\\hyperref[baz:fig22]{Figure\\ref{baz:fig22}}' in result
|
||||
assert '\\hyperref[index:table-1]{Table \\ref{index:table-1}}' in result
|
||||
assert '\\hyperref[baz:table22]{Table:\\ref{baz:table22}}' in result
|
||||
assert '\\hyperref[index:code-1]{Listing \\ref{index:code-1}}' in result
|
||||
assert '\\hyperref[baz:code22]{Code-\\ref{baz:code22}}' in result
|
||||
|
||||
|
||||
@with_app(buildername='latex')
|
||||
def test_latex_add_latex_package(app, status, warning):
|
||||
app.add_latex_package('foo')
|
||||
|
Loading…
Reference in New Issue
Block a user