diff options
author | Karl Berry <karl@freefriends.org> | 2021-07-13 20:07:21 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2021-07-13 20:07:21 +0000 |
commit | cdf5616cb0197dbd6acad760f46c9cc81e34664e (patch) | |
tree | 5e1366f64394ce4af2bf9e5558e80d6f6fec6ed2 /Master/texmf-dist/tex/latex/l3kernel | |
parent | c6abb39c23b0dfdbbcd2dff7970bc57816f65982 (diff) |
l3 (13jul21)
git-svn-id: svn://tug.org/texlive/trunk@59922 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/l3kernel')
5 files changed, 13 insertions, 66 deletions
diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex b/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex index aad1442bc76..d37d061f9d8 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{2021-06-18}% +\def\ExplFileDate{2021-07-12}% \begingroup \def\next{\endgroup}% \expandafter\ifx\csname PackageError\endcsname\relax @@ -28558,16 +28558,21 @@ } } } -\cs_new_protected:Npx \color_set:nnn #1#2#3 +\cs_new_protected:Npn \color_set:nnn #1#2#3 { - \exp_not:N \str_if_eq:nnF {#1} { . } + \str_if_eq:nnF {#1} { . } { \tl_clear_new:c { l__color_named_ #1 _tl } \prop_clear_new:c { l__color_named_ #1 _prop } - \exp_not:N \__color_set_colon:nnw {#1} {#3} - #2 \c_colon_str \c_colon_str \exp_not:N \s__color_stop + \exp_args:Ne \__color_set_aux:nnn { \tl_to_str:n {#2} } + {#1} {#3} } } +\cs_new_protected:Npx \__color_set_aux:nnn #1#2#3 + { + \exp_not:N \__color_set_colon:nnw {#2} {#3} + #1 \c_colon_str \c_colon_str \exp_not:N \s__color_stop + } \use:x { \cs_new_protected:Npn \exp_not:N \__color_set_colon:nnw diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex b/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex index f271143c1f4..00b7bd3bf9a 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{2021-06-18}% +\def\ExplFileDate{2021-07-12}% \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 d6690948578..94040008521 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{2021-06-18}% +\def\ExplFileDate{2021-07-12}% \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 4f528de6b89..205c240e640 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{2021-06-18}% +\def\ExplFileDate{2021-07-12}% \let\ExplLoaderFileDate\ExplFileDate \ProvidesPackage{expl3} [% diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3deprecation.def b/Master/texmf-dist/tex/latex/l3kernel/l3deprecation.def index 7200fb5cab7..0b8d312ec84 100644 --- a/Master/texmf-dist/tex/latex/l3kernel/l3deprecation.def +++ b/Master/texmf-dist/tex/latex/l3kernel/l3deprecation.def @@ -20,22 +20,6 @@ %% %% File: l3deprecation.dtx \ProvidesExplFile{l3deprecation.def}{2019-04-06}{}{L3 Deprecated functions} -\__kernel_patch_deprecation:nnNNpn { 2021-01-01 } { \box_set_eq_drop:N } -\cs_gset_protected:Npn \box_set_eq_clear:NN #1#2 - { \tex_setbox:D #1 \tex_box:D #2 } -\__kernel_patch_deprecation:nnNNpn { 2021-01-01 } { \box_gset_eq_drop:N } -\cs_gset_protected:Npn \box_gset_eq_clear:NN #1#2 - { \tex_global:D \tex_setbox:D #1 \tex_box:D #2 } -\cs_generate_variant:Nn \box_set_eq_clear:NN { c , Nc , cc } -\cs_generate_variant:Nn \box_gset_eq_clear:NN { c , Nc , cc } -\__kernel_patch_deprecation:nnNNpn { 2021-01-01 } { \hbox_unpack_drop:N } -\cs_gset_protected:Npn \hbox_unpack_clear:N - { \hbox_unpack_drop:N } -\cs_generate_variant:Nn \hbox_unpack_clear:N { c } -\__kernel_patch_deprecation:nnNNpn { 2021-01-01 } { \vbox_unpack_drop:N } -\cs_gset_protected:Npn \vbox_unpack_clear:N - { \vbox_unpack_drop:N } -\cs_generate_variant:Nn \vbox_unpack_clear:N { c } \__kernel_patch_deprecation:nnNNpn { 2022-01-01 } { \str_lowercase:n } \cs_gset:Npn \str_lower_case:n { \str_lowercase:n } \__kernel_patch_deprecation:nnNNpn { 2022-01-01 } { \str_lowercase:f } @@ -55,40 +39,6 @@ \cs_gset:Npn \seq_indexed_map_inline:Nn { \seq_map_indexed_inline:Nn } \__kernel_patch_deprecation:nnNNpn { 2022-07-01 } { \seq_map_indexed_function:NN } \cs_gset:Npn \seq_indexed_map_function:NN { \seq_map_indexed_function:NN } -\__kernel_patch_deprecation:nnNNpn { 2021-01-01 } { \file_get:nnN } -\cs_gset_protected:Npn \tl_set_from_file:Nnn #1#2#3 - { \file_get:nnN {#3} {#2} #1 } -\cs_generate_variant:Nn \tl_set_from_file:Nnn { c } -\__kernel_patch_deprecation:nnNNpn { 2021-01-01 } { \file_get:nnN } -\cs_gset_protected:Npn \tl_gset_from_file:Nnn #1#2#3 - { - \group_begin: - \file_get:nnN {#3} {#2} \l__tl_internal_a_tl - \tl_gset_eq:NN #1 \l__tl_internal_a_tl - \group_end: - } -\cs_generate_variant:Nn \tl_gset_from_file:Nnn { c } -\__kernel_patch_deprecation:nnNNpn { 2021-01-01 } { \file_get:nnN } -\cs_gset_protected:Npn \tl_set_from_file_x:Nnn #1#2#3 - { - \group_begin: - \file_get:nnN {#3} {#2} \l__tl_internal_a_tl - #2 \scan_stop: - \__kernel_tl_set:Nx \l__tl_internal_a_tl { \l__tl_internal_a_tl } - \exp_args:NNNo \group_end: - \tl_set:Nn #1 \l__tl_internal_a_tl - } -\cs_generate_variant:Nn \tl_set_from_file_x:Nnn { c } -\__kernel_patch_deprecation:nnNNpn { 2021-01-01 } { \file_get:nnN } -\cs_gset_protected:Npn \tl_gset_from_file_x:Nnn #1#2#3 - { - \group_begin: - \file_get:nnN {#3} {#2} \l__tl_internal_a_tl - #2 \scan_stop: - \__kernel_tl_gset:Nx #1 { \l__tl_internal_a_tl } - \group_end: - } -\cs_generate_variant:Nn \tl_gset_from_file_x:Nnn { c } \__kernel_patch_deprecation:nnNNpn { 2022-01-01 } { \text_lowercase:n } \cs_gset:Npn \tl_lower_case:n #1 { \text_lowercase:n {#1} } @@ -107,12 +57,6 @@ \__kernel_patch_deprecation:nnNNpn { 2022-01-01 } { \text_titlecase:nn } \cs_gset:Npn \tl_mixed_case:nn #1#2 { \text_titlecase:nn {#1} {#2} } -\__kernel_patch_deprecation:nnNNpn { 2021-01-01 } { \cs_prefix_spec:N } -\cs_gset:Npn \token_get_prefix_spec:N { \cs_prefix_spec:N } -\__kernel_patch_deprecation:nnNNpn { 2021-01-01 } { \cs_argument_spec:N } -\cs_gset:Npn \token_get_arg_spec:N { \cs_argument_spec:N } -\__kernel_patch_deprecation:nnNNpn { 2021-01-01 } { \cs_replacement_spec:N } -\cs_gset:Npn \token_get_replacement_spec:N { \cs_replacement_spec:N } \__kernel_patch_deprecation:nnNNpn { 2022-01-01 } { \char_lowercase:N } \cs_gset:Npn \char_lower_case:N { \char_lowercase:N } \__kernel_patch_deprecation:nnNNpn { 2022-01-01 } { \char_uppercase:N } @@ -129,8 +73,6 @@ \cs_gset:Npn \char_str_mixed_case:N { \char_str_titlecase:N } \__kernel_patch_deprecation:nnNNpn { 2022-01-01 } { \char_str_foldcase:N } \cs_gset:Npn \char_str_fold_case:N { \char_str_foldcase:N } -\__kernel_patch_deprecation:nnNNpn { 2021-01-01 } { -1 } -\cs_gset_protected:Npn \c_term_ior { -1 \scan_stop: } %% %% %% End of file `l3deprecation.def'. |