Merge branch 'stable' into latex_datefont

CHANGES

@@ -6,6 +6,7 @@ Bugs fixed
 
 * #2530: got "Counter too large" error on building PDF if large numbered footnotes existed in admonitions
 * ``width`` option of figure directive does not work if ``align`` option specified at same time (ref: #2595)
+* #2590: The ``inputenc`` package breaks compiling under lualatex and xelatex
 * #2540: date on latex front page use different font
 
 

Makefile

@@ -33,12 +33,15 @@ all: clean-pyc clean-backupfiles style-check test
 style-check:
 	@$(PYTHON) utils/check_sources.py $(DONT_CHECK) .
 
-clean: clean-pyc clean-patchfiles clean-backupfiles clean-generated
+clean: clean-pyc clean-pycache clean-patchfiles clean-backupfiles clean-generated clean-testfiles
 
 clean-pyc:
 	find . -name '*.pyc' -exec rm -f {} +
 	find . -name '*.pyo' -exec rm -f {} +
 
+clean-pycache:
+	find . -name __pycache__ -exec rm -rf {} +
+
 clean-patchfiles:
 	find . -name '*.orig' -exec rm -f {} +
 	find . -name '*.rej' -exec rm -f {} +
@@ -50,6 +53,10 @@ clean-backupfiles:
 clean-generated:
 	rm -f utils/*3.py*
 
+clean-testfiles:
+	rm -rf tests/build
+	rm -rf .tox/
+
 pylint:
 	@pylint --rcfile utils/pylintrc sphinx
 

doc/config.rst

@@ -1620,8 +1620,13 @@ These options influence LaTeX output.
    * Keys that don't need be overridden unless in special cases are:
 
      ``'inputenc'``
-        "inputenc" package inclusion, default
-        ``'\\usepackage[utf8]{inputenc}'``.
+        "inputenc" package inclusion, defaults to
+        ``'\\usepackage[utf8]{inputenc}'`` when using pdflatex.
+        Otherwise unset.
+
+        .. versionchanged:: 1.4.3
+           Previously ``'\\usepackage[utf8]{inputenc}'`` was used for all
+           compilers.
      ``'cmappkg'``
         "cmap" package inclusion, default ``'\\usepackage{cmap}'``.
 

sphinx/writers/latex.py

@@ -34,6 +34,7 @@ from sphinx.util.smartypants import educate_quotes_latex
 HEADER = r'''%% Generated by Sphinx.
 \def\sphinxdocclass{%(docclass)s}
 \documentclass[%(papersize)s,%(pointsize)s%(classoptions)s]{%(wrapperclass)s}
+\usepackage{iftex}
 %(passoptionstopackages)s
 %(inputenc)s
 %(utf8extra)s
@@ -298,10 +299,12 @@ class LaTeXTranslator(nodes.NodeVisitor):
         'classoptions':    '',
         'extraclassoptions': '',
         'passoptionstopackages': '',
-        'inputenc':        '\\usepackage[utf8]{inputenc}',
+        'inputenc':        ('\\ifPDFTeX\n'
+                            '  \\usepackage[utf8]{inputenc}\n'
+                            '\\fi'),
         'utf8extra':       ('\\ifdefined\\DeclareUnicodeCharacter\n'
                             '  \\DeclareUnicodeCharacter{00A0}{\\nobreakspace}\n'
-                            '\\else\\fi'),
+                            '\\fi'),
         'cmappkg':         '\\usepackage{cmap}',
         'fontenc':         '\\usepackage[T1]{fontenc}',
         'amsmath':         '\\usepackage{amsmath,amssymb,amstext}',