From ead753eaad7e0f73f106c4bda918f916b6d3638c Mon Sep 17 00:00:00 2001
From: Takeshi KOMIYA <i.tkomiya@gmail.com>
Date: Wed, 13 Jul 2016 21:15:24 +0900
Subject: [PATCH] Replace iftex by latex_engine

---
 sphinx/templates/latex/content.tex_t |  1 -
 sphinx/texinputs/iftex.sty           | 97 ----------------------------
 sphinx/writers/latex.py              |  6 +-
 3 files changed, 3 insertions(+), 101 deletions(-)
 delete mode 100755 sphinx/texinputs/iftex.sty

diff --git a/sphinx/templates/latex/content.tex_t b/sphinx/templates/latex/content.tex_t
index fb5b1decd..cac910945 100644
--- a/sphinx/templates/latex/content.tex_t
+++ b/sphinx/templates/latex/content.tex_t
@@ -5,7 +5,6 @@
 \ifdefined\pdfpxdimen
    \let\sphinxpxdimen\pdfpxdimen\else\newdimen\sphinxpxdimen
 \fi \sphinxpxdimen=<%= pxunit %>\relax
-\usepackage{iftex}
 <%= passoptionstopackages %>
 <%= inputenc %>
 <%= utf8extra %>
diff --git a/sphinx/texinputs/iftex.sty b/sphinx/texinputs/iftex.sty
deleted file mode 100755
index 765146644..000000000
--- a/sphinx/texinputs/iftex.sty
+++ /dev/null
@@ -1,97 +0,0 @@
-%%
-%% This is file `iftex.sty',
-
-%% 
-%%   __________________________________
-%%   Copyright © 2010–2013 Persian TeX Group
-%% 
-%%   License information appended.
-%% 
-%% 
-\csname iftexloaded\endcsname
-\let\iftexloaded\endinput
-\expandafter\ifx\csname ProvidesPackage\endcsname\relax\else
-  \ProvidesPackage{iftex}
-    [2013/04/04 v0.2 Provides if(tex) conditional for PDFTeX, XeTeX, and LuaTeX]
-\fi
-\def\RequirePDFTeX{%
-  \ifPDFTeX\else
-    \begingroup
-      \errorcontextlines=-1\relax
-      \newlinechar=10\relax
-      \errmessage{^^J
-      ********************************************^^J
-      * PDFTeX is required to compile this document.^^J
-      * Sorry!^^J
-      ********************************************}%
-    \endgroup
-  \fi}
-\def\RequireXeTeX{%
-  \ifXeTeX\else
-    \begingroup
-      \errorcontextlines=-1\relax
-      \newlinechar=10\relax
-      \errmessage{^^J
-      ********************************************^^J
-      * XeTeX is required to compile this document.^^J
-      * Sorry!^^J
-      ********************************************}%
-    \endgroup
-  \fi}
-\def\RequireLuaTeX{%
-  \ifLuaTeX\else
-    \begingroup
-      \errorcontextlines=-1\relax
-      \newlinechar=10\relax
-      \errmessage{^^J
-      ********************************************^^J
-      * LuaTeX is required to compile this document.^^J
-      * Sorry!^^J
-      ********************************************}%
-    \endgroup
-  \fi}
-\expandafter\ifx\csname ifPDFTeX\endcsname\relax\else
-  \expandafter\endinput
-\fi
-\expandafter\ifx\csname ifXeTeX\endcsname\relax\else
-  \expandafter\endinput
-\fi
-\expandafter\ifx\csname ifLuaTeX\endcsname\relax\else
-  \expandafter\endinput
-\fi
-\newif\ifPDFTeX
-\begingroup\expandafter\expandafter\expandafter\endgroup
-\expandafter\ifx\csname pdfmatch\endcsname\relax
-  \PDFTeXfalse
-\else
-  \PDFTeXtrue
-\fi
-\newif\ifXeTeX
-\begingroup\expandafter\expandafter\expandafter\endgroup
-\expandafter\ifx\csname XeTeXinterchartoks\endcsname\relax
-  \XeTeXfalse
-\else
-  \XeTeXtrue
-\fi
-\newif\ifLuaTeX
-\begingroup\expandafter\expandafter\expandafter\endgroup
-\expandafter\ifx\csname directlua\endcsname\relax
-  \LuaTeXfalse
-\else
-  \LuaTeXtrue
-\fi
-%% 
-%% Copyright © 2010–2013      by Persian TeX Group     <persian-tex@tug.org>
-%% 
-%% Distributable under the LaTeX Project Public License,
-%% version 1.3c or higher (your choice). The latest version of
-%% this license is at: http://www.latex-project.org/lppl.txt
-%% 
-%% This work is "maintained" (as per LPPL maintenance status)
-%% by Persian TeX Group.
-%% 
-%% 
-%% 
-%% 
-%%
-%% End of file `iftex.sty'.
diff --git a/sphinx/writers/latex.py b/sphinx/writers/latex.py
index 85014ef2a..19eb3e195 100644
--- a/sphinx/writers/latex.py
+++ b/sphinx/writers/latex.py
@@ -265,9 +265,7 @@ class LaTeXTranslator(nodes.NodeVisitor):
         'classoptions':    '',
         'extraclassoptions': '',
         'passoptionstopackages': '',
-        'inputenc':        ('\\ifPDFTeX\n'
-                            '  \\usepackage[utf8]{inputenc}\n'
-                            '\\fi'),
+        'inputenc':        '',
         'utf8extra':       ('\\ifdefined\\DeclareUnicodeCharacter\n'
                             '  \\DeclareUnicodeCharacter{00A0}{\\nobreakspace}\n'
                             '\\fi'),
@@ -358,6 +356,8 @@ class LaTeXTranslator(nodes.NodeVisitor):
         else:
             docclass = builder.config.latex_docclass.get('manual', 'report')
         self.elements['docclass'] = docclass
+        if builder.config.latex_engine == 'pdflatex':
+            self.elements['inputenc'] = '\\usepackage[utf8]{inputenc}'
         if builder.config.today:
             self.elements['date'] = builder.config.today
         else: