From e4b42fe15fbba4882f2dd3b5b38a43db37d5947c Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Sat, 25 Jul 2015 16:51:45 +0200 Subject: [PATCH] Fixes #1923: Use babel features only if the babel latex element is nonempty. --- CHANGES | 3 ++- sphinx/writers/latex.py | 8 ++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/CHANGES b/CHANGES index 3457994bd..d88d41aed 100644 --- a/CHANGES +++ b/CHANGES @@ -33,7 +33,8 @@ Bugs fixed * #1949: Use ``safe_getattr`` in the coverage builder to avoid aborting with descriptors that have custom behavior. * #1915: Do not generate smart quotes in doc field type annotations. -* #1796, On py3, automated .mo building cause UnicodeDecodeError +* #1796: On py3, automated .mo building caused UnicodeDecodeError. +* #1923: Use babel features only if the babel latex element is nonempty. Release 1.3.1 (released Mar 17, 2015) diff --git a/sphinx/writers/latex.py b/sphinx/writers/latex.py index c1ba04cab..5d175eae6 100644 --- a/sphinx/writers/latex.py +++ b/sphinx/writers/latex.py @@ -342,8 +342,12 @@ class LaTeXTranslator(nodes.NodeVisitor): else: language = 'english' - babel_prefix = '\\addto\\captions%s{' % language - babel_suffix = '}' + if self.elements['babel']: + babel_prefix = '\\addto\\captions%s{' % language + babel_suffix = '}' + else: + babel_prefix = '' + babel_suffix = '' figure = self.builder.config.numfig_format['figure'].split('%s', 1) if len(figure) == 1: