From 8088d7d98dd621d0fc49aa4019f2cdeff0693e32 Mon Sep 17 00:00:00 2001 From: Joseph Wright Date: Wed, 25 Dec 2024 11:20:17 +0000 Subject: [PATCH] Update l3kernel to 2024-12-25 --- base/testfiles/github-0944.tlg | 2 +- texmf/tex/latex/l3kernel/expl3-code.tex | 34 +++++++++++++--------- texmf/tex/latex/l3kernel/expl3-generic.tex | 2 +- texmf/tex/latex/l3kernel/expl3.ltx | 2 +- texmf/tex/latex/l3kernel/expl3.sty | 2 +- texmf/tex/latex/l3kernel/l3debug.def | 2 +- texmf/tex/latex/l3kernel/l3doc.cls | 2 +- 7 files changed, 26 insertions(+), 20 deletions(-) diff --git a/base/testfiles/github-0944.tlg b/base/testfiles/github-0944.tlg index b938bdd93..add16da8d 100644 --- a/base/testfiles/github-0944.tlg +++ b/base/testfiles/github-0944.tlg @@ -22,7 +22,7 @@ LaTeX Warning: Reference `unknown' on page 1 undefined on input line .... ] (github-0944.aux) *********** -formatname- <-formatversion-> patch level -2 -L3 programming layer <2024-12-09> +L3 programming layer <2024-12-25> *********** *File List* -show the file list here- diff --git a/texmf/tex/latex/l3kernel/expl3-code.tex b/texmf/tex/latex/l3kernel/expl3-code.tex index ee46de3b4..fd8da0a35 100644 --- a/texmf/tex/latex/l3kernel/expl3-code.tex +++ b/texmf/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-12-09}% +\def\ExplFileDate{2024-12-25}% \begingroup \def\next{\endgroup}% \expandafter\ifx\csname PackageError\endcsname\relax @@ -3473,7 +3473,7 @@ \__kernel_chk_if_free_cs:N #1 \cs_gset_nopar:Npe #1 { \__kernel_exp_not:w {#2} } } -\cs_generate_variant:Nn \tl_const:Nn { Ne , c , ce } +\cs_generate_variant:Nn \tl_const:Nn { NV , Ne , c , cV , ce } \cs_generate_variant:Nn \tl_const:Nn { Nx , cx } \cs_new_protected:Npn \tl_clear:N #1 { \tex_let:D #1 = ~ \c_empty_tl } @@ -12474,6 +12474,8 @@ {#3} } } +\cs_new_protected:Npn \file_forget:n #1 + { \cs_undefine:c { __file_seen_ \file_full_name:n {#1} : } } \cs_new_protected:Npn \file_get_full_name:nN #1#2 { \file_get_full_name:nNF {#1} #2 @@ -30678,11 +30680,19 @@ } \cs_new_protected:Npn \color_select:nn #1#2 { - \__color_select_main:Nw \l__color_current_tl - #1 / / \s__color_mark #2 / / \s__color_stop + \__color_select_main:Nnn \l__color_current_tl {#1} {#2} \__color_finalise_current: \__color_select:N \l__color_current_tl } +\cs_new_protected:Npn \__color_select_main:Nnn #1#2#3 + { + \use:e + { + \exp_not:N \__color_select_main:Nw \exp_not:N #1 + \exp_not:n {#2} / / \exp_not:N \s__color_mark + #3 / / \exp_not:N \s__color_stop + } + } \cs_new_protected:Npn \__color_select_main:Nw #1 #2 / #3 / #4 \s__color_mark #5 / #6 / #7 \s__color_stop { @@ -30729,10 +30739,7 @@ \cs_new_protected:Npn \color_math:nnn #1#2#3 { \__color_math:nn {#3} - { - \__color_select_main:Nw \l__color_current_tl - #1 / / \s__color_mark #2 / / \s__color_stop - } + { \__color_select_main:Nnn \l__color_current_tl {#1} {#2} } } \cs_new_protected:Npn \__color_math:nn #1#2 { @@ -30830,14 +30837,12 @@ } \cs_new_protected:Npn \color_fill:nn #1#2 { - \__color_select_main:Nw \l__color_current_tl - #1 / / \s__color_mark #2 / / \s__color_stop + \__color_select_main:Nnn \l__color_current_tl {#1} {#2} \exp_after:wN \__color_draw:nnn \l__color_current_tl { fill } } \cs_new_protected:Npn \color_stroke:nn #1#2 { - \__color_select_main:Nw \l__color_current_tl - #1 / / \s__color_mark #2 / / \s__color_stop + \__color_select_main:Nnn \l__color_current_tl {#1} {#2} \exp_after:wN \__color_draw:nnn \l__color_current_tl { stroke } } \cs_new_protected:Npn \__color_draw:nnn #1#2#3 @@ -30966,6 +30971,8 @@ \prop_new:c { l__color_named_._prop } \tl_new:c { l__color_named_._tl } \tl_set:ce { l__color_named_._tl } { \__color_model:N \l__color_current_tl } +\prop_put:cve { l__color_named_._prop } { l__color_named_._tl } + { \__color_values:N \l__color_current_tl } \cs_new_protected:Npn \color_export:nnN #1#2#3 { \group_begin: @@ -30978,8 +30985,7 @@ } \cs_new_protected:Npn \color_export:nnnN #1#2#3#4 { - \__color_select_main:Nw #4 - #1 / / \s__color_mark #2 / / \s__color_stop + \__color_select_main:Nnn #4 {#1} {#2} \__color_export:nN {#3} #4 } \cs_new_protected:Npn \__color_export:nN #1#2 diff --git a/texmf/tex/latex/l3kernel/expl3-generic.tex b/texmf/tex/latex/l3kernel/expl3-generic.tex index 3e221f842..e63ad6c9a 100644 --- a/texmf/tex/latex/l3kernel/expl3-generic.tex +++ b/texmf/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-12-09}% +\def\ExplFileDate{2024-12-25}% \let\ExplLoaderFileDate\ExplFileDate \begingroup \catcode`\_=11 diff --git a/texmf/tex/latex/l3kernel/expl3.ltx b/texmf/tex/latex/l3kernel/expl3.ltx index 704ecfd2f..29b9700c1 100644 --- a/texmf/tex/latex/l3kernel/expl3.ltx +++ b/texmf/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-12-09}% +\def\ExplFileDate{2024-12-25}% \let\ExplLoaderFileDate\ExplFileDate \begingroup \catcode`\_=11 diff --git a/texmf/tex/latex/l3kernel/expl3.sty b/texmf/tex/latex/l3kernel/expl3.sty index aa6217f3f..7f73b6bdd 100644 --- a/texmf/tex/latex/l3kernel/expl3.sty +++ b/texmf/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-12-09}% +\def\ExplFileDate{2024-12-25}% \let\ExplLoaderFileDate\ExplFileDate \ProvidesPackage{expl3} [% diff --git a/texmf/tex/latex/l3kernel/l3debug.def b/texmf/tex/latex/l3kernel/l3debug.def index 6361b7c36..7b5724918 100644 --- a/texmf/tex/latex/l3kernel/l3debug.def +++ b/texmf/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-12-09}{}{L3 Debugging support} +\ProvidesExplFile{l3debug.def}{2024-12-25}{}{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 diff --git a/texmf/tex/latex/l3kernel/l3doc.cls b/texmf/tex/latex/l3kernel/l3doc.cls index 33d0a1c40..0649af9fb 100644 --- a/texmf/tex/latex/l3kernel/l3doc.cls +++ b/texmf/tex/latex/l3kernel/l3doc.cls @@ -20,7 +20,7 @@ %% %% File: l3doc.dtx \RequirePackage{calc} -\ProvidesExplClass{l3doc}{2024-12-09}{} +\ProvidesExplClass{l3doc}{2024-12-25}{} {L3 Experimental documentation class} \clist_new:N \g_docinput_clist \seq_new:N \g_doc_functions_seq