[latex3-commits] [git/LaTeX3-latex3-latex2e] gh569: The code is stored in \environment~<name>~code (c9b9e63b)

[PhelypeOleinik]

Repository : https://github.com/latex3/latex2e
On branch  : gh569
Link       : https://github.com/latex3/latex2e/commit/c9b9e63b8ab6a6273aac29be92910105afbd99cb

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

commit c9b9e63b8ab6a6273aac29be92910105afbd99cb
Author: PhelypeOleinik <phelype.oleinik at latex-project.org>
Date:   Sun Aug 29 18:22:43 2021 -0300

    The code is stored in \environment~<name>~code


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

c9b9e63b8ab6a6273aac29be92910105afbd99cb
 base/ltcmd.dtx | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/base/ltcmd.dtx b/base/ltcmd.dtx
index e4cae7ae..78d2b463 100644
--- a/base/ltcmd.dtx
+++ b/base/ltcmd.dtx
@@ -2197,17 +2197,17 @@
 % \end{macro}
 %
 % \begin{macro}{\@@_copy_env:nnNN}
+% \begin{macro}{\@@_copy_env:Nnnnnnn}
 %    \begin{macrocode}
 \cs_new_protected:Npn \@@_copy_env:nnNN #1 #2 #3 #4
+  { \exp_after:wN \@@_copy_env:Nnnnnnn #4 {#1} }
+\cs_new_protected:Npn \@@_copy_env:Nnnnnnn #1 #2 #3 #4 #5 #6 #7
   {
-    \@@_set_eq_if_exist:cc { #1 ~ defaults } { #2 ~ defaults }
-    \exp_after:wN \@@_copy_env:NnnnnnnN #4 {#1} #3
-  }
-\cs_new_protected:Npn \@@_copy_env:NnnnnnnN #1 #2 #3 #4 #5 #6 #7 #8
-  {
-    \cs_set_protected_nopar:Npn #8 { #1 {#2} {#7} {#4} {#5} {#6} }
+    \@@_set_eq_if_exist:cc { #7 ~ defaults } { #3 ~ defaults }
+    \cs_set_protected_nopar:cpn { environment~ #7 }
+      { #1 {#2} {#7} {#4} {#5} {#6} }
     \@@_split_signature:n {#2}
-    \cs_generate_from_arg_count:cNnn { #7 ~ code }
+    \cs_generate_from_arg_count:cNnn { environment~ #7 ~ code }
       \cs_set_protected:Npx { \l_@@_current_arg_int - 1 }
         {
           \cs_set_nopar:Npx \exp_not:c { environment~ #7 ~end~aux }
@@ -2225,6 +2225,8 @@
                 \int_value:w \int_eval:n { \l_@@_current_arg_int - 1 } ;
             }
         }
+    \cs_set_eq:cc {#7}       { environment~ #7 }
+    \cs_set_eq:cc { end #7 } { environment~ #7 ~end }
     % #1: \__cmd_start_env:nnnnn
     % #2: {+b}
     % #3: {foo} % old name
@@ -2249,6 +2251,7 @@
   { Copying~environments~is~not~possible. }
 %    \end{macrocode}
 % \end{macro}
+% \end{macro}
 %
 % Not much to do regarding \pkg{latexrelease}: we could remove the
 % entries from \cs{@declarecommandcopylisthook}, but it doesn't seem