From 256517b90269206e02ff686721631f175918925c Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Mon, 3 Jan 2011 23:13:40 +0100 Subject: [PATCH] #574: Add special code for better support of Japanese documents in the LaTeX builder. --- CHANGES | 3 +++ sphinx/texinputs/Makefile | 9 +++++++++ sphinx/writers/latex.py | 7 +++++++ 3 files changed, 19 insertions(+) diff --git a/CHANGES b/CHANGES index e2db85e32..ec30df93d 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,9 @@ Release 1.0.6 (in development) ============================== +* #574: Add special code for better support of Japanese documents + in the LaTeX builder. + * Regression of #77: If there is only one parameter given with ``:param:`` markup, the bullet list is now suppressed again. diff --git a/sphinx/texinputs/Makefile b/sphinx/texinputs/Makefile index ce0ebb837..f219a2fe6 100644 --- a/sphinx/texinputs/Makefile +++ b/sphinx/texinputs/Makefile @@ -14,6 +14,15 @@ all-pdf: $(ALLPDF) all-dvi: $(ALLDVI) all-ps: all-dvi for f in *.dvi; do dvips $$f; done +all-pdf-ja: $(wildcard *.tex) + ebb $(wildcard *.pdf *.png *.gif *.jpeg) + platex -kanji=utf8 $(LATEXOPTS) '$<' + platex -kanji=utf8 $(LATEXOPTS) '$<' + platex -kanji=utf8 $(LATEXOPTS) '$<' + -mendex -U -f -d '$(basename $<).dic' -s python.ist '$(basename $<).idx' + platex -kanji=utf8 $(LATEXOPTS) '$<' + platex -kanji=utf8 $(LATEXOPTS) '$<' + dvipdfmx '$(basename $<).dvi' zip: all-$(FMT) mkdir $(ARCHIVEPREFIX)docs-$(FMT) diff --git a/sphinx/writers/latex.py b/sphinx/writers/latex.py index 07d7bb7e3..e027c938e 100644 --- a/sphinx/writers/latex.py +++ b/sphinx/writers/latex.py @@ -191,6 +191,13 @@ class LaTeXTranslator(nodes.NodeVisitor): lang = babel.get_language() if lang: self.elements['classoptions'] += ',' + babel.get_language() + elif builder.config.language == 'ja': + self.elements['classoptions'] += ',english,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)