[latex3-commits] [git/LaTeX3-latex3-latex2e] master: do not change the default encoding with mltex (issue #24) (fd8ef2a)

[David Carlisle]

Repository : https://github.com/latex3/latex2e
On branch  : master
Link       : https://github.com/latex3/latex2e/commit/fd8ef2a57f5513e633224bda28f0d7e6f4eb779e

>---------------------------------------------------------------

commit fd8ef2a57f5513e633224bda28f0d7e6f4eb779e
Author: David Carlisle <d.p.carlisle at gmail.com>
Date:   Sun Mar 25 14:20:39 2018 +0100

    do not change the default encoding with mltex (issue #24)


>---------------------------------------------------------------

fd8ef2a57f5513e633224bda28f0d7e6f4eb779e
 base/ltfinal.dtx |   17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/base/ltfinal.dtx b/base/ltfinal.dtx
index f045d2e..626c6e1 100644
--- a/base/ltfinal.dtx
+++ b/base/ltfinal.dtx
@@ -1,6 +1,6 @@
 % \iffalse meta-comment
 %
-% Copyright 1993-2017
+% Copyright 1993-2018
 % The LaTeX3 Project and any individual authors listed elsewhere
 % in this file.
 %
@@ -33,7 +33,7 @@
 %<*driver>
 % \fi
 \ProvidesFile{ltfinal.dtx}
-             [2017/03/09 v2.0t LaTeX Kernel (Final Settings)]
+             [2018/03/25 v2.1a LaTeX Kernel (Final Settings)]
 % \iffalse
 \documentclass{ltxdoc}
 \GetFileInfo{ltfinal.dtx}
@@ -541,13 +541,14 @@
 %
 % \subsection{Input encoding}
 %
+% \changes{v2.1a}{2018/03/25}{default to UTF-8}
 % Starting with the 2018 \LaTeX\ release default the inputencoding
 % to UTF-8. Unless the format is being used with luatex or xetex or enctex.
 %
 % This is done in a way largely compatible with older releases:\\
 % |\usepackage[utf8]{inputenc}|\\
 % is used in the format, but (similar to |fontenc|, the package load information
-% is undefined so that teh encoding may be reset in the document usimg\\
+% is undefined so that the encoding may be reset in the document usimg\\
 % |\usepackage[latin1]{inputenc}|\\
 % or whatever encofing is needed.
 %
@@ -560,7 +561,15 @@
 %
 %    \begin{macrocode}
 \ifnum\@ne=
-\ifx\Umathchar\@undefined\ifx\mubyte\@undefined\@ne\else\z@\fi\else\z@\fi
+\ifx\Umathchar\@undefined
+  \ifx\mubyte\@undefined
+    \ifx\charsubdef\@undefined
+      \@ne
+    \else\z@
+  \else\z@
+\else
+  \z@
+\fi
 %    \end{macrocode}
 %
 %    \begin{macrocode}