Merged in aohta/sphinx (pull request #24)

1 files changed, 10 insertions, 8 deletions

diff --git a/sphinx/writers/latex.py b/sphinx/writers/latex.py
index 14e24cfb..e6585f27 100644
--- a/sphinx/writers/latex.py
+++ b/sphinx/writers/latex.py
@@ -196,19 +196,21 @@ class LaTeXTranslator(nodes.NodeVisitor):
             lang = babel.get_language()
             if lang:
                 self.elements['classoptions'] += ',' + babel.get_language()
-            elif builder.config.language == 'ja':
-                self.elements['classoptions'] += ',dvipdfm'
-                # not elements of babel, but this should be above sphinx.sty.
-                # because pTeX (Japanese TeX) cannot handle this count.
-                self.elements['babel'] = r'\newcount\pdfoutput\pdfoutput=0'
-                # to make the pdf with correct encoded hyperref bookmarks
-                self.elements['preamble'] += \
-                    r'\AtBeginDvi{\special{pdf:tounicode EUC-UCS2}}'
             else:
                 self.builder.warn('no Babel option known for language %r' %
                                   builder.config.language)
             self.elements['shorthandoff'] = babel.get_shorthandoff()
             self.elements['fncychap'] = '\\usepackage[Sonny]{fncychap}'
+
+            # pTeX (Japanese TeX) for support
+            if builder.config.language == 'ja':
+                self.elements['classoptions'] = ',dvipdfm'
+                # found elements of babel, but this should be above sphinx.sty.
+                # because pTeX (Japanese TeX) cannot handle this count.
+                self.elements['babel'] = r'\newcount\pdfoutput\pdfoutput=0'
+                # to make the pdf with correct encoded hyperref bookmarks
+                self.elements['preamble'] += \
+                    r'\AtBeginDvi{\special{pdf:tounicode EUC-UCS2}}'
         else:
             self.elements['classoptions'] += ',english'
         # allow the user to override them all