Merge pull request #3363 from jfbu/dvipdfm

LaTeX, pass dvipdfm option to geometry package for Japanese documents

3 files changed, 8 insertions, 0 deletions

diff --git a/CHANGES b/CHANGES
index 2b73f00ef..12e578d58 100644
--- a/CHANGES
+++ b/CHANGES
@@ -52,6 +52,7 @@ Bugs fixed
 * #3308: Parsed-literals don't wrap very long lines with pdf builder (ref #3340)
 * #3295: Could not import extension sphinx.builders.linkcheck
 * #3285: autosummary: asterisks are escaped twice
+* LaTeX, pass dvipdfm option to geometry package for Japanese documents
 
 
 Release 1.5.1 (released Dec 13, 2016)
diff --git a/doc/config.rst b/doc/config.rst
index 330cfe014..2ef5fe88f 100644
--- a/doc/config.rst
+++ b/doc/config.rst
@@ -1733,6 +1733,11 @@ These options influence LaTeX output. See further :doc:`latex`.
           ``'\\usepackage[margin=1in,marginparwidth=0.5in]{geometry}'``.
 
         .. versionadded:: 1.5
+
+        .. versionchanged:: 1.5.2
+           For Japanese documents also ``dvipdfm`` option is passed to
+           ``geometry``.
+
      ``'babel'``
         "babel" package inclusion, default ``'\\usepackage{babel}'`` (the
         suitable document language string is passed as class option, and
diff --git a/sphinx/writers/latex.py b/sphinx/writers/latex.py
index 303011b86..ddb07afe5 100644
--- a/sphinx/writers/latex.py
+++ b/sphinx/writers/latex.py
@@ -122,6 +122,8 @@ ADDITIONAL_SETTINGS = {
     },
     'platex': {
         'latex_engine': 'platex',
+        'geometry': ('\\usepackage[margin=1in,marginparwidth=0.5in,dvipdfm]'
+                     '{geometry}'),
     },
 }