From 75db33dc347ec9cfbaa2f3ec538a2697351f571b Mon Sep 17 00:00:00 2001
From: Norbert Preining <norbert@preining.info>
Date: Wed, 5 May 2021 03:02:17 +0000
Subject: CTAN sync 202105050302

---
 macros/latex-dev/base/ltfssini.dtx | 58 +++++++++++++++++++++++++++++++++++---
 1 file changed, 54 insertions(+), 4 deletions(-)

(limited to 'macros/latex-dev/base/ltfssini.dtx')

diff --git a/macros/latex-dev/base/ltfssini.dtx b/macros/latex-dev/base/ltfssini.dtx
index 361adac9c3..b06fc161b0 100644
--- a/macros/latex-dev/base/ltfssini.dtx
+++ b/macros/latex-dev/base/ltfssini.dtx
@@ -36,7 +36,7 @@
 %
 %
 \ProvidesFile{ltfssini.dtx}
-             [2021/01/15 v3.2f LaTeX Kernel (NFSS Initialisation)]
+             [2021/04/26 v3.2h LaTeX Kernel (NFSS Initialisation)]
 % \iffalse
 \documentclass{ltxdoc}
 \begin{document}
@@ -1088,6 +1088,8 @@
 %  \end{macro}
 %
 %
+% \changes{v3.2g}{2021/03/18}
+%         {Add legacy hook definitions for rollback.}
 %    \begin{macrocode}
 %</2ekernel|latexrelease>
 %<latexrelease>\EndIncludeInRelease
@@ -1140,6 +1142,9 @@
 %<latexrelease>   \prepare@family@series@update{tt}\ttdefault
 %<latexrelease>   \@ttfamilyhook
 %<latexrelease>   \selectfont}
+%<latexrelease>\let\@rmfamilyhook\@empty
+%<latexrelease>\let\@sffamilyhook\@empty
+%<latexrelease>\let\@ttfamilyhook\@empty
 %<latexrelease>
 %    \end{macrocode}
 %    
@@ -1765,7 +1770,7 @@
 %    \begin{macrocode}
 %</2ekernel>
 %<*2ekernel|latexrelease>
-%<latexrelease>\IncludeInRelease{2020/02/02}%
+%<latexrelease>\IncludeInRelease{2021/06/01}%
 %<latexrelease>                 {\normalfont}{Add hook to \normalfont}%
 \DeclareRobustCommand\normalfont{%
 %    \end{macrocode}
@@ -1778,6 +1783,15 @@
    \edef\f@series{\seriesdefault}%
    \edef\f@shape{\shapedefault}%
 %    \end{macrocode}
+%    Any earlier \cs{fontseries}, etc.\ should be canceled and we
+%    should switch unconditionally to the requested font face so we
+%    drop any  code that may have been stored in
+%    \cs{delayed@f@adjustment}.
+% \changes{v3.2h}{2021/04/26}{Unconditionally switch to the requested
+%    font face (gh/444)}
+%    \begin{macrocode}
+   \let\delayed@f@adjustment\@empty
+%    \end{macrocode}
 %    
 % \changes{v3.2b}{2020/08/21}{Integration of new hook management interface}
 %    \begin{macrocode}
@@ -1789,18 +1803,54 @@
    \@defaultfamilyhook        % hookname from 2020/02 will vanish
    \selectfont}
 %    \end{macrocode}
-%    
+%
 %    \begin{macrocode}
 \let\reset@font\normalfont
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
-%    
+%
 %
 %
 %    \begin{macrocode}
+% \changes{v3.2g}{2021/03/18}
+%         {Add missing 2020/02/02 latexrelease entry.}
 %</2ekernel|latexrelease>
 %<latexrelease>\EndIncludeInRelease
+%<latexrelease>
+%<latexrelease>\IncludeInRelease{2020/10/01}%
+%<latexrelease>                 {\normalfont}{Add hook to \normalfont}%
+%<latexrelease>
+%<latexrelease>\DeclareRobustCommand\normalfont{%
+%<latexrelease>   \fontencoding\encodingdefault
+%<latexrelease>   \edef\f@family{\familydefault}%
+%<latexrelease>   \edef\f@series{\seriesdefault}%
+%<latexrelease>   \edef\f@shape{\shapedefault}%
+%<latexrelease>   \UseHook{normalfont}%
+%<latexrelease>   \@defaultfamilyhook        % hookname from 2020/02 will vanish
+%<latexrelease>   \selectfont}
+%<latexrelease>
+%<latexrelease>\let\reset@font\normalfont
+%<latexrelease>
+%<latexrelease>\EndIncludeInRelease
+%<latexrelease>
+%<latexrelease>\IncludeInRelease{2020/02/02}%
+%<latexrelease>                 {\normalfont}{Add hook to \normalfont}%
+%<latexrelease>
+%<latexrelease>\DeclareRobustCommand\normalfont{%
+%<latexrelease>   \fontencoding\encodingdefault
+%<latexrelease>   \edef\f@family{\familydefault}%
+%<latexrelease>   \edef\f@series{\seriesdefault}%
+%<latexrelease>   \edef\f@shape{\shapedefault}%
+%<latexrelease>   \@defaultfamilyhook
+%<latexrelease>   \selectfont}
+%<latexrelease>
+%<latexrelease>\let\reset@font\normalfont
+%<latexrelease>
+%<latexrelease>\let\@defaultfamilyhook\@empty
+%<latexrelease>
+%<latexrelease>\EndIncludeInRelease
+%<latexrelease>
 %<latexrelease>\IncludeInRelease{0000/00/00}%
 %<latexrelease>                 {\normalfont}{Add hook to \normalfont}%
 %<latexrelease>
-- 
cgit v1.2.3

