Skip to content

Commit

Permalink
LaTeX: stop using extractbb for image inclusion in Japanese documents
Browse files Browse the repository at this point in the history
Since TeXLive2015, the dvipdfmx binary does not need extra .xbb files
for images (which were produced using extractbb).
  • Loading branch information
jfbu committed Mar 19, 2019
1 parent e6cc18c commit 0466f70
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 20 deletions.
16 changes: 1 addition & 15 deletions sphinx/texinputs/Makefile_t
Expand Up @@ -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 =
Expand Down Expand Up @@ -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)
Expand Down
5 changes: 0 additions & 5 deletions sphinx/texinputs/make.bat_t
Expand Up @@ -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
)
Expand Down

0 comments on commit 0466f70

Please sign in to comment.