Simplify/fix LaTeX character encoding handling.

Do not call "inputenc" if the "output-encoding" setting is 'utf-8'.
(UTF-8 is the default encoding for LaTeX2e since 2018.)

Do not call "inputenc" if the "output-encoding" setting is 'unicode':
Docutils returns a `str` instance and does not know which encoding will
be used when the output is written to a file or passed to LaTeX.

git-svn-id: https://svn.code.sf.net/p/docutils/code/trunk@9219 929543f6-e4f2-0310-98a6-ba3bd3dd1d04

13 files changed, 0 insertions, 14 deletions

diff --git a/docutils/test/functional/expected/cyrillic.tex b/docutils/test/functional/expected/cyrillic.tex
index ee7c1058a..18cf0b7db 100644
--- a/docutils/test/functional/expected/cyrillic.tex
+++ b/docutils/test/functional/expected/cyrillic.tex
@@ -3,7 +3,6 @@
 \usepackage{cmap} % fix search and cut-and-paste in Acrobat
 \usepackage{ifthen}
 \usepackage[T1,T2A]{fontenc}
-\usepackage[utf8]{inputenc}
 \usepackage[english,russian]{babel}
 \setcounter{secnumdepth}{0}
 
diff --git a/docutils/test/functional/expected/latex_babel.tex b/docutils/test/functional/expected/latex_babel.tex
index e982d4a45..060737051 100644
--- a/docutils/test/functional/expected/latex_babel.tex
+++ b/docutils/test/functional/expected/latex_babel.tex
@@ -3,7 +3,6 @@
 \usepackage{cmap} % fix search and cut-and-paste in Acrobat
 \usepackage{ifthen}
 \usepackage[T1]{fontenc}
-\usepackage[utf8]{inputenc}
 \usepackage[basque,esperanto,estonian,galician,ngerman,english]{babel}
 \AtBeginDocument{\shorthandoff{.<>}}
 \deactivatetilden % restore ~ in Galician
diff --git a/docutils/test/functional/expected/latex_cornercases.tex b/docutils/test/functional/expected/latex_cornercases.tex
index d1bd0134d..33e672a31 100644
--- a/docutils/test/functional/expected/latex_cornercases.tex
+++ b/docutils/test/functional/expected/latex_cornercases.tex
@@ -3,7 +3,6 @@
 \usepackage{cmap} % fix search and cut-and-paste in Acrobat
 \usepackage{ifthen}
 \usepackage[T1]{fontenc}
-\usepackage[utf8]{inputenc}
 \DeclareUnicodeCharacter{21D4}{\ensuremath{\Leftrightarrow}}
 \DeclareUnicodeCharacter{2660}{\ensuremath{\spadesuit}}
 \DeclareUnicodeCharacter{2663}{\ensuremath{\clubsuit}}
diff --git a/docutils/test/functional/expected/latex_docinfo.tex b/docutils/test/functional/expected/latex_docinfo.tex
index 2c5b401fa..544f4cc77 100644
--- a/docutils/test/functional/expected/latex_docinfo.tex
+++ b/docutils/test/functional/expected/latex_docinfo.tex
@@ -3,7 +3,6 @@
 \usepackage{cmap} % fix search and cut-and-paste in Acrobat
 \usepackage{ifthen}
 \usepackage[T1]{fontenc}
-\usepackage[utf8]{inputenc}
 
 %%% Custom LaTeX preamble
 % PDF Standard Fonts
diff --git a/docutils/test/functional/expected/latex_leavevmode.tex b/docutils/test/functional/expected/latex_leavevmode.tex
index 4ced1512c..6a93d7f0a 100644
--- a/docutils/test/functional/expected/latex_leavevmode.tex
+++ b/docutils/test/functional/expected/latex_leavevmode.tex
@@ -3,7 +3,6 @@
 \usepackage{cmap} % fix search and cut-and-paste in Acrobat
 \usepackage{ifthen}
 \usepackage[T1]{fontenc}
-\usepackage[utf8]{inputenc}
 \usepackage{alltt}
 \usepackage{amsmath}
 \usepackage{float} % extended float configuration
diff --git a/docutils/test/functional/expected/latex_literal_block.tex b/docutils/test/functional/expected/latex_literal_block.tex
index 55317941a..7088993d2 100644
--- a/docutils/test/functional/expected/latex_literal_block.tex
+++ b/docutils/test/functional/expected/latex_literal_block.tex
@@ -3,7 +3,6 @@
 \usepackage{cmap} % fix search and cut-and-paste in Acrobat
 \usepackage{ifthen}
 \usepackage[T1]{fontenc}
-\usepackage[utf8]{inputenc}
 \usepackage{alltt}
 \usepackage{amsmath}
 \usepackage{color}
diff --git a/docutils/test/functional/expected/latex_literal_block_fancyvrb.tex b/docutils/test/functional/expected/latex_literal_block_fancyvrb.tex
index 081166ec0..76638011a 100644
--- a/docutils/test/functional/expected/latex_literal_block_fancyvrb.tex
+++ b/docutils/test/functional/expected/latex_literal_block_fancyvrb.tex
@@ -3,7 +3,6 @@
 \usepackage{cmap} % fix search and cut-and-paste in Acrobat
 \usepackage{ifthen}
 \usepackage[T1]{fontenc}
-\usepackage[utf8]{inputenc}
 \usepackage{amsmath}
 \usepackage{color}
 \usepackage{graphicx}
diff --git a/docutils/test/functional/expected/latex_literal_block_listings.tex b/docutils/test/functional/expected/latex_literal_block_listings.tex
index 6c499a8c4..55280432d 100644
--- a/docutils/test/functional/expected/latex_literal_block_listings.tex
+++ b/docutils/test/functional/expected/latex_literal_block_listings.tex
@@ -3,7 +3,6 @@
 \usepackage{cmap} % fix search and cut-and-paste in Acrobat
 \usepackage{ifthen}
 \usepackage[T1]{fontenc}
-\usepackage[utf8]{inputenc}
 \usepackage{amsmath}
 \usepackage{color}
 \usepackage{graphicx}
diff --git a/docutils/test/functional/expected/latex_literal_block_verbatim.tex b/docutils/test/functional/expected/latex_literal_block_verbatim.tex
index 61739ec9b..df6530954 100644
--- a/docutils/test/functional/expected/latex_literal_block_verbatim.tex
+++ b/docutils/test/functional/expected/latex_literal_block_verbatim.tex
@@ -3,7 +3,6 @@
 \usepackage{cmap} % fix search and cut-and-paste in Acrobat
 \usepackage{ifthen}
 \usepackage[T1]{fontenc}
-\usepackage[utf8]{inputenc}
 \usepackage{amsmath}
 \usepackage{color}
 \usepackage{graphicx}
diff --git a/docutils/test/functional/expected/latex_literal_block_verbatimtab.tex b/docutils/test/functional/expected/latex_literal_block_verbatimtab.tex
index 3b733ccea..2a0197dfd 100644
--- a/docutils/test/functional/expected/latex_literal_block_verbatimtab.tex
+++ b/docutils/test/functional/expected/latex_literal_block_verbatimtab.tex
@@ -3,7 +3,6 @@
 \usepackage{cmap} % fix search and cut-and-paste in Acrobat
 \usepackage{ifthen}
 \usepackage[T1]{fontenc}
-\usepackage[utf8]{inputenc}
 \usepackage{amsmath}
 \usepackage{color}
 \usepackage{graphicx}
diff --git a/docutils/test/functional/expected/latex_memoir.tex b/docutils/test/functional/expected/latex_memoir.tex
index bf0bc94ca..bd2891a1d 100644
--- a/docutils/test/functional/expected/latex_memoir.tex
+++ b/docutils/test/functional/expected/latex_memoir.tex
@@ -3,7 +3,6 @@
 
 \usepackage{ifthen}
 \usepackage[T1]{fontenc}
-\usepackage[utf8]{inputenc}
 \usepackage{alltt}
 \usepackage{amsmath}
 \usepackage[british,french,ngerman,english]{babel}
diff --git a/docutils/test/functional/expected/standalone_rst_latex.tex b/docutils/test/functional/expected/standalone_rst_latex.tex
index 7cfd004d2..ec4d47092 100644
--- a/docutils/test/functional/expected/standalone_rst_latex.tex
+++ b/docutils/test/functional/expected/standalone_rst_latex.tex
@@ -3,7 +3,6 @@
 \usepackage{cmap} % fix search and cut-and-paste in Acrobat
 \usepackage{ifthen}
 \usepackage[T1]{fontenc}
-\usepackage[utf8]{inputenc}
 \usepackage{alltt}
 \usepackage{amsmath}
 \usepackage[british,french,ngerman,english]{babel}
diff --git a/docutils/test/test_writers/test_latex2e.py b/docutils/test/test_writers/test_latex2e.py
index 5549f29e7..5cd5530f8 100755
--- a/docutils/test/test_writers/test_latex2e.py
+++ b/docutils/test/test_writers/test_latex2e.py
@@ -62,7 +62,6 @@ head_prefix=r"""\documentclass[a4paper]{article}
 """,
 requirements=r"""\usepackage{ifthen}
 \usepackage[T1]{fontenc}
-\usepackage[utf8]{inputenc}
 """,
 latex_preamble=r"""% PDF Standard Fonts
 \usepackage{mathptmx} % Times
@@ -152,7 +151,6 @@ totest['spanish_quote'] = [
 head_template.substitute(dict(parts,
 requirements=r"""\usepackage{ifthen}
 \usepackage[T1]{fontenc}
-\usepackage[utf8]{inputenc}
 \usepackage[spanish,english]{babel}
 \AtBeginDocument{\shorthandoff{.<>}}
 """)) + r"""