diff options
18 files changed, 49 insertions, 24 deletions
diff --git a/Master/texmf-dist/doc/latex/l3backend/CHANGELOG.md b/Master/texmf-dist/doc/latex/l3backend/CHANGELOG.md index a81f6724b92..ddccab9d202 100644 --- a/Master/texmf-dist/doc/latex/l3backend/CHANGELOG.md +++ b/Master/texmf-dist/doc/latex/l3backend/CHANGELOG.md @@ -6,6 +6,11 @@ this project uses date-based 'snapshot' version identifiers. ## [Unreleased] +## [2023-11-09] + +### Changed +- Changed `luaotfload` integration to allow coexistance with (x)color. + ## [2023-11-04] ### Fixed @@ -311,7 +316,8 @@ this project uses date-based 'snapshot' version identifiers. - Include `l3backend` in file names - Moved backend code to internal for each 'parent' module -[Unreleased]: https://github.com/latex3/latex3/compare/2023-11-04...HEAD +[Unreleased]: https://github.com/latex3/latex3/compare/2023-11-09...HEAD +[2023-11-09]: https://github.com/latex3/latex3/compare/2023-11-04...2023-11-09 [2023-11-04]: https://github.com/latex3/latex3/compare/2023-10-23...2023-11-04 [2023-10-23]: https://github.com/latex3/latex3/compare/2023-10-10...2023-10-23 [2023-10-10]: https://github.com/latex3/latex3/compare/2023-04-19...2023-10-10 diff --git a/Master/texmf-dist/doc/latex/l3backend/README.md b/Master/texmf-dist/doc/latex/l3backend/README.md index 5f964ab76db..0dd36a404ce 100644 --- a/Master/texmf-dist/doc/latex/l3backend/README.md +++ b/Master/texmf-dist/doc/latex/l3backend/README.md @@ -1,7 +1,7 @@ LaTeX3 Backend Drivers ====================== -Release 2023-11-04 +Release 2023-11-09 This package forms parts of `expl3`, and contains the code used to interface with backends (drivers) across the `expl3` codebase. The functions here are diff --git a/Master/texmf-dist/doc/latex/l3backend/l3backend-code.pdf b/Master/texmf-dist/doc/latex/l3backend/l3backend-code.pdf Binary files differindex 80b5d11e0fa..dc7099b579b 100644 --- a/Master/texmf-dist/doc/latex/l3backend/l3backend-code.pdf +++ b/Master/texmf-dist/doc/latex/l3backend/l3backend-code.pdf diff --git a/Master/texmf-dist/source/latex/l3backend/l3backend-basics.dtx b/Master/texmf-dist/source/latex/l3backend/l3backend-basics.dtx index 2bcf84e9963..add8305061a 100644 --- a/Master/texmf-dist/source/latex/l3backend/l3backend-basics.dtx +++ b/Master/texmf-dist/source/latex/l3backend/l3backend-basics.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2023-11-04} +% \date{Released 2023-11-09} % % \maketitle % @@ -70,27 +70,27 @@ % \begin{macrocode} \ProvidesExplFile %<*dvipdfmx> - {l3backend-dvipdfmx.def}{2023-11-04}{} + {l3backend-dvipdfmx.def}{2023-11-09}{} {L3 backend support: dvipdfmx} %</dvipdfmx> %<*dvips> - {l3backend-dvips.def}{2023-11-04}{} + {l3backend-dvips.def}{2023-11-09}{} {L3 backend support: dvips} %</dvips> %<*dvisvgm> - {l3backend-dvisvgm.def}{2023-11-04}{} + {l3backend-dvisvgm.def}{2023-11-09}{} {L3 backend support: dvisvgm} %</dvisvgm> %<*luatex> - {l3backend-luatex.def}{2023-11-04}{} + {l3backend-luatex.def}{2023-11-09}{} {L3 backend support: PDF output (LuaTeX)} %</luatex> %<*pdftex> - {l3backend-pdftex.def}{2023-11-04}{} + {l3backend-pdftex.def}{2023-11-09}{} {L3 backend support: PDF output (pdfTeX)} %</pdftex> %<*xetex> - {l3backend-xetex.def}{2023-11-04}{} + {l3backend-xetex.def}{2023-11-09}{} {L3 backend support: XeTeX} %</xetex> % \end{macrocode} diff --git a/Master/texmf-dist/source/latex/l3backend/l3backend-box.dtx b/Master/texmf-dist/source/latex/l3backend/l3backend-box.dtx index 2cb177b13d2..cf91e71bed1 100644 --- a/Master/texmf-dist/source/latex/l3backend/l3backend-box.dtx +++ b/Master/texmf-dist/source/latex/l3backend/l3backend-box.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2023-11-04} +% \date{Released 2023-11-09} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3backend/l3backend-color.dtx b/Master/texmf-dist/source/latex/l3backend/l3backend-color.dtx index 9b662307edb..cca4f543836 100644 --- a/Master/texmf-dist/source/latex/l3backend/l3backend-color.dtx +++ b/Master/texmf-dist/source/latex/l3backend/l3backend-color.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2023-11-04} +% \date{Released 2023-11-09} % % \maketitle % @@ -1297,7 +1297,7 @@ if luaotfload and luaotfload.set_transparent_colorstack then token.new(0, 2), token.create'l_tmpa_tl', token.create'exp_after:wN', - token.create'__color_select:nn', + token.create'@@_select:nn', token.create'l_tmpa_tl', token.new(0, 2), } @@ -1308,6 +1308,16 @@ if luaotfload and luaotfload.set_transparent_colorstack then local html = htmlcolor:match(value) if html then return html end +% If no l3color named color with this name is known, check for defined xcolor colors + local l3color_prop = token.get_macro(string.format('l_@@_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 diff --git a/Master/texmf-dist/source/latex/l3backend/l3backend-draw.dtx b/Master/texmf-dist/source/latex/l3backend/l3backend-draw.dtx index bd281997571..46b0e2af1dd 100644 --- a/Master/texmf-dist/source/latex/l3backend/l3backend-draw.dtx +++ b/Master/texmf-dist/source/latex/l3backend/l3backend-draw.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2023-11-04} +% \date{Released 2023-11-09} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3backend/l3backend-graphics.dtx b/Master/texmf-dist/source/latex/l3backend/l3backend-graphics.dtx index f995d071a47..ce2e00a4058 100644 --- a/Master/texmf-dist/source/latex/l3backend/l3backend-graphics.dtx +++ b/Master/texmf-dist/source/latex/l3backend/l3backend-graphics.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2023-11-04} +% \date{Released 2023-11-09} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3backend/l3backend-header.dtx b/Master/texmf-dist/source/latex/l3backend/l3backend-header.dtx index 8bfb6190e9d..8fe469e6395 100644 --- a/Master/texmf-dist/source/latex/l3backend/l3backend-header.dtx +++ b/Master/texmf-dist/source/latex/l3backend/l3backend-header.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2023-11-04} +% \date{Released 2023-11-09} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3backend/l3backend-opacity.dtx b/Master/texmf-dist/source/latex/l3backend/l3backend-opacity.dtx index eecc8376b18..440becf7608 100644 --- a/Master/texmf-dist/source/latex/l3backend/l3backend-opacity.dtx +++ b/Master/texmf-dist/source/latex/l3backend/l3backend-opacity.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2023-11-04} +% \date{Released 2023-11-09} % % \maketitle % @@ -310,7 +310,7 @@ local pdfmanagement_active do end if pdfmanagement_active and luaotfload and luaotfload.set_transparent_colorstack then - luaotfload.set_transparent_colorstack(function() return token.create'c__opacity_backend_stack_int'.index end) + luaotfload.set_transparent_colorstack(function() return token.create'c_@@_backend_stack_int'.index end) local transparent_register = { token.create'pdfmanagement_add:nnn', diff --git a/Master/texmf-dist/source/latex/l3backend/l3backend-pdf.dtx b/Master/texmf-dist/source/latex/l3backend/l3backend-pdf.dtx index 6079b8bdea9..e787ab7c25b 100644 --- a/Master/texmf-dist/source/latex/l3backend/l3backend-pdf.dtx +++ b/Master/texmf-dist/source/latex/l3backend/l3backend-pdf.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2023-11-04} +% \date{Released 2023-11-09} % % \maketitle % diff --git a/Master/texmf-dist/tex/latex/l3backend/l3backend-dvipdfmx.def b/Master/texmf-dist/tex/latex/l3backend/l3backend-dvipdfmx.def index ce90e4df65c..6b4f83c5dde 100644 --- a/Master/texmf-dist/tex/latex/l3backend/l3backend-dvipdfmx.def +++ b/Master/texmf-dist/tex/latex/l3backend/l3backend-dvipdfmx.def @@ -26,7 +26,7 @@ %% %% File: l3backend-basics.dtx \ProvidesExplFile - {l3backend-dvipdfmx.def}{2023-11-04}{} + {l3backend-dvipdfmx.def}{2023-11-09}{} {L3 backend support: dvipdfmx} \cs_if_exist:NTF \__kernel_dependency_version_check:nn { diff --git a/Master/texmf-dist/tex/latex/l3backend/l3backend-dvips.def b/Master/texmf-dist/tex/latex/l3backend/l3backend-dvips.def index 79543e5b083..3e4cfa337cd 100644 --- a/Master/texmf-dist/tex/latex/l3backend/l3backend-dvips.def +++ b/Master/texmf-dist/tex/latex/l3backend/l3backend-dvips.def @@ -26,7 +26,7 @@ %% %% File: l3backend-basics.dtx \ProvidesExplFile - {l3backend-dvips.def}{2023-11-04}{} + {l3backend-dvips.def}{2023-11-09}{} {L3 backend support: dvips} \cs_if_exist:NTF \__kernel_dependency_version_check:nn { diff --git a/Master/texmf-dist/tex/latex/l3backend/l3backend-dvisvgm.def b/Master/texmf-dist/tex/latex/l3backend/l3backend-dvisvgm.def index b43b25aa81b..f129e35165f 100644 --- a/Master/texmf-dist/tex/latex/l3backend/l3backend-dvisvgm.def +++ b/Master/texmf-dist/tex/latex/l3backend/l3backend-dvisvgm.def @@ -26,7 +26,7 @@ %% %% File: l3backend-basics.dtx \ProvidesExplFile - {l3backend-dvisvgm.def}{2023-11-04}{} + {l3backend-dvisvgm.def}{2023-11-09}{} {L3 backend support: dvisvgm} \cs_if_exist:NTF \__kernel_dependency_version_check:nn { diff --git a/Master/texmf-dist/tex/latex/l3backend/l3backend-luatex.def b/Master/texmf-dist/tex/latex/l3backend/l3backend-luatex.def index 567ba956c91..9a258eedb44 100644 --- a/Master/texmf-dist/tex/latex/l3backend/l3backend-luatex.def +++ b/Master/texmf-dist/tex/latex/l3backend/l3backend-luatex.def @@ -26,7 +26,7 @@ %% %% File: l3backend-basics.dtx \ProvidesExplFile - {l3backend-luatex.def}{2023-11-04}{} + {l3backend-luatex.def}{2023-11-09}{} {L3 backend support: PDF output (LuaTeX)} \cs_if_exist:NTF \__kernel_dependency_version_check:nn { diff --git a/Master/texmf-dist/tex/latex/l3backend/l3backend-luatex.lua b/Master/texmf-dist/tex/latex/l3backend/l3backend-luatex.lua index 7ea32b0c64a..b05c93a2b53 100644 --- a/Master/texmf-dist/tex/latex/l3backend/l3backend-luatex.lua +++ b/Master/texmf-dist/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 diff --git a/Master/texmf-dist/tex/latex/l3backend/l3backend-pdftex.def b/Master/texmf-dist/tex/latex/l3backend/l3backend-pdftex.def index a66ceac3b1f..8db284d7615 100644 --- a/Master/texmf-dist/tex/latex/l3backend/l3backend-pdftex.def +++ b/Master/texmf-dist/tex/latex/l3backend/l3backend-pdftex.def @@ -26,7 +26,7 @@ %% %% File: l3backend-basics.dtx \ProvidesExplFile - {l3backend-pdftex.def}{2023-11-04}{} + {l3backend-pdftex.def}{2023-11-09}{} {L3 backend support: PDF output (pdfTeX)} \cs_if_exist:NTF \__kernel_dependency_version_check:nn { diff --git a/Master/texmf-dist/tex/latex/l3backend/l3backend-xetex.def b/Master/texmf-dist/tex/latex/l3backend/l3backend-xetex.def index 29cd6796a50..912f09d4248 100644 --- a/Master/texmf-dist/tex/latex/l3backend/l3backend-xetex.def +++ b/Master/texmf-dist/tex/latex/l3backend/l3backend-xetex.def @@ -26,7 +26,7 @@ %% %% File: l3backend-basics.dtx \ProvidesExplFile - {l3backend-xetex.def}{2023-11-04}{} + {l3backend-xetex.def}{2023-11-09}{} {L3 backend support: XeTeX} \cs_if_exist:NTF \__kernel_dependency_version_check:nn { |