From d9eeb5b88792852d7c1c8269da7dc61a80cd87de Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 19 Oct 2021 20:43:43 +0000 Subject: l3 (19oct21) git-svn-id: svn://tug.org/texlive/trunk@60803 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/latex/l3backend/l3backend-dvipdfmx.def | 54 +++++++++++++++++++++- .../tex/latex/l3backend/l3backend-dvips.def | 4 +- .../tex/latex/l3backend/l3backend-dvisvgm.def | 20 +++++++- .../tex/latex/l3backend/l3backend-luatex.def | 54 +++++++++++++++++++++- .../tex/latex/l3backend/l3backend-pdftex.def | 54 +++++++++++++++++++++- .../tex/latex/l3backend/l3backend-xetex.def | 54 +++++++++++++++++++++- 6 files changed, 233 insertions(+), 7 deletions(-) (limited to 'Master/texmf-dist/tex/latex/l3backend') diff --git a/Master/texmf-dist/tex/latex/l3backend/l3backend-dvipdfmx.def b/Master/texmf-dist/tex/latex/l3backend/l3backend-dvipdfmx.def index 3c60e08d909..dbe5d9606f2 100644 --- a/Master/texmf-dist/tex/latex/l3backend/l3backend-dvipdfmx.def +++ b/Master/texmf-dist/tex/latex/l3backend/l3backend-dvipdfmx.def @@ -26,7 +26,7 @@ %% %% File: l3backend-basics.dtx \ProvidesExplFile - {l3backend-dvipdfmx.def}{2021-10-17}{} + {l3backend-dvipdfmx.def}{2021-10-18}{} {L3 backend support: dvipdfmx} \cs_if_exist:NTF \__kernel_dependency_version_check:nn { @@ -224,6 +224,7 @@ \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 +\cs_new_eq:NN \__color_backend_select_iccbased:nn \__color_backend_select_separation:nn \cs_new_protected:Npn \__color_backend_separation_init:nnnnn #1#2#3#4#5 { \pdf_object_unnamed_write:nx { dict } @@ -329,6 +330,57 @@ \tl_if_blank:nF {#2} { \__color_backend_devicen_init:w #2 \s__color_stop } } +\cs_new_protected:Npn \__color_backend_iccbased_init:nnn #1#2#3 + { + \pdf_object_if_exist:nF { __color_icc_ #1 } + { + \pdf_object_new:nn { __color_icc_ #1 } { fstream } + \pdf_object_write:nx { __color_icc_ #1 } + { + { + /N ~ \exp_not:n { #2 } ~ + \tl_if_empty:nF { #3 } { /Range~[ #3 ] } + } + {#1} + } + } + \pdf_object_unnamed_write:nx { array } + { /ICCBased ~ \pdf_object_ref:n { __color_icc_ #1 } } + \cs_if_exist:NT \pdfmanagement_add:nnn + { + \use:x + { + \pdfmanagement_add:nnn { Page / Resources / ColorSpace } + { color \int_use:N \g__color_model_int } + { ~ \pdf_object_ref_last: } + } + } + } + +\cs_new_protected:Npn \__color_backend_iccbased_device:nnn #1#2#3 + { + \pdf_object_if_exist:nF { __color_icc_ #1 } + { + \pdf_object_new:nn { __color_icc_ #1 } { fstream } + \pdf_object_write:nn { __color_icc_ #1 } + { + { /N ~ #3 } + {#1} + } + } + \pdf_object_unnamed_write:nx { array } + { /ICCBased ~ \pdf_object_ref:n { __color_icc_ #1 } } + \cs_if_exist:NT \pdfmanagement_add:nnn + { + \use:x + { + \pdfmanagement_add:nnn + { Page / Resources / ColorSpace } + { Default #2 } + { \pdf_object_ref_last: } + } + } + } \int_compare:nNnT \c__kernel_sys_dvipdfmx_version_int < { 20201111 } { \cs_gset_protected:Npn \__color_backend_select_separation:nn #1#2 { } diff --git a/Master/texmf-dist/tex/latex/l3backend/l3backend-dvips.def b/Master/texmf-dist/tex/latex/l3backend/l3backend-dvips.def index 2b3314ee4bd..e6a75ffbf5e 100644 --- a/Master/texmf-dist/tex/latex/l3backend/l3backend-dvips.def +++ b/Master/texmf-dist/tex/latex/l3backend/l3backend-dvips.def @@ -26,7 +26,7 @@ %% %% File: l3backend-basics.dtx \ProvidesExplFile - {l3backend-dvips.def}{2021-10-17}{} + {l3backend-dvips.def}{2021-10-18}{} {L3 backend support: dvips} \cs_if_exist:NTF \__kernel_dependency_version_check:nn { @@ -147,6 +147,7 @@ \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 +\cs_new_protected:Npn \__color_backend_select_iccbased:nn #1#2 { } \cs_new_protected:Npx \__color_backend_separation_init:nnnnn #1#2#3#4#5 { \bool_if:NT \g__kernel_backend_header_bool @@ -324,6 +325,7 @@ end } } +\cs_new_protected:Npn \__color_backend_iccbased_init:nnn #1#2#3 { } \cs_new_protected:Npn \__color_backend_fill_cmyk:n #1 { \__color_backend_fill:n { cmyk ~ #1 } } \cs_new_protected:Npn \__color_backend_fill_gray:n #1 diff --git a/Master/texmf-dist/tex/latex/l3backend/l3backend-dvisvgm.def b/Master/texmf-dist/tex/latex/l3backend/l3backend-dvisvgm.def index e76764e73cc..9f7839f5dd3 100644 --- a/Master/texmf-dist/tex/latex/l3backend/l3backend-dvisvgm.def +++ b/Master/texmf-dist/tex/latex/l3backend/l3backend-dvisvgm.def @@ -26,7 +26,7 @@ %% %% File: l3backend-basics.dtx \ProvidesExplFile - {l3backend-dvisvgm.def}{2021-10-17}{} + {l3backend-dvisvgm.def}{2021-10-18}{} {L3 backend support: dvisvgm} \cs_if_exist:NTF \__kernel_dependency_version_check:nn { @@ -132,9 +132,25 @@ \cs_new_protected:Npn \__color_backend_reset: { \__kernel_backend_literal:n { color~pop } } \cs_new_protected:Npn \__color_backend_select_separation:nn #1#2 { } -\cs_new_protected:Npn \__color_backend_select_devicen:nn #1#2 { } +\cs_new_eq:NN \__color_backend_select_devicen:nn \__color_backend_select_separation:nn \cs_new_protected:Npn \__color_backend_separation_init:nnnnn #1#2#3#4#5 { } \cs_new_protected:Npn \__color_backend_separation_init_CIELAB:nnnnnn #1#2#3 { } +\cs_new_protected:Npn \__color_backend_select_iccbased:nn #1#2 + { + \__kernel_backend_literal_svg:x + { + + } + } \cs_new_protected:Npn \__color_backend_fill_cmyk:n #1 { \__color_backend_fill:n { cmyk ~ #1 } } \cs_new_protected:Npn \__color_backend_fill_gray:n #1 diff --git a/Master/texmf-dist/tex/latex/l3backend/l3backend-luatex.def b/Master/texmf-dist/tex/latex/l3backend/l3backend-luatex.def index af99f37a036..18d39d723b8 100644 --- a/Master/texmf-dist/tex/latex/l3backend/l3backend-luatex.def +++ b/Master/texmf-dist/tex/latex/l3backend/l3backend-luatex.def @@ -26,7 +26,7 @@ %% %% File: l3backend-basics.dtx \ProvidesExplFile - {l3backend-luatex.def}{2021-10-17}{} + {l3backend-luatex.def}{2021-10-18}{} {L3 backend support: PDF output (LuaTeX)} \cs_if_exist:NTF \__kernel_dependency_version_check:nn { @@ -181,6 +181,7 @@ \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 +\cs_new_eq:NN \__color_backend_select_iccbased:nn \__color_backend_select_separation:nn \cs_new_protected:Npn \__color_backend_separation_init:nnnnn #1#2#3#4#5 { \pdf_object_unnamed_write:nx { dict } @@ -286,6 +287,57 @@ \tl_if_blank:nF {#2} { \__color_backend_devicen_init:w #2 \s__color_stop } } +\cs_new_protected:Npn \__color_backend_iccbased_init:nnn #1#2#3 + { + \pdf_object_if_exist:nF { __color_icc_ #1 } + { + \pdf_object_new:nn { __color_icc_ #1 } { fstream } + \pdf_object_write:nx { __color_icc_ #1 } + { + { + /N ~ \exp_not:n { #2 } ~ + \tl_if_empty:nF { #3 } { /Range~[ #3 ] } + } + {#1} + } + } + \pdf_object_unnamed_write:nx { array } + { /ICCBased ~ \pdf_object_ref:n { __color_icc_ #1 } } + \cs_if_exist:NT \pdfmanagement_add:nnn + { + \use:x + { + \pdfmanagement_add:nnn { Page / Resources / ColorSpace } + { color \int_use:N \g__color_model_int } + { ~ \pdf_object_ref_last: } + } + } + } + +\cs_new_protected:Npn \__color_backend_iccbased_device:nnn #1#2#3 + { + \pdf_object_if_exist:nF { __color_icc_ #1 } + { + \pdf_object_new:nn { __color_icc_ #1 } { fstream } + \pdf_object_write:nn { __color_icc_ #1 } + { + { /N ~ #3 } + {#1} + } + } + \pdf_object_unnamed_write:nx { array } + { /ICCBased ~ \pdf_object_ref:n { __color_icc_ #1 } } + \cs_if_exist:NT \pdfmanagement_add:nnn + { + \use:x + { + \pdfmanagement_add:nnn + { Page / Resources / ColorSpace } + { Default #2 } + { \pdf_object_ref_last: } + } + } + } \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 diff --git a/Master/texmf-dist/tex/latex/l3backend/l3backend-pdftex.def b/Master/texmf-dist/tex/latex/l3backend/l3backend-pdftex.def index 55fb8e16993..0cca706a208 100644 --- a/Master/texmf-dist/tex/latex/l3backend/l3backend-pdftex.def +++ b/Master/texmf-dist/tex/latex/l3backend/l3backend-pdftex.def @@ -26,7 +26,7 @@ %% %% File: l3backend-basics.dtx \ProvidesExplFile - {l3backend-pdftex.def}{2021-10-17}{} + {l3backend-pdftex.def}{2021-10-18}{} {L3 backend support: PDF output (pdfTeX)} \cs_if_exist:NTF \__kernel_dependency_version_check:nn { @@ -181,6 +181,7 @@ \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 +\cs_new_eq:NN \__color_backend_select_iccbased:nn \__color_backend_select_separation:nn \cs_new_protected:Npn \__color_backend_separation_init:nnnnn #1#2#3#4#5 { \pdf_object_unnamed_write:nx { dict } @@ -286,6 +287,57 @@ \tl_if_blank:nF {#2} { \__color_backend_devicen_init:w #2 \s__color_stop } } +\cs_new_protected:Npn \__color_backend_iccbased_init:nnn #1#2#3 + { + \pdf_object_if_exist:nF { __color_icc_ #1 } + { + \pdf_object_new:nn { __color_icc_ #1 } { fstream } + \pdf_object_write:nx { __color_icc_ #1 } + { + { + /N ~ \exp_not:n { #2 } ~ + \tl_if_empty:nF { #3 } { /Range~[ #3 ] } + } + {#1} + } + } + \pdf_object_unnamed_write:nx { array } + { /ICCBased ~ \pdf_object_ref:n { __color_icc_ #1 } } + \cs_if_exist:NT \pdfmanagement_add:nnn + { + \use:x + { + \pdfmanagement_add:nnn { Page / Resources / ColorSpace } + { color \int_use:N \g__color_model_int } + { ~ \pdf_object_ref_last: } + } + } + } + +\cs_new_protected:Npn \__color_backend_iccbased_device:nnn #1#2#3 + { + \pdf_object_if_exist:nF { __color_icc_ #1 } + { + \pdf_object_new:nn { __color_icc_ #1 } { fstream } + \pdf_object_write:nn { __color_icc_ #1 } + { + { /N ~ #3 } + {#1} + } + } + \pdf_object_unnamed_write:nx { array } + { /ICCBased ~ \pdf_object_ref:n { __color_icc_ #1 } } + \cs_if_exist:NT \pdfmanagement_add:nnn + { + \use:x + { + \pdfmanagement_add:nnn + { Page / Resources / ColorSpace } + { Default #2 } + { \pdf_object_ref_last: } + } + } + } \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 diff --git a/Master/texmf-dist/tex/latex/l3backend/l3backend-xetex.def b/Master/texmf-dist/tex/latex/l3backend/l3backend-xetex.def index 28afd4cba32..2c035ff5851 100644 --- a/Master/texmf-dist/tex/latex/l3backend/l3backend-xetex.def +++ b/Master/texmf-dist/tex/latex/l3backend/l3backend-xetex.def @@ -26,7 +26,7 @@ %% %% File: l3backend-basics.dtx \ProvidesExplFile - {l3backend-xetex.def}{2021-10-17}{} + {l3backend-xetex.def}{2021-10-18}{} {L3 backend support: XeTeX} \cs_if_exist:NTF \__kernel_dependency_version_check:nn { @@ -224,6 +224,7 @@ \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 +\cs_new_eq:NN \__color_backend_select_iccbased:nn \__color_backend_select_separation:nn \cs_new_protected:Npn \__color_backend_separation_init:nnnnn #1#2#3#4#5 { \pdf_object_unnamed_write:nx { dict } @@ -329,6 +330,57 @@ \tl_if_blank:nF {#2} { \__color_backend_devicen_init:w #2 \s__color_stop } } +\cs_new_protected:Npn \__color_backend_iccbased_init:nnn #1#2#3 + { + \pdf_object_if_exist:nF { __color_icc_ #1 } + { + \pdf_object_new:nn { __color_icc_ #1 } { fstream } + \pdf_object_write:nx { __color_icc_ #1 } + { + { + /N ~ \exp_not:n { #2 } ~ + \tl_if_empty:nF { #3 } { /Range~[ #3 ] } + } + {#1} + } + } + \pdf_object_unnamed_write:nx { array } + { /ICCBased ~ \pdf_object_ref:n { __color_icc_ #1 } } + \cs_if_exist:NT \pdfmanagement_add:nnn + { + \use:x + { + \pdfmanagement_add:nnn { Page / Resources / ColorSpace } + { color \int_use:N \g__color_model_int } + { ~ \pdf_object_ref_last: } + } + } + } + +\cs_new_protected:Npn \__color_backend_iccbased_device:nnn #1#2#3 + { + \pdf_object_if_exist:nF { __color_icc_ #1 } + { + \pdf_object_new:nn { __color_icc_ #1 } { fstream } + \pdf_object_write:nn { __color_icc_ #1 } + { + { /N ~ #3 } + {#1} + } + } + \pdf_object_unnamed_write:nx { array } + { /ICCBased ~ \pdf_object_ref:n { __color_icc_ #1 } } + \cs_if_exist:NT \pdfmanagement_add:nnn + { + \use:x + { + \pdfmanagement_add:nnn + { Page / Resources / ColorSpace } + { Default #2 } + { \pdf_object_ref_last: } + } + } + } \int_compare:nNnT \c__kernel_sys_dvipdfmx_version_int < { 20201111 } { \cs_gset_protected:Npn \__color_backend_select_separation:nn #1#2 { } -- cgit v1.2.3