Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

LaTeX: stop using extractbb for image inclusion in Japanese documents #6189

Merged
merged 1 commit into from Sep 5, 2019
Merged

LaTeX: stop using extractbb for image inclusion in Japanese documents #6189

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 1 addition & 15 deletions sphinx/texinputs/Makefile_t
View file
Open in desktop
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
View file
Open in desktop
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