From ddf0f0ccbfbf255d9b3f42460865fc5673b8c84f Mon Sep 17 00:00:00 2001 From: Joseph Wright Date: Thu, 9 Nov 2023 12:42:38 +0000 Subject: [PATCH] Update l3backend and l3kernel to 2023-11-09 --- base/testfiles/github-0944.tlg | 2 +- texmf/tex/latex/l3backend/l3backend-dvipdfmx.def | 2 +- texmf/tex/latex/l3backend/l3backend-dvips.def | 2 +- texmf/tex/latex/l3backend/l3backend-dvisvgm.def | 2 +- texmf/tex/latex/l3backend/l3backend-luatex.def | 2 +- texmf/tex/latex/l3backend/l3backend-luatex.lua | 11 ++++++++++- texmf/tex/latex/l3backend/l3backend-pdftex.def | 2 +- texmf/tex/latex/l3backend/l3backend-xetex.def | 2 +- texmf/tex/latex/l3kernel/expl3-code.tex | 15 ++++++++++----- texmf/tex/latex/l3kernel/expl3-generic.tex | 2 +- texmf/tex/latex/l3kernel/expl3.ltx | 2 +- texmf/tex/latex/l3kernel/expl3.sty | 2 +- 12 files changed, 30 insertions(+), 16 deletions(-) diff --git a/base/testfiles/github-0944.tlg b/base/testfiles/github-0944.tlg index 993cc6d5b..2d5a19e93 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-> -L3 programming layer <2023-11-01> +L3 programming layer <2023-11-09> *********** *File List* -show the file list here- diff --git a/texmf/tex/latex/l3backend/l3backend-dvipdfmx.def b/texmf/tex/latex/l3backend/l3backend-dvipdfmx.def index 305695ca2..6b4f83c5d 100644 --- a/texmf/tex/latex/l3backend/l3backend-dvipdfmx.def +++ b/texmf/tex/latex/l3backend/l3backend-dvipdfmx.def @@ -26,7 +26,7 @@ %% %% File: l3backend-basics.dtx \ProvidesExplFile - {l3backend-dvipdfmx.def}{2023-10-23}{} + {l3backend-dvipdfmx.def}{2023-11-09}{} {L3 backend support: dvipdfmx} \cs_if_exist:NTF \__kernel_dependency_version_check:nn { diff --git a/texmf/tex/latex/l3backend/l3backend-dvips.def b/texmf/tex/latex/l3backend/l3backend-dvips.def index 1f08e53c1..3e4cfa337 100644 --- a/texmf/tex/latex/l3backend/l3backend-dvips.def +++ b/texmf/tex/latex/l3backend/l3backend-dvips.def @@ -26,7 +26,7 @@ %% %% File: l3backend-basics.dtx \ProvidesExplFile - {l3backend-dvips.def}{2023-10-23}{} + {l3backend-dvips.def}{2023-11-09}{} {L3 backend support: dvips} \cs_if_exist:NTF \__kernel_dependency_version_check:nn { diff --git a/texmf/tex/latex/l3backend/l3backend-dvisvgm.def b/texmf/tex/latex/l3backend/l3backend-dvisvgm.def index f033c93c5..f129e3516 100644 --- a/texmf/tex/latex/l3backend/l3backend-dvisvgm.def +++ b/texmf/tex/latex/l3backend/l3backend-dvisvgm.def @@ -26,7 +26,7 @@ %% %% File: l3backend-basics.dtx \ProvidesExplFile - {l3backend-dvisvgm.def}{2023-10-23}{} + {l3backend-dvisvgm.def}{2023-11-09}{} {L3 backend support: dvisvgm} \cs_if_exist:NTF \__kernel_dependency_version_check:nn { diff --git a/texmf/tex/latex/l3backend/l3backend-luatex.def b/texmf/tex/latex/l3backend/l3backend-luatex.def index b45e91ae5..9a258eedb 100644 --- a/texmf/tex/latex/l3backend/l3backend-luatex.def +++ b/texmf/tex/latex/l3backend/l3backend-luatex.def @@ -26,7 +26,7 @@ %% %% File: l3backend-basics.dtx \ProvidesExplFile - {l3backend-luatex.def}{2023-10-23}{} + {l3backend-luatex.def}{2023-11-09}{} {L3 backend support: PDF output (LuaTeX)} \cs_if_exist:NTF \__kernel_dependency_version_check:nn { diff --git a/texmf/tex/latex/l3backend/l3backend-luatex.lua b/texmf/tex/latex/l3backend/l3backend-luatex.lua index d784e77c2..b05c93a2b 100644 --- a/texmf/tex/latex/l3backend/l3backend-luatex.lua +++ b/texmf/tex/latex/l3backend/l3backend-luatex.lua @@ -53,6 +53,15 @@ if luaotfload and luaotfload.set_transparent_colorstack then local html = htmlcolor:match(value) if html then return html end + local l3color_prop = token.get_macro(string.format('l__color_named_%s_prop', value)) + if l3color_prop == nil or l3color_prop == '' then + local legacy_color_macro = token.create(string.format('\\color@%s', value)) + if legacy_color_macro.cmdname ~= 'undefined_cs' then + token.put_next(legacy_color_macro) + return token.scan_argument() + end + end + tex.runtoks(function() token.get_next() color_export[6] = value @@ -81,7 +90,7 @@ local pdfmanagement_active do end if pdfmanagement_active and luaotfload and luaotfload.set_transparent_colorstack then - luaotfload.set_transparent_colorstack(token.create'c__opacity_backend_stack_int'.index) + luaotfload.set_transparent_colorstack(function() return token.create'c__opacity_backend_stack_int'.index end) local transparent_register = { token.create'pdfmanagement_add:nnn', diff --git a/texmf/tex/latex/l3backend/l3backend-pdftex.def b/texmf/tex/latex/l3backend/l3backend-pdftex.def index 4022a90bd..8db284d76 100644 --- a/texmf/tex/latex/l3backend/l3backend-pdftex.def +++ b/texmf/tex/latex/l3backend/l3backend-pdftex.def @@ -26,7 +26,7 @@ %% %% File: l3backend-basics.dtx \ProvidesExplFile - {l3backend-pdftex.def}{2023-10-23}{} + {l3backend-pdftex.def}{2023-11-09}{} {L3 backend support: PDF output (pdfTeX)} \cs_if_exist:NTF \__kernel_dependency_version_check:nn { diff --git a/texmf/tex/latex/l3backend/l3backend-xetex.def b/texmf/tex/latex/l3backend/l3backend-xetex.def index cdb14e25c..912f09d42 100644 --- a/texmf/tex/latex/l3backend/l3backend-xetex.def +++ b/texmf/tex/latex/l3backend/l3backend-xetex.def @@ -26,7 +26,7 @@ %% %% File: l3backend-basics.dtx \ProvidesExplFile - {l3backend-xetex.def}{2023-10-23}{} + {l3backend-xetex.def}{2023-11-09}{} {L3 backend support: XeTeX} \cs_if_exist:NTF \__kernel_dependency_version_check:nn { diff --git a/texmf/tex/latex/l3kernel/expl3-code.tex b/texmf/tex/latex/l3kernel/expl3-code.tex index d80a33cae..65ebd2e70 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{2023-11-01}% +\def\ExplFileDate{2023-11-09}% \begingroup \def\next{\endgroup}% \expandafter\ifx\csname PackageError\endcsname\relax @@ -4881,6 +4881,8 @@ } \cs_new:Npn \__str_case_e:nnTF #1#2#3#4 { \__str_case_e:nw {#1} #2 {#1} { } \s__str_mark {#3} \s__str_mark {#4} \s__str_stop } +\cs_generate_variant:Nn \str_case_e:nn { e } +\prg_generate_conditional_variant:Nnn \str_case_e:nn { e } { T , F , TF } \cs_new:Npn \__str_case_e:nw #1#2#3 { \str_if_eq:eeTF {#1} {#2} @@ -13174,6 +13176,7 @@ \int_new:N \l_keys_choice_int \tl_new:N \l_keys_choice_tl \clist_new:N \l__keys_groups_clist +\clist_new:N \l__keys_inherit_clist \str_new:N \l_keys_key_str \tl_new:N \l_keys_key_tl \str_new:N \l__keys_module_str @@ -13188,7 +13191,7 @@ \bool_new:N \l__keys_selective_bool \bool_new:N \l__keys_filtered_bool \seq_new:N \l__keys_selective_seq -\tl_new:N \l__keys_unused_clist +\clist_new:N \l__keys_unused_clist \tl_new:N \l_keys_value_tl \bool_new:N \l__keys_tmp_bool \tl_new:N \l__keys_tmpa_tl @@ -13419,7 +13422,9 @@ \cs_new_protected:Npn \__keys_inherit:n #1 { \__keys_undefine: - \cs_set_nopar:cpn { \c__keys_inherit_root_str \l_keys_path_str } {#1} + \clist_set:Nn \l__keys_inherit_clist {#1} + \cs_set_eq:cN { \c__keys_inherit_root_str \l_keys_path_str } + \l__keys_inherit_clist } \cs_new_protected:Npn \__keys_initialise:n #1 { @@ -13844,7 +13849,7 @@ \clist_clear:N \l__keys_unused_clist \__keys_set_known:nnn {#2} {#3} {#4} \__kernel_tl_set:Ne #5 { \exp_not:o \l__keys_unused_clist } - \tl_set:Nn \l__keys_unused_clist {#1} + \__kernel_tl_set:Ne \l__keys_unused_clist { \exp_not:n {#1} } } \cs_new_protected:Npn \keys_set_known:nn #1#2 { \__keys_set_known:nnn \q__keys_no_value {#1} {#2} } @@ -13886,7 +13891,7 @@ \clist_clear:N \l__keys_unused_clist \__keys_set_filter:nnnn {#2} {#3} {#4} {#5} \__kernel_tl_set:Ne #6 { \exp_not:o \l__keys_unused_clist } - \tl_set:Nn \l__keys_unused_clist {#1} + \__kernel_tl_set:Ne \l__keys_unused_clist { \exp_not:n {#1} } } \cs_new_protected:Npn \keys_set_filter:nnn #1#2#3 {\__keys_set_filter:nnnn \q__keys_no_value {#1} {#2} {#3} } diff --git a/texmf/tex/latex/l3kernel/expl3-generic.tex b/texmf/tex/latex/l3kernel/expl3-generic.tex index f84742ea3..0c7206d40 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{2023-11-01}% +\def\ExplFileDate{2023-11-09}% \let\ExplLoaderFileDate\ExplFileDate \begingroup \catcode`\_=11 diff --git a/texmf/tex/latex/l3kernel/expl3.ltx b/texmf/tex/latex/l3kernel/expl3.ltx index b0134c23c..54d24346c 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{2023-11-01}% +\def\ExplFileDate{2023-11-09}% \let\ExplLoaderFileDate\ExplFileDate \begingroup \catcode`\_=11 diff --git a/texmf/tex/latex/l3kernel/expl3.sty b/texmf/tex/latex/l3kernel/expl3.sty index 8afbeb2e7..0d984b2c8 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{2023-11-01}% +\def\ExplFileDate{2023-11-09}% \let\ExplLoaderFileDate\ExplFileDate \ProvidesPackage{expl3} [%