refactor multilingual setup, let "polyglossia" use `\setmainlanguage`

This commit is contained in:
jfbu 2016-10-19 23:57:58 +02:00
parent 24dd7852f4
commit e4d73df110

View File

@ -396,20 +396,31 @@ class LaTeXTranslator(nodes.NodeVisitor):
# no need for \\noindent here, used in flushright
self.elements['logo'] = '\\sphinxincludegraphics{%s}\\par' % \
path.basename(builder.config.latex_logo)
# setup multilingual package
if builder.config.language:
# use Sonny style if any language specified
self.elements['fncychap'] = '\\usepackage[Sonny]{fncychap}'
self.babel = ExtBabel(builder.config.language)
if builder.config.language and not self.babel.is_supported_language():
# emit warning if specified language is invalid
# (only emitting, nothing changed to processing)
self.builder.warn('no Babel option known for language %r' %
builder.config.language)
# simply use babel.get_language() always, as get_language() returns
# 'english' even if language is invalid or empty
self.elements['classoptions'] += ',' + self.babel.get_language()
# set up multilingual module...
if self.elements['polyglossia']:
self.elements['babel'] = '' # disable babel forcely
self.elements['multilingual'] = self.elements['polyglossia']
self.elements['babel'] = '' # disable babel
self.elements['multilingual'] = '%s\n\\setmainlanguage{%s}' % \
(self.elements['polyglossia'], self.babel.get_language())
elif self.elements['babel']:
self.elements['multilingual'] = self.elements['babel']
self.elements['classoptions'] += ',' + self.babel.get_language()
if builder.config.language:
if not self.babel.is_supported_language():
self.builder.warn('no Babel option known for language %r' %
builder.config.language)
self.elements['shorthandoff'] = self.babel.get_shorthandoff()
self.elements['fncychap'] = '\\usepackage[Sonny]{fncychap}'
# Times fonts don't work with Cyrillic languages
if self.babel.uses_cyrillic():
@ -424,6 +435,7 @@ class LaTeXTranslator(nodes.NodeVisitor):
self.elements['multilingual'] = ''
# disable fncychap in Japanese documents
self.elements['fncychap'] = ''
if getattr(builder, 'usepackages', None):
def declare_package(packagename, options=None):
if options: