diff options
| author | jfbu <jfbu@free.fr> | 2018-07-24 09:21:52 +0200 |
|---|---|---|
| committer | jfbu <jfbu@free.fr> | 2018-07-24 09:21:52 +0200 |
| commit | 34ec2e3fb9faefda131819d1f2e84e4d39f67f03 (patch) | |
| tree | a2f3e516b4d0fe8033ebc026f3a33c6462d90edc /sphinx/texinputs/Makefile_t | |
| parent | c2a396c776bf4dbc6c92e47808ab553ad262ec48 (diff) | |
| parent | b3d89f94179022e9633a5c5fa68e38b349c7f34d (diff) | |
| download | sphinx-git-34ec2e3fb9faefda131819d1f2e84e4d39f67f03.tar.gz | |
Merge branch 'latex_xindy_fix_latin' into latex_xindy_cyrillic_latin
Diffstat (limited to 'sphinx/texinputs/Makefile_t')
| -rw-r--r-- | sphinx/texinputs/Makefile_t | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sphinx/texinputs/Makefile_t b/sphinx/texinputs/Makefile_t index 97054def0..f385ae18b 100644 --- a/sphinx/texinputs/Makefile_t +++ b/sphinx/texinputs/Makefile_t @@ -24,16 +24,18 @@ export LATEXOPTS = LATEXMKOPTS = {% if xindy_use -%} export XINDYOPTS = {{ xindy_lang_option }} -M sphinx.xdy -{% if latex_engine == 'pdflatex' and xindy_cyrillic -%} -XINDYOPTS += -M cyrLICRutf8.xdy +{% if latex_engine == 'pdflatex' -%} +XINDYOPTS += -M LICRlatin2utf8.xdy +{% if xindy_cyrillic -%} +XINDYOPTS += -M LICRcyr2utf8.xdy +{% endif -%} {% endif -%} {% if xindy_cyrillic -%} XINDYOPTS += -M sphinx-basiclatin.xdy {% endif -%} -{% if latex_engine == 'xelatex' or latex_engine == 'lualatex' -%} +# also with pdflatex as LICRlatin2utf8.xdy replaces xindy's /tex/inputenc/utf8.xdy XINDYOPTS += -I xelatex {% endif -%} -{% endif -%} # format: pdf or dvi (used only by archive targets) FMT = pdf |