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

refactor: Move settings for pLaTeX to ADDITIONAL_SETTINGS

Browse Source
This commit is contained in:
Takeshi KOMIYA 2018-08-07 23:17:42 +09:00
parent f697717c0e
commit 67760128c2
1 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
sphinx/writers/latex.py
View File

@ -177,6 +177,9 @@ ADDITIONAL_SETTINGS = {
}, },
'platex': { 'platex': {
'latex_engine': 'platex', 'latex_engine': 'platex',
'babel': '',
'classoptions': ',dvipdfmx',
'fncychap': '',
'geometry': '\\usepackage[dvipdfm]{geometry}', 'geometry': '\\usepackage[dvipdfm]{geometry}',
}, },
} # type: Dict[unicode, Dict[unicode, unicode]] } # type: Dict[unicode, Dict[unicode, unicode]]
@ -570,8 +573,8 @@ class LaTeXTranslator(nodes.NodeVisitor):
self.elements['logo'] = '\\sphinxincludegraphics{%s}\\par' % \ self.elements['logo'] = '\\sphinxincludegraphics{%s}\\par' % \
path.basename(builder.config.latex_logo) path.basename(builder.config.latex_logo)
if builder.config.language \ if (builder.config.language and builder.config.language != 'ja' and
and 'fncychap' not in builder.config.latex_elements: 'fncychap' not in builder.config.latex_elements):
# use Sonny style if any language specified # use Sonny style if any language specified
self.elements['fncychap'] = ('\\usepackage[Sonny]{fncychap}\n' self.elements['fncychap'] = ('\\usepackage[Sonny]{fncychap}\n'
'\\ChNameVar{\\Large\\normalfont' '\\ChNameVar{\\Large\\normalfont'
@ -586,13 +589,10 @@ class LaTeXTranslator(nodes.NodeVisitor):
logger.warning(__('no Babel option known for language %r'), logger.warning(__('no Babel option known for language %r'),
builder.config.language) 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... # set up multilingual module...
# 'babel' key is public and user setting must be obeyed # 'babel' key is public and user setting must be obeyed
if self.elements['babel']: if self.elements['babel']:
self.elements['classoptions'] += ',' + self.babel.get_language()
# this branch is not taken for xelatex/lualatex if default settings # this branch is not taken for xelatex/lualatex if default settings
self.elements['multilingual'] = self.elements['babel'] self.elements['multilingual'] = self.elements['babel']
if builder.config.language: if builder.config.language:
@ -602,18 +602,8 @@ class LaTeXTranslator(nodes.NodeVisitor):
if self.babel.uses_cyrillic() \ if self.babel.uses_cyrillic() \
and 'fontpkg' not in builder.config.latex_elements: and 'fontpkg' not in builder.config.latex_elements:
self.elements['fontpkg'] = '' self.elements['fontpkg'] = ''
# pTeX (Japanese TeX) for support
if builder.config.language == 'ja':
# use dvipdfmx as default class option in Japanese
self.elements['classoptions'] = ',dvipdfmx'
# disable babel which has not publishing quality in Japanese
self.elements['babel'] = ''
self.elements['shorthandoff'] = ''
self.elements['multilingual'] = ''
# disable fncychap in Japanese documents
self.elements['fncychap'] = ''
elif self.elements['polyglossia']: elif self.elements['polyglossia']:
self.elements['classoptions'] += ',' + self.babel.get_language()
options = self.babel.get_mainlanguage_options() options = self.babel.get_mainlanguage_options()
if options: if options:
mainlanguage = r'\setmainlanguage[%s]{%s}' % (options, mainlanguage = r'\setmainlanguage[%s]{%s}' % (options,