From 138d0a6cfd5f2187973fb6b83ad2fb0dcf5a8348 Mon Sep 17 00:00:00 2001
From: Norbert Preining <norbert@preining.info>
Date: Wed, 2 Jun 2021 03:04:23 +0000
Subject: CTAN sync 202106020304

---
 macros/latex/base/ltfssbas.dtx | 56 ++++++++++++++++++++++++++++--------------
 1 file changed, 38 insertions(+), 18 deletions(-)

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

diff --git a/macros/latex/base/ltfssbas.dtx b/macros/latex/base/ltfssbas.dtx
index 30f500b6e4..df265d0b0f 100644
--- a/macros/latex/base/ltfssbas.dtx
+++ b/macros/latex/base/ltfssbas.dtx
@@ -1,7 +1,7 @@
 % \iffalse meta-comment
 %
-% Copyright (C) 1993-2020
-% The LaTeX3 Project and any individual authors listed elsewhere
+% Copyright (C) 1993-2021
+% The LaTeX Project and any individual authors listed elsewhere
 % in this file.
 %
 % This file is part of the LaTeX base system.
@@ -35,7 +35,7 @@
 %
 %
 \ProvidesFile{ltfssbas.dtx}
-             [2020/12/10 v3.2h LaTeX Kernel (NFSS Basic Macros)]
+             [2021/04/26 v3.2i LaTeX Kernel (NFSS Basic Macros)]
 % \iffalse
 \documentclass{ltxdoc}
 \begin{document}
@@ -896,15 +896,35 @@
 %    \begin{macrocode}
 %</2ekernel>
 %<*2ekernel|latexrelease>
-%<latexrelease>\IncludeInRelease{2020/02/02}%
-%<latexrelease>                 {\usefont}{Drop m in usefont}%
+%<latexrelease>\IncludeInRelease{2021/06/01}%
+%<latexrelease>                 {\usefont}{Force font face}%
 \DeclareRobustCommand\usefont[4]{\fontencoding{#1}%
    \edef\f@family{#2}%
    \set@target@series{#3}%
-   \edef\f@shape{#4}\selectfont
+   \edef\f@shape{#4}%
+%    \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.2i}{2021/04/26}{Unconditionally switch to the requested
+%    font face (gh/444)}
+%    \begin{macrocode}
+   \let\delayed@f@adjustment\@empty
+   \selectfont
    \ignorespaces}
 %</2ekernel|latexrelease>
 %<latexrelease>\EndIncludeInRelease
+%<latexrelease>\IncludeInRelease{2020/02/02}%
+%<latexrelease>                 {\usefont}{Drop m in usefont}%
+%<latexrelease>
+%<latexrelease>\DeclareRobustCommand\usefont[4]{\fontencoding{#1}%
+%<latexrelease>   \edef\f@family{#2}%
+%<latexrelease>   \set@target@series{#3}%
+%<latexrelease>   \edef\f@shape{#4}\selectfont
+%<latexrelease>   \ignorespaces}
+%<latexrelease>
+%<latexrelease>\EndIncludeInRelease
 %<latexrelease>\IncludeInRelease{0000/00/00}%
 %<latexrelease>                 {\usefont}{Drop m in usefont}%
 %<latexrelease>
@@ -1403,7 +1423,7 @@
 %    The idea for this macro is stolen from the \texttt{substitutefont}
 %    package by Günter Milde, with some modifications and a new name.
 %
-%    Its purpose is to provide characters in a special encoding tht
+%    Its purpose is to provide characters in a special encoding that
 %    are not available in the current font family to be taken from a
 %    different family that is visually compatible (or not if you
 %    choose badly). For example, you can match the GFS Didot Greek
@@ -1422,7 +1442,7 @@
 %</2ekernel>
 %<*2ekernel|latexrelease>
 %<latexrelease>\IncludeInRelease{2020/02/02}%
-%<latexrelease>       {\DeclareFontFamilySubstitution}{Provide family substituation}%
+%<latexrelease>       {\DeclareFontFamilySubstitution}{Provide family substitution}%
 \begingroup
 \nfss@catcodes
 \gdef\DeclareFontFamilySubstitution#1#2#3{%
@@ -1432,7 +1452,7 @@
 %    is better to handle that differently.
 %
 %    Of course the families  may still need loading at
-%    this point and so we arange for this. Otherwise we might run into
+%    this point and so we arrange for this. Otherwise we might run into
 %    trouble because the necessary \cs{DeclareFontFamily} has not been
 %    seen.
 %    \begin{macrocode}
@@ -1476,7 +1496,7 @@
 %</2ekernel|latexrelease>
 %<latexrelease>\EndIncludeInRelease
 %<latexrelease>\IncludeInRelease{0000/00/00}%
-%<latexrelease>      {\DeclareFontFamilySubstitution}{Provide family substituation}%
+%<latexrelease>      {\DeclareFontFamilySubstitution}{Provide family substitution}%
 %<latexrelease>
 %<latexrelease>\let\DeclareFontFamilySubstitution\@undefined
 %<latexrelease>\EndIncludeInRelease
@@ -1503,11 +1523,11 @@
           \noexpand\@nil}%
 %    \end{macrocode}
 %    Initialize all those internal variables which may or may not have
-%    values in the first seconds of NFSS' bootstraping process. Later
+%    values in the first seconds of NFSS' bootstrapping process. Later
 %    on such values will be updated when an encoding is selected, etc.
 %
 %    We definitely don't want to set |\f@encoding|; we can set all the
-%    others since if they are left ``blank'' any selection would grap
+%    others since if they are left ``blank'' any selection would grab
 %    ``error default values'' as well. However, this probably should
 %    go also---and now it did.
 % \changes{v2.1n}{1994/05/14}{Don't set \cs{f@encoding}}
@@ -1559,7 +1579,7 @@
 %    \begin{macrocode}
 %</2ekernel>
 %<latexrelease>\IncludeInRelease{2015/01/01}{\wrong@fontshape}%
-%<latexrelease>                 {Font substituation in preamble}%
+%<latexrelease>                 {Font substitution in preamble}%
 %<*2ekernel|latexrelease>
 \def\wrong@fontshape{%
     \csname D@\f@encoding\endcsname   % install defaults if in math
@@ -1600,9 +1620,9 @@
 %    corresponding \texttt{.fd} file may not been loaded
 %    yet. Therefore we try this now. Otherwise equating the requested
 %    font shape with the finally selected fontshape below will fail
-%    and can result in ``NFSS tables corruped''. After begin document
+%    and can result in ``NFSS tables corrupted''. After begin document
 %    that will not happen as all \texttt{.fd} files involved in
-%    substituation are loaded at |\begin{document}|.
+%    substitution are loaded at |\begin{document}|.
 %    \begin{macrocode}
            \begingroup
               \try@load@fontshape
@@ -1681,7 +1701,7 @@
 %</2ekernel|latexrelease>
 %<latexrelease>\EndIncludeInRelease
 %<latexrelease>\IncludeInRelease{0000/00/00}{\wrong@fontshape}%
-%<latexrelease>                 {Font substituation in preamble}%
+%<latexrelease>                 {Font substitution in preamble}%
 %<latexrelease>\def\wrong@fontshape{%
 %<latexrelease>    \csname D@\f@encoding\endcsname
 %<latexrelease>    \edef\reserved@a{\csname\curr@fontshape\endcsname}%
@@ -1856,7 +1876,7 @@
 %    it modifies the corresponding macro |\mv@|\meta{version}
 %    so that it calls |\getanddefine@fonts| directly in future as well.
 %    We use the macro |\extract@alph@from@version| to do this.
-%    It takes the math alphabet identifer |#1| and the math version
+%    It takes the math alphabet identifier |#1| and the math version
 %    macro as arguments.
 % \changes{v1.9a}{1992/07/26}{}
 %    \begin{macrocode}
@@ -1944,7 +1964,7 @@
               \use@mathgroup##1{#2}}}%
 %    \end{macrocode}
 % \changes{v2.1t}{1994/10/15}{Warn if math alpha is used outside math}
-%    In addtion it defines the alphabet the way it should be used from
+%    In addition it defines the alphabet the way it should be used from
 %    now on.
 %    \begin{macrocode}
        \gdef#3{\relax\ifmmode \else \non@alpherr#3\fi
-- 
cgit v1.2.3

