From 3414292acee41e6c47b864a4e9cb17b24f4e3f4f Mon Sep 17 00:00:00 2001
From: jfbu <jfbu@free.fr>
Date: Sun, 7 May 2017 15:35:53 +0200
Subject: [PATCH] Fix: LATEXOPTS is not passed over correctly to pdflatex since
 1.6b3

---
 sphinx/texinputs/Makefile_t  | 4 ++--
 sphinx/texinputs/latexmkjarc | 2 +-
 sphinx/texinputs/latexmkrc   | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/sphinx/texinputs/Makefile_t b/sphinx/texinputs/Makefile_t
index 72874ec47..3905182b5 100644
--- a/sphinx/texinputs/Makefile_t
+++ b/sphinx/texinputs/Makefile_t
@@ -14,8 +14,8 @@ ALLIMGS = $(wildcard *.png *.gif *.jpg *.jpeg)
 
 # Prefix for archive names
 ARCHIVEPRREFIX =
-# Additional LaTeX options (used via latexmkrc/latexmkjarc file)
-LATEXOPTS = --interaction=nonstopmode
+# Additional LaTeX options (used by latexmk via latexmkrc/latexmkjarc file)
+export LATEXOPTS = --interaction=nonstopmode
 # Additional latexmk options
 LATEXMKOPTS = -f
 # format: pdf or dvi
diff --git a/sphinx/texinputs/latexmkjarc b/sphinx/texinputs/latexmkjarc
index 2124d4673..39ea47f3b 100644
--- a/sphinx/texinputs/latexmkjarc
+++ b/sphinx/texinputs/latexmkjarc
@@ -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" );
diff --git a/sphinx/texinputs/latexmkrc b/sphinx/texinputs/latexmkrc
index e0bfe9fd0..1e1ec1903 100644
--- a/sphinx/texinputs/latexmkrc
+++ b/sphinx/texinputs/latexmkrc
@@ -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 {