texlive[60790] Master/texmf-dist: l3 (17oct21)
commits+karl at tug.org
commits+karl at tug.org
Sun Oct 17 22:51:10 CEST 2021
Revision: 60790
http://tug.org/svn/texlive?view=revision&revision=60790
Author: karl
Date: 2021-10-17 22:51:10 +0200 (Sun, 17 Oct 2021)
Log Message:
-----------
l3 (17oct21)
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/doc/latex/l3kernel/CHANGELOG.md
trunk/Master/texmf-dist/doc/latex/l3kernel/README.md
trunk/Master/texmf-dist/doc/latex/l3kernel/expl3.pdf
trunk/Master/texmf-dist/doc/latex/l3kernel/interface3.pdf
trunk/Master/texmf-dist/doc/latex/l3kernel/interface3.tex
trunk/Master/texmf-dist/doc/latex/l3kernel/l3docstrip.pdf
trunk/Master/texmf-dist/doc/latex/l3kernel/l3news.pdf
trunk/Master/texmf-dist/doc/latex/l3kernel/l3news01.pdf
trunk/Master/texmf-dist/doc/latex/l3kernel/l3news02.pdf
trunk/Master/texmf-dist/doc/latex/l3kernel/l3news03.pdf
trunk/Master/texmf-dist/doc/latex/l3kernel/l3news04.pdf
trunk/Master/texmf-dist/doc/latex/l3kernel/l3news05.pdf
trunk/Master/texmf-dist/doc/latex/l3kernel/l3news06.pdf
trunk/Master/texmf-dist/doc/latex/l3kernel/l3news07.pdf
trunk/Master/texmf-dist/doc/latex/l3kernel/l3news08.pdf
trunk/Master/texmf-dist/doc/latex/l3kernel/l3news09.pdf
trunk/Master/texmf-dist/doc/latex/l3kernel/l3news10.pdf
trunk/Master/texmf-dist/doc/latex/l3kernel/l3news11.pdf
trunk/Master/texmf-dist/doc/latex/l3kernel/l3news12.pdf
trunk/Master/texmf-dist/doc/latex/l3kernel/l3prefixes.pdf
trunk/Master/texmf-dist/doc/latex/l3kernel/l3styleguide.pdf
trunk/Master/texmf-dist/doc/latex/l3kernel/l3styleguide.tex
trunk/Master/texmf-dist/doc/latex/l3kernel/l3syntax-changes.pdf
trunk/Master/texmf-dist/doc/latex/l3kernel/l3syntax-changes.tex
trunk/Master/texmf-dist/doc/latex/l3kernel/l3term-glossary.pdf
trunk/Master/texmf-dist/doc/latex/l3kernel/l3term-glossary.tex
trunk/Master/texmf-dist/doc/latex/l3kernel/source3.pdf
trunk/Master/texmf-dist/doc/latex/l3kernel/source3.tex
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/source/latex/l3kernel/expl3.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3basics.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3bootstrap.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3box.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3candidates.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3cctab.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3clist.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3coffins.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3color.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3debug.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3deprecation.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3doc.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3docstrip.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3expan.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3file.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3flag.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-assign.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-aux.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-basics.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-convert.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-expo.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-extended.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-logic.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-parse.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-random.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-round.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-traps.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-trig.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3fp.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3fparray.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3int.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3intarray.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3kernel-functions.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3keys.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3legacy.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3luatex.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3msg.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3names.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3pdf.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3prg.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3prop.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3quark.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3regex.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3seq.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3skip.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3sort.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3str-convert.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3str.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3sys.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3text-case.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3text-purify.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3text.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3tl-analysis.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3tl.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3token.dtx
trunk/Master/texmf-dist/source/latex/l3kernel/l3unicode.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-pdftex.def
trunk/Master/texmf-dist/tex/latex/l3backend/l3backend-xetex.def
trunk/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex
trunk/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex
trunk/Master/texmf-dist/tex/latex/l3kernel/expl3.ltx
trunk/Master/texmf-dist/tex/latex/l3kernel/expl3.sty
Modified: trunk/Master/texmf-dist/doc/latex/l3backend/CHANGELOG.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/l3backend/CHANGELOG.md 2021-10-17 20:49:19 UTC (rev 60789)
+++ trunk/Master/texmf-dist/doc/latex/l3backend/CHANGELOG.md 2021-10-17 20:51:10 UTC (rev 60790)
@@ -6,6 +6,11 @@
## [Unreleased]
+## [2021-10-17]
+
+### Changed
+- Better DeviceN support
+
## [2021-10-12]
### Fixed
@@ -196,7 +201,8 @@
- Include `l3backend` in file names
- Moved backend code to internal for each 'parent' module
-[Unreleased]: https://github.com/latex3/latex3/compare/2021-10-12...HEAD
+[Unreleased]: https://github.com/latex3/latex3/compare/2021-10-17...HEAD
+[2021-10-17]: https://github.com/latex3/latex3/compare/2021-10-12...2021-10-17
[2021-10-12]: https://github.com/latex3/latex3/compare/2021-08-04...2021-10-12
[2021-08-04]: https://github.com/latex3/latex3/compare/2021-07-12...2021-08-04
[2021-07-12]: https://github.com/latex3/latex3/compare/2021-05-07...2021-07-12
Modified: trunk/Master/texmf-dist/doc/latex/l3backend/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/l3backend/README.md 2021-10-17 20:49:19 UTC (rev 60789)
+++ trunk/Master/texmf-dist/doc/latex/l3backend/README.md 2021-10-17 20:51:10 UTC (rev 60790)
@@ -1,7 +1,7 @@
LaTeX3 Backend Drivers
======================
-Release 2021-10-12
+Release 2021-10-17
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/doc/latex/l3kernel/CHANGELOG.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/l3kernel/CHANGELOG.md 2021-10-17 20:49:19 UTC (rev 60789)
+++ trunk/Master/texmf-dist/doc/latex/l3kernel/CHANGELOG.md 2021-10-17 20:51:10 UTC (rev 60790)
@@ -7,6 +7,11 @@
## [Unreleased]
+## [2021-10-17]
+
+### Changed
+- Better DeviceN support
+
## [2021-10-12]
### Fixed
@@ -960,7 +965,8 @@
- Step functions have been added for dim variables,
e.g. `\dim_step_inline:nnnn`
-[Unreleased]: https://github.com/latex3/latex3/compare/2021-10-12...HEAD
+[Unreleased]: https://github.com/latex3/latex3/compare/2021-10-17...HEAD
+[2021-10-17]: https://github.com/latex3/latex3/compare/2021-10-12...2021-10-17
[2021-10-12]: https://github.com/latex3/latex3/compare/2021-08-27...2021-10-12
[2021-08-27]: https://github.com/latex3/latex3/compare/2021-07-12...2021-08-27
[2021-07-12]: https://github.com/latex3/latex3/compare/2021-06-18...2021-07-12
Modified: trunk/Master/texmf-dist/doc/latex/l3kernel/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/l3kernel/README.md 2021-10-17 20:49:19 UTC (rev 60789)
+++ trunk/Master/texmf-dist/doc/latex/l3kernel/README.md 2021-10-17 20:51:10 UTC (rev 60790)
@@ -1,7 +1,7 @@
LaTeX3 Programming Conventions
==============================
-Release 2021-10-12
+Release 2021-10-17
Overview
--------
Modified: trunk/Master/texmf-dist/doc/latex/l3kernel/expl3.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/l3kernel/interface3.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/l3kernel/interface3.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/l3kernel/interface3.tex 2021-10-17 20:49:19 UTC (rev 60789)
+++ trunk/Master/texmf-dist/doc/latex/l3kernel/interface3.tex 2021-10-17 20:51:10 UTC (rev 60790)
@@ -54,7 +54,7 @@
{latex-team at latex-project.org}%
}%
}
-\date{Released 2021-10-12}
+\date{Released 2021-10-17}
\pagenumbering{roman}
\maketitle
Modified: trunk/Master/texmf-dist/doc/latex/l3kernel/l3docstrip.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/l3kernel/l3news.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/l3kernel/l3news01.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/l3kernel/l3news02.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/l3kernel/l3news03.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/l3kernel/l3news04.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/l3kernel/l3news05.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/l3kernel/l3news06.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/l3kernel/l3news07.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/l3kernel/l3news08.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/l3kernel/l3news09.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/l3kernel/l3news10.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/l3kernel/l3news11.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/l3kernel/l3news12.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/l3kernel/l3prefixes.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/l3kernel/l3styleguide.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/l3kernel/l3styleguide.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/l3kernel/l3styleguide.tex 2021-10-17 20:49:19 UTC (rev 60789)
+++ trunk/Master/texmf-dist/doc/latex/l3kernel/l3styleguide.tex 2021-10-17 20:51:10 UTC (rev 60790)
@@ -32,7 +32,7 @@
{latex-team at latex-project.org}%
}%
}
-\date{Released 2021-10-12}
+\date{Released 2021-10-17}
\begin{document}
Modified: trunk/Master/texmf-dist/doc/latex/l3kernel/l3syntax-changes.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/l3kernel/l3syntax-changes.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/l3kernel/l3syntax-changes.tex 2021-10-17 20:49:19 UTC (rev 60789)
+++ trunk/Master/texmf-dist/doc/latex/l3kernel/l3syntax-changes.tex 2021-10-17 20:51:10 UTC (rev 60790)
@@ -32,7 +32,7 @@
{latex-team at latex-project.org}%
}%
}
-\date{Released 2021-10-12}
+\date{Released 2021-10-17}
\newcommand{\TF}{\textit{(TF)}}
Modified: trunk/Master/texmf-dist/doc/latex/l3kernel/l3term-glossary.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/l3kernel/l3term-glossary.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/l3kernel/l3term-glossary.tex 2021-10-17 20:49:19 UTC (rev 60789)
+++ trunk/Master/texmf-dist/doc/latex/l3kernel/l3term-glossary.tex 2021-10-17 20:51:10 UTC (rev 60790)
@@ -32,7 +32,7 @@
{latex-team at latex-project.org}%
}%
}
-\date{Released 2021-10-12}
+\date{Released 2021-10-17}
\newcommand{\TF}{\textit{(TF)}}
Modified: trunk/Master/texmf-dist/doc/latex/l3kernel/source3.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/l3kernel/source3.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/l3kernel/source3.tex 2021-10-17 20:49:19 UTC (rev 60789)
+++ trunk/Master/texmf-dist/doc/latex/l3kernel/source3.tex 2021-10-17 20:51:10 UTC (rev 60790)
@@ -53,7 +53,7 @@
{latex-team at latex-project.org}%
}%
}
-\date{Released 2021-10-12}
+\date{Released 2021-10-17}
\pagenumbering{roman}
\maketitle
Modified: trunk/Master/texmf-dist/source/latex/l3backend/l3backend-basics.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3backend/l3backend-basics.dtx 2021-10-17 20:49:19 UTC (rev 60789)
+++ trunk/Master/texmf-dist/source/latex/l3backend/l3backend-basics.dtx 2021-10-17 20:51:10 UTC (rev 60790)
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2021-10-12}
+% \date{Released 2021-10-17}
%
% \maketitle
%
@@ -70,27 +70,27 @@
% \begin{macrocode}
\ProvidesExplFile
%<*dvipdfmx>
- {l3backend-dvipdfmx.def}{2021-10-12}{}
+ {l3backend-dvipdfmx.def}{2021-10-17}{}
{L3 backend support: dvipdfmx}
%</dvipdfmx>
%<*dvips>
- {l3backend-dvips.def}{2021-10-12}{}
+ {l3backend-dvips.def}{2021-10-17}{}
{L3 backend support: dvips}
%</dvips>
%<*dvisvgm>
- {l3backend-dvisvgm.def}{2021-10-12}{}
+ {l3backend-dvisvgm.def}{2021-10-17}{}
{L3 backend support: dvisvgm}
%</dvisvgm>
%<*luatex>
- {l3backend-luatex.def}{2021-10-12}{}
+ {l3backend-luatex.def}{2021-10-17}{}
{L3 backend support: PDF output (LuaTeX)}
%</luatex>
%<*pdftex>
- {l3backend-pdftex.def}{2021-10-12}{}
+ {l3backend-pdftex.def}{2021-10-17}{}
{L3 backend support: PDF output (pdfTeX)}
%</pdftex>
%<*xetex>
- {l3backend-xetex.def}{2021-10-12}{}
+ {l3backend-xetex.def}{2021-10-17}{}
{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 2021-10-17 20:49:19 UTC (rev 60789)
+++ trunk/Master/texmf-dist/source/latex/l3backend/l3backend-box.dtx 2021-10-17 20:51:10 UTC (rev 60790)
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2021-10-12}
+% \date{Released 2021-10-17}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3backend/l3backend-color.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3backend/l3backend-color.dtx 2021-10-17 20:49:19 UTC (rev 60789)
+++ trunk/Master/texmf-dist/source/latex/l3backend/l3backend-color.dtx 2021-10-17 20:51:10 UTC (rev 60790)
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2021-10-12}
+% \date{Released 2021-10-17}
%
% \maketitle
%
@@ -486,6 +486,55 @@
% backend.
%
% \begin{macrocode}
+%<*dvipdfmx|luatex|pdftex|xetex|dvips>
+% \end{macrocode}
+%
+% But we start with some functionality needed for both PostScript and
+% PDF based backends.
+%
+% \begin{variable}{\g_@@_backend_colorant_prop}
+% \begin{macrocode}
+\prop_new:N \g_@@_backend_colorant_prop
+% \end{macrocode}
+% \end{variable}
+%
+% \begin{macro}[EXP]{\@@_backend_devicen_colorants:n}
+% \begin{macro}[EXP]{\@@_backend_devicen_colorants:w}
+% \begin{macrocode}
+\cs_new:Npx \@@_backend_devicen_colorants:n #1
+ {
+ \exp_not:N \tl_if_blank:nF {#1}
+ {
+ \c_space_tl
+ << ~
+ /Colorants ~
+ << ~
+ \exp_not:N \@@_backend_devicen_colorants:w #1 ~
+ \exp_not:N \q_recursion_tail \c_space_tl
+ \exp_not:N \q_recursion_stop
+ >> ~
+ >>
+ }
+ }
+\cs_new:Npn \@@_backend_devicen_colorants:w #1 ~
+ {
+ \quark_if_recursion_tail_stop:n {#1}
+ \prop_if_in:NnT \g_@@_backend_colorant_prop {#1}
+ {
+ #1 ~
+ \prop_item:Nn \g_@@_backend_colorant_prop {#1} ~
+ }
+ \@@_backend_devicen_colorants:w
+ }
+% \end{macrocode}
+% \end{macro}
+% \end{macro}
+%
+% \begin{macrocode}
+%</dvipdfmx|luatex|pdftex|xetex|dvips>
+% \end{macrocode}
+%
+% \begin{macrocode}
%<*dvips>
% \end{macrocode}
%
@@ -535,6 +584,15 @@
{ \exp_not:N \int_use:N \g_@@_model_int }
{#1} {#2} {#3} {#4} {#5}
}
+ \prop_gput:Nxx \exp_not:N \g_@@_backend_colorant_prop
+ { / \exp_not:N \str_convert_pdfname:n {#1} }
+ {
+ << ~
+ /setcolorspace ~ {} ~
+ >> ~ begin ~
+ color \exp_not:N \int_use:N \g_@@_model_int \c_space_tl
+ end
+ }
}
}
\cs_generate_variant:Nn \@@_backend_separation_init:nnnnn { nxx }
@@ -740,6 +798,7 @@
[ ~ #1 ~ ] ~
#2 ~
{ ~ #3 ~ } ~
+ \@@_backend_devicen_colorants:n {#1}
] ~ setcolorspace
} ~ def ~
end
@@ -793,7 +852,7 @@
% \end{macro}
%
% \begin{macro}{\@@_backend_separation_init:nnnnn}
-% \begin{macro}{\@@_backend_separation_init:n}
+% \begin{macro}{\@@_backend_separation_init:nn}
% \begin{macro}{\@@_backend_separation_init_CIELAB:nnn}
% Initialising the PDF structures needs two parts: creating an object
% containing the \enquote{real} name of the Separation, then adding a reference
@@ -810,15 +869,11 @@
/C0 ~ [#4] ~
/C1 ~ [#5] /N ~ 1
}
- \@@_backend_separation_init:n
- {
- /Separation ~
- / \str_convert_pdfname:n {#1} ~ #2 ~
- \pdf_object_ref_last:
- }
+ \exp_args:Nx \@@_backend_separation_init:nn
+ { \str_convert_pdfname:n {#1} } {#2}
\bool_lazy_and:nnT
{ \cs_if_exist_p:N \pdfmanagement_if_active_p: }
- { \pdfmanagement_if_active_p:}
+ { \pdfmanagement_if_active_p: }
{
\use:x
{
@@ -829,9 +884,12 @@
}
}
}
-\cs_new_protected:Npn \@@_backend_separation_init:n #1
+\cs_new_protected:Npn \@@_backend_separation_init:nn #1#2
{
- \pdf_object_unnamed_write:nx { array } {#1}
+ \pdf_object_unnamed_write:nx { array }
+ { /Separation /#1 ~ #2 ~ \pdf_object_ref_last: }
+ \prop_gput:Nnx \g_@@_backend_colorant_prop { /#1 }
+ { \pdf_object_ref_last: }
}
% \end{macrocode}
% For CIELAB colors, we need one object per document for the illuminant,
@@ -866,7 +924,6 @@
%
% \begin{macro}{\@@_backend_devicen_init:nnn}
% \begin{macro}[EXP]{\@@_backend_devicen_init:w}
-% \begin{macro}{\@@_backend_devicen_init:n}
% Similar to the Separations case, but with an arbitrary function for
% the alternative space work.
% \begin{macrocode}
@@ -894,12 +951,13 @@
}
{ {#3} }
}
- \@@_backend_separation_init:n
+ \pdf_object_unnamed_write:nx { array }
{
/DeviceN ~
[ ~ #1 ~ ] ~
#2 ~
\pdf_object_ref_last:
+ \@@_backend_devicen_colorants:n {#1}
}
\bool_lazy_and:nnT
{ \cs_if_exist_p:N \pdfmanagement_if_active_p: }
@@ -920,11 +978,9 @@
\tl_if_blank:nF {#2}
{ \@@_backend_devicen_init:w #2 \s_@@_stop }
}
-\cs_new_eq:NN \@@_backend_devicen_init:n \@@_backend_separation_init:n
% \end{macrocode}
% \end{macro}
% \end{macro}
-% \end{macro}
%
% \begin{macrocode}
%</dvipdfmx|luatex|pdftex|xetex>
Modified: trunk/Master/texmf-dist/source/latex/l3backend/l3backend-draw.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3backend/l3backend-draw.dtx 2021-10-17 20:49:19 UTC (rev 60789)
+++ trunk/Master/texmf-dist/source/latex/l3backend/l3backend-draw.dtx 2021-10-17 20:51:10 UTC (rev 60790)
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2021-10-12}
+% \date{Released 2021-10-17}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3backend/l3backend-graphics.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3backend/l3backend-graphics.dtx 2021-10-17 20:49:19 UTC (rev 60789)
+++ trunk/Master/texmf-dist/source/latex/l3backend/l3backend-graphics.dtx 2021-10-17 20:51:10 UTC (rev 60790)
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2021-10-12}
+% \date{Released 2021-10-17}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3backend/l3backend-header.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3backend/l3backend-header.dtx 2021-10-17 20:49:19 UTC (rev 60789)
+++ trunk/Master/texmf-dist/source/latex/l3backend/l3backend-header.dtx 2021-10-17 20:51:10 UTC (rev 60790)
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2021-10-12}
+% \date{Released 2021-10-17}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3backend/l3backend-opacity.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3backend/l3backend-opacity.dtx 2021-10-17 20:49:19 UTC (rev 60789)
+++ trunk/Master/texmf-dist/source/latex/l3backend/l3backend-opacity.dtx 2021-10-17 20:51:10 UTC (rev 60790)
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2021-10-12}
+% \date{Released 2021-10-17}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3backend/l3backend-pdf.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3backend/l3backend-pdf.dtx 2021-10-17 20:49:19 UTC (rev 60789)
+++ trunk/Master/texmf-dist/source/latex/l3backend/l3backend-pdf.dtx 2021-10-17 20:51:10 UTC (rev 60790)
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2021-10-12}
+% \date{Released 2021-10-17}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/expl3.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/expl3.dtx 2021-10-17 20:49:19 UTC (rev 60789)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/expl3.dtx 2021-10-17 20:51:10 UTC (rev 60790)
@@ -24,7 +24,7 @@
%
%<*driver|generic|package|2ekernel>
%</driver|generic|package|2ekernel>
-\def\ExplFileDate{2021-10-12}%
+\def\ExplFileDate{2021-10-17}%
%<*driver>
\documentclass[full]{l3doc}
\usepackage{graphicx}
@@ -51,7 +51,7 @@
% }^^A
% }
%
-% \date{Released 2021-10-12}
+% \date{Released 2021-10-17}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3basics.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3basics.dtx 2021-10-17 20:49:19 UTC (rev 60789)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3basics.dtx 2021-10-17 20:51:10 UTC (rev 60790)
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2021-10-12}
+% \date{Released 2021-10-17}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3bootstrap.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3bootstrap.dtx 2021-10-17 20:49:19 UTC (rev 60789)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3bootstrap.dtx 2021-10-17 20:51:10 UTC (rev 60790)
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2021-10-12}
+% \date{Released 2021-10-17}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3box.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3box.dtx 2021-10-17 20:49:19 UTC (rev 60789)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3box.dtx 2021-10-17 20:51:10 UTC (rev 60790)
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2021-10-12}
+% \date{Released 2021-10-17}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3candidates.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3candidates.dtx 2021-10-17 20:49:19 UTC (rev 60789)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3candidates.dtx 2021-10-17 20:51:10 UTC (rev 60790)
@@ -44,7 +44,7 @@
% }^^A
% }
%
-% \date{Released 2021-10-12}
+% \date{Released 2021-10-17}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3cctab.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3cctab.dtx 2021-10-17 20:49:19 UTC (rev 60789)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3cctab.dtx 2021-10-17 20:51:10 UTC (rev 60790)
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2021-10-12}
+% \date{Released 2021-10-17}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3clist.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3clist.dtx 2021-10-17 20:49:19 UTC (rev 60789)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3clist.dtx 2021-10-17 20:51:10 UTC (rev 60790)
@@ -44,7 +44,7 @@
% }^^A
% }
%
-% \date{Released 2021-10-12}
+% \date{Released 2021-10-17}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3coffins.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3coffins.dtx 2021-10-17 20:49:19 UTC (rev 60789)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3coffins.dtx 2021-10-17 20:51:10 UTC (rev 60790)
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2021-10-12}
+% \date{Released 2021-10-17}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3color.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3color.dtx 2021-10-17 20:49:19 UTC (rev 60789)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3color.dtx 2021-10-17 20:51:10 UTC (rev 60790)
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2021-10-12}
+% \date{Released 2021-10-17}
%
% \maketitle
%
@@ -2303,7 +2303,7 @@
{ rgb } { /DeviceRGB }
}
}
- { { \exp_not:V \l_@@_internal_tl } }
+ { \exp_not:V \l_@@_internal_tl }
}
}
\cs_new_protected:Npn \@@_model_devicen_transform:w
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3debug.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3debug.dtx 2021-10-17 20:49:19 UTC (rev 60789)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3debug.dtx 2021-10-17 20:51:10 UTC (rev 60790)
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2021-10-12}
+% \date{Released 2021-10-17}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3deprecation.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3deprecation.dtx 2021-10-17 20:49:19 UTC (rev 60789)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3deprecation.dtx 2021-10-17 20:51:10 UTC (rev 60790)
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2021-10-12}
+% \date{Released 2021-10-17}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3doc.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3doc.dtx 2021-10-17 20:49:19 UTC (rev 60789)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3doc.dtx 2021-10-17 20:51:10 UTC (rev 60790)
@@ -79,7 +79,7 @@
%
% \title{The \cls{l3doc} class}
% \author{\Team}
-% \date{Released 2021-10-12}
+% \date{Released 2021-10-17}
% \maketitle
% \tableofcontents
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3docstrip.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3docstrip.dtx 2021-10-17 20:49:19 UTC (rev 60789)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3docstrip.dtx 2021-10-17 20:51:10 UTC (rev 60790)
@@ -63,7 +63,7 @@
% }^^A
% }
%
-% \date{Released 2021-10-12}
+% \date{Released 2021-10-17}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3expan.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3expan.dtx 2021-10-17 20:49:19 UTC (rev 60789)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3expan.dtx 2021-10-17 20:51:10 UTC (rev 60790)
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2021-10-12}
+% \date{Released 2021-10-17}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3file.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3file.dtx 2021-10-17 20:49:19 UTC (rev 60789)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3file.dtx 2021-10-17 20:51:10 UTC (rev 60790)
@@ -44,7 +44,7 @@
% }^^A
% }
%
-% \date{Released 2021-10-12}
+% \date{Released 2021-10-17}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3flag.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3flag.dtx 2021-10-17 20:49:19 UTC (rev 60789)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3flag.dtx 2021-10-17 20:51:10 UTC (rev 60790)
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2021-10-12}
+% \date{Released 2021-10-17}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-assign.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-assign.dtx 2021-10-17 20:49:19 UTC (rev 60789)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-assign.dtx 2021-10-17 20:51:10 UTC (rev 60790)
@@ -40,7 +40,7 @@
% {latex-team at latex-project.org}^^A
% }^^A
% }
-% \date{Released 2021-10-12}
+% \date{Released 2021-10-17}
% \maketitle
%
% \begin{documentation}
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-aux.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-aux.dtx 2021-10-17 20:49:19 UTC (rev 60789)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-aux.dtx 2021-10-17 20:51:10 UTC (rev 60790)
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2021-10-12}
+% \date{Released 2021-10-17}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-basics.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-basics.dtx 2021-10-17 20:49:19 UTC (rev 60789)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-basics.dtx 2021-10-17 20:51:10 UTC (rev 60790)
@@ -40,7 +40,7 @@
% {latex-team at latex-project.org}^^A
% }^^A
% }
-% \date{Released 2021-10-12}
+% \date{Released 2021-10-17}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-convert.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-convert.dtx 2021-10-17 20:49:19 UTC (rev 60789)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-convert.dtx 2021-10-17 20:51:10 UTC (rev 60790)
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2021-10-12}
+% \date{Released 2021-10-17}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-expo.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-expo.dtx 2021-10-17 20:49:19 UTC (rev 60789)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-expo.dtx 2021-10-17 20:51:10 UTC (rev 60790)
@@ -40,7 +40,7 @@
% {latex-team at latex-project.org}^^A
% }^^A
% }
-% \date{Released 2021-10-12}
+% \date{Released 2021-10-17}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-extended.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-extended.dtx 2021-10-17 20:49:19 UTC (rev 60789)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-extended.dtx 2021-10-17 20:51:10 UTC (rev 60790)
@@ -40,7 +40,7 @@
% {latex-team at latex-project.org}^^A
% }^^A
% }
-% \date{Released 2021-10-12}
+% \date{Released 2021-10-17}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-logic.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-logic.dtx 2021-10-17 20:49:19 UTC (rev 60789)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-logic.dtx 2021-10-17 20:51:10 UTC (rev 60790)
@@ -40,7 +40,7 @@
% {latex-team at latex-project.org}^^A
% }^^A
% }
-% \date{Released 2021-10-12}
+% \date{Released 2021-10-17}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-parse.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-parse.dtx 2021-10-17 20:49:19 UTC (rev 60789)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-parse.dtx 2021-10-17 20:51:10 UTC (rev 60790)
@@ -40,7 +40,7 @@
% {latex-team at latex-project.org}^^A
% }^^A
% }
-% \date{Released 2021-10-12}
+% \date{Released 2021-10-17}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-random.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-random.dtx 2021-10-17 20:49:19 UTC (rev 60789)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-random.dtx 2021-10-17 20:51:10 UTC (rev 60790)
@@ -40,7 +40,7 @@
% {latex-team at latex-project.org}^^A
% }^^A
% }
-% \date{Released 2021-10-12}
+% \date{Released 2021-10-17}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-round.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-round.dtx 2021-10-17 20:49:19 UTC (rev 60789)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-round.dtx 2021-10-17 20:51:10 UTC (rev 60790)
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2021-10-12}
+% \date{Released 2021-10-17}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-traps.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-traps.dtx 2021-10-17 20:49:19 UTC (rev 60789)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-traps.dtx 2021-10-17 20:51:10 UTC (rev 60790)
@@ -40,7 +40,7 @@
% {latex-team at latex-project.org}^^A
% }^^A
% }
-% \date{Released 2021-10-12}
+% \date{Released 2021-10-17}
% \maketitle
%
% \begin{documentation}
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-trig.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-trig.dtx 2021-10-17 20:49:19 UTC (rev 60789)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3fp-trig.dtx 2021-10-17 20:51:10 UTC (rev 60790)
@@ -40,7 +40,7 @@
% {latex-team at latex-project.org}^^A
% }^^A
% }
-% \date{Released 2021-10-12}
+% \date{Released 2021-10-17}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3fp.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3fp.dtx 2021-10-17 20:49:19 UTC (rev 60789)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3fp.dtx 2021-10-17 20:51:10 UTC (rev 60790)
@@ -49,7 +49,7 @@
% }^^A
% }
%
-% \date{Released 2021-10-12}
+% \date{Released 2021-10-17}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3fparray.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3fparray.dtx 2021-10-17 20:49:19 UTC (rev 60789)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3fparray.dtx 2021-10-17 20:51:10 UTC (rev 60790)
@@ -44,7 +44,7 @@
% }^^A
% }
%
-% \date{Released 2021-10-12}
+% \date{Released 2021-10-17}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3int.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3int.dtx 2021-10-17 20:49:19 UTC (rev 60789)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3int.dtx 2021-10-17 20:51:10 UTC (rev 60790)
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2021-10-12}
+% \date{Released 2021-10-17}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3intarray.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3intarray.dtx 2021-10-17 20:49:19 UTC (rev 60789)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3intarray.dtx 2021-10-17 20:51:10 UTC (rev 60790)
@@ -44,7 +44,7 @@
% }^^A
% }
%
-% \date{Released 2021-10-12}
+% \date{Released 2021-10-17}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3kernel-functions.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3kernel-functions.dtx 2021-10-17 20:49:19 UTC (rev 60789)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3kernel-functions.dtx 2021-10-17 20:51:10 UTC (rev 60790)
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2021-10-12}
+% \date{Released 2021-10-17}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3keys.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3keys.dtx 2021-10-17 20:49:19 UTC (rev 60789)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3keys.dtx 2021-10-17 20:51:10 UTC (rev 60790)
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2021-10-12}
+% \date{Released 2021-10-17}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3legacy.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3legacy.dtx 2021-10-17 20:49:19 UTC (rev 60789)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3legacy.dtx 2021-10-17 20:51:10 UTC (rev 60790)
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2021-10-12}
+% \date{Released 2021-10-17}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3luatex.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3luatex.dtx 2021-10-17 20:49:19 UTC (rev 60789)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3luatex.dtx 2021-10-17 20:51:10 UTC (rev 60790)
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2021-10-12}
+% \date{Released 2021-10-17}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3msg.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3msg.dtx 2021-10-17 20:49:19 UTC (rev 60789)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3msg.dtx 2021-10-17 20:51:10 UTC (rev 60790)
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2021-10-12}
+% \date{Released 2021-10-17}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3names.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3names.dtx 2021-10-17 20:49:19 UTC (rev 60789)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3names.dtx 2021-10-17 20:51:10 UTC (rev 60790)
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2021-10-12}
+% \date{Released 2021-10-17}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3pdf.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3pdf.dtx 2021-10-17 20:49:19 UTC (rev 60789)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3pdf.dtx 2021-10-17 20:51:10 UTC (rev 60790)
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2021-10-12}
+% \date{Released 2021-10-17}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3prg.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3prg.dtx 2021-10-17 20:49:19 UTC (rev 60789)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3prg.dtx 2021-10-17 20:51:10 UTC (rev 60790)
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2021-10-12}
+% \date{Released 2021-10-17}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3prop.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3prop.dtx 2021-10-17 20:49:19 UTC (rev 60789)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3prop.dtx 2021-10-17 20:51:10 UTC (rev 60790)
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2021-10-12}
+% \date{Released 2021-10-17}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3quark.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3quark.dtx 2021-10-17 20:49:19 UTC (rev 60789)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3quark.dtx 2021-10-17 20:51:10 UTC (rev 60790)
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2021-10-12}
+% \date{Released 2021-10-17}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3regex.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3regex.dtx 2021-10-17 20:49:19 UTC (rev 60789)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3regex.dtx 2021-10-17 20:51:10 UTC (rev 60790)
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2021-10-12}
+% \date{Released 2021-10-17}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3seq.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3seq.dtx 2021-10-17 20:49:19 UTC (rev 60789)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3seq.dtx 2021-10-17 20:51:10 UTC (rev 60790)
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2021-10-12}
+% \date{Released 2021-10-17}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3skip.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3skip.dtx 2021-10-17 20:49:19 UTC (rev 60789)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3skip.dtx 2021-10-17 20:51:10 UTC (rev 60790)
@@ -44,7 +44,7 @@
% }^^A
% }
%
-% \date{Released 2021-10-12}
+% \date{Released 2021-10-17}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3sort.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3sort.dtx 2021-10-17 20:49:19 UTC (rev 60789)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3sort.dtx 2021-10-17 20:51:10 UTC (rev 60790)
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2021-10-12}
+% \date{Released 2021-10-17}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3str-convert.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3str-convert.dtx 2021-10-17 20:49:19 UTC (rev 60789)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3str-convert.dtx 2021-10-17 20:51:10 UTC (rev 60790)
@@ -44,7 +44,7 @@
% }^^A
% }
%
-% \date{Released 2021-10-12}
+% \date{Released 2021-10-17}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3str.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3str.dtx 2021-10-17 20:49:19 UTC (rev 60789)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3str.dtx 2021-10-17 20:51:10 UTC (rev 60790)
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2021-10-12}
+% \date{Released 2021-10-17}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3sys.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3sys.dtx 2021-10-17 20:49:19 UTC (rev 60789)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3sys.dtx 2021-10-17 20:51:10 UTC (rev 60790)
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2021-10-12}
+% \date{Released 2021-10-17}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3text-case.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3text-case.dtx 2021-10-17 20:49:19 UTC (rev 60789)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3text-case.dtx 2021-10-17 20:51:10 UTC (rev 60790)
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2021-10-12}
+% \date{Released 2021-10-17}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3text-purify.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3text-purify.dtx 2021-10-17 20:49:19 UTC (rev 60789)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3text-purify.dtx 2021-10-17 20:51:10 UTC (rev 60790)
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2021-10-12}
+% \date{Released 2021-10-17}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3text.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3text.dtx 2021-10-17 20:49:19 UTC (rev 60789)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3text.dtx 2021-10-17 20:51:10 UTC (rev 60790)
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2021-10-12}
+% \date{Released 2021-10-17}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3tl-analysis.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3tl-analysis.dtx 2021-10-17 20:49:19 UTC (rev 60789)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3tl-analysis.dtx 2021-10-17 20:51:10 UTC (rev 60790)
@@ -44,7 +44,7 @@
% }^^A
% }
%
-% \date{Released 2021-10-12}
+% \date{Released 2021-10-17}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3tl.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3tl.dtx 2021-10-17 20:49:19 UTC (rev 60789)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3tl.dtx 2021-10-17 20:51:10 UTC (rev 60790)
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2021-10-12}
+% \date{Released 2021-10-17}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3token.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3token.dtx 2021-10-17 20:49:19 UTC (rev 60789)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3token.dtx 2021-10-17 20:51:10 UTC (rev 60790)
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2021-10-12}
+% \date{Released 2021-10-17}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/source/latex/l3kernel/l3unicode.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/l3kernel/l3unicode.dtx 2021-10-17 20:49:19 UTC (rev 60789)
+++ trunk/Master/texmf-dist/source/latex/l3kernel/l3unicode.dtx 2021-10-17 20:51:10 UTC (rev 60790)
@@ -43,7 +43,7 @@
% }^^A
% }
%
-% \date{Released 2021-10-12}
+% \date{Released 2021-10-17}
%
% \maketitle
%
Modified: trunk/Master/texmf-dist/tex/latex/l3backend/l3backend-dvipdfmx.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/l3backend/l3backend-dvipdfmx.def 2021-10-17 20:49:19 UTC (rev 60789)
+++ trunk/Master/texmf-dist/tex/latex/l3backend/l3backend-dvipdfmx.def 2021-10-17 20:51:10 UTC (rev 60790)
@@ -26,7 +26,7 @@
%%
%% File: l3backend-basics.dtx
\ProvidesExplFile
- {l3backend-dvipdfmx.def}{2021-10-12}{}
+ {l3backend-dvipdfmx.def}{2021-10-17}{}
{L3 backend support: dvipdfmx}
\cs_if_exist:NTF \__kernel_dependency_version_check:nn
{
@@ -195,6 +195,32 @@
\cs_gset_protected:Npn \__color_backend_reset:
{ \__kernel_backend_literal:n { pdf: ec } }
}
+\prop_new:N \g__color_backend_colorant_prop
+\cs_new:Npx \__color_backend_devicen_colorants:n #1
+ {
+ \exp_not:N \tl_if_blank:nF {#1}
+ {
+ \c_space_tl
+ << ~
+ /Colorants ~
+ << ~
+ \exp_not:N \__color_backend_devicen_colorants:w #1 ~
+ \exp_not:N \q_recursion_tail \c_space_tl
+ \exp_not:N \q_recursion_stop
+ >> ~
+ >>
+ }
+ }
+\cs_new:Npn \__color_backend_devicen_colorants:w #1 ~
+ {
+ \quark_if_recursion_tail_stop:n {#1}
+ \prop_if_in:NnT \g__color_backend_colorant_prop {#1}
+ {
+ #1 ~
+ \prop_item:Nn \g__color_backend_colorant_prop {#1} ~
+ }
+ \__color_backend_devicen_colorants:w
+ }
\cs_new_protected:Npn \__color_backend_select_separation:nn #1#2
{ \__color_backend_select:nn { /#1 ~ cs ~ #2 ~ scn } { /#1 ~ CS ~ #2 ~ SCN } }
\cs_new_eq:NN \__color_backend_select_devicen:nn \__color_backend_select_separation:nn
@@ -208,15 +234,11 @@
/C0 ~ [#4] ~
/C1 ~ [#5] /N ~ 1
}
- \__color_backend_separation_init:n
- {
- /Separation ~
- / \str_convert_pdfname:n {#1} ~ #2 ~
- \pdf_object_ref_last:
- }
+ \exp_args:Nx \__color_backend_separation_init:nn
+ { \str_convert_pdfname:n {#1} } {#2}
\bool_lazy_and:nnT
{ \cs_if_exist_p:N \pdfmanagement_if_active_p: }
- { \pdfmanagement_if_active_p:}
+ { \pdfmanagement_if_active_p: }
{
\use:x
{
@@ -227,9 +249,12 @@
}
}
}
-\cs_new_protected:Npn \__color_backend_separation_init:n #1
+\cs_new_protected:Npn \__color_backend_separation_init:nn #1#2
{
- \pdf_object_unnamed_write:nx { array } {#1}
+ \pdf_object_unnamed_write:nx { array }
+ { /Separation /#1 ~ #2 ~ \pdf_object_ref_last: }
+ \prop_gput:Nnx \g__color_backend_colorant_prop { /#1 }
+ { \pdf_object_ref_last: }
}
\cs_new_protected:Npn \__color_backend_separation_init_CIELAB:nnn #1#2#3
{
@@ -277,12 +302,13 @@
}
{ {#3} }
}
- \__color_backend_separation_init:n
+ \pdf_object_unnamed_write:nx { array }
{
/DeviceN ~
[ ~ #1 ~ ] ~
#2 ~
\pdf_object_ref_last:
+ \__color_backend_devicen_colorants:n {#1}
}
\bool_lazy_and:nnT
{ \cs_if_exist_p:N \pdfmanagement_if_active_p: }
@@ -303,7 +329,6 @@
\tl_if_blank:nF {#2}
{ \__color_backend_devicen_init:w #2 \s__color_stop }
}
-\cs_new_eq:NN \__color_backend_devicen_init:n \__color_backend_separation_init:n
\int_compare:nNnT \c__kernel_sys_dvipdfmx_version_int < { 20201111 }
{
\cs_gset_protected:Npn \__color_backend_select_separation:nn #1#2 { }
Modified: trunk/Master/texmf-dist/tex/latex/l3backend/l3backend-dvips.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/l3backend/l3backend-dvips.def 2021-10-17 20:49:19 UTC (rev 60789)
+++ trunk/Master/texmf-dist/tex/latex/l3backend/l3backend-dvips.def 2021-10-17 20:51:10 UTC (rev 60790)
@@ -26,7 +26,7 @@
%%
%% File: l3backend-basics.dtx
\ProvidesExplFile
- {l3backend-dvips.def}{2021-10-12}{}
+ {l3backend-dvips.def}{2021-10-17}{}
{L3 backend support: dvips}
\cs_if_exist:NTF \__kernel_dependency_version_check:nn
{
@@ -118,6 +118,32 @@
}
\cs_new_protected:Npn \__color_backend_reset:
{ \__kernel_backend_literal:n { color~pop } }
+\prop_new:N \g__color_backend_colorant_prop
+\cs_new:Npx \__color_backend_devicen_colorants:n #1
+ {
+ \exp_not:N \tl_if_blank:nF {#1}
+ {
+ \c_space_tl
+ << ~
+ /Colorants ~
+ << ~
+ \exp_not:N \__color_backend_devicen_colorants:w #1 ~
+ \exp_not:N \q_recursion_tail \c_space_tl
+ \exp_not:N \q_recursion_stop
+ >> ~
+ >>
+ }
+ }
+\cs_new:Npn \__color_backend_devicen_colorants:w #1 ~
+ {
+ \quark_if_recursion_tail_stop:n {#1}
+ \prop_if_in:NnT \g__color_backend_colorant_prop {#1}
+ {
+ #1 ~
+ \prop_item:Nn \g__color_backend_colorant_prop {#1} ~
+ }
+ \__color_backend_devicen_colorants:w
+ }
\cs_new_protected:Npn \__color_backend_select_separation:nn #1#2
{ \__color_backend_select:n { separation ~ #1 ~ #2 } }
\cs_new_eq:NN \__color_backend_select_devicen:nn \__color_backend_select_separation:nn
@@ -131,6 +157,15 @@
{ \exp_not:N \int_use:N \g__color_model_int }
{#1} {#2} {#3} {#4} {#5}
}
+ \prop_gput:Nxx \exp_not:N \g__color_backend_colorant_prop
+ { / \exp_not:N \str_convert_pdfname:n {#1} }
+ {
+ << ~
+ /setcolorspace ~ {} ~
+ >> ~ begin ~
+ color \exp_not:N \int_use:N \g__color_model_int \c_space_tl
+ end
+ }
}
}
\cs_generate_variant:Nn \__color_backend_separation_init:nnnnn { nxx }
@@ -283,6 +318,7 @@
[ ~ #1 ~ ] ~
#2 ~
{ ~ #3 ~ } ~
+ \__color_backend_devicen_colorants:n {#1}
] ~ setcolorspace
} ~ def ~
end
Modified: trunk/Master/texmf-dist/tex/latex/l3backend/l3backend-dvisvgm.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/l3backend/l3backend-dvisvgm.def 2021-10-17 20:49:19 UTC (rev 60789)
+++ trunk/Master/texmf-dist/tex/latex/l3backend/l3backend-dvisvgm.def 2021-10-17 20:51:10 UTC (rev 60790)
@@ -26,7 +26,7 @@
%%
%% File: l3backend-basics.dtx
\ProvidesExplFile
- {l3backend-dvisvgm.def}{2021-10-12}{}
+ {l3backend-dvisvgm.def}{2021-10-17}{}
{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 2021-10-17 20:49:19 UTC (rev 60789)
+++ trunk/Master/texmf-dist/tex/latex/l3backend/l3backend-luatex.def 2021-10-17 20:51:10 UTC (rev 60790)
@@ -26,7 +26,7 @@
%%
%% File: l3backend-basics.dtx
\ProvidesExplFile
- {l3backend-luatex.def}{2021-10-12}{}
+ {l3backend-luatex.def}{2021-10-17}{}
{L3 backend support: PDF output (LuaTeX)}
\cs_if_exist:NTF \__kernel_dependency_version_check:nn
{
@@ -152,6 +152,32 @@
}
\cs_new_protected:Npn \__color_backend_reset:
{ \__kernel_color_backend_stack_pop:n \l__color_backend_stack_int }
+\prop_new:N \g__color_backend_colorant_prop
+\cs_new:Npx \__color_backend_devicen_colorants:n #1
+ {
+ \exp_not:N \tl_if_blank:nF {#1}
+ {
+ \c_space_tl
+ << ~
+ /Colorants ~
+ << ~
+ \exp_not:N \__color_backend_devicen_colorants:w #1 ~
+ \exp_not:N \q_recursion_tail \c_space_tl
+ \exp_not:N \q_recursion_stop
+ >> ~
+ >>
+ }
+ }
+\cs_new:Npn \__color_backend_devicen_colorants:w #1 ~
+ {
+ \quark_if_recursion_tail_stop:n {#1}
+ \prop_if_in:NnT \g__color_backend_colorant_prop {#1}
+ {
+ #1 ~
+ \prop_item:Nn \g__color_backend_colorant_prop {#1} ~
+ }
+ \__color_backend_devicen_colorants:w
+ }
\cs_new_protected:Npn \__color_backend_select_separation:nn #1#2
{ \__color_backend_select:nn { /#1 ~ cs ~ #2 ~ scn } { /#1 ~ CS ~ #2 ~ SCN } }
\cs_new_eq:NN \__color_backend_select_devicen:nn \__color_backend_select_separation:nn
@@ -165,15 +191,11 @@
/C0 ~ [#4] ~
/C1 ~ [#5] /N ~ 1
}
- \__color_backend_separation_init:n
- {
- /Separation ~
- / \str_convert_pdfname:n {#1} ~ #2 ~
- \pdf_object_ref_last:
- }
+ \exp_args:Nx \__color_backend_separation_init:nn
+ { \str_convert_pdfname:n {#1} } {#2}
\bool_lazy_and:nnT
{ \cs_if_exist_p:N \pdfmanagement_if_active_p: }
- { \pdfmanagement_if_active_p:}
+ { \pdfmanagement_if_active_p: }
{
\use:x
{
@@ -184,9 +206,12 @@
}
}
}
-\cs_new_protected:Npn \__color_backend_separation_init:n #1
+\cs_new_protected:Npn \__color_backend_separation_init:nn #1#2
{
- \pdf_object_unnamed_write:nx { array } {#1}
+ \pdf_object_unnamed_write:nx { array }
+ { /Separation /#1 ~ #2 ~ \pdf_object_ref_last: }
+ \prop_gput:Nnx \g__color_backend_colorant_prop { /#1 }
+ { \pdf_object_ref_last: }
}
\cs_new_protected:Npn \__color_backend_separation_init_CIELAB:nnn #1#2#3
{
@@ -234,12 +259,13 @@
}
{ {#3} }
}
- \__color_backend_separation_init:n
+ \pdf_object_unnamed_write:nx { array }
{
/DeviceN ~
[ ~ #1 ~ ] ~
#2 ~
\pdf_object_ref_last:
+ \__color_backend_devicen_colorants:n {#1}
}
\bool_lazy_and:nnT
{ \cs_if_exist_p:N \pdfmanagement_if_active_p: }
@@ -260,7 +286,6 @@
\tl_if_blank:nF {#2}
{ \__color_backend_devicen_init:w #2 \s__color_stop }
}
-\cs_new_eq:NN \__color_backend_devicen_init:n \__color_backend_separation_init:n
\cs_new_protected:Npn \__color_backend_fill_cmyk:n #1
{ \__color_backend_fill:n { #1 ~ k } }
\cs_new_protected:Npn \__color_backend_fill_gray:n #1
Modified: trunk/Master/texmf-dist/tex/latex/l3backend/l3backend-pdftex.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/l3backend/l3backend-pdftex.def 2021-10-17 20:49:19 UTC (rev 60789)
+++ trunk/Master/texmf-dist/tex/latex/l3backend/l3backend-pdftex.def 2021-10-17 20:51:10 UTC (rev 60790)
@@ -26,7 +26,7 @@
%%
%% File: l3backend-basics.dtx
\ProvidesExplFile
- {l3backend-pdftex.def}{2021-10-12}{}
+ {l3backend-pdftex.def}{2021-10-17}{}
{L3 backend support: PDF output (pdfTeX)}
\cs_if_exist:NTF \__kernel_dependency_version_check:nn
{
@@ -152,6 +152,32 @@
}
\cs_new_protected:Npn \__color_backend_reset:
{ \__kernel_color_backend_stack_pop:n \l__color_backend_stack_int }
+\prop_new:N \g__color_backend_colorant_prop
+\cs_new:Npx \__color_backend_devicen_colorants:n #1
+ {
+ \exp_not:N \tl_if_blank:nF {#1}
+ {
+ \c_space_tl
+ << ~
+ /Colorants ~
+ << ~
+ \exp_not:N \__color_backend_devicen_colorants:w #1 ~
+ \exp_not:N \q_recursion_tail \c_space_tl
+ \exp_not:N \q_recursion_stop
+ >> ~
+ >>
+ }
+ }
+\cs_new:Npn \__color_backend_devicen_colorants:w #1 ~
+ {
+ \quark_if_recursion_tail_stop:n {#1}
+ \prop_if_in:NnT \g__color_backend_colorant_prop {#1}
+ {
+ #1 ~
+ \prop_item:Nn \g__color_backend_colorant_prop {#1} ~
+ }
+ \__color_backend_devicen_colorants:w
+ }
\cs_new_protected:Npn \__color_backend_select_separation:nn #1#2
{ \__color_backend_select:nn { /#1 ~ cs ~ #2 ~ scn } { /#1 ~ CS ~ #2 ~ SCN } }
\cs_new_eq:NN \__color_backend_select_devicen:nn \__color_backend_select_separation:nn
@@ -165,15 +191,11 @@
/C0 ~ [#4] ~
/C1 ~ [#5] /N ~ 1
}
- \__color_backend_separation_init:n
- {
- /Separation ~
- / \str_convert_pdfname:n {#1} ~ #2 ~
- \pdf_object_ref_last:
- }
+ \exp_args:Nx \__color_backend_separation_init:nn
+ { \str_convert_pdfname:n {#1} } {#2}
\bool_lazy_and:nnT
{ \cs_if_exist_p:N \pdfmanagement_if_active_p: }
- { \pdfmanagement_if_active_p:}
+ { \pdfmanagement_if_active_p: }
{
\use:x
{
@@ -184,9 +206,12 @@
}
}
}
-\cs_new_protected:Npn \__color_backend_separation_init:n #1
+\cs_new_protected:Npn \__color_backend_separation_init:nn #1#2
{
- \pdf_object_unnamed_write:nx { array } {#1}
+ \pdf_object_unnamed_write:nx { array }
+ { /Separation /#1 ~ #2 ~ \pdf_object_ref_last: }
+ \prop_gput:Nnx \g__color_backend_colorant_prop { /#1 }
+ { \pdf_object_ref_last: }
}
\cs_new_protected:Npn \__color_backend_separation_init_CIELAB:nnn #1#2#3
{
@@ -234,12 +259,13 @@
}
{ {#3} }
}
- \__color_backend_separation_init:n
+ \pdf_object_unnamed_write:nx { array }
{
/DeviceN ~
[ ~ #1 ~ ] ~
#2 ~
\pdf_object_ref_last:
+ \__color_backend_devicen_colorants:n {#1}
}
\bool_lazy_and:nnT
{ \cs_if_exist_p:N \pdfmanagement_if_active_p: }
@@ -260,7 +286,6 @@
\tl_if_blank:nF {#2}
{ \__color_backend_devicen_init:w #2 \s__color_stop }
}
-\cs_new_eq:NN \__color_backend_devicen_init:n \__color_backend_separation_init:n
\cs_new_protected:Npn \__color_backend_fill_cmyk:n #1
{ \__color_backend_fill:n { #1 ~ k } }
\cs_new_protected:Npn \__color_backend_fill_gray:n #1
Modified: trunk/Master/texmf-dist/tex/latex/l3backend/l3backend-xetex.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/l3backend/l3backend-xetex.def 2021-10-17 20:49:19 UTC (rev 60789)
+++ trunk/Master/texmf-dist/tex/latex/l3backend/l3backend-xetex.def 2021-10-17 20:51:10 UTC (rev 60790)
@@ -26,7 +26,7 @@
%%
%% File: l3backend-basics.dtx
\ProvidesExplFile
- {l3backend-xetex.def}{2021-10-12}{}
+ {l3backend-xetex.def}{2021-10-17}{}
{L3 backend support: XeTeX}
\cs_if_exist:NTF \__kernel_dependency_version_check:nn
{
@@ -195,6 +195,32 @@
\cs_gset_protected:Npn \__color_backend_reset:
{ \__kernel_backend_literal:n { pdf: ec } }
}
+\prop_new:N \g__color_backend_colorant_prop
+\cs_new:Npx \__color_backend_devicen_colorants:n #1
+ {
+ \exp_not:N \tl_if_blank:nF {#1}
+ {
+ \c_space_tl
+ << ~
+ /Colorants ~
+ << ~
+ \exp_not:N \__color_backend_devicen_colorants:w #1 ~
+ \exp_not:N \q_recursion_tail \c_space_tl
+ \exp_not:N \q_recursion_stop
+ >> ~
+ >>
+ }
+ }
+\cs_new:Npn \__color_backend_devicen_colorants:w #1 ~
+ {
+ \quark_if_recursion_tail_stop:n {#1}
+ \prop_if_in:NnT \g__color_backend_colorant_prop {#1}
+ {
+ #1 ~
+ \prop_item:Nn \g__color_backend_colorant_prop {#1} ~
+ }
+ \__color_backend_devicen_colorants:w
+ }
\cs_new_protected:Npn \__color_backend_select_separation:nn #1#2
{ \__color_backend_select:nn { /#1 ~ cs ~ #2 ~ scn } { /#1 ~ CS ~ #2 ~ SCN } }
\cs_new_eq:NN \__color_backend_select_devicen:nn \__color_backend_select_separation:nn
@@ -208,15 +234,11 @@
/C0 ~ [#4] ~
/C1 ~ [#5] /N ~ 1
}
- \__color_backend_separation_init:n
- {
- /Separation ~
- / \str_convert_pdfname:n {#1} ~ #2 ~
- \pdf_object_ref_last:
- }
+ \exp_args:Nx \__color_backend_separation_init:nn
+ { \str_convert_pdfname:n {#1} } {#2}
\bool_lazy_and:nnT
{ \cs_if_exist_p:N \pdfmanagement_if_active_p: }
- { \pdfmanagement_if_active_p:}
+ { \pdfmanagement_if_active_p: }
{
\use:x
{
@@ -227,9 +249,12 @@
}
}
}
-\cs_new_protected:Npn \__color_backend_separation_init:n #1
+\cs_new_protected:Npn \__color_backend_separation_init:nn #1#2
{
- \pdf_object_unnamed_write:nx { array } {#1}
+ \pdf_object_unnamed_write:nx { array }
+ { /Separation /#1 ~ #2 ~ \pdf_object_ref_last: }
+ \prop_gput:Nnx \g__color_backend_colorant_prop { /#1 }
+ { \pdf_object_ref_last: }
}
\cs_new_protected:Npn \__color_backend_separation_init_CIELAB:nnn #1#2#3
{
@@ -277,12 +302,13 @@
}
{ {#3} }
}
- \__color_backend_separation_init:n
+ \pdf_object_unnamed_write:nx { array }
{
/DeviceN ~
[ ~ #1 ~ ] ~
#2 ~
\pdf_object_ref_last:
+ \__color_backend_devicen_colorants:n {#1}
}
\bool_lazy_and:nnT
{ \cs_if_exist_p:N \pdfmanagement_if_active_p: }
@@ -303,7 +329,6 @@
\tl_if_blank:nF {#2}
{ \__color_backend_devicen_init:w #2 \s__color_stop }
}
-\cs_new_eq:NN \__color_backend_devicen_init:n \__color_backend_separation_init:n
\int_compare:nNnT \c__kernel_sys_dvipdfmx_version_int < { 20201111 }
{
\cs_gset_protected:Npn \__color_backend_select_separation:nn #1#2 { }
Modified: trunk/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex
===================================================================
--- trunk/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex 2021-10-17 20:49:19 UTC (rev 60789)
+++ trunk/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex 2021-10-17 20:51:10 UTC (rev 60790)
@@ -70,7 +70,7 @@
%% and all files in that bundle must be distributed together.
%%
%% File: expl3.dtx
-\def\ExplFileDate{2021-10-12}%
+\def\ExplFileDate{2021-10-17}%
\begingroup
\def\next{\endgroup}%
\expandafter\ifx\csname PackageError\endcsname\relax
@@ -29062,7 +29062,7 @@
{ rgb } { /DeviceRGB }
}
}
- { { \exp_not:V \l__color_internal_tl } }
+ { \exp_not:V \l__color_internal_tl }
}
}
\cs_new_protected:Npn \__color_model_devicen_transform:w
Modified: trunk/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex
===================================================================
--- trunk/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex 2021-10-17 20:49:19 UTC (rev 60789)
+++ trunk/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex 2021-10-17 20:51:10 UTC (rev 60790)
@@ -19,7 +19,7 @@
%% and all files in that bundle must be distributed together.
%%
%% File: expl3.dtx
-\def\ExplFileDate{2021-10-12}%
+\def\ExplFileDate{2021-10-17}%
\let\ExplLoaderFileDate\ExplFileDate
\begingroup
\catcode`\_=11
Modified: trunk/Master/texmf-dist/tex/latex/l3kernel/expl3.ltx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/l3kernel/expl3.ltx 2021-10-17 20:49:19 UTC (rev 60789)
+++ trunk/Master/texmf-dist/tex/latex/l3kernel/expl3.ltx 2021-10-17 20:51:10 UTC (rev 60790)
@@ -19,7 +19,7 @@
%% and all files in that bundle must be distributed together.
%%
%% File: expl3.dtx
-\def\ExplFileDate{2021-10-12}%
+\def\ExplFileDate{2021-10-17}%
\let\ExplLoaderFileDate\ExplFileDate
\begingroup
\catcode`\_=11
Modified: trunk/Master/texmf-dist/tex/latex/l3kernel/expl3.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/l3kernel/expl3.sty 2021-10-17 20:49:19 UTC (rev 60789)
+++ trunk/Master/texmf-dist/tex/latex/l3kernel/expl3.sty 2021-10-17 20:51:10 UTC (rev 60790)
@@ -19,7 +19,7 @@
%% and all files in that bundle must be distributed together.
%%
%% File: expl3.dtx
-\def\ExplFileDate{2021-10-12}%
+\def\ExplFileDate{2021-10-17}%
\let\ExplLoaderFileDate\ExplFileDate
\ProvidesPackage{expl3}
[%
More information about the tex-live-commits
mailing list.