Skip to content

Commit

Permalink
Use (again) Perl concatenation for latexmk variables (refs sphinx-doc…
Browse files Browse the repository at this point in the history
…#3719)

Indeed, with this latexmk will display something like

Running 'pdflatex --halt-on-error --interaction=batchmode  -recorder
"sphinx.tex"'

if `make latexpdf` was invoked with `LATEXOPTS="--halt... "`, which
is more useful console output than:

Running 'pdflatex $LATEXOPTS -recorder "sphinx.tex"'

as is the case without this commit.
  • Loading branch information
jfbu committed May 9, 2017
1 parent 593eb39 commit 1385e1a
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion sphinx/texinputs/latexmkjarc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
$latex = 'platex $LATEXOPTS -kanji=utf8 %O %S';
$latex = 'platex ' . $ENV{'LATEXOPTS'} . ' -kanji=utf8 %O %S';
$dvipdf = 'dvipdfmx %O -o %D %S';
$makeindex = 'rm -f %D; mendex -U -f -d %B.dic -s python.ist %S || echo "mendex exited with error code $? (ignoring)" && : >> %D';
add_cus_dep( "glo", "gls", 0, "makeglo" );
Expand Down
8 changes: 4 additions & 4 deletions sphinx/texinputs/latexmkrc
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
$latex = 'latex $LATEXOPTS %O %S';
$pdflatex = 'pdflatex $LATEXOPTS %O %S';
$lualatex = 'lualatex $LATEXOPTS %O %S';
$xelatex = 'xelatex --no-pdf $LATEXOPTS %O %S';
$latex = 'latex ' . $ENV{'LATEXOPTS'} . ' %O %S';
$pdflatex = 'pdflatex ' . $ENV{'LATEXOPTS'} . ' %O %S';
$lualatex = 'lualatex ' . $ENV{'LATEXOPTS'} . ' %O %S';
$xelatex = 'xelatex --no-pdf ' . $ENV{'LATEXOPTS'} . ' %O %S';
$makeindex = 'makeindex -s python.ist %O -o %D %S';
add_cus_dep( "glo", "gls", 0, "makeglo" );
sub makeglo {
Expand Down

0 comments on commit 1385e1a

Please sign in to comment.