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

Merge pull request #3363 from jfbu/dvipdfm

Browse Source 
LaTeX, pass dvipdfm option to geometry package for Japanese documents
This commit is contained in:
Jean-François B
2017-01-21 12:08:16 +01:00
committed by GitHub
parent 3f17bebecb 8ba4005013
commit b86af5626d
3 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@@ -52,6 +52,7 @@ Bugs fixed
* #3308: Parsed-literals don't wrap very long lines with pdf builder (ref #3340) * #3308: Parsed-literals don't wrap very long lines with pdf builder (ref #3340)
* #3295: Could not import extension sphinx.builders.linkcheck * #3295: Could not import extension sphinx.builders.linkcheck
* #3285: autosummary: asterisks are escaped twice * #3285: autosummary: asterisks are escaped twice
* LaTeX, pass dvipdfm option to geometry package for Japanese documents
Release 1.5.1 (released Dec 13, 2016) Release 1.5.1 (released Dec 13, 2016)

5
doc/config.rst
View File

@@ -1733,6 +1733,11 @@ These options influence LaTeX output. See further :doc:`latex`.
``'\\usepackage[margin=1in,marginparwidth=0.5in]{geometry}'``. ``'\\usepackage[margin=1in,marginparwidth=0.5in]{geometry}'``.
.. versionadded:: 1.5 .. versionadded:: 1.5
.. versionchanged:: 1.5.2
For Japanese documents also ``dvipdfm`` option is passed to
``geometry``.
``'babel'`` ``'babel'``
"babel" package inclusion, default ``'\\usepackage{babel}'`` (the "babel" package inclusion, default ``'\\usepackage{babel}'`` (the
suitable document language string is passed as class option, and suitable document language string is passed as class option, and

2
sphinx/writers/latex.py
View File

@@ -122,6 +122,8 @@ ADDITIONAL_SETTINGS = {
}, },
'platex': { 'platex': {
'latex_engine': 'platex', 'latex_engine': 'platex',
'geometry': ('\\usepackage[margin=1in,marginparwidth=0.5in,dvipdfm]'
'{geometry}'),
}, },
} }