diff options
author | Karl Berry <karl@freefriends.org> | 2022-08-31 20:20:02 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2022-08-31 20:20:02 +0000 |
commit | f448cdb03795e1bb20f2f161b6ef98ee9d397d63 (patch) | |
tree | 53855239a59c20df9b21f6161b69dbb888e713f0 /Master/texmf-dist/tex | |
parent | dda31e626ef6f0f11d9fc942ef8feb6025acd8af (diff) |
l3backend (31aug22)
git-svn-id: svn://tug.org/texlive/trunk@64252 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
6 files changed, 102 insertions, 152 deletions
diff --git a/Master/texmf-dist/tex/latex/l3backend/l3backend-dvipdfmx.def b/Master/texmf-dist/tex/latex/l3backend/l3backend-dvipdfmx.def index 7146ee10cdc..67f92072dcd 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}{2022-08-23}{} + {l3backend-dvipdfmx.def}{2022-08-30}{} {L3 backend support: dvipdfmx} \cs_if_exist:NTF \__kernel_dependency_version_check:nn { @@ -147,8 +147,8 @@ { \use:x { - \pdf_object_new:nn { color \int_use:N \g__color_model_int } { array } - \pdf_object_write:nn { color \int_use:N \g__color_model_int } + \pdf_object_new:n { color \int_use:N \g__color_model_int } + \pdf_object_write:nnn { color \int_use:N \g__color_model_int } { array } { /Separation /#1 ~ #2 ~ \pdf_object_ref_last: } } \prop_gput:Nnx \g__color_backend_colorant_prop { /#1 } @@ -158,8 +158,8 @@ { \pdf_object_if_exist:nF { __color_illuminant_CIELAB_ #1 } { - \pdf_object_new:nn { __color_illuminant_CIELAB_ #1 } { array } - \pdf_object_write:nx { __color_illuminant_CIELAB_ #1 } + \pdf_object_new:n { __color_illuminant_CIELAB_ #1 } + \pdf_object_write:nnx { __color_illuminant_CIELAB_ #1 } { array } { /Lab ~ << @@ -202,8 +202,8 @@ } \use:x { - \pdf_object_new:nn { color \int_use:N \g__color_model_int } { array } - \pdf_object_write:nn { color \int_use:N \g__color_model_int } + \pdf_object_new:n { color \int_use:N \g__color_model_int } + \pdf_object_write:nnn { color \int_use:N \g__color_model_int } { array } { /DeviceN ~ [ ~ #1 ~ ] ~ @@ -224,8 +224,8 @@ { \pdf_object_if_exist:nF { __color_icc_ #1 } { - \pdf_object_new:nn { __color_icc_ #1 } { fstream } - \pdf_object_write:nx { __color_icc_ #1 } + \pdf_object_new:n { __color_icc_ #1 } + \pdf_object_write:nnx { __color_icc_ #1 } { fstream } { { /N ~ \exp_not:n { #2 } ~ @@ -242,8 +242,8 @@ { \pdf_object_if_exist:nF { __color_icc_ #1 } { - \pdf_object_new:nn { __color_icc_ #1 } { fstream } - \pdf_object_write:nn { __color_icc_ #1 } + \pdf_object_new:n { __color_icc_ #1 } + \pdf_object_write:nnn { __color_icc_ #1 } { fstream } { { /N ~ #3 } {#1} @@ -625,27 +625,21 @@ { \__pdf_backend:n { docinfo << /#1 ~ #2 >> } } \int_new:N \g__pdf_backend_object_int \prop_new:N \g__pdf_backend_object_prop -\cs_new_protected:Npn \__pdf_backend_object_new:nn #1#2 +\cs_new_protected:Npn \__pdf_backend_object_new:n #1 { \int_gincr:N \g__pdf_backend_object_int \int_const:cn - { c__pdf_backend_object_ \tl_to_str:n {#1} _int } + { c__pdf_object_ \tl_to_str:n {#1} _int } { \g__pdf_backend_object_int } - \prop_gput:Nnn \g__pdf_backend_object_prop {#1} {#2} } \cs_new:Npn \__pdf_backend_object_ref:n #1 - { @pdf.obj \int_use:c { c__pdf_backend_object_ \tl_to_str:n {#1} _int } } -\cs_new_protected:Npn \__pdf_backend_object_write:nn #1#2 - { - \exp_args:Nx \__pdf_backend_object_write:nnn - { \prop_item:Nn \g__pdf_backend_object_prop {#1} } {#1} {#2} - } -\cs_generate_variant:Nn \__pdf_backend_object_write:nn { nx } + { @pdf.obj \int_use:c { c__pdf_object_ \tl_to_str:n {#1} _int } } \cs_new_protected:Npn \__pdf_backend_object_write:nnn #1#2#3 { - \use:c { __pdf_backend_object_write_ #1 :nn } - { \__pdf_backend_object_ref:n {#2} } {#3} + \use:c { __pdf_backend_object_write_ #2 :nn } + { \__pdf_backend_object_ref:n {#1} } {#3} } +\cs_generate_variant:Nn \__pdf_backend_object_write:nnn { nnx } \cs_new_protected:Npn \__pdf_backend_object_write_array:nn #1#2 { \__pdf_backend:x diff --git a/Master/texmf-dist/tex/latex/l3backend/l3backend-dvips.def b/Master/texmf-dist/tex/latex/l3backend/l3backend-dvips.def index b7efe7a693e..c20decfc84d 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}{2022-08-23}{} + {l3backend-dvips.def}{2022-08-30}{} {L3 backend support: dvips} \cs_if_exist:NTF \__kernel_dependency_version_check:nn { @@ -636,25 +636,29 @@ \cs_new_protected:Npn \__pdf_backend_info_gput:nn #1#2 { \__pdf_backend_pdfmark:n { /#1 ~ #2 /DOCINFO } } \int_new:N \g__pdf_backend_object_int -\prop_new:N \g__pdf_backend_object_prop -\cs_new_protected:Npn \__pdf_backend_object_new:nn #1#2 +\cs_new_protected:Npn \__pdf_backend_object_new:n #1 { \int_gincr:N \g__pdf_backend_object_int \int_const:cn - { c__pdf_backend_object_ \tl_to_str:n {#1} _int } + { c__pdf_object_ \tl_to_str:n {#1} _int } { \g__pdf_backend_object_int } - \prop_gput:Nnn \g__pdf_backend_object_prop {#1} {#2} } \cs_new:Npn \__pdf_backend_object_ref:n #1 - { { pdf.obj \int_use:c { c__pdf_backend_object_ \tl_to_str:n {#1} _int } } } -\cs_new_protected:Npn \__pdf_backend_object_write:nn #1#2 + { { pdf.obj \int_use:c { c__pdf_object_ \tl_to_str:n {#1} _int } } } +\cs_new_protected:Npn \__pdf_backend_object_write:nnn #1#2#3 + { + \__pdf_backend_object_write_aux:nnn + { \__pdf_backend_object_ref:n {#1} } + {#2} {#3} + } +\cs_generate_variant:Nn \__pdf_backend_object_write:nnn { nnx } +\cs_new_protected:Npn \__pdf_backend_object_write_aux:nnn #1#2#3 { \__pdf_backend_pdfmark:x { - /_objdef ~ \__pdf_backend_object_ref:n {#1} + /_objdef ~ #1 /type - \str_case_e:nn - { \prop_item:Nn \g__pdf_backend_object_prop {#1} } + \str_case:nn {#2} { { array } { /array } { dict } { /dict } @@ -663,11 +667,8 @@ } /OBJ } - \use:c - { __pdf_backend_object_write_ \prop_item:Nn \g__pdf_backend_object_prop {#1} :nn } - { \__pdf_backend_object_ref:n {#1} } {#2} + \use:c { __pdf_backend_object_write_ #2 :nn } {#1} {#3} } -\cs_generate_variant:Nn \__pdf_backend_object_write:nn { nx } \cs_new_protected:Npn \__pdf_backend_object_write_array:nn #1#2 { \__pdf_backend_pdfmark:x @@ -709,22 +710,9 @@ \cs_new_protected:Npn \__pdf_backend_object_now:nn #1#2 { \int_gincr:N \g__pdf_backend_object_int - \__pdf_backend_pdfmark:x - { - /_objdef ~ { pdf.obj \int_use:N \g__pdf_backend_object_int } - /type - \str_case:nn - {#1} - { - { array } { /array } - { dict } { /dict } - { fstream } { /stream } - { stream } { /stream } - } - /OBJ - } - \exp_args:Nnx \use:c { __pdf_backend_object_write_ #1 :nn } - { { pdf.obj \int_use:N \g__pdf_backend_object_int } } {#2} + \__pdf_backend_object_write_aux:nnn + { { pdf.obj \int_use:N \g__pdf_backend_object_int } } + {#1} {#2} } \cs_generate_variant:Nn \__pdf_backend_object_now:nn { nx } \cs_new:Npn \__pdf_backend_object_last: diff --git a/Master/texmf-dist/tex/latex/l3backend/l3backend-dvisvgm.def b/Master/texmf-dist/tex/latex/l3backend/l3backend-dvisvgm.def index 3f20aef6ff2..a471691cef3 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}{2022-08-23}{} + {l3backend-dvisvgm.def}{2022-08-30}{} {L3 backend support: dvisvgm} \cs_if_exist:NTF \__kernel_dependency_version_check:nn { @@ -657,10 +657,10 @@ \cs_new_protected:Npn \__pdf_backend_destination:nnnn #1#2#3#4 { } \cs_new_protected:Npn \__pdf_backend_catalog_gput:nn #1#2 { } \cs_new_protected:Npn \__pdf_backend_info_gput:nn #1#2 { } -\cs_new_protected:Npn \__pdf_backend_object_new:nn #1#2 { } +\cs_new_protected:Npn \__pdf_backend_object_new:nn #1 { } \cs_new:Npn \__pdf_backend_object_ref:n #1 { } -\cs_new_protected:Npn \__pdf_backend_object_write:nn #1#2 { } -\cs_new_protected:Npn \__pdf_backend_object_write:nx #1#2 { } +\cs_new_protected:Npn \__pdf_backend_object_write:nnn #1#2#3 { } +\cs_new_protected:Npn \__pdf_backend_object_write:nnx #1#2#3 { } \cs_new_protected:Npn \__pdf_backend_object_now:nn #1#2 { } \cs_new_protected:Npn \__pdf_backend_object_now:nx #1#2 { } \cs_new:Npn \__pdf_backend_object_last: { } diff --git a/Master/texmf-dist/tex/latex/l3backend/l3backend-luatex.def b/Master/texmf-dist/tex/latex/l3backend/l3backend-luatex.def index 9be080803a7..82de7e19712 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}{2022-08-23}{} + {l3backend-luatex.def}{2022-08-30}{} {L3 backend support: PDF output (LuaTeX)} \cs_if_exist:NTF \__kernel_dependency_version_check:nn { @@ -205,8 +205,8 @@ { \use:x { - \pdf_object_new:nn { color \int_use:N \g__color_model_int } { array } - \pdf_object_write:nn { color \int_use:N \g__color_model_int } + \pdf_object_new:n { color \int_use:N \g__color_model_int } + \pdf_object_write:nnn { color \int_use:N \g__color_model_int } { array } { /Separation /#1 ~ #2 ~ \pdf_object_ref_last: } } \prop_gput:Nnx \g__color_backend_colorant_prop { /#1 } @@ -216,8 +216,8 @@ { \pdf_object_if_exist:nF { __color_illuminant_CIELAB_ #1 } { - \pdf_object_new:nn { __color_illuminant_CIELAB_ #1 } { array } - \pdf_object_write:nx { __color_illuminant_CIELAB_ #1 } + \pdf_object_new:n { __color_illuminant_CIELAB_ #1 } + \pdf_object_write:nnx { __color_illuminant_CIELAB_ #1 } { array } { /Lab ~ << @@ -260,8 +260,8 @@ } \use:x { - \pdf_object_new:nn { color \int_use:N \g__color_model_int } { array } - \pdf_object_write:nn { color \int_use:N \g__color_model_int } + \pdf_object_new:n { color \int_use:N \g__color_model_int } + \pdf_object_write:nnn { color \int_use:N \g__color_model_int } { array } { /DeviceN ~ [ ~ #1 ~ ] ~ @@ -282,8 +282,8 @@ { \pdf_object_if_exist:nF { __color_icc_ #1 } { - \pdf_object_new:nn { __color_icc_ #1 } { fstream } - \pdf_object_write:nx { __color_icc_ #1 } + \pdf_object_new:n { __color_icc_ #1 } + \pdf_object_write:nnx { __color_icc_ #1 } { fstream } { { /N ~ \exp_not:n { #2 } ~ @@ -300,8 +300,8 @@ { \pdf_object_if_exist:nF { __color_icc_ #1 } { - \pdf_object_new:nn { __color_icc_ #1 } { fstream } - \pdf_object_write:nn { __color_icc_ #1 } + \pdf_object_new:n { __color_icc_ #1 } + \pdf_object_write:nnn { __color_icc_ #1 } { fstream } { { /N ~ #3 } {#1} @@ -736,25 +736,27 @@ { / #1 ~ #2 } } \prop_new:N \g__pdf_backend_object_prop -\cs_new_protected:Npn \__pdf_backend_object_new:nn #1#2 +\cs_new_protected:Npn \__pdf_backend_object_new:n #1 { \tex_pdfextension:D obj ~ reserveobjnum ~ \int_const:cn - { c__pdf_backend_object_ \tl_to_str:n {#1} _int } + { c__pdf_object_ \tl_to_str:n {#1} _int } { \tex_pdffeedback:D lastobj } - \prop_gput:Nnn \g__pdf_backend_object_prop {#1} {#2} } \cs_new:Npn \__pdf_backend_object_ref:n #1 - { \int_use:c { c__pdf_backend_object_ \tl_to_str:n {#1} _int } ~ 0 ~ R } -\cs_new_protected:Npn \__pdf_backend_object_write:nn #1#2 + { \int_use:c { c__pdf_object_ \tl_to_str:n {#1} _int } ~ 0 ~ R } +\cs_new_protected:Npn \__pdf_backend_object_write:nnn #1#2#3 { \tex_immediate:D \tex_pdfextension:D obj ~ useobjnum ~ \int_use:c - { c__pdf_backend_object_ \tl_to_str:n {#1} _int } - \str_case_e:nn - { \prop_item:Nn \g__pdf_backend_object_prop {#1} } + { c__pdf_object_ \tl_to_str:n {#1} _int } + \__pdf_backend_object_write:nn {#2} {#3} + } +\cs_new:Npn \__pdf_backend_object_write:nn #1#2 + { + \str_case:nn {#1} { { array } { { [ ~ \exp_not:n {#2} ~ ] } } { dict } { { << ~ \exp_not:n {#2} ~ >> } } @@ -770,28 +772,13 @@ } } } -\cs_generate_variant:Nn \__pdf_backend_object_write:nn { nx } +\cs_generate_variant:Nn \__pdf_backend_object_write:nnn { nnx } \cs_new:Npn \__pdf_exp_not_i:nn #1#2 { \exp_not:n {#1} } \cs_new:Npn \__pdf_exp_not_ii:nn #1#2 { \exp_not:n {#2} } \cs_new_protected:Npn \__pdf_backend_object_now:nn #1#2 { \tex_immediate:D \tex_pdfextension:D obj ~ - \str_case:nn - {#1} - { - { array } { { [ ~ \exp_not:n {#2} ~ ] } } - { dict } { { << ~ \exp_not:n {#2} ~ >> } } - { fstream } - { - stream ~ attr ~ { \__pdf_exp_not_i:nn #2 } ~ - file ~ { \__pdf_exp_not_ii:nn #2 } - } - { stream } - { - stream ~ attr ~ { \__pdf_exp_not_i:nn #2 } ~ - { \__pdf_exp_not_ii:nn #2 } - } - } + \__pdf_backend_object_write:nn {#1} {#2} } \cs_generate_variant:Nn \__pdf_backend_object_now:nn { nx } \cs_new:Npx \__pdf_backend_object_last: diff --git a/Master/texmf-dist/tex/latex/l3backend/l3backend-pdftex.def b/Master/texmf-dist/tex/latex/l3backend/l3backend-pdftex.def index 4d5b03c068b..ef45c26770f 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}{2022-08-23}{} + {l3backend-pdftex.def}{2022-08-30}{} {L3 backend support: PDF output (pdfTeX)} \cs_if_exist:NTF \__kernel_dependency_version_check:nn { @@ -205,8 +205,8 @@ { \use:x { - \pdf_object_new:nn { color \int_use:N \g__color_model_int } { array } - \pdf_object_write:nn { color \int_use:N \g__color_model_int } + \pdf_object_new:n { color \int_use:N \g__color_model_int } + \pdf_object_write:nnn { color \int_use:N \g__color_model_int } { array } { /Separation /#1 ~ #2 ~ \pdf_object_ref_last: } } \prop_gput:Nnx \g__color_backend_colorant_prop { /#1 } @@ -216,8 +216,8 @@ { \pdf_object_if_exist:nF { __color_illuminant_CIELAB_ #1 } { - \pdf_object_new:nn { __color_illuminant_CIELAB_ #1 } { array } - \pdf_object_write:nx { __color_illuminant_CIELAB_ #1 } + \pdf_object_new:n { __color_illuminant_CIELAB_ #1 } + \pdf_object_write:nnx { __color_illuminant_CIELAB_ #1 } { array } { /Lab ~ << @@ -260,8 +260,8 @@ } \use:x { - \pdf_object_new:nn { color \int_use:N \g__color_model_int } { array } - \pdf_object_write:nn { color \int_use:N \g__color_model_int } + \pdf_object_new:n { color \int_use:N \g__color_model_int } + \pdf_object_write:nnn { color \int_use:N \g__color_model_int } { array } { /DeviceN ~ [ ~ #1 ~ ] ~ @@ -282,8 +282,8 @@ { \pdf_object_if_exist:nF { __color_icc_ #1 } { - \pdf_object_new:nn { __color_icc_ #1 } { fstream } - \pdf_object_write:nx { __color_icc_ #1 } + \pdf_object_new:n { __color_icc_ #1 } + \pdf_object_write:nnx { __color_icc_ #1 } { fstream } { { /N ~ \exp_not:n { #2 } ~ @@ -300,8 +300,8 @@ { \pdf_object_if_exist:nF { __color_icc_ #1 } { - \pdf_object_new:nn { __color_icc_ #1 } { fstream } - \pdf_object_write:nn { __color_icc_ #1 } + \pdf_object_new:n { __color_icc_ #1 } + \pdf_object_write:nnn { __color_icc_ #1 } { fstream } { { /N ~ #3 } {#1} @@ -736,25 +736,27 @@ { / #1 ~ #2 } } \prop_new:N \g__pdf_backend_object_prop -\cs_new_protected:Npn \__pdf_backend_object_new:nn #1#2 +\cs_new_protected:Npn \__pdf_backend_object_new:n #1 { \tex_pdfobj:D reserveobjnum ~ \int_const:cn - { c__pdf_backend_object_ \tl_to_str:n {#1} _int } + { c__pdf_object_ \tl_to_str:n {#1} _int } { \tex_pdflastobj:D } - \prop_gput:Nnn \g__pdf_backend_object_prop {#1} {#2} } \cs_new:Npn \__pdf_backend_object_ref:n #1 - { \int_use:c { c__pdf_backend_object_ \tl_to_str:n {#1} _int } ~ 0 ~ R } -\cs_new_protected:Npn \__pdf_backend_object_write:nn #1#2 + { \int_use:c { c__pdf_object_ \tl_to_str:n {#1} _int } ~ 0 ~ R } +\cs_new_protected:Npn \__pdf_backend_object_write:nnn #1#2#3 { \tex_immediate:D \tex_pdfobj:D useobjnum ~ \int_use:c - { c__pdf_backend_object_ \tl_to_str:n {#1} _int } - \str_case_e:nn - { \prop_item:Nn \g__pdf_backend_object_prop {#1} } + { c__pdf_object_ \tl_to_str:n {#1} _int } + \__pdf_backend_object_write:nn {#2} {#3} + } +\cs_new:Npn \__pdf_backend_object_write:nn #1#2 + { + \str_case:nn {#1} { { array } { { [ ~ \exp_not:n {#2} ~ ] } } { dict } { { << ~ \exp_not:n {#2} ~ >> } } @@ -770,28 +772,13 @@ } } } -\cs_generate_variant:Nn \__pdf_backend_object_write:nn { nx } +\cs_generate_variant:Nn \__pdf_backend_object_write:nnn { nnx } \cs_new:Npn \__pdf_exp_not_i:nn #1#2 { \exp_not:n {#1} } \cs_new:Npn \__pdf_exp_not_ii:nn #1#2 { \exp_not:n {#2} } \cs_new_protected:Npn \__pdf_backend_object_now:nn #1#2 { \tex_immediate:D \tex_pdfobj:D - \str_case:nn - {#1} - { - { array } { { [ ~ \exp_not:n {#2} ~ ] } } - { dict } { { << ~ \exp_not:n {#2} ~ >> } } - { fstream } - { - stream ~ attr ~ { \__pdf_exp_not_i:nn #2 } ~ - file ~ { \__pdf_exp_not_ii:nn #2 } - } - { stream } - { - stream ~ attr ~ { \__pdf_exp_not_i:nn #2 } ~ - { \__pdf_exp_not_ii:nn #2 } - } - } + \__pdf_backend_object_write:nn {#1} {#2} } \cs_generate_variant:Nn \__pdf_backend_object_now:nn { nx } \cs_new:Npx \__pdf_backend_object_last: diff --git a/Master/texmf-dist/tex/latex/l3backend/l3backend-xetex.def b/Master/texmf-dist/tex/latex/l3backend/l3backend-xetex.def index 29e2cc7c183..d171fc435d9 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}{2022-08-23}{} + {l3backend-xetex.def}{2022-08-30}{} {L3 backend support: XeTeX} \cs_if_exist:NTF \__kernel_dependency_version_check:nn { @@ -147,8 +147,8 @@ { \use:x { - \pdf_object_new:nn { color \int_use:N \g__color_model_int } { array } - \pdf_object_write:nn { color \int_use:N \g__color_model_int } + \pdf_object_new:n { color \int_use:N \g__color_model_int } + \pdf_object_write:nnn { color \int_use:N \g__color_model_int } { array } { /Separation /#1 ~ #2 ~ \pdf_object_ref_last: } } \prop_gput:Nnx \g__color_backend_colorant_prop { /#1 } @@ -158,8 +158,8 @@ { \pdf_object_if_exist:nF { __color_illuminant_CIELAB_ #1 } { - \pdf_object_new:nn { __color_illuminant_CIELAB_ #1 } { array } - \pdf_object_write:nx { __color_illuminant_CIELAB_ #1 } + \pdf_object_new:n { __color_illuminant_CIELAB_ #1 } + \pdf_object_write:nnx { __color_illuminant_CIELAB_ #1 } { array } { /Lab ~ << @@ -202,8 +202,8 @@ } \use:x { - \pdf_object_new:nn { color \int_use:N \g__color_model_int } { array } - \pdf_object_write:nn { color \int_use:N \g__color_model_int } + \pdf_object_new:n { color \int_use:N \g__color_model_int } + \pdf_object_write:nnn { color \int_use:N \g__color_model_int } { array } { /DeviceN ~ [ ~ #1 ~ ] ~ @@ -224,8 +224,8 @@ { \pdf_object_if_exist:nF { __color_icc_ #1 } { - \pdf_object_new:nn { __color_icc_ #1 } { fstream } - \pdf_object_write:nx { __color_icc_ #1 } + \pdf_object_new:n { __color_icc_ #1 } + \pdf_object_write:nnx { __color_icc_ #1 } { fstream } { { /N ~ \exp_not:n { #2 } ~ @@ -242,8 +242,8 @@ { \pdf_object_if_exist:nF { __color_icc_ #1 } { - \pdf_object_new:nn { __color_icc_ #1 } { fstream } - \pdf_object_write:nn { __color_icc_ #1 } + \pdf_object_new:n { __color_icc_ #1 } + \pdf_object_write:nnn { __color_icc_ #1 } { fstream } { { /N ~ #3 } {#1} @@ -679,27 +679,21 @@ { \__pdf_backend:n { docinfo << /#1 ~ #2 >> } } \int_new:N \g__pdf_backend_object_int \prop_new:N \g__pdf_backend_object_prop -\cs_new_protected:Npn \__pdf_backend_object_new:nn #1#2 +\cs_new_protected:Npn \__pdf_backend_object_new:n #1 { \int_gincr:N \g__pdf_backend_object_int \int_const:cn - { c__pdf_backend_object_ \tl_to_str:n {#1} _int } + { c__pdf_object_ \tl_to_str:n {#1} _int } { \g__pdf_backend_object_int } - \prop_gput:Nnn \g__pdf_backend_object_prop {#1} {#2} } \cs_new:Npn \__pdf_backend_object_ref:n #1 - { @pdf.obj \int_use:c { c__pdf_backend_object_ \tl_to_str:n {#1} _int } } -\cs_new_protected:Npn \__pdf_backend_object_write:nn #1#2 - { - \exp_args:Nx \__pdf_backend_object_write:nnn - { \prop_item:Nn \g__pdf_backend_object_prop {#1} } {#1} {#2} - } -\cs_generate_variant:Nn \__pdf_backend_object_write:nn { nx } + { @pdf.obj \int_use:c { c__pdf_object_ \tl_to_str:n {#1} _int } } \cs_new_protected:Npn \__pdf_backend_object_write:nnn #1#2#3 { - \use:c { __pdf_backend_object_write_ #1 :nn } - { \__pdf_backend_object_ref:n {#2} } {#3} + \use:c { __pdf_backend_object_write_ #2 :nn } + { \__pdf_backend_object_ref:n {#1} } {#3} } +\cs_generate_variant:Nn \__pdf_backend_object_write:nnn { nnx } \cs_new_protected:Npn \__pdf_backend_object_write_array:nn #1#2 { \__pdf_backend:x |