Swtich to all-e-type expansion in latex-lab-math

latex3 · Nov 12, 2023 · 653208f · 653208f
1 parent 9975d6e
commit 653208f
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 17 deletions.
diff --git a/required/latex-lab/changes.txt b/required/latex-lab/changes.txt
@@ -1,5 +1,5 @@
 2023-11-12 Joseph Wright <[email protected]>
-	* latex-lab-math.dtx: tidy variant creation
+	* latex-lab-math.dtx: tidy variant creation, switch to e-type expansion
 
 2023-10-30 Ulrike Fischer <[email protected]>
 	* added latex-lab-table.dtx for basic table tagging. 

diff --git a/required/latex-lab/latex-lab-math.dtx b/required/latex-lab/latex-lab-math.dtx
@@ -472,15 +472,15 @@
     \cs_gset_eq:cc { @@_env_ #1 _begin: } {#1}
     \cs_gset_eq:cc { @@_env_ #1 _end: } { end #1 }
 %
-    \ExpandArgs { nnx } \RenewDocumentEnvironment {#1} { b }
+    \ExpandArgs { nne } \RenewDocumentEnvironment {#1} { b }
       {
 %        \bool_set_true:N \exp_not:N \l_@@_collected_bool
 %        \cs_if_exist:cTF { @@_env #1 _aux: }
 %          {
 %            \exp_not:c { @@_env #1 _aux: }
-%              ####1 \exp_not:N \@@_env_end: {#1}
+%              ##1 \exp_not:N \@@_env_end: {#1}
 %          }
-%          { \exp_not:N \@@_process:nn {#1} {####1} }
+%          { \exp_not:N \@@_process:nn {#1} {##1} }
         \exp_not:N \bool_if:NTF \exp_not:N \l_@@_collected_bool
           {
 %            \typeout{===>B1}
@@ -490,15 +490,15 @@
             \cs_if_exist:cTF { @@_env #1 _aux: }
               {
                 \exp_not:c { @@_env #1 _aux: }
-                  ####1 \exp_not:N \@@_env_end: {#1}
+                  ##1 \exp_not:N \@@_env_end: {#1}
               }
-              { \exp_not:N \@@_process:nn {#1} {####1} }
+              { \exp_not:N \@@_process:nn {#1} {##1} }
             \exp_not:n { \@kernel@math@registered@begin }
             \bool_set_true:N \exp_not:N \l_@@_collected_bool
           }
 %        \exp_not:N \tracingall  
         \exp_not:c { @@_env_ #1 _begin: }
-        ####1
+        ##1
         \exp_not:c { @@_env_ #1 _end: }
 %        \exp_not:c { @@_env_ #1 _end: }
 %        \exp_not:N \tracingnone
@@ -514,15 +514,15 @@
     \cs_gset_eq:cc { @@_env_ #1 _begin: } {#1}
     \cs_gset_eq:cc { @@_env_ #1 _end: } { end #1 }
 %
-    \ExpandArgs { nnxx } \RenewDocumentEnvironment {#1} { b }
+    \ExpandArgs { nnee } \RenewDocumentEnvironment {#1} { b }
       {
 %        \bool_set_true:N \exp_not:N \l_@@_collected_bool
 %        \cs_if_exist:cTF { @@_env #1 _aux: }
 %          {
 %            \exp_not:c { @@_env #1 _aux: }
-%              ####1 \exp_not:N \@@_env_end: {#1}
+%              ##1 \exp_not:N \@@_env_end: {#1}
 %          }
-%          { \exp_not:N \@@_process:nn {#1} {####1} }
+%          { \exp_not:N \@@_process:nn {#1} {##1} }
         \exp_not:N \bool_if:NTF \exp_not:N \l_@@_collected_bool
           {
 %            \typeout{===>B1}
@@ -532,15 +532,15 @@
             \cs_if_exist:cTF { @@_env #1 _aux: }
               {
                 \exp_not:c { @@_env #1 _aux: }
-                  ####1 \exp_not:N \@@_env_end: {#1}
+                  ##1 \exp_not:N \@@_env_end: {#1}
               }
-              { \exp_not:N \@@_process:nn {#1} {####1} }
+              { \exp_not:N \@@_process:nn {#1} {##1} }
             \exp_not:n { \@kernel@math@registered@begin }
             \bool_set_true:N \exp_not:N \l_@@_collected_bool
           }
 %        \exp_not:N \tracingall  
         \exp_not:c { @@_env_ #1 _begin: }
-        ####1
+        ##1
 %        \exp_not:c { @@_env_ #1 _end: }
 %        \exp_not:N \tracingnone
      }
@@ -556,7 +556,7 @@
     \cs_gset_eq:cc { @@_env_ #1 _begin: } {#1}
     \cs_gset_eq:cc { @@_env_ #1 _end: } { end #1 }
 %
-    \ExpandArgs { nnxx } \RenewDocumentEnvironment {#1} { b }
+    \ExpandArgs { nnee } \RenewDocumentEnvironment {#1} { b }
       {
         \exp_not:N \bool_if:NTF \exp_not:N \l_@@_collected_bool
           {
@@ -567,15 +567,15 @@
             \cs_if_exist:cTF { @@_env #1 _aux: }
               {
                 \exp_not:c { @@_env #1 _aux: }
-                  ####1 \exp_not:N \@@_env_end: {#1}
+                  ##1 \exp_not:N \@@_env_end: {#1}
               }
-              { \exp_not:N \@@_process:nn {#1} {####1} }
+              { \exp_not:N \@@_process:nn {#1} {##1} }
             \exp_not:n { \@kernel@math@registered@begin }
             \bool_set_true:N \exp_not:N \l_@@_collected_bool
           }
 %        \exp_not:N \tracingall  
         \exp_not:c { @@_env_ #1 _begin: }
-        ####1
+        ##1
      }
       {
         \exp_not:c { @@_env_ #1 _end: }