Merge pull request #6189 from jfbu/latex_stop_using_extractbb

LaTeX: stop using extractbb for image inclusion in Japanese documents

sphinx/texinputs/Makefile_t

@@ -10,7 +10,6 @@ ALLDVI = $(addsuffix .dvi,$(ALLDOCS))
 ALLXDV =
 {% endif -%}
 ALLPS  = $(addsuffix .ps,$(ALLDOCS))
-ALLIMGS = $(wildcard *.png *.gif *.jpg *.jpeg)
 
 # Prefix for archive names
 ARCHIVEPREFIX =
@@ -46,28 +45,15 @@ LATEX = latexmk -dvi
 PDFLATEX = latexmk -pdf -dvi- -ps-
 {% endif %}
 
-%.png %.gif %.jpg %.jpeg: FORCE_MAKE
-	extractbb '$@'
-
-{% if latex_engine == 'platex' -%}
-%.dvi: %.tex $(ALLIMGS) FORCE_MAKE
-	for f in *.pdf; do extractbb "$$f"; done
-	$(LATEX) $(LATEXMKOPTS) '$<'
-
-{% elif latex_engine != 'xelatex' -%}
+{% if latex_engine != 'xelatex' -%}
 %.dvi: %.tex FORCE_MAKE
 	$(LATEX) $(LATEXMKOPTS) '$<'
 
 {% endif -%}
 %.ps: %.dvi
 	dvips '$<'
 
-{% if latex_engine == 'platex' -%}
-%.pdf: %.tex $(ALLIMGS) FORCE_MAKE
-	for f in *.pdf; do extractbb "$$f"; done
-{%- else -%}
 %.pdf: %.tex FORCE_MAKE
-{%- endif %}
 	$(PDFLATEX) $(LATEXMKOPTS) '$<'
 
 all: $(ALLPDF)

sphinx/texinputs/make.bat_t

@@ -31,11 +31,6 @@ if "%1" == "" goto all-pdf
 
 if "%1" == "all-pdf" (
 	:all-pdf
-{%- if latex_engine == 'platex' %}
-	for %%i in (*.png *.gif *.jpg *.jpeg *.pdf) do (
-		extractbb %%i
-	)
-{%- endif %}
 	for %%i in (*.tex) do (
 		%PDFLATEX% %LATEXMKOPTS% %%i
 	)