[latex3-commits] [git/LaTeX3-latex3-latex2e] master: fix for utf8x incompatibility with kernel UTF-8 (e078593)

[Frank Mittelbach]

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

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

commit e07859306b6fadd9ae4f8345fd08564d110650db
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date:   Fri Apr 6 12:10:02 2018 +0200

    fix for utf8x incompatibility with kernel UTF-8


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

e07859306b6fadd9ae4f8345fd08564d110650db
 base/changes.txt  |    6 ++++++
 base/inputenc.dtx |    8 +++++++-
 base/ltfinal.dtx  |    7 ++++++-
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/base/changes.txt b/base/changes.txt
index 1ad68b7..9015cb6 100644
--- a/base/changes.txt
+++ b/base/changes.txt
@@ -8,6 +8,12 @@ are not part of the distribution.
 # 2018-04-01 Release
 #########################
 
+2018-04-06  Frank Mittelbach  <Frank.Mittelbach at latex-project.org>
+
+	* ltfinal.dtx (subsection{Input encoding}):
+	* inputenc.dtx:
+	Handle special case of utf8x incompatibility
+
 2018-04-05  David Carlisle  <David.Carlisle at latex-project.org>
 
 	* utf8ienc.dtx: add BOM default definition
diff --git a/base/inputenc.dtx b/base/inputenc.dtx
index 4bcc57c..79f7a6c 100644
--- a/base/inputenc.dtx
+++ b/base/inputenc.dtx
@@ -410,7 +410,7 @@
 %<cp1252&!ansinew>  \ProvidesFile{cp1252.def}
 %<cp1250>  \ProvidesFile{cp1250.def}
 %<cp1257>  \ProvidesFile{cp1257.def}
-   [2018/03/24 v1.3a Input encoding file]
+   [2018/04/06 v1.3b Input encoding file]
 %<cp850>%%
 %<cp850>%% If you need a Euro symbol, try cp858 instead.
 %<cp850>%%
@@ -737,7 +737,13 @@
 %
 %
 %    Then for each option, we input that encoding file.
+%    Only exception: for utf8x (from \texttt{ucs} package) we
+%    first restore the raw input encoding. That should be moved to the
+%    \texttt{utf8xenc.def} file, eventually.
+% \changes{v1.3b}{2018/04/06}{Handle utf8x encoding manually for now}
 %    \begin{macrocode}
+\DeclareOption{utf8x}{\UseRawInputEncoding
+                      \inputencoding{\CurrentOption}}
 \DeclareOption*{\inputencoding{\CurrentOption}}
 \ProcessOptions
 %</package>
diff --git a/base/ltfinal.dtx b/base/ltfinal.dtx
index 7aeac16..99a9e3b 100644
--- a/base/ltfinal.dtx
+++ b/base/ltfinal.dtx
@@ -33,7 +33,7 @@
 %<*driver>
 % \fi
 \ProvidesFile{ltfinal.dtx}
-             [2018/03/25 v2.1a LaTeX Kernel (Final Settings)]
+             [2018/04/06 v2.1b LaTeX Kernel (Final Settings)]
 % \iffalse
 \documentclass{ltxdoc}
 \GetFileInfo{ltfinal.dtx}
@@ -612,8 +612,13 @@
 % Reset 8 bit characters to catcode 12 so the input endcoing matches the ``Raw''
 % font encoding.
 % Useful for special behaviours, or for compatibility with older \LaTeX\ formats.
+% \changes{v2.1b}{2018/04/06}{Undo changes to \cs{DeclareFontEncoding@} and
+%                             definition of \cs{DeclareUnicodeCharacter}}
 %    \begin{macrocode}
+\let\DeclareFontEncoding at saved\DeclareFontEncoding@
 \def\UseRawInputEncoding{%
+\let\DeclareFontEncoding@\DeclareFontEncoding at saved   % revert
+\let\DeclareUnicodeCharacter\@undefined               % revert
 \@tempcnta=1
 \loop
   \catcode\@tempcnta=15  %