From 46e58d3989d692e4c5501c3bad7a56a0c28d06aa Mon Sep 17 00:00:00 2001 From: Takeshi KOMIYA Date: Sun, 9 Feb 2020 00:27:56 +0900 Subject: [PATCH] Close #7115: LaTeX: Allow to override LATEXOPTS and LATEXMKOPTS via envvars --- CHANGES | 2 ++ sphinx/texinputs/Makefile_t | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index 0d72f3e629..764cb6d72b 100644 --- a/CHANGES +++ b/CHANGES @@ -42,6 +42,8 @@ Features added * #6446: duration: Add ``sphinx.ext.durations`` to inspect which documents slow down the build * #6837: LaTeX: Support a nested table +* #7115: LaTeX: Allow to override LATEXOPTS and LATEXMKOPTS via environment + variable * #6966: graphviz: Support ``:class:`` option * #6696: html: ``:scale:`` option of image/figure directive not working for SVG images (imagesize-1.2.0 or above is required) diff --git a/sphinx/texinputs/Makefile_t b/sphinx/texinputs/Makefile_t index 405b34a584..08ddd2f0aa 100644 --- a/sphinx/texinputs/Makefile_t +++ b/sphinx/texinputs/Makefile_t @@ -15,13 +15,13 @@ ALLIMGS = $(wildcard *.png *.gif *.jpg *.jpeg) # Prefix for archive names ARCHIVEPREFIX = # Additional LaTeX options (passed via variables in latexmkrc/latexmkjarc file) -export LATEXOPTS = +export LATEXOPTS ?= # Additional latexmk options {% if latex_engine == 'xelatex' -%} # with latexmk version 4.52b or higher set LATEXMKOPTS to -xelatex either here # or on command line for faster builds. {% endif -%} -LATEXMKOPTS = +LATEXMKOPTS ?= {% if xindy_use -%} export XINDYOPTS = {{ xindy_lang_option }} -M sphinx.xdy {% if latex_engine == 'pdflatex' -%}