LaTeX2e develop branch 83f0f81 -- 26bbad2 変更点（フォント関係のみ）

latex-develop-83f0f81-26bbad2-all.diff

diff --git a/base/ltfssaxes.dtx b/base/ltfssaxes.dtx
index 4e3b4d98..86c84b11 100644
--- a/base/ltfssaxes.dtx
+++ b/base/ltfssaxes.dtx
@@ -35,7 +35,7 @@
 %
 %
 \ProvidesFile{ltfssaxes.dtx}
-             [2020/12/22 v1.0h LaTeX Kernel (NFSS Axes handing)]
+             [2021/03/18 v1.0i LaTeX Kernel (NFSS Axes handing)]
 % \iffalse
 \documentclass{ltxdoc}
 \begin{document}
@@ -764,17 +764,20 @@
 %<latexrelease>\IncludeInRelease{2020/02/02}%
 %<latexrelease>                 {\fontseries}{delay fontseries update}%
 %<latexrelease>
-%<latexrelease>\DeclareRobustCommand\fontseries[1]{\@forced@seriesfalse\merge@font@series{#1}}
-%<latexrelease>\DeclareRobustCommand\fontseriesforce[1]{\@forced@seriestrue\edef\f@series{#1}}
+%<latexrelease>\DeclareRobustCommand\fontseries[1]{\@forced@seriesfalse
+%<latexrelease>                                    \merge@font@series{#1}}
+%<latexrelease>\DeclareRobustCommand\fontseriesforce[1]{\@forced@seriestrue
+%<latexrelease>                                         \edef\f@series{#1}}
 %<latexrelease>\let\delayed@f@adjustment\@undefined
 %<latexrelease>
 %    \end{macrocode}
 %    For a roll forward we may have to define \cs{if@forced@series}
-%    but this needs doing in a somewhat roundabout way.
+%    but this needs doing in a way that \TeX{} doesn't see it when
+%    skipping over conditionals.
+% \changes{v1.0i}{2021/03/18}
+%         {Fix rollforward definition.}
 %    \begin{macrocode}
-%<latexrelease>\ifx\@forced@seriestrue\@undefined \else
-%<latexrelease>  \expandafter\newif\csname if@forced@series\endcsname
-%<latexrelease>\fi
+%<latexrelease>\expandafter\newif\csname if@forced@series\endcsname
 %<latexrelease>
 %<latexrelease>\EndIncludeInRelease
 %    \end{macrocode}
diff --git a/base/ltfssbas.dtx b/base/ltfssbas.dtx
index d2dde745..df265d0b 100644
--- a/base/ltfssbas.dtx
+++ b/base/ltfssbas.dtx
@@ -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>
diff --git a/base/ltfssdcl.dtx b/base/ltfssdcl.dtx
index 725d0e39..9710d543 100644
--- a/base/ltfssdcl.dtx
+++ b/base/ltfssdcl.dtx
@@ -36,7 +36,7 @@
 %
 %
 \ProvidesFile{ltfssdcl.dtx}
-            [2020/12/05 v3.0v LaTeX Kernel (NFSS Declarative Interface)]
+            [2021/02/15 v3.0w LaTeX Kernel (NFSS Declarative Interface)]
 % \iffalse
 \documentclass{ltxdoc}
 \begin{document}
@@ -490,7 +490,11 @@
                    in version \math@version}%
         \@eha
   \fi
- \else \expandafter\non@alpherr\fi
+%    \end{macrocode}
+% extra \cs{expandafter} to remove the \cs{expandafter} added below
+% \changes{v3.0w}{2021/02/115}{fix for (gh/501)}
+%    \begin{macrocode}
+ \else \expandafter\expandafter\expandafter\non@alpherr\fi
 %    \end{macrocode}
 %    If the legacy interface is used, e.g., \verb=$\sf -1$= the math
 %    alphabet \verb=#1= does not take an argument so we better do not
diff --git a/base/ltfssini.dtx b/base/ltfssini.dtx
index a92321bf..b06fc161 100644
--- a/base/ltfssini.dtx
+++ b/base/ltfssini.dtx
@@ -36,7 +36,7 @@
 %
 %
 \ProvidesFile{ltfssini.dtx}
-             [2020/12/06 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}
 %    
@@ -1761,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}
@@ -1774,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}
@@ -1785,18 +1803,54 @@
 %
 %
 %    \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>
diff --git a/base/ltfsstrc.dtx b/base/ltfsstrc.dtx
index bd0f6fab..c6aec105 100644
--- a/base/ltfsstrc.dtx
+++ b/base/ltfsstrc.dtx
@@ -30,14 +30,14 @@
 % \iffalse
 %%% From File: ltfsstrc.dtx
 %
-%<package>\NeedsTeXFormat{LaTeX2e}[2021/05/01]
+%<package>\NeedsTeXFormat{LaTeX2e}[2021/06/01]
 %<package>\ProvidesPackage{tracefnt}
 %<package>     [2020/12/22 v3.0n  Standard LaTeX package (font tracing)]
 % \fi
 % \ProvidesFile{ltfsstrc.dtx}
-%              [2020/12/22 v3.0n LaTeX Kernel (NFSS tracing)]
+%              [2021/04/26 v3.0o LaTeX Kernel (NFSS tracing)]
 %
 % \iffalse
 %<+checkmem>\CHECKMEM
@@ -423,7 +423,7 @@
 
 %    \begin{macrocode}
 %<*2ekernel|latexrelease|package>
-%<latexrelease>\IncludeInRelease{2021/05/01}%
+%<latexrelease>\IncludeInRelease{2021/06/01}%
 %<latexrelease>                 {\selectfont}{Add hook to \selectfont}%
 %    \end{macrocode}
 %
@@ -525,6 +525,14 @@
       \let\delayed@f@adjustment\@empty
     \fi
 %    \end{macrocode}
+%    If the series was forced we should now cancel that in case the
+%    next series change is done with some low-level setting to
+%    \cs{f@series}.
+% \changes{v3.0o}{2021/04/26}{Unset the forced series boolean when reaching
+%    \cs{selectfont} (gh/444)}
+%    \begin{macrocode}
+    \@forced@seriesfalse
+%    \end{macrocode}
 %    Then we generate the internal name of the font
 %    by concatenating {\em family}, {\em series},
 %    {\em shape}, and current {\em size},
@@ -610,7 +618,7 @@
 %    package to support rollback. In packages that works a bit
 %    differently and therefore we have to provide an empty block there.   
 %    \begin{macrocode}
-%<package>\IncludeInRelease{2021/05/01}%
+%<package>\IncludeInRelease{2021/06/01}%
 %<package>                 {\selectfont}{Add hook to \selectfont}%
 %<package>\EndIncludeInRelease
 %    \end{macrocode}