IntenseWebs/sphinx
3
0
Fork 0
mirror of https://github.com/sphinx-doc/sphinx.git synced 2025-02-25 18:55:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6189 from jfbu/latex_stop_using_extractbb

Browse Source 
LaTeX: stop using extractbb for image inclusion in Japanese documents
This commit is contained in:
Jean-François B 2019-09-05 08:51:34 +02:00 committed by GitHub
commit 1174309478
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sphinx/texinputs/Makefile_t
View File

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

5
sphinx/texinputs/make.bat_t
View File

@ -31,11 +31,6 @@ if "%1" == "" goto all-pdf
if "%1" == "all-pdf" ( if "%1" == "all-pdf" (
: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 ( for %%i in (*.tex) do (
%PDFLATEX% %LATEXMKOPTS% %%i %PDFLATEX% %LATEXMKOPTS% %%i
) )