diff options
| author | Takeshi KOMIYA <i.tkomiya@gmail.com> | 2019-11-17 17:37:48 +0900 |
|---|---|---|
| committer | Takeshi KOMIYA <i.tkomiya@gmail.com> | 2019-11-17 17:37:48 +0900 |
| commit | c6f0eb215a234eef4163d20477a49877eb8fe11e (patch) | |
| tree | 82d5d3999ce10093f319952011301d7cd82e2691 /sphinx/texinputs | |
| parent | fcdeafd56e67cc38dcd56862cc0ee6304178a3e8 (diff) | |
| download | sphinx-git-c6f0eb215a234eef4163d20477a49877eb8fe11e.tar.gz | |
Fix #4186: LaTeX: Support upLaTeX as a new latex_engine (experimental)
Diffstat (limited to 'sphinx/texinputs')
| -rw-r--r-- | sphinx/texinputs/Makefile_t | 6 | ||||
| -rw-r--r-- | sphinx/texinputs/latexmkjarc_t (renamed from sphinx/texinputs/latexmkjarc) | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sphinx/texinputs/Makefile_t b/sphinx/texinputs/Makefile_t index 2afabb360..405b34a58 100644 --- a/sphinx/texinputs/Makefile_t +++ b/sphinx/texinputs/Makefile_t @@ -37,7 +37,7 @@ XINDYOPTS += -M LatinRules.xdy # format: pdf or dvi (used only by archive targets) FMT = pdf -{% if latex_engine == 'platex' -%} +{% if latex_engine in ('platex', 'uplatex') -%} # latexmkrc is read then overridden by latexmkjarc LATEX = latexmk -r latexmkjarc -dvi PDFLATEX = latexmk -r latexmkjarc -pdfdvi -dvi- -ps- @@ -49,7 +49,7 @@ PDFLATEX = latexmk -pdf -dvi- -ps- %.png %.gif %.jpg %.jpeg: FORCE_MAKE extractbb '$@' -{% if latex_engine == 'platex' -%} +{% if latex_engine in ('platex', 'uplatex') -%} %.dvi: %.tex $(ALLIMGS) FORCE_MAKE for f in *.pdf; do extractbb "$$f"; done $(LATEX) $(LATEXMKOPTS) '$<' @@ -62,7 +62,7 @@ PDFLATEX = latexmk -pdf -dvi- -ps- %.ps: %.dvi dvips '$<' -{% if latex_engine == 'platex' -%} +{% if latex_engine in ('platex', 'uplatex') -%} %.pdf: %.tex $(ALLIMGS) FORCE_MAKE for f in *.pdf; do extractbb "$$f"; done {%- else -%} diff --git a/sphinx/texinputs/latexmkjarc b/sphinx/texinputs/latexmkjarc_t index 5b315d6c9..c7403a90b 100644 --- a/sphinx/texinputs/latexmkjarc +++ b/sphinx/texinputs/latexmkjarc_t @@ -1,4 +1,4 @@ -$latex = 'platex ' . $ENV{'LATEXOPTS'} . ' -kanji=utf8 %O %S'; +$latex = '{{ latex_engine }} ' . $ENV{'LATEXOPTS'} . ' -kanji=utf8 %O %S'; $dvipdf = 'dvipdfmx %O -o %D %S'; $makeindex = 'internal mendex %S %B %D'; sub mendex { |