From 9b9af3f98ce453fa388221fbb39b765facc75146 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 12 Oct 2021 20:07:20 +0000 Subject: l3 (12oct21) git-svn-id: svn://tug.org/texlive/trunk@60743 c570f23f-e606-0410-a88d-b1316a301751 --- .../source/latex/l3backend/l3backend-basics.dtx | 14 +++++----- .../source/latex/l3backend/l3backend-box.dtx | 2 +- .../source/latex/l3backend/l3backend-color.dtx | 31 ++++++++++++---------- .../source/latex/l3backend/l3backend-draw.dtx | 2 +- .../source/latex/l3backend/l3backend-graphics.dtx | 2 +- .../source/latex/l3backend/l3backend-header.dtx | 2 +- .../source/latex/l3backend/l3backend-opacity.dtx | 2 +- .../source/latex/l3backend/l3backend-pdf.dtx | 2 +- 8 files changed, 30 insertions(+), 27 deletions(-) (limited to 'Master/texmf-dist/source/latex/l3backend') diff --git a/Master/texmf-dist/source/latex/l3backend/l3backend-basics.dtx b/Master/texmf-dist/source/latex/l3backend/l3backend-basics.dtx index 6f21c964c29..aa2176c91f4 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 2021-08-04} +% \date{Released 2021-10-12} % % \maketitle % @@ -70,27 +70,27 @@ % \begin{macrocode} \ProvidesExplFile %<*dvipdfmx> - {l3backend-dvipdfmx.def}{2021-08-04}{} + {l3backend-dvipdfmx.def}{2021-10-12}{} {L3 backend support: dvipdfmx} % %<*dvips> - {l3backend-dvips.def}{2021-08-04}{} + {l3backend-dvips.def}{2021-10-12}{} {L3 backend support: dvips} % %<*dvisvgm> - {l3backend-dvisvgm.def}{2021-08-04}{} + {l3backend-dvisvgm.def}{2021-10-12}{} {L3 backend support: dvisvgm} % %<*luatex> - {l3backend-luatex.def}{2021-08-04}{} + {l3backend-luatex.def}{2021-10-12}{} {L3 backend support: PDF output (LuaTeX)} % %<*pdftex> - {l3backend-pdftex.def}{2021-08-04}{} + {l3backend-pdftex.def}{2021-10-12}{} {L3 backend support: PDF output (pdfTeX)} % %<*xetex> - {l3backend-xetex.def}{2021-08-04}{} + {l3backend-xetex.def}{2021-10-12}{} {L3 backend support: 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 810deb7bb76..c8f32e8262c 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 2021-08-04} +% \date{Released 2021-10-12} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3backend/l3backend-color.dtx b/Master/texmf-dist/source/latex/l3backend/l3backend-color.dtx index 2d33f8ed4e0..72254382f5c 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 2021-08-04} +% \date{Released 2021-10-12} % % \maketitle % @@ -500,9 +500,10 @@ % \begin{macro} % { % \@@_backend_separation_init:nnnnn, -% \@@_backend_separation_init:nxxnn, -% \@@_backend_separation_init_aux:nnnnn +% \@@_backend_separation_init:nxxnn % } +% \begin{macro} +% {\@@_backend_separation_init_aux:nnnnnn} % \begin{macro}[EXP] % { % \@@_backend_separation_init_/DeviceCMYK:nnn , @@ -528,29 +529,30 @@ { \bool_if:NT \g__kernel_backend_header_bool { - \__kernel_backend_first_shipout:n + \exp_args:Nx \__kernel_backend_first_shipout:n { - \exp_not:N \@@_backend_separation_init_aux:nnnnn + \exp_not:N \@@_backend_separation_init_aux:nnnnnn + { \exp_not:N \int_use:N \g_@@_model_int } {#1} {#2} {#3} {#4} {#5} } } } \cs_generate_variant:Nn \@@_backend_separation_init:nnnnn { nxx } -\cs_new_protected:Npn \@@_backend_separation_init_aux:nnnnn #1#2#3#4#5 +\cs_new_protected:Npn \@@_backend_separation_init_aux:nnnnnn #1#2#3#4#5#6 { \__kernel_backend_literal:e { ! TeXDict ~ begin ~ - /color \int_use:N \g_@@_model_int + /color #1 { [ ~ - /Separation ~ ( \str_convert_pdfname:n {#1} ) ~ - [ ~ #2 ~ ] ~ + /Separation ~ ( \str_convert_pdfname:n {#2} ) ~ + [ ~ #3 ~ ] ~ { - \cs_if_exist_use:cF { @@_backend_separation_init_ #2 :nnn } + \cs_if_exist_use:cF { @@_backend_separation_init_ #3 :nnn } { \@@_backend_separation_init:nnn } - {#3} {#4} {#5} + {#4} {#5} {#6} } ] ~ setcolorspace } ~ def ~ @@ -720,6 +722,7 @@ % \end{macro} % \end{macro} % \end{macro} +% \end{macro} % % \begin{macro}{\@@_backend_devicen_init:nnn} % Trivial as almost all of the work occurs in the shared code. @@ -877,7 +880,7 @@ [ ~ \prg_replicate:nn { 0 \@@_backend_devicen_init:w #1 ~ \s_@@_stop } - { 0 ~ 1 ~ } ~ + { 0 ~ 1 ~ } ] ~ /Range ~ [ ~ @@ -889,7 +892,7 @@ } ~ ] } - {#3} + { {#3} } } \@@_backend_separation_init:n { @@ -900,7 +903,7 @@ } \bool_lazy_and:nnT { \cs_if_exist_p:N \pdfmanagement_if_active_p: } - { \pdfmanagement_if_active_p:} + { \pdfmanagement_if_active_p: } { \use:x { diff --git a/Master/texmf-dist/source/latex/l3backend/l3backend-draw.dtx b/Master/texmf-dist/source/latex/l3backend/l3backend-draw.dtx index 79c790daa05..820c1bcd2c3 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 2021-08-04} +% \date{Released 2021-10-12} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3backend/l3backend-graphics.dtx b/Master/texmf-dist/source/latex/l3backend/l3backend-graphics.dtx index a82ca742d87..1f7895a2ac7 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 2021-08-04} +% \date{Released 2021-10-12} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3backend/l3backend-header.dtx b/Master/texmf-dist/source/latex/l3backend/l3backend-header.dtx index d741a5eb775..25aa81e99c8 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 2021-08-04} +% \date{Released 2021-10-12} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3backend/l3backend-opacity.dtx b/Master/texmf-dist/source/latex/l3backend/l3backend-opacity.dtx index e8159fc6519..e2837a27287 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 2021-08-04} +% \date{Released 2021-10-12} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3backend/l3backend-pdf.dtx b/Master/texmf-dist/source/latex/l3backend/l3backend-pdf.dtx index 4943ee7f221..78df77acfaf 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 2021-08-04} +% \date{Released 2021-10-12} % % \maketitle % -- cgit v1.2.3