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

Close #7115: LaTeX: Allow to override LATEXOPTS and LATEXMKOPTS via envvars

Browse Source
This commit is contained in:
Takeshi KOMIYA
2020-02-09 00:27:56 +09:00
parent 1e5342faa9
commit 46e58d3989
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES
View File

@@ -42,6 +42,8 @@ Features added
* #6446: duration: Add ``sphinx.ext.durations`` to inspect which documents slow * #6446: duration: Add ``sphinx.ext.durations`` to inspect which documents slow
down the build down the build
* #6837: LaTeX: Support a nested table * #6837: LaTeX: Support a nested table
* #7115: LaTeX: Allow to override LATEXOPTS and LATEXMKOPTS via environment
variable
* #6966: graphviz: Support ``:class:`` option * #6966: graphviz: Support ``:class:`` option
* #6696: html: ``:scale:`` option of image/figure directive not working for SVG * #6696: html: ``:scale:`` option of image/figure directive not working for SVG
images (imagesize-1.2.0 or above is required) images (imagesize-1.2.0 or above is required)

4
sphinx/texinputs/Makefile_t
View File

@@ -15,13 +15,13 @@ ALLIMGS = $(wildcard *.png *.gif *.jpg *.jpeg)
# Prefix for archive names # Prefix for archive names
ARCHIVEPREFIX = ARCHIVEPREFIX =
# Additional LaTeX options (passed via variables in latexmkrc/latexmkjarc file) # Additional LaTeX options (passed via variables in latexmkrc/latexmkjarc file)
export LATEXOPTS = export LATEXOPTS ?=
# Additional latexmk options # Additional latexmk options
{% if latex_engine == 'xelatex' -%} {% if latex_engine == 'xelatex' -%}
# with latexmk version 4.52b or higher set LATEXMKOPTS to -xelatex either here # with latexmk version 4.52b or higher set LATEXMKOPTS to -xelatex either here
# or on command line for faster builds. # or on command line for faster builds.
{% endif -%} {% endif -%}
LATEXMKOPTS = LATEXMKOPTS ?=
{% if xindy_use -%} {% if xindy_use -%}
export XINDYOPTS = {{ xindy_lang_option }} -M sphinx.xdy export XINDYOPTS = {{ xindy_lang_option }} -M sphinx.xdy
{% if latex_engine == 'pdflatex' -%} {% if latex_engine == 'pdflatex' -%}