diff options
Diffstat (limited to 'macros/latex-dev/required/l3kernel/l3tl-analysis.dtx')
-rw-r--r-- | macros/latex-dev/required/l3kernel/l3tl-analysis.dtx | 35 |
1 files changed, 19 insertions, 16 deletions
diff --git a/macros/latex-dev/required/l3kernel/l3tl-analysis.dtx b/macros/latex-dev/required/l3kernel/l3tl-analysis.dtx index 560288db9a..fd162839a8 100644 --- a/macros/latex-dev/required/l3kernel/l3tl-analysis.dtx +++ b/macros/latex-dev/required/l3kernel/l3tl-analysis.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2025-01-14} +% \date{Released 2025-01-18} % % \maketitle % @@ -1028,39 +1028,42 @@ % % \subsection{Showing the results} % -% \begin{macro}{\tl_analysis_show:N, \tl_analysis_log:N, \@@_analysis_show:NNN} +% \begin{macro}{\tl_analysis_show:N, \tl_analysis_log:N, \@@_analysis_show:NNnnN} % Add to \cs{@@_analysis:n} a third pass to display tokens to the terminal. % If the token list variable is not defined, throw the same error % as \cs{tl_show:N} by simply calling that function. % \begin{macrocode} \cs_new_protected:Npn \tl_analysis_show:N - { \@@_analysis_show:NNN \msg_show:nneeee \tl_show:N } + { \@@_analysis_show:NNnnN \msg_show:nneeee \tl_show:N {} {} } \cs_new_protected:Npn \tl_analysis_log:N - { \@@_analysis_show:NNN \msg_log:nneeee \tl_log:N } -\cs_new_protected:Npn \@@_analysis_show:NNN #1#2#3 { - \tl_if_exist:NTF #3 + \@@_analysis_show:NNnnN \msg_log:nneeee \tl_log:N + { \iow_newline: >~ . } { . } + } +\cs_new_protected:Npn \@@_analysis_show:NNnnN #1#2#3#4#5 + { + \tl_if_exist:NTF #5 { - \exp_args:No \@@_analysis:n {#3} + \exp_args:No \@@_analysis:n {#5} #1 { tl } { show-analysis } - { \token_to_str:N #3 } { \@@_analysis_show: } { } { } + { \token_to_str:N #5 } { \@@_analysis_show: } {#3} {#4} } { #2 #3 } } % \end{macrocode} % \end{macro} % -% \begin{macro}{\tl_analysis_show:n, \tl_analysis_log:n, \@@_analysis_show:Nn} +% \begin{macro}{\tl_analysis_show:n, \tl_analysis_log:n, \@@_analysis_show:Nnnn} % No existence test needed here. % \begin{macrocode} \cs_new_protected:Npn \tl_analysis_show:n - { \@@_analysis_show:Nn \msg_show:nneeee } + { \@@_analysis_show:Nnnn \msg_show:nneeee {} {} } \cs_new_protected:Npn \tl_analysis_log:n - { \@@_analysis_show:Nn \msg_log:nneeee } -\cs_new_protected:Npn \@@_analysis_show:Nn #1#2 + { \@@_analysis_show:Nnnn \msg_log:nneeee { \iow_newline: >~ . } { . } } +\cs_new_protected:Npn \@@_analysis_show:Nnnn #1#2#3#4 { - \@@_analysis:n {#2} - #1 { tl } { show-analysis } { } { \@@_analysis_show: } { } { } + \@@_analysis:n {#4} + #1 { tl } { show-analysis } { } { \@@_analysis_show: } {#2} {#3} } % \end{macrocode} % \end{macro} @@ -1654,8 +1657,8 @@ { The~token~list~ \tl_if_empty:nF {#1} { #1 ~ } \tl_if_empty:nTF {#2} - { is~empty } - { contains~the~tokens: #2 } + { is~empty #3 } + { contains~the~tokens: #2 #4 } } % \end{macrocode} % |