pytho****@googl*****
pytho****@googl*****
2011年 2月 10日 (木) 23:19:43 JST
2 new revisions: Revision: 84bb0a2280 Author: Akihiro Uchida <uchid****@ike-d*****> Date: Thu Feb 10 06:10:53 2011 Log: apply patch in http://bitbucket.org/birkenfeld/sphinx/issue/614/ http://code.google.com/p/python-doc-ja/source/detail?repo=sphinx-ja&r=84bb0a2280 Revision: d05eed83ae Author: Akihiro Uchida <uchid****@ike-d*****> Date: Thu Feb 10 06:14:59 2011 Log: fixed #613 http://bitbucket.org/birkenfeld/sphinx/issue/613/ http://code.google.com/p/python-doc-ja/source/detail?repo=sphinx-ja&r=d05eed83ae ============================================================================== Revision: 84bb0a2280 Author: Akihiro Uchida <uchid****@ike-d*****> Date: Thu Feb 10 06:10:53 2011 Log: apply patch in http://bitbucket.org/birkenfeld/sphinx/issue/614/ http://code.google.com/p/python-doc-ja/source/detail?repo=sphinx-ja&r=84bb0a2280 Modified: /sphinx/texinputs/Makefile /sphinx/writers/latex.py ======================================= --- /sphinx/texinputs/Makefile Mon Jan 3 14:13:40 2011 +++ /sphinx/texinputs/Makefile Thu Feb 10 06:10:53 2011 @@ -14,15 +14,15 @@ 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 +61,5 @@ 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 + ======================================= --- /sphinx/writers/latex.py Sat Jan 15 06:59:48 2011 +++ /sphinx/writers/latex.py Thu Feb 10 06:10:53 2011 @@ -196,10 +196,10 @@ 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}}' ============================================================================== Revision: d05eed83ae Author: Akihiro Uchida <uchid****@ike-d*****> Date: Thu Feb 10 06:14:59 2011 Log: fixed #613 http://bitbucket.org/birkenfeld/sphinx/issue/613/ http://code.google.com/p/python-doc-ja/source/detail?repo=sphinx-ja&r=d05eed83ae Modified: /sphinx/writers/latex.py ======================================= --- /sphinx/writers/latex.py Thu Feb 10 06:10:53 2011 +++ /sphinx/writers/latex.py Thu Feb 10 06:14:59 2011 @@ -273,7 +273,7 @@ return '\\autopageref*{%s}' % self.idescape(id) def idescape(self, id): - return str(unicode(id).translate(tex_replace_map)) + return unicode(id).translate(tex_replace_map) def generate_indices(self): def generate(content, collapsed):
