summaryrefslogtreecommitdiff
path: root/macros/latex/contrib/l3backend
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2023-11-10 03:04:54 +0000
committerNorbert Preining <norbert@preining.info>2023-11-10 03:04:54 +0000
commitd8b5161942976a522cdb1a7b580fe3886eea6bc6 (patch)
tree30b475f96e81b8b58bf4fbfb709a3e9e2551e16e /macros/latex/contrib/l3backend
parent3425ad695d75cc781b0fe3412db3aa2ad5985959 (diff)
CTAN sync 202311100304
Diffstat (limited to 'macros/latex/contrib/l3backend')
-rw-r--r--macros/latex/contrib/l3backend/CHANGELOG.md8
-rw-r--r--macros/latex/contrib/l3backend/README.md2
-rw-r--r--macros/latex/contrib/l3backend/l3backend-basics.dtx14
-rw-r--r--macros/latex/contrib/l3backend/l3backend-box.dtx2
-rw-r--r--macros/latex/contrib/l3backend/l3backend-code.pdfbin934049 -> 934856 bytes
-rw-r--r--macros/latex/contrib/l3backend/l3backend-color.dtx14
-rw-r--r--macros/latex/contrib/l3backend/l3backend-draw.dtx2
-rw-r--r--macros/latex/contrib/l3backend/l3backend-graphics.dtx2
-rw-r--r--macros/latex/contrib/l3backend/l3backend-header.dtx2
-rw-r--r--macros/latex/contrib/l3backend/l3backend-opacity.dtx4
-rw-r--r--macros/latex/contrib/l3backend/l3backend-pdf.dtx2
11 files changed, 34 insertions, 18 deletions
diff --git a/macros/latex/contrib/l3backend/CHANGELOG.md b/macros/latex/contrib/l3backend/CHANGELOG.md
index a81f6724b9..ddccab9d20 100644
--- a/macros/latex/contrib/l3backend/CHANGELOG.md
+++ b/macros/latex/contrib/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/macros/latex/contrib/l3backend/README.md b/macros/latex/contrib/l3backend/README.md
index 5f964ab76d..0dd36a404c 100644
--- a/macros/latex/contrib/l3backend/README.md
+++ b/macros/latex/contrib/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/macros/latex/contrib/l3backend/l3backend-basics.dtx b/macros/latex/contrib/l3backend/l3backend-basics.dtx
index 2bcf84e996..add8305061 100644
--- a/macros/latex/contrib/l3backend/l3backend-basics.dtx
+++ b/macros/latex/contrib/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/macros/latex/contrib/l3backend/l3backend-box.dtx b/macros/latex/contrib/l3backend/l3backend-box.dtx
index 2cb177b13d..cf91e71bed 100644
--- a/macros/latex/contrib/l3backend/l3backend-box.dtx
+++ b/macros/latex/contrib/l3backend/l3backend-box.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2023-11-04}
+% \date{Released 2023-11-09}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3backend/l3backend-code.pdf b/macros/latex/contrib/l3backend/l3backend-code.pdf
index 80b5d11e0f..dc7099b579 100644
--- a/macros/latex/contrib/l3backend/l3backend-code.pdf
+++ b/macros/latex/contrib/l3backend/l3backend-code.pdf
Binary files differ
diff --git a/macros/latex/contrib/l3backend/l3backend-color.dtx b/macros/latex/contrib/l3backend/l3backend-color.dtx
index 9b662307ed..cca4f54383 100644
--- a/macros/latex/contrib/l3backend/l3backend-color.dtx
+++ b/macros/latex/contrib/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/macros/latex/contrib/l3backend/l3backend-draw.dtx b/macros/latex/contrib/l3backend/l3backend-draw.dtx
index bd28199757..46b0e2af1d 100644
--- a/macros/latex/contrib/l3backend/l3backend-draw.dtx
+++ b/macros/latex/contrib/l3backend/l3backend-draw.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2023-11-04}
+% \date{Released 2023-11-09}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3backend/l3backend-graphics.dtx b/macros/latex/contrib/l3backend/l3backend-graphics.dtx
index f995d071a4..ce2e00a405 100644
--- a/macros/latex/contrib/l3backend/l3backend-graphics.dtx
+++ b/macros/latex/contrib/l3backend/l3backend-graphics.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2023-11-04}
+% \date{Released 2023-11-09}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3backend/l3backend-header.dtx b/macros/latex/contrib/l3backend/l3backend-header.dtx
index 8bfb6190e9..8fe469e639 100644
--- a/macros/latex/contrib/l3backend/l3backend-header.dtx
+++ b/macros/latex/contrib/l3backend/l3backend-header.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2023-11-04}
+% \date{Released 2023-11-09}
%
% \maketitle
%
diff --git a/macros/latex/contrib/l3backend/l3backend-opacity.dtx b/macros/latex/contrib/l3backend/l3backend-opacity.dtx
index eecc8376b1..440becf760 100644
--- a/macros/latex/contrib/l3backend/l3backend-opacity.dtx
+++ b/macros/latex/contrib/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/macros/latex/contrib/l3backend/l3backend-pdf.dtx b/macros/latex/contrib/l3backend/l3backend-pdf.dtx
index 6079b8bdea..e787ab7c25 100644
--- a/macros/latex/contrib/l3backend/l3backend-pdf.dtx
+++ b/macros/latex/contrib/l3backend/l3backend-pdf.dtx
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2023-11-04}
+% \date{Released 2023-11-09}
%
% \maketitle
%