[latex3-commits] [latex3/latex2e] latex-lab/uf-review-05: clean up split code (e5abe931)

[github at latex-project.org]

Repository : https://github.com/latex3/latex2e
On branch  : latex-lab/uf-review-05
Link       : https://github.com/latex3/latex2e/commit/e5abe931b485ac8715ced4362e180f9dd3934fae

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

commit e5abe931b485ac8715ced4362e180f9dd3934fae
Author: Ulrike Fischer <fischer at troubleshooting-tex.de>
Date:   Thu Nov 16 00:35:24 2023 +0100

    clean up split code


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

e5abe931b485ac8715ced4362e180f9dd3934fae
 required/latex-lab/latex-lab-math.dtx | 56 ++++++++++++++++++++---------------
 1 file changed, 32 insertions(+), 24 deletions(-)

diff --git a/required/latex-lab/latex-lab-math.dtx b/required/latex-lab/latex-lab-math.dtx
index 591a9702..7cc9c528 100644
--- a/required/latex-lab/latex-lab-math.dtx
+++ b/required/latex-lab/latex-lab-math.dtx
@@ -1296,9 +1296,18 @@
 %
 %
 
-%  \begin{macro}{}
+%  \begin{macro}{\@@_split_at_nl:NN}
+%  This splits grabbed math at newlines. 
 %    
 %    \begin{macrocode}
+\cs_new:Npn \@@_split_at_nl:NN #1#2 {
+  \tl_set:Nf \l_@@_tmpa_tl {
+      \exp_after:wN \@@_split_at_nl_first:w #1 \\ \q_nil \\ \s_stop }
+  \exp_after:wN \@@_split_at_nl_aux:nnNN \l_@@_tmpa_tl #1 #2
+}
+%    \end{macrocode}
+% and the auxiliary commands
+%    \begin{macrocode}
 \cs_new:Npn \@@_split_at_nl_first:w #1 \\ #2 \\ #3 \s_stop
   {
     \quark_if_nil:nTF {#2}
@@ -1308,8 +1317,15 @@
           #2 \\ #3 \s_stop
       }
   }
-\cs_new:Npn \@@_split_chk_if_begin:ww #1 \begin #2 #3 \s_mark
-    #4 \\ \q_nil \\ \s_stop
+  
+\cs_new_protected:Npn \@@_split_at_nl_aux:nnNN #1 #2 #3 #4
+  {
+    \tl_gset:Nn #4 {#1}
+    \tl_gset:Nn #3 {#2}
+  }
+
+\cs_new:Npn \@@_split_chk_if_begin:ww 
+   #1 \begin #2 #3 \s_mark #4 \\ \q_nil \\ \s_stop
   {
     \quark_if_nil:nTF {#2}
       { {#1} {#4} }
@@ -1319,7 +1335,9 @@
             { } { 1 }
       }
   }
+
 \cs_new:Npn \@@_split_cleanup_begin_q_nil:w #1 \begin \q_nil {#1}
+
 \cs_new:Npn \@@_split_collect_one_end:w #1 \end #2 #3 \s_stop #4 #5
   {
     \exp_args:Nf \@@_split_check_count_begins:nnnn
@@ -1328,14 +1346,16 @@
   }
 \cs_new:Npn \@@_split_count_begins:n #1
   { \int_eval:n { 0 \@@_split_count_begins:w #1 \begin \q_nil } }
+
 \cs_new:Npn \@@_split_count_begins:w #1 \begin #2
   { \quark_if_nil:nF {#2} { +1 \@@_split_count_begins:w } }
+
 \cs_new:Npn \@@_split_check_count_begins:nnnn #1 #2 #3 #4
   {
     \int_compare:nNnTF {#1} = {#2}
       {
         \exp_last_unbraced:Nf \@@_split_final_cleanup:nn
-          { \split:n { \@@_split_guard:n {#3} #4 } }
+          { \@@_split:n { \@@_split_guard:n {#3} #4 } }
       }
       {
         \exp_args:No \use_ii_i:nn
@@ -1355,29 +1375,17 @@
       { \exp_end: { #4 #1 } }
       { \@@_split_final_cleanup:w #3 \s_mark { #4 #1 #2 } }
   }
-\NewDocumentCommand \splitnl { mm +m }
-  {
-    \tl_set:Nf \l_tmpa_tl { \split:n {#3} }
-    \show \l_tmpa_tl
-    \exp_after:wN \__splitnl_aux:nnNN \l_tmpa_tl #1 #2
-  }
   
-
-\cs_new:Npn \split:n #1 {
+\cs_new:Npn \@@_split:n #1 {
     \@@_split_at_nl_first:w #1 \\ \q_nil \\ \s_stop }
   
-\cs_new:Npn \@@_split_at_nl:NN #1#2 {
-  \tl_set:Nf \l_tmpa_tl {
-      \exp_after:wN \@@_split_at_nl_first:w #1 \\ \q_nil \\ \s_stop }
-  \exp_after:wN \@@_split_at_nl_aux:nnNN \l_tmpa_tl #1 #2
-}
-
-\cs_new_protected:Npn \@@_split_at_nl_aux:nnNN #1 #2 #3 #4
-  {
-    \tl_gset:Nn #4 {#1}
-    \tl_gset:Nn #3 {#2}
-}
-
+% this looks unused.  
+%\NewDocumentCommand \splitnl { mm +m }
+%  {
+%    \tl_set:Nf \l_@@_tmpa_tl { \split:n {#3} }
+%    \show \l_@@_tmpa_tl
+%    \exp_after:wN \__splitnl_aux:nnNN \l_@@_tmpa_tl #1 #2
+%  }
 %    \end{macrocode}
 %  \end{macro}
 %