[latex3-commits] [git/LaTeX3-latex3-latex2e] master: handle rollbacjk situation correctly (e443847)

[Frank Mittelbach]

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

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

commit e44384788483e009384b175651768db8d17b1532
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date:   Fri Apr 6 14:40:45 2018 +0200

    handle rollbacjk situation correctly


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

e44384788483e009384b175651768db8d17b1532
 base/inputenc.dtx |    6 +++++-
 base/ltfinal.dtx  |    1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/base/inputenc.dtx b/base/inputenc.dtx
index ffd5851..c88d488 100644
--- a/base/inputenc.dtx
+++ b/base/inputenc.dtx
@@ -740,9 +740,13 @@
 %    Only exception: for utf8x (from \texttt{ucs} package) we
 %    first restore the raw input encoding. That should be moved to the
 %    \texttt{utf8x.def} file, eventually.
+%    In case of a rollback |\UseRawInputEncoding| is not defined so we
+%    only input the encoding.
 % \changes{v1.3b}{2018/04/06}{Handle utf8x encoding manually for now}
 %    \begin{macrocode}
-\DeclareOption{utf8x}{\UseRawInputEncoding
+\DeclareOption{utf8x}{\ifdefined\UseRawInputEncoding
+                        \UseRawInputEncoding
+                      \fi
                       \inputencoding{\CurrentOption}}
 \DeclareOption*{\inputencoding{\CurrentOption}}
 \ProcessOptions
diff --git a/base/ltfinal.dtx b/base/ltfinal.dtx
index 90e298c..0d53743 100644
--- a/base/ltfinal.dtx
+++ b/base/ltfinal.dtx
@@ -716,6 +716,7 @@
 %<latexrelease>  \xdef\LastDeclaredEncoding{#1}%
 %<latexrelease>  }
 %<latexrelease>  \let\UseRawInputEncoding\@undefined
+%<latexrelease>  \let\DeclareFontEncoding at saved\@undefined
 %<latexrelease>\EndIncludeInRelease
 %    \end{macrocode}
 %