Georg Brandl avatar Georg Brandl committed 63143c6 Merge

Merged in aohta/sphinx (pull request #24)

Comments (0)

Files changed (1)

sphinx/writers/latex.py

             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.
+            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.builder.warn('no Babel option known for language %r' %
-                                  builder.config.language)
-            self.elements['shorthandoff'] = babel.get_shorthandoff()
-            self.elements['fncychap'] = '\\usepackage[Sonny]{fncychap}'
         else:
             self.elements['classoptions'] += ',english'
         # allow the user to override them all
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.