texlive[68821] Master/texmf-dist: l3backend (11nov23)
commits+karl at tug.org
commits+karl at tug.org
Sun Nov 12 22:54:05 CET 2023
Revision: 68821
https://tug.org/svn/texlive?view=revision&revision=68821
Author: karl
Date: 2023-11-12 22:54:04 +0100 (Sun, 12 Nov 2023)
Log Message:
-----------
l3backend (11nov23)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/l3backend/CHANGELOG.md
trunk/Master/texmf-dist/doc/latex/l3backend/README.md
trunk/Master/texmf-dist/doc/latex/l3backend/l3backend-code.pdf
trunk/Master/texmf-dist/source/latex/l3backend/l3backend-basics.dtx
trunk/Master/texmf-dist/source/latex/l3backend/l3backend-box.dtx
trunk/Master/texmf-dist/source/latex/l3backend/l3backend-color.dtx
trunk/Master/texmf-dist/source/latex/l3backend/l3backend-draw.dtx
trunk/Master/texmf-dist/source/latex/l3backend/l3backend-graphics.dtx
trunk/Master/texmf-dist/source/latex/l3backend/l3backend-header.dtx
trunk/Master/texmf-dist/source/latex/l3backend/l3backend-opacity.dtx
trunk/Master/texmf-dist/source/latex/l3backend/l3backend-pdf.dtx
trunk/Master/texmf-dist/tex/latex/l3backend/l3backend-dvipdfmx.def
trunk/Master/texmf-dist/tex/latex/l3backend/l3backend-dvips.def
trunk/Master/texmf-dist/tex/latex/l3backend/l3backend-dvisvgm.def
trunk/Master/texmf-dist/tex/latex/l3backend/l3backend-luatex.def
trunk/Master/texmf-dist/tex/latex/l3backend/l3backend-luatex.lua
trunk/Master/texmf-dist/tex/latex/l3backend/l3backend-pdftex.def
trunk/Master/texmf-dist/tex/latex/l3backend/l3backend-xetex.def
Modified: trunk/Master/texmf-dist/doc/latex/l3backend/CHANGELOG.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/l3backend/CHANGELOG.md 2023-11-12 00:46:13 UTC (rev 68820)
+++ trunk/Master/texmf-dist/doc/latex/l3backend/CHANGELOG.md 2023-11-12 21:54:04 UTC (rev 68821)
@@ -6,6 +6,11 @@
## [Unreleased]
+## [2023-11-09]
+
+### Changed
+- Changed `luaotfload` integration to allow coexistance with (x)color.
+
## [2023-11-04]
### Fixed
@@ -311,7 +316,8 @@
- 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
Modified: trunk/Master/texmf-dist/doc/latex/l3backend/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/l3backend/README.md 2023-11-12 00:46:13 UTC (rev 68820)
+++ trunk/Master/texmf-dist/doc/latex/l3backend/README.md 2023-11-12 21:54:04 UTC (rev 68821)
@@ -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
Modified: trunk/Master/texmf-dist/doc/latex/l3backend/l3backend-code.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/source/latex/l3backend/l3backend-basics.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3backend/l3backend-basics.dtx 2023-11-12 00:46:13 UTC (rev 68820)
+++ trunk/Master/texmf-dist/source/latex/l3backend/l3backend-basics.dtx 2023-11-12 21:54:04 UTC (rev 68821)
@@ -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}
Modified: trunk/Master/texmf-dist/source/latex/l3backend/l3backend-box.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3backend/l3backend-box.dtx 2023-11-12 00:46:13 UTC (rev 68820)
+++ trunk/Master/texmf-dist/source/latex/l3backend/l3backend-box.dtx 2023-11-12 21:54:04 UTC (rev 68821)
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2023-11-04}
+% \date{Released 2023-11-09}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3backend/l3backend-color.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3backend/l3backend-color.dtx 2023-11-12 00:46:13 UTC (rev 68820)
+++ trunk/Master/texmf-dist/source/latex/l3backend/l3backend-color.dtx 2023-11-12 21:54:04 UTC (rev 68821)
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2023-11-04}
+% \date{Released 2023-11-09}
%
% \maketitle
%
@@ -1297,7 +1297,7 @@
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 @@
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
Modified: trunk/Master/texmf-dist/source/latex/l3backend/l3backend-draw.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3backend/l3backend-draw.dtx 2023-11-12 00:46:13 UTC (rev 68820)
+++ trunk/Master/texmf-dist/source/latex/l3backend/l3backend-draw.dtx 2023-11-12 21:54:04 UTC (rev 68821)
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2023-11-04}
+% \date{Released 2023-11-09}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3backend/l3backend-graphics.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3backend/l3backend-graphics.dtx 2023-11-12 00:46:13 UTC (rev 68820)
+++ trunk/Master/texmf-dist/source/latex/l3backend/l3backend-graphics.dtx 2023-11-12 21:54:04 UTC (rev 68821)
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2023-11-04}
+% \date{Released 2023-11-09}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3backend/l3backend-header.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3backend/l3backend-header.dtx 2023-11-12 00:46:13 UTC (rev 68820)
+++ trunk/Master/texmf-dist/source/latex/l3backend/l3backend-header.dtx 2023-11-12 21:54:04 UTC (rev 68821)
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2023-11-04}
+% \date{Released 2023-11-09}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3backend/l3backend-opacity.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3backend/l3backend-opacity.dtx 2023-11-12 00:46:13 UTC (rev 68820)
+++ trunk/Master/texmf-dist/source/latex/l3backend/l3backend-opacity.dtx 2023-11-12 21:54:04 UTC (rev 68821)
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2023-11-04}
+% \date{Released 2023-11-09}
%
% \maketitle
%
@@ -310,7 +310,7 @@
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',
Modified: trunk/Master/texmf-dist/source/latex/l3backend/l3backend-pdf.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3backend/l3backend-pdf.dtx 2023-11-12 00:46:13 UTC (rev 68820)
+++ trunk/Master/texmf-dist/source/latex/l3backend/l3backend-pdf.dtx 2023-11-12 21:54:04 UTC (rev 68821)
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2023-11-04}
+% \date{Released 2023-11-09}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/tex/latex/l3backend/l3backend-dvipdfmx.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/l3backend/l3backend-dvipdfmx.def 2023-11-12 00:46:13 UTC (rev 68820)
+++ trunk/Master/texmf-dist/tex/latex/l3backend/l3backend-dvipdfmx.def 2023-11-12 21:54:04 UTC (rev 68821)
@@ -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
{
Modified: trunk/Master/texmf-dist/tex/latex/l3backend/l3backend-dvips.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/l3backend/l3backend-dvips.def 2023-11-12 00:46:13 UTC (rev 68820)
+++ trunk/Master/texmf-dist/tex/latex/l3backend/l3backend-dvips.def 2023-11-12 21:54:04 UTC (rev 68821)
@@ -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
{
Modified: trunk/Master/texmf-dist/tex/latex/l3backend/l3backend-dvisvgm.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/l3backend/l3backend-dvisvgm.def 2023-11-12 00:46:13 UTC (rev 68820)
+++ trunk/Master/texmf-dist/tex/latex/l3backend/l3backend-dvisvgm.def 2023-11-12 21:54:04 UTC (rev 68821)
@@ -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
{
Modified: trunk/Master/texmf-dist/tex/latex/l3backend/l3backend-luatex.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/l3backend/l3backend-luatex.def 2023-11-12 00:46:13 UTC (rev 68820)
+++ trunk/Master/texmf-dist/tex/latex/l3backend/l3backend-luatex.def 2023-11-12 21:54:04 UTC (rev 68821)
@@ -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
{
Modified: trunk/Master/texmf-dist/tex/latex/l3backend/l3backend-luatex.lua
===================================================================
--- trunk/Master/texmf-dist/tex/latex/l3backend/l3backend-luatex.lua 2023-11-12 00:46:13 UTC (rev 68820)
+++ trunk/Master/texmf-dist/tex/latex/l3backend/l3backend-luatex.lua 2023-11-12 21:54:04 UTC (rev 68821)
@@ -53,6 +53,15 @@
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
Modified: trunk/Master/texmf-dist/tex/latex/l3backend/l3backend-pdftex.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/l3backend/l3backend-pdftex.def 2023-11-12 00:46:13 UTC (rev 68820)
+++ trunk/Master/texmf-dist/tex/latex/l3backend/l3backend-pdftex.def 2023-11-12 21:54:04 UTC (rev 68821)
@@ -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
{
Modified: trunk/Master/texmf-dist/tex/latex/l3backend/l3backend-xetex.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/l3backend/l3backend-xetex.def 2023-11-12 00:46:13 UTC (rev 68820)
+++ trunk/Master/texmf-dist/tex/latex/l3backend/l3backend-xetex.def 2023-11-12 21:54:04 UTC (rev 68821)
@@ -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
{
More information about the tex-live-commits
mailing list.