From 6c8d67d5ddbb2b0005f3a0270921602af29f7944 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 20 Feb 2024 21:07:53 +0000 Subject: l3 (20feb24) git-svn-id: svn://tug.org/texlive/trunk@70026 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/latex/l3kernel/expl3-code.tex | 82 +++++++++++++++------- .../tex/latex/l3kernel/expl3-generic.tex | 2 +- Master/texmf-dist/tex/latex/l3kernel/expl3.ltx | 2 +- Master/texmf-dist/tex/latex/l3kernel/expl3.sty | 2 +- Master/texmf-dist/tex/latex/l3kernel/l3debug.def | 12 ++-- Master/texmf-dist/tex/latex/l3kernel/l3doc.cls | 2 +- 6 files changed, 68 insertions(+), 34 deletions(-) (limited to 'Master/texmf-dist/tex/latex/l3kernel') diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex b/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex index 998fa55a679..324ff825f1c 100644 --- a/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex +++ b/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex @@ -75,7 +75,7 @@ %% and all files in that bundle must be distributed together. %% %% File: expl3.dtx -\def\ExplFileDate{2024-02-18}% +\def\ExplFileDate{2024-02-20}% \begingroup \def\next{\endgroup}% \expandafter\ifx\csname PackageError\endcsname\relax @@ -1625,12 +1625,14 @@ Type H for immediate help}\def~{\errmessage{% \cs_set_protected:Npn \debug_on:n #1 { \sys_load_debug: - \debug_on:n {#1} + \cs_if_exist:NT \__debug_all_on: + { \debug_on:n {#1} } } \cs_set_protected:Npn \debug_off:n #1 { \sys_load_debug: - \debug_off:n {#1} + \cs_if_exist:NT \__debug_all_on: + { \debug_off:n {#1} } } \cs_set_protected:Npn \debug_suspend: { } \cs_set_protected:Npn \debug_resume: { } @@ -7758,6 +7760,17 @@ Type H for immediate help}\def~{\errmessage{% { \__kernel_sys_configuration_load:n { l3debug } } \bool_gset_true:N \g__sys_debug_bool } +\cs_if_exist:NT \@expl@finalise@setup@@ + { + \tl_gput_right:Nn \@expl@finalise@setup@@ + { + \tl_gput_right:Nn \@kernel@after@begindocument + { + \cs_gset_protected:Npn \sys_load_debug: + { \msg_error:nn { sys } { load-debug-in-preamble } } + } + } + } \tl_new:N \l__sys_internal_tl \tl_const:Ne \c__sys_marker_tl { : \token_to_str:N : } \cs_new_protected:Npn \sys_get_shell:nnN #1#2#3 @@ -9753,18 +9766,33 @@ Type H for immediate help}\def~{\errmessage{% } \cs_generate_variant:Nn \prop_const_linked_from_keyval:Nn { c } \cs_new_protected:Npn \__prop_split:NnTFn #1#2 - { \exp_args:NNo \__prop_split_aux:NnTFn #1 { \tl_to_str:n {#2} } } -\cs_new_protected:Npn \__prop_split_aux:NnTFn #1#2#3 - { - \cs_set:Npn \__prop_split_aux:w ##1 \__prop_chk:w ##2 - \__prop_pair:wn #2 \s__prop ##3 ##4 \s__prop_mark ##5 ##6 \s__prop_stop - { ##5 {#3} } - \exp_after:wN \__prop_split_aux:w #1 \s__prop_mark \use_i:nnn - \__prop_pair:wn #2 \s__prop { } \s__prop_mark \use_ii:nnn - \__prop_chk:w - \__prop_pair:wn #2 \s__prop { } \s__prop_mark \use_iii:nnn + { + \exp_after:wN \__prop_split_aux:nNTFn + \exp_after:wN { \tl_to_str:n {#2} } #1 + } +\cs_new_protected:Npn \__prop_split_aux:nNTFn #1#2#3 + { + \cs_set:Npn \__prop_split_flat:w \__prop_split_linked:w ##1 + \__prop_pair:wn #1 \s__prop ##2 ##3 \s__prop_mark ##4 ##5 \s__prop_stop + { ##4 {#3} } + \exp_after:wN \__prop_split_test:wn #2 \s__prop_mark \use_i:nnn + \__prop_pair:wn #1 \s__prop { ? \fi: \__prop_split_wrong:Nw #2 } + \s__prop_mark \use_ii:nnn \s__prop_stop } +\cs_new:Npn \__prop_split_flat:w { } +\cs_new_protected:Npn \__prop_split_test:wn #1 \s__prop #2 + { + \if_meaning:w \__prop_chk:w #2 \exp_after:wN \__prop_split_flat:w \fi: + \__prop_split_linked:w + } +\cs_new_protected:Npn \__prop_split_linked:w #1 \s__prop_stop #2#3 {#3} +\cs_new_protected:Npn \__prop_split_wrong:Nw #1#2 \s__prop_stop #3#4 + { + \prop_show:N #1 + \cs_gset_eq:NN #1 \c_empty_prop + #3 + } \cs_new_protected:Npn \prop_get:NnN #1#2#3 { \__prop_get:NnnTF #1 {#2} @@ -9787,7 +9815,7 @@ Type H for immediate help}\def~{\errmessage{% \cs_new_protected:Npn \__prop_get:NnnTF #1#2#3#4#5 { \__prop_split:NnTFn #1 {#2} - { #3 {##3} #4 } + { #3 {##2} #4 } {#5} { \exp_after:wN \__prop_get_linked:w #1 {#2} {#3} {#4} {#5} } } @@ -9828,8 +9856,8 @@ Type H for immediate help}\def~{\errmessage{% { \__prop_split:NnTFn #1 {#2} { - #4 #1 { \exp_not:n { \s__prop \__prop_chk:w ##2 ##4 } } - #5 {##3} + #4 #1 { \exp_not:n { \s__prop \__prop_chk:w ##1 ##3 } } + #5 {##2} #6 } {#7} @@ -9974,8 +10002,8 @@ Type H for immediate help}\def~{\errmessage{% { #1 #2 #3 { - \s__prop \__prop_chk:w \exp_not:n {##2} - \l__prop_internal_tl \exp_not:n {##4} + \s__prop \__prop_chk:w \exp_not:n {##1} + \l__prop_internal_tl \exp_not:n {##3} } } { #2 #3 { \exp_not:o {#3} \l__prop_internal_tl } } @@ -10796,17 +10824,17 @@ Type H for immediate help}\def~{\errmessage{% { \msg_new:nnnn { LaTeX / #1 } } \cs_new_protected:Npn \__kernel_msg_new:nnn #1 { \msg_new:nnn { LaTeX / #1 } } -\cs_new_protected:Npn \__kernel_msg_info:nnee #1 +\cs_new_protected:Npn \__kernel_msg_info:nnxx #1 { \msg_info:nnee { LaTeX / #1 } } -\cs_new_protected:Npn \__kernel_msg_warning:nne #1 +\cs_new_protected:Npn \__kernel_msg_warning:nnx #1 { \msg_warning:nne { LaTeX / #1 } } -\cs_new_protected:Npn \__kernel_msg_warning:nnee #1 +\cs_new_protected:Npn \__kernel_msg_warning:nnxx #1 { \msg_warning:nnee { LaTeX / #1 } } -\cs_new_protected:Npn \__kernel_msg_error:nne #1 +\cs_new_protected:Npn \__kernel_msg_error:nnx #1 { \msg_error:nne { LaTeX / #1 } } -\cs_new_protected:Npn \__kernel_msg_error:nnee #1 +\cs_new_protected:Npn \__kernel_msg_error:nnxx #1 { \msg_error:nnee { LaTeX / #1 } } -\cs_new_protected:Npn \__kernel_msg_error:nneee #1 +\cs_new_protected:Npn \__kernel_msg_error:nnxxx #1 { \msg_error:nneee { LaTeX / #1 } } \cs_new:Npn \__kernel_msg_expandable_error:nnn #1 { \msg_expandable_error:nnn { LaTeX / #1 } } @@ -11159,6 +11187,12 @@ Type H for immediate help}\def~{\errmessage{% Run-time~backend~selection~may~only~be~carried~out~once~during~a~run.~ This~second~attempt~to~set~them~will~be~ignored. } +\msg_new:nnnn { sys } { load-debug-in-preamble } + { Load~debug~support~in~the~preamble. } + { + Debugging~requires~support~loaded~in~the~preamble: \\ + Use~\sys_load_debug:~before~\begin{document}. + } \msg_new:nnnn { sys } { wrong-backend } { Backend~request~inconsistent~with~engine:~using~'#2'~backend. } { diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex b/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex index 79a79f11323..e57bdbe49e7 100644 --- a/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex +++ b/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex @@ -19,7 +19,7 @@ %% and all files in that bundle must be distributed together. %% %% File: expl3.dtx -\def\ExplFileDate{2024-02-18}% +\def\ExplFileDate{2024-02-20}% \let\ExplLoaderFileDate\ExplFileDate \begingroup \catcode`\_=11 diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3.ltx b/Master/texmf-dist/tex/latex/l3kernel/expl3.ltx index 38de0490d2f..a40c3a3176d 100644 --- a/Master/texmf-dist/tex/latex/l3kernel/expl3.ltx +++ b/Master/texmf-dist/tex/latex/l3kernel/expl3.ltx @@ -19,7 +19,7 @@ %% and all files in that bundle must be distributed together. %% %% File: expl3.dtx -\def\ExplFileDate{2024-02-18}% +\def\ExplFileDate{2024-02-20}% \let\ExplLoaderFileDate\ExplFileDate \begingroup \catcode`\_=11 diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3.sty b/Master/texmf-dist/tex/latex/l3kernel/expl3.sty index bae277a3338..03a22d85e19 100644 --- a/Master/texmf-dist/tex/latex/l3kernel/expl3.sty +++ b/Master/texmf-dist/tex/latex/l3kernel/expl3.sty @@ -19,7 +19,7 @@ %% and all files in that bundle must be distributed together. %% %% File: expl3.dtx -\def\ExplFileDate{2024-02-18}% +\def\ExplFileDate{2024-02-20}% \let\ExplLoaderFileDate\ExplFileDate \ProvidesPackage{expl3} [% diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3debug.def b/Master/texmf-dist/tex/latex/l3kernel/l3debug.def index 39b078166cf..1021e5373e7 100644 --- a/Master/texmf-dist/tex/latex/l3kernel/l3debug.def +++ b/Master/texmf-dist/tex/latex/l3kernel/l3debug.def @@ -19,7 +19,7 @@ %% and all files in that bundle must be distributed together. %% %% File: l3debug.dtx -\ProvidesExplFile{l3debug.def}{2024-02-18}{}{L3 Debugging support} +\ProvidesExplFile{l3debug.def}{2024-02-20}{}{L3 Debugging support} \scan_new:N \s__debug_stop \cs_new:Npn \__debug_use_i_delimit_by_s_stop:nw #1 #2 \s__debug_stop {#1} \quark_new:N \q__debug_recursion_tail @@ -27,7 +27,7 @@ \cs_new:Npn \__debug_use_none_delimit_by_q_recursion_stop:w #1 \q__debug_recursion_stop { } \__kernel_quark_new_test:N \__debug_if_recursion_tail_stop:N -\cs_set_protected:Npn \debug_on:n #1 +\cs_gset_protected:Npn \debug_on:n #1 { \exp_args:No \clist_map_inline:nn { \tl_to_str:n {#1} } { @@ -35,7 +35,7 @@ { \msg_error:nnn { debug } { debug } {##1} } } } -\cs_set_protected:Npn \debug_off:n #1 +\cs_gset_protected:Npn \debug_off:n #1 { \exp_args:No \clist_map_inline:nn { \tl_to_str:n {#1} } { @@ -64,12 +64,12 @@ } } \tl_new:N \l__debug_suspended_tl { } -\cs_set_protected:Npn \debug_suspend: +\cs_gset_protected:Npn \debug_suspend: { \tl_put_right:Nn \l__debug_suspended_tl { . } \cs_set_eq:NN \__debug_suspended:T \use:n } -\cs_set_protected:Npn \debug_resume: +\cs_gset_protected:Npn \debug_resume: { \__kernel_tl_set:Nx \l__debug_suspended_tl { \tl_tail:N \l__debug_suspended_tl } @@ -1047,7 +1047,7 @@ without~first~having: \\ \ \ \tl_new:N ~ #1 \\ \\ - LaTeX~will~create~the~variable~and~continue. + LaTeX~will~continue,~creating~the~variable~where~it~is~the~one~being~set. } \cs_set_protected:Npn \__kernel_if_debug:TF #1#2 {#1} %% diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3doc.cls b/Master/texmf-dist/tex/latex/l3kernel/l3doc.cls index 1208bd3a989..5c0b0436c63 100644 --- a/Master/texmf-dist/tex/latex/l3kernel/l3doc.cls +++ b/Master/texmf-dist/tex/latex/l3kernel/l3doc.cls @@ -20,7 +20,7 @@ %% %% File: l3doc.dtx \RequirePackage{calc} -\ProvidesExplClass{l3doc}{2024-02-18}{} +\ProvidesExplClass{l3doc}{2024-02-20}{} {L3 Experimental documentation class} \clist_new:N \g_docinput_clist \seq_new:N \g_doc_functions_seq -- cgit v1.2.3