[latex3-commits] [git/LaTeX3-latex3-latex2e] gh444: fix for #458 (d2820195)

[Frank Mittelbach]

Repository : https://github.com/latex3/latex2e
On branch  : gh444
Link       : https://github.com/latex3/latex2e/commit/d282019542368f2659bfb6119d9dd6e290331c30

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

commit d282019542368f2659bfb6119d9dd6e290331c30
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date:   Tue Dec 22 16:02:06 2020 +0100

    fix for #458


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

d282019542368f2659bfb6119d9dd6e290331c30
 base/changes.txt   | 3 +++
 base/ltfssaxes.dtx | 9 +++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/base/changes.txt b/base/changes.txt
index f1da7746..c565aa85 100644
--- a/base/changes.txt
+++ b/base/changes.txt
@@ -12,6 +12,9 @@ are not part of the distribution.
 	Distangle series and shape update by delaying the font series
 	and font shape merging (gh/444)
 
+	Move the rollback info for \normalshape after its main definition
+	otherwise it will not be undone	(gh/458)
+
 2020-12-22  Frank Mittelbach  <Frank.Mittelbach at latex-project.org>
 
 	* ltfsstrc.dtx (subsection{General font loading}):
diff --git a/base/ltfssaxes.dtx b/base/ltfssaxes.dtx
index 80d0231d..2c31b6b1 100644
--- a/base/ltfssaxes.dtx
+++ b/base/ltfssaxes.dtx
@@ -1115,8 +1115,9 @@
 %    resets everything and \texttt{up} changes italic or slanted to
 %    upright and \texttt{ulc} undoes small caps.
 %
-%    So we now offer \cs{normalshape} (using \cs{shapedefault} which is normally the same as
-%    calling both \cs{ulcshape} and \cs{upshape}, only more efficient.
+%    So we now offer \cs{normalshape} (using \cs{shapedefault} which
+%    is normally the same as calling both \cs{ulcshape} and
+%    \cs{upshape}, only more efficient.
 %
 %
 %  \begin{macro}{\ulcshape}
@@ -1309,14 +1310,12 @@
 %<latexrelease>   {\DeclareFontShapeChangeRule}{Font shape change rules}%
 %<latexrelease>
 %<latexrelease>\let\DeclareFontShapeChangeRule\@undefined
-%<latexrelease>\let\normalshape\@undefined
 %<latexrelease>\let\ulcshape\@undefined
 %<latexrelease>\let\ulcdefault\@undefined
 %<latexrelease>\let\swshape\@undefined
 %<latexrelease>\let\swdefault\@undefined
 %<latexrelease>\let\sscshape\@undefined
 %<latexrelease>\let\sscdefault\@undefined
-%<latexrelease>\let\normalshape\@undefined
 %<latexrelease>
 %<latexrelease>\EndIncludeInRelease
 %    \end{macrocode}
@@ -1549,6 +1548,8 @@
 %<latexrelease>\let\merge at font@shape at without@substitution@\@undefined
 %<latexrelease>\let\delayed at merge@font at shape\@undefined
 %<latexrelease>
+%<latexrelease>\let\normalshape\@undefined
+%<latexrelease>
 %    \end{macrocode}
 %    This is always called in \cs{document} so don't make it undefined.
 %    \begin{macrocode}