Merge with 1.0.

This commit is contained in:
Georg Brandl 2011-09-21 10:49:10 +02:00
commit 6251adff45
2 changed files with 13 additions and 11 deletions

View File

@ -14,15 +14,16 @@ 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'
all-pdf-ja:
for f in *.pdf *.png *.gif *.jpg *.jpeg; do ebb $$f; done
for f in *.tex; do platex -kanji=utf8 $(LATEXOPTS) $$f; done
for f in *.tex; do platex -kanji=utf8 $(LATEXOPTS) $$f; done
for f in *.tex; do platex -kanji=utf8 $(LATEXOPTS) $$f; done
for f in *.idx; do mendex -U -f -d "`basename $$f .idx`.dic" -s python.ist $$f; done
for f in *.tex; do platex -kanji=utf8 $(LATEXOPTS) $$f; done
for f in *.tex; do platex -kanji=utf8 $(LATEXOPTS) $$f; done
for f in *.dvi; do dvipdfmx $$f; done
zip: all-$(FMT)
mkdir $(ARCHIVEPREFIX)docs-$(FMT)
@ -61,4 +62,5 @@ clean:
rm -f *.dvi *.log *.ind *.aux *.toc *.syn *.idx *.out *.ilg *.pla
.PHONY: all all-pdf all-dvi all-ps clean
.PHONY: all-pdf-ja

View File

@ -197,10 +197,10 @@ class LaTeXTranslator(nodes.NodeVisitor):
if lang:
self.elements['classoptions'] += ',' + babel.get_language()
elif builder.config.language == 'ja':
self.elements['classoptions'] += ',english,dvipdfm'
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'
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}}'