From 34897eebd22c3de968b64f09bb4a371d96cb0b89 Mon Sep 17 00:00:00 2001
From: Norbert Preining <norbert@preining.info>
Date: Mon, 3 Feb 2020 03:02:01 +0000
Subject: CTAN sync 202002030302

---
 macros/latex/base/utf8ienc.dtx | 35 ++++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 17 deletions(-)

(limited to 'macros/latex/base/utf8ienc.dtx')

diff --git a/macros/latex/base/utf8ienc.dtx b/macros/latex/base/utf8ienc.dtx
index ea377297a5..8d454d1c71 100644
--- a/macros/latex/base/utf8ienc.dtx
+++ b/macros/latex/base/utf8ienc.dtx
@@ -1,6 +1,6 @@
 % \iffalse meta-comment
 %
-% Copyright (C) 1993-2019
+% Copyright (C) 1993-2020
 % The LaTeX3 Project and any individual authors listed elsewhere
 % in this file.
 %
@@ -216,14 +216,14 @@
 %<+ts1> \ProvidesFile{ts1enc.dfu}
 %<+x2>  \ProvidesFile{x2enc.dfu}
 %<+all> \ProvidesFile{utf8enc.dfu}
-%<-utf8-2018>   [2019/07/11 v1.2j UTF-8 support for inputenc]
+%<-utf8-2018>   [2019/11/14 v1.2k UTF-8 support for inputenc]
 %    \end{macrocode}
 %
 %    \begin{macrocode}
 %<*utf8>
 %    \end{macrocode}
 %    This is a temporary fix for the e-p\TeX{} / e-up\TeX{} engines that do not yet
-%    have a |\ifincsname| primitive. Once this is available the the extra file will
+%    have a |\ifincsname| primitive. Once this is available the extra file will
 %    be dropped.
 % \changes{v1.2h}{2019/07/09}{Temp rollback fix for e-pTeX}
 %    \begin{macrocode}
@@ -235,7 +235,7 @@
 \fi
   \endinput
 %    \end{macrocode}
-%    
+%
 %    \begin{macrocode}
 \makeatletter
 %    \end{macrocode}
@@ -451,7 +451,7 @@
      \else
       \PackageError{inputenc}{Invalid UTF-8 byte sequence}%
                              \UTFviii@invalid@help
-     \fi         
+     \fi
 %    \end{macrocode}
 %
 %    \begin{macrocode}
@@ -769,7 +769,7 @@
 % the character os already active.  The definition of |\UTFviii@tmp|
 % looks slightly strange but is designed for the sequence of |\expandafter|
 % in |\DeclareUnicodeCharacter|.
-% 
+%
 %    \begin{macrocode}
   \ifnum\count@<"A0\relax
     \ifnum\catcode\count@=13
@@ -784,7 +784,7 @@
 %    The code below is derived from \texttt{xmltex} and generates the UTF-8 byte sequence
 %    for the number in |\count@|.
 %
-%    The reverse operation (just used in error messages) 
+%    The reverse operation (just used in error messages)
 %    has now been added as \cs{decode@UTFviii}.
 %    \begin{macrocode}
   \else\ifnum\count@<"800\relax
@@ -889,16 +889,16 @@
 \gdef\dec@de@UTFviii#1{%
 \ifx\relax#1%
 \else
-  \ifnum`#1>"EF 
+  \ifnum`#1>"EF
     ((((`#1-"F0)%
   \else
-    \ifnum`#1>"DF 
+    \ifnum`#1>"DF
       (((`#1-"E0)%
     \else
-      \ifnum`#1>"BF 
+      \ifnum`#1>"BF
         ((`#1-"C0)%
       \else
-        \ifnum`#1>"7F 
+        \ifnum`#1>"7F
         )*64+(`#1-"80)%
         \else
         +`#1 %
@@ -1030,7 +1030,7 @@
 %    \end{macrocode}
 % However, we don't know if there are font encodings still to be
 % loaded (either with \texttt{fontenc} or directly with |\input| by
-% some some package). Font encoding files are loaded only if the
+% some package). Font encoding files are loaded only if the
 % corresponding encoding has not been loaded yet, and they always
 % begin with |\DeclareFontEncoding|. We now redefine the internal
 % kernel version of the latter to load the Unicode file if available.
@@ -1789,14 +1789,15 @@
 %    (which is normally the case) they are then reconstructed as
 %    ligatures so they come out as desired. Otherwise they will come
 %    out as individual characters which is fine too.
-% \changes{v1.2j}{2019/07/11}{Add typical f-ligatures and st (github/154)}
+% \changes{v1.2j}{2019/07/11}{Add typical f-ligatures and s-ligatures and st (github/154)}
+% \changes{v1.kj}{2019/11/14}{Fixed setting for FB05 = long-s t lig (github/154)}
 %    \begin{macrocode}
 %<all,t1,ot1,ly1,t2a,t2b,t2c>\DeclareUnicodeCharacter{FB00}{ff}   % ﬀ
 %<all,t1,ot1,ly1,t2a,t2b,t2c>\DeclareUnicodeCharacter{FB01}{fi}   % ﬁ
 %<all,t1,ot1,ly1,t2a,t2b,t2c>\DeclareUnicodeCharacter{FB02}{fl}   % ﬂ
 %<all,t1,ot1,ly1,t2a,t2b,t2c>\DeclareUnicodeCharacter{FB03}{ffi}  % ﬃ
 %<all,t1,ot1,ly1,t2a,t2b,t2c>\DeclareUnicodeCharacter{FB04}{ffl}  % ﬄ
-%<all,t1,ot1,ly1,t2a,t2b,t2c>\DeclareUnicodeCharacter{FB05}{ft}   % ﬅ
+%<all,t1,ot1,ly1,t2a,t2b,t2c>\DeclareUnicodeCharacter{FB05}{st}   % ﬅ  -- this is the long s (not f)
 %<all,t1,ot1,ly1,t2a,t2b,t2c>\DeclareUnicodeCharacter{FB06}{st}   % ﬆ
 %    \end{macrocode}
 %
@@ -1805,8 +1806,8 @@
 %    \begin{macrocode}
 %<all,ts1,utf8>\DeclareUnicodeCharacter{FEFF}{\ifhmode\nobreak\fi}
 %    \end{macrocode}
-%    
-% 
+%
+%
 % \endgroup
 % \subsection{Notes}
 %
@@ -1931,7 +1932,7 @@
 % This space is intentionally empty ...
 %</utf8>
 %    \end{macrocode}
-%    
+%
 % \subsection{Old \texttt{utf8.def} file as a temp fix for p\TeX{} and friends}
 %
 %
-- 
cgit v1.2.3

