diff options
author | Karl Berry <karl@freefriends.org> | 2022-07-02 20:09:55 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2022-07-02 20:09:55 +0000 |
commit | 596fcbf6ac63d4e0042c40ddee584e66c35ccd67 (patch) | |
tree | fea2a1bfaec339d773d7dc008aa47c328e9542e0 /Master/texmf-dist/tex/latex | |
parent | 2c637e7cf7e665b209867a6c04ab853858bf7bd6 (diff) |
l3kernel (2jul22)
git-svn-id: svn://tug.org/texlive/trunk@63793 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex')
5 files changed, 53 insertions, 18 deletions
diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex b/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex index baad0eaa9da..8002f1b319e 100644 --- a/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex +++ b/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex @@ -70,7 +70,7 @@ %% and all files in that bundle must be distributed together. %% %% File: expl3.dtx -\def\ExplFileDate{2022-06-16}% +\def\ExplFileDate{2022-07-01}% \begingroup \def\next{\endgroup}% \expandafter\ifx\csname PackageError\endcsname\relax @@ -2288,7 +2288,7 @@ Type H <return> for immediate help}\def~{\errmessage{% } { \scan_stop: } } -\cs_new:Npn \cs_argument_spec:N #1 +\cs_new:Npn \cs_parameter_spec:N #1 { \token_if_macro:NTF #1 { @@ -4773,7 +4773,7 @@ Type H <return> for immediate help}\def~{\errmessage{% \__kernel_chk_defined:NT #2 { \exp_args:Nf \tl_if_empty:nTF - { \cs_prefix_spec:N #2 \cs_argument_spec:N #2 } + { \cs_prefix_spec:N #2 \cs_parameter_spec:N #2 } { \exp_args:Ne #1 { \token_to_str:N #2 = \__kernel_exp_not:w \exp_after:wN {#2} } @@ -4806,7 +4806,7 @@ Type H <return> for immediate help}\def~{\errmessage{% \__kernel_chk_defined:NT #1 { \exp_args:Nf \tl_if_empty:nTF - { \cs_prefix_spec:N #1 \cs_argument_spec:N #1 } + { \cs_prefix_spec:N #1 \cs_parameter_spec:N #1 } { \tl_set:Nx \l__tl_internal_a_tl {#3} \tl_if_eq:NNTF #1 \l__tl_internal_a_tl @@ -11141,7 +11141,7 @@ Type H <return> for immediate help}\def~{\errmessage{% \cs_generate_variant:Nn \__iow_open_stream:Nn { NV } \cs_new_protected:Npn \iow_close:N #1 { - \int_compare:nT { - \c_log_iow < #1 < \c_term_iow } + \int_compare:nT { \c_log_iow < #1 < \c_term_iow } { \tex_immediate:D \tex_closeout:D #1 \prop_gremove:NV \g__iow_streams_prop #1 @@ -24741,7 +24741,7 @@ Type H <return> for immediate help}\def~{\errmessage{% \cs_new_protected:cpx { __regex_compile_/#2: } { \__regex_compile_one:n - { \__regex_item_reverse:n \exp_not:c { __regex_prop_#1: } } + { \__regex_item_reverse:n { \exp_not:c { __regex_prop_#1: } } } } } \__regex_tmp:w d D @@ -24898,8 +24898,8 @@ Type H <return> for immediate help}\def~{\errmessage{% { \__regex_compile_one:n { - \bool_if:NF \l__regex_internal_bool \__regex_item_reverse:n - \exp_not:c { __regex_posix_ \l__regex_internal_a_tl : } + \bool_if:NTF \l__regex_internal_bool \use:n \__regex_item_reverse:n + { \exp_not:c { __regex_posix_ \l__regex_internal_a_tl : } } } } { @@ -25448,7 +25448,10 @@ Type H <return> for immediate help}\def~{\errmessage{% \__regex_item_caseless_range:nn { } \__regex_item_exact:nn { } } - { #1 { \__regex_clean_int:n {#2} } { \__regex_clean_int:n {#3} } } + { + #1 { \__regex_clean_int:n {#2} } { \__regex_clean_int:n {#3} } + \__regex_clean_class_loop:nnn + } { \token_case_meaning:NnTF #1 { @@ -25459,7 +25462,22 @@ Type H <return> for immediate help}\def~{\errmessage{% #1 { \__regex_clean_int:n {#2} } { \__regex_clean_class:n {#3} } \__regex_clean_class_loop:nnn } - { \prg_break: } + { + \exp_args:Nf \str_case:nnTF + { + \exp_args:Nf \str_range:nnn + { \cs_to_str:N #1 } { 1 } { 13 } + } + { + { __regex_prop_ } { } + { __regex_posix } { } + } + { + #1 + \__regex_clean_class_loop:nnn {#2} {#3} + } + { \prg_break: } + } } } } @@ -26015,7 +26033,7 @@ Type H <return> for immediate help}\def~{\errmessage{% \int_set_eq:NN \l__regex_curr_char_int \l__regex_last_char_int \__regex_prop_w: \__regex_break_point:TF - { \group_end: \__regex_item_reverse:n \__regex_prop_w: } + { \group_end: \__regex_item_reverse:n { \__regex_prop_w: } } { \group_end: \__regex_prop_w: } } \cs_new_protected:Npn \__regex_Z_test: @@ -31700,6 +31718,7 @@ Type H <return> for immediate help}\def~{\errmessage{% \group_end: } %% File: l3text.dtx +\cs_generate_variant:Nn \tl_if_head_eq_meaning_p:nN { o } \scan_new:N \s__text_stop \quark_new:N \q__text_nil \__kernel_quark_new_conditional:Nn \__text_quark_if_nil:n { TF } @@ -32077,8 +32096,23 @@ Type H <return> for immediate help}\def~{\errmessage{% \token_if_cs:NTF #1 { \__text_expand_exclude:N #1 } { - \__text_expand_store:n {#1} - \__text_expand_loop:w + \bool_lazy_and:nnTF + { \token_if_active_p:N #1 } + { + ! \bool_lazy_any_p:n + { + { \token_if_protected_macro_p:N #1 } + { \token_if_protected_long_macro_p:N #1 } + { \tl_if_head_eq_meaning_p:oN {#1} \UTFviii@two@octets } + { \tl_if_head_eq_meaning_p:oN {#1} \UTFviii@three@octets } + { \tl_if_head_eq_meaning_p:oN {#1} \UTFviii@four@octets } + } + } + { \exp_after:wN \__text_expand_loop:w #1 } + { + \__text_expand_store:n {#1} + \__text_expand_loop:w + } } } \cs_new:Npn \__text_expand_exclude:N #1 @@ -35530,6 +35564,7 @@ Type H <return> for immediate help}\def~{\errmessage{% { \sys_if_engine_xetex:T } { 2017-01-01 } \__deprecation_old:Nnn \xetex_if_engine:TF { \sys_if_engine_xetex:TF } { 2017-01-01 } +\cs_gset:Npn \cs_argument_spec:N { \cs_parameter_spec:N } \__kernel_patch_deprecation:nnNNpn { 2020-01-03 } { \str_lowercase:n } \cs_gset:Npn \str_lower_case:n { \str_lowercase:n } \__kernel_patch_deprecation:nnNNpn { 2020-01-03 } { \str_lowercase:f } diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex b/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex index 75362e4ed27..3b73fbb1042 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{2022-06-16}% +\def\ExplFileDate{2022-07-01}% \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 1773d88c879..11973865886 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{2022-06-16}% +\def\ExplFileDate{2022-07-01}% \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 941b6d9d16c..261227b079d 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{2022-06-16}% +\def\ExplFileDate{2022-07-01}% \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 864ce5a0952..f649cde7bdd 100644 --- a/Master/texmf-dist/tex/latex/l3kernel/l3debug.def +++ b/Master/texmf-dist/tex/latex/l3kernel/l3debug.def @@ -379,7 +379,7 @@ { \tex_global:D \cs_prefix_spec:N #1 \tex_def:D \exp_not:N #1 - \cs_argument_spec:N #1 + \cs_parameter_spec:N #1 { \tl_to_str:n {#2} \cs_replacement_spec:N #1 @@ -737,7 +737,7 @@ \exp_args:Nx \tex_scantokens:D { \tex_global:D \cs_prefix_spec:N #1 \tex_def:D \exp_not:N #1 - \cs_argument_spec:N #1 + \cs_parameter_spec:N #1 { \exp_args:No \tl_to_str:n { #1 #2 } } } \group_end: |