Skip to content

Commit

Permalink
Update l3backend and l3kernel to 2023-11-09
Browse files Browse the repository at this point in the history
  • Loading branch information
josephwright committed Nov 9, 2023
1 parent a4a0ae4 commit ddf0f0c
Show file tree
Hide file tree
Showing 12 changed files with 30 additions and 16 deletions.
2 changes: 1 addition & 1 deletion base/testfiles/github-0944.tlg
Original file line number Diff line number Diff line change
Expand Up @@ -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-
Expand Down
2 changes: 1 addition & 1 deletion texmf/tex/latex/l3backend/l3backend-dvipdfmx.def
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
2 changes: 1 addition & 1 deletion texmf/tex/latex/l3backend/l3backend-dvips.def
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
2 changes: 1 addition & 1 deletion texmf/tex/latex/l3backend/l3backend-dvisvgm.def
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
2 changes: 1 addition & 1 deletion texmf/tex/latex/l3backend/l3backend-luatex.def
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
11 changes: 10 additions & 1 deletion texmf/tex/latex/l3backend/l3backend-luatex.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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',
Expand Down
2 changes: 1 addition & 1 deletion texmf/tex/latex/l3backend/l3backend-pdftex.def
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
2 changes: 1 addition & 1 deletion texmf/tex/latex/l3backend/l3backend-xetex.def
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
15 changes: 10 additions & 5 deletions texmf/tex/latex/l3kernel/expl3-code.tex
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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}
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
{
Expand Down Expand Up @@ -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} }
Expand Down Expand Up @@ -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} }
Expand Down
2 changes: 1 addition & 1 deletion texmf/tex/latex/l3kernel/expl3-generic.tex
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion texmf/tex/latex/l3kernel/expl3.ltx
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion texmf/tex/latex/l3kernel/expl3.sty
Original file line number Diff line number Diff line change
Expand Up @@ -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}
[%
Expand Down

0 comments on commit ddf0f0c

Please sign in to comment.