[latex3-commits] [git/LaTeX3-latex3-latex2e] nfssaxes: \emfontdeclare needs robust \normalcolor (8cc12256)

[Frank Mittelbach]

Repository : https://github.com/latex3/latex2e
On branch  : nfssaxes
Link       : https://github.com/latex3/latex2e/commit/8cc1225607d76781fb7bb5d232ed04f7c4ac00ef

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

commit 8cc1225607d76781fb7bb5d232ed04f7c4ac00ef
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date:   Wed Oct 9 17:25:09 2019 +0200

    \emfontdeclare needs robust \normalcolor


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

8cc1225607d76781fb7bb5d232ed04f7c4ac00ef
 base/nfssaxes.tex             | 5 +++--
 required/graphics/changes.txt | 5 +++++
 required/graphics/color.dtx   | 5 +++--
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/base/nfssaxes.tex b/base/nfssaxes.tex
index 98ca03c7..cfb9a1fd 100644
--- a/base/nfssaxes.tex
+++ b/base/nfssaxes.tex
@@ -541,8 +541,9 @@
 %    \textt{it} separately as \cs{upshape} no longer resets both in
 %    one go).
 %    \begin{macrocode}
-\def\emreset{\fontshape{ulc}% in case sc is in use, e.g,  changes scit -> it
-             \fontshape{n}%   for all other cases
+\DeclareRobustCommand\emreset{%
+    \fontshape{ulc}% in case sc is in use, e.g,  changes scit -> it
+    \fontshape{n}%   for all other cases
 }
 %    \end{macrocode}
 %    We could have used \verb=\fontshape{n}= twice, that would give
diff --git a/required/graphics/changes.txt b/required/graphics/changes.txt
index 08594988..b4783449 100644
--- a/required/graphics/changes.txt
+++ b/required/graphics/changes.txt
@@ -4,6 +4,11 @@ completeness or accuracy and it contains some references to files that
 are not part of the distribution.
 =======================================================================
 
+2019-10-09  Frank Mittelbach  <Frank.Mittelbach at latex-project.org>
+
+	* color.dtx (section{Default Colour}):
+	Make \normalcolor robust
+
 #########################
 # 2019-10-01 Release
 #########################
diff --git a/required/graphics/color.dtx b/required/graphics/color.dtx
index 8de7d013..01e8aca7 100644
--- a/required/graphics/color.dtx
+++ b/required/graphics/color.dtx
@@ -19,7 +19,7 @@
 %<driver> \ProvidesFile{color.drv}
 % \fi
 %         \ProvidesFile{color.dtx}
-          [2016/07/10 v1.1e Standard LaTeX Color (DPC)]
+          [2019/10/09 v1.1f Standard LaTeX Color (DPC)]
 %
 % \iffalse
 %<*driver>
@@ -684,8 +684,9 @@
 % \changes{v0.2d}{1994/05/13}
 %     {Stop changing \cs{reset at font}. Use the new \cs{normalfont}
 %     instead.}
+% \changes{v1.1f}{2019/10/09{Make \cs{normalcolor} robust}
 %    \begin{macrocode}
-\def\normalcolor{\let\current at color\default at color\set at color}
+\DeclareRobustCommand\normalcolor{\let\current at color\default at color\set at color}
 %    \end{macrocode}
 % \end{macro}
 %