[latex3-commits] [git/LaTeX3-latex3-latex2e] localalpha: updates as suggested by Phelype (b673079e)

[Frank Mittelbach]

Repository : https://github.com/latex3/latex2e
On branch  : localalpha
Link       : https://github.com/latex3/latex2e/commit/b673079eafd830525c68c2b129db964400d7cca0

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

commit b673079eafd830525c68c2b129db964400d7cca0
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date:   Tue Sep 28 10:12:12 2021 +0200

    updates as suggested by Phelype


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

b673079eafd830525c68c2b129db964400d7cca0
 base/ltfssdcl.dtx | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/base/ltfssdcl.dtx b/base/ltfssdcl.dtx
index 797ea62c..f9898562 100644
--- a/base/ltfssdcl.dtx
+++ b/base/ltfssdcl.dtx
@@ -36,7 +36,7 @@
 %
 %
 \ProvidesFile{ltfssdcl.dtx}
-            [2021/09/27 v3.0x LaTeX Kernel (NFSS Declarative Interface)]
+            [2021/09/28 v3.0x LaTeX Kernel (NFSS Declarative Interface)]
 % \iffalse
 \documentclass{ltxdoc}
 \begin{document}
@@ -580,21 +580,21 @@
 %    L3 programming layer code to set it up.
 %    \begin{macrocode}
 \ExplSyntaxOn
-\cs_new:Npn\freeze at math@version #1 {
+\cs_new_protected:Npn\freeze at math@version #1 {
 %    \end{macrocode}
 %    Save the current \cs{mv@\meta{version}} code and the number of
 %    allocated mathgroups inside.
 %    \begin{macrocode}
   \@font at info{Freeze~ math~ alphabet~ allocation~ in~ version~ #1}
   \cs_gset_eq:cc { mv@#1 at frozen }{ mv@#1 }
-  \tl_gset:cx { g__mv_frozen_ #1 _tl }{ \int_use:c { c at mv@#1 } }
+  \tl_gset:cx { g__nfss_frozen_mv_ #1 _tl }{ \int_use:c { c at mv@#1 } }
 %    \end{macrocode}
 %    Doing the reset the first time, we wait until we are out of
-%    math mode, so we use some recursive \cs{aftergroup} for this
+%    math mode, so we use some recursive \cs{group_insert_after:N} for this
 %    before we execute \cs{mv@\meta{version}@reset}.
 %    \begin{macrocode}
-  \aftergroup \__mv_init_freeze:N \exp_after:wN
-    \aftergroup \cs:w mv@#1 at reset \cs_end:
+  \group_insert_after:N \__nfss_init_mv_freeze:N \exp_after:wN
+    \group_insert_after:N \cs:w mv@#1 at reset \cs_end:
 %    \end{macrocode}
 %    The \cs{check at mathfonts} is called at the very beginning of each
 %    math formula, so it is a good way to hook in the resetting.
@@ -604,7 +604,7 @@
 %    \begin{macrocode}
   \tl_gput_right:No \check at mathfonts 
        {
-         \exp_after:wN \aftergroup \cs:w mv@#1 at reset \cs_end:
+         \exp_after:wN \group_insert_after:N \cs:w mv@#1 at reset \cs_end:
        }
 %    \end{macrocode}
 %    Here is the definition of \cs{mv@\meta{version}@reset}. If there
@@ -615,14 +615,14 @@
   \cs_gset:cpn{mv@#1 at reset}
      {
          \int_compare:nNnTF { \int_use:c{c at mv@#1} } > 
-                            { \tl_use:c{g__mv_frozen_ #1 _tl} }
+                            { \tl_use:c{g__nfss_frozen_mv_ #1 _tl} }
              {
                \@font at info{Undo~ math~ alphabet~ allocation~ in~ version~ #1}
 %    \end{macrocode}
 %    If the undo is necessary, we restore the \cs{mv@\meta{version}} code.
 %    \begin{macrocode}
                \cs_gset_eq:cc { mv@#1 }{ mv@#1 at frozen }
-               \int_gset:cn { c at mv@#1 }{ \tl_use:c {g__mv_frozen_ #1 _tl} }
+               \int_gset:cn { c at mv@#1 }{ \tl_use:c {g__nfss_frozen_mv_ #1 _tl} }
 %    \end{macrocode}
 %    But we also should undo changes to the math alphabet
 %    definitions. We therefore run this code with a modified
@@ -647,18 +647,19 @@
 %  \end{macro}
 %
 %
-%  \begin{macro}{\__mv_init_freeze:N}
+%  \begin{macro}{\__nfss_init_mv_freeze:N}
 % \changes{v3.0x}{2021/09/26}{Macro added for (gh/676)}
 %    To do the initial freeze in a safe place, we check if we are in
 %    math mode and if so try again after the group has ended by pushing
 %    the command and its  single token argument with two
-%    \cs{aftergroup}s after the current group. If we are no longer in
+%    \cs{group_insert_after:N}s after the current group. If we are no longer in
 %    math mode we bypass the
 %    conditional and so the next token is our argument
 %    which is then finally executed.
 %    \begin{macrocode}
-\cs_new:Npn \__mv_init_freeze:N #1 {%
-  \mode_if_math:T { \aftergroup \__mv_init_freeze:N \aftergroup } #1
+\cs_new_protected:Npn \__nfss_init_mv_freeze:N #1 {%
+  \mode_if_math:T { \group_insert_after:N \__nfss_init_mv_freeze:N
+                    \group_insert_after:N } #1
 }
 %    \end{macrocode}
 %  \end{macro}