diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/pdfmanagement-testphase/pdfmanagement-testphase.ltx')
-rw-r--r-- | Master/texmf-dist/tex/latex/pdfmanagement-testphase/pdfmanagement-testphase.ltx | 266 |
1 files changed, 133 insertions, 133 deletions
diff --git a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/pdfmanagement-testphase.ltx b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/pdfmanagement-testphase.ltx index e0f6f78d832..8654dbe2f2c 100644 --- a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/pdfmanagement-testphase.ltx +++ b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/pdfmanagement-testphase.ltx @@ -27,7 +27,7 @@ %% and all files in that bundle must be distributed together. %% %% File: pdfmanagement-testphase.dtx -\ProvidesExplFile{pdfmanagement-testphase.ltx}{2023-10-09}{0.96a} +\ProvidesExplFile{pdfmanagement-testphase.ltx}{2023-11-05}{0.96b} {PDF~management~code~(testphase)} \bool_new:N\l__pdfmanagement_delayed_shipout_bool \msg_new:nnn {pdfmanagement}{delayed-shipout} @@ -116,7 +116,7 @@ { \__pdfdict_if_exist:nTF { #1 } { - \msg_error:nnxx + \msg_error:nnee { pdfdict } { dict-already-defined } { \tl_to_str:n {#1} } @@ -137,7 +137,7 @@ } } { - \msg_error:nnx{pdfdict}{invalid-name}{\tl_to_str:n{#1}} + \msg_error:nne{pdfdict}{invalid-name}{\tl_to_str:n{#1}} } } } @@ -204,7 +204,7 @@ { \__pdfdict_if_exist:nTF { #1 } { - \exp_args:Nnx \prop_put:cnn + \exp_args:Nne \prop_put:cnn { \__pdfdict_name:n { #1 } }{ \str_convert_pdfname:n { #2 } } { #3 } } { @@ -214,7 +214,7 @@ } \cs_set_eq:NN \pdfdict_put:nnn \__pdfdict_put:nnn -\cs_generate_variant:Nn \pdfdict_put:nnn {nnx,nno,nee} +\cs_generate_variant:Nn \pdfdict_put:nnn {nne,nno,nee,nnx} \cs_new_protected:Npn \__pdfdict_gput:nnn #1 #2 #3 %#1 global dict, #2 name, #3 value { @@ -225,7 +225,7 @@ { \__pdfdict_if_exist:nTF { #1 } { - \exp_args:Nnx \prop_gput:cnn + \exp_args:Nne \prop_gput:cnn { \__pdfdict_name:n { #1 } }{ \str_convert_pdfname:n { #2 } } { #3 } } { @@ -235,12 +235,12 @@ } \cs_set_eq:NN \pdfdict_gput:nnn \__pdfdict_gput:nnn -\cs_generate_variant:Nn \pdfdict_gput:nnn {nnx,nno,nee} +\cs_generate_variant:Nn \pdfdict_gput:nnn {nne,nno,nee,nnx} \cs_new_protected:Npn \__pdfdict_get:nnN #1 #2 #3 %dict,key,macro { \__pdfdict_if_exist:nTF { #1 } { - \exp_args:Nnx \prop_get:cnN + \exp_args:Nne \prop_get:cnN { \__pdfdict_name:n { #1 } } { \str_convert_pdfname:n { #2 } } #3 } @@ -254,7 +254,7 @@ { \__pdfdict_if_exist:nTF { #1 } { - \exp_args:Nnx \prop_remove:cn + \exp_args:Nne \prop_remove:cn { \__pdfdict_name:n { #1 } }{ \str_convert_pdfname:n { #2 } } } { @@ -267,7 +267,7 @@ { \__pdfdict_if_exist:nTF { #1 } { - \exp_args:Nnx \prop_gremove:cn + \exp_args:Nne \prop_gremove:cn { \__pdfdict_name:n { #1 } }{ \str_convert_pdfname:n { #2 } } } { @@ -294,7 +294,7 @@ } \cs_new_protected:Npn \pdfdict_show:n #1 { - \__pdfdict_show:Nn \msg_show:nnxxxx {#1} + \__pdfdict_show:Nn \msg_show:nneeee {#1} } \cs_new:Npn \__pdfdict_item:nn #1 #2 %#1 name, #2 value { @@ -377,13 +377,13 @@ } } { - \msg_warning:nnx {pdfmanagement}{inactive} + \msg_warning:nne {pdfmanagement}{inactive} {\tl_to_str:n {\pdfmanagement_add:nnn}} } } -\cs_generate_variant:Nn \pdfmanagement_add:nnn {nnx,nxx,xxx} -\cs_set_eq:NN \PDFManagementAdd \pdfmanagement_add:xxx +\cs_generate_variant:Nn \pdfmanagement_add:nnn {nne,nee,eee,nnx,nxx,xxx} +\cs_set_eq:NN \PDFManagementAdd \pdfmanagement_add:eee \tl_new:N \g__kernel_pdfmanagement_thispage_shipout_code_tl \tl_new:N \g__kernel_pdfmanagement_lastpage_shipout_code_tl \tl_new:N \g__kernel_pdfmanagement_end_run_code_tl @@ -426,7 +426,7 @@ { __pdfmanagement_handler/#1/#2_gput:n } { \use:c {__pdfmanagement_handler/#1/#2_gput:n} {#3} } %special handler { - \exp_args:Nnx + \exp_args:Nne \prop_gput:cnn { \__kernel_pdfdict_name:n { g__pdf_Core/#1 } } { \str_convert_pdfname:n { #2 } } @@ -440,11 +440,11 @@ } } -\cs_generate_variant:Nn \__pdfmanagement_handler_gput:nnn {nxx} +\cs_generate_variant:Nn \__pdfmanagement_handler_gput:nnn {nee} \cs_new_protected:Npn \__pdfmanagement_get:nnN #1 #2 #3 %path,key,macro { - \exp_args:Nnx + \exp_args:Nne \prop_get:cnN { \__kernel_pdfdict_name:n { g__pdf_Core/#1 } } { \str_convert_pdfname:n {#2} } #3 @@ -462,7 +462,7 @@ { __pdfmanagement_handler/#1/#2_gremove: } { \use:c {__pdfmanagement_handler/#1/#2_gremove:} } %special handler { - \exp_args:Nnx + \exp_args:Nne \prop_gremove:cn { \__kernel_pdfdict_name:n { g__pdf_Core/#1 } } { \str_convert_pdfname:n {#2} } @@ -478,7 +478,7 @@ { \pdfdict_if_exist:nTF { g__pdf_Core/#1 } { - \exp_args:Nnx + \exp_args:Nne \prop_gremove:cn { \__kernel_pdfdict_name:n { g__pdf_Core/#1 } } { \str_convert_pdfname:n{#2} } @@ -518,7 +518,7 @@ } \cs_new_protected:Npn \pdfmanagement_show:n #1 { - \__pdfmanagement_show:Nn \msg_show:nnxxxx {#1} + \__pdfmanagement_show:Nn \msg_show:nneeee {#1} } \cs_new_protected:Npn \pdfmanagement_remove:nn #1 #2 { @@ -553,7 +553,7 @@ { \pdfdict_if_empty:nF { g__pdf_Core/Pages} { - \exp_args:Nx \__pdf_backend_Pages_primitive:n + \exp_args:Ne \__pdf_backend_Pages_primitive:n { \pdfdict_use:n { g__pdf_Core/Pages} } @@ -760,10 +760,10 @@ { \__kernel_pdfdict_name:n { g__pdf_Core/Catalog/AA } } { \pdf_object_new:n { __pdfmanagement/Catalog/AA } - \pdf_object_write:nnx + \pdf_object_write:nne { __pdfmanagement/Catalog/AA }{ dict } { \pdfdict_use:n { g__pdf_Core/Catalog/AA } } - \exp_args:Nnx + \exp_args:Nne \__pdf_backend_catalog_gput:nn {AA} { @@ -776,10 +776,10 @@ \seq_if_empty:cF { g__pdfmanagement_/Catalog/AcroForm/Fields_seq } { \pdf_object_new:n { __pdfmanagement/Catalog/AcroForm/Fields } - \pdf_object_write:nnx + \pdf_object_write:nne { __pdfmanagement/Catalog/AcroForm/Fields } { array } { \seq_use:cn { g__pdfmanagement_/Catalog/AcroForm/Fields_seq } {~} } - \exp_args:Nnnx + \exp_args:Nnne \prop_gput:cnn %we have to use \prop here to avoid the handler ... { \__kernel_pdfdict_name:n { g__pdf_Core/Catalog/AcroForm } } { Fields } @@ -788,10 +788,10 @@ \seq_if_empty:cF { g__pdfmanagement_/Catalog/AcroForm/CO_seq } { \pdf_object_new:n { __pdfmanagement/Catalog/AcroForm/CO } - \pdf_object_write:nnx + \pdf_object_write:nne { __pdfmanagement/Catalog/AcroForm/CO } { array } { \seq_use:cn { g__pdfmanagement_/Catalog/AcroForm/CO_seq } {~} } - \exp_args:Nnnx + \exp_args:Nnne \prop_gput:cnn %we have to use \prop here to avoid the handler ... { \__kernel_pdfdict_name:n { g__pdf_Core/Catalog/AcroForm } } { CO } @@ -800,10 +800,10 @@ \prop_if_empty:cF { \__kernel_pdfdict_name:n { g__pdf_Core/Catalog/AcroForm/DR/Font}} { \pdf_object_new:n { __pdfmanagement/Catalog/AcroForm/DR/Font } - \pdf_object_write:nnx + \pdf_object_write:nne { __pdfmanagement/Catalog/AcroForm/DR/Font } { dict } { \pdfdict_use:n { g__pdf_Core/Catalog/AcroForm/DR/Font } } - \exp_args:Nnnx + \exp_args:Nnne \prop_gput:cnn %we have to use \prop here to avoid the handler ... { \__kernel_pdfdict_name:n { g__pdf_Core/Catalog/AcroForm/DR } } { Font } @@ -812,10 +812,10 @@ \prop_if_empty:cF { \__kernel_pdfdict_name:n { g__pdf_Core/Catalog/AcroForm/DR}} { \pdf_object_new:n { __pdfmanagement/Catalog/AcroForm/DR } - \pdf_object_write:nnx + \pdf_object_write:nne { __pdfmanagement/Catalog/AcroForm/DR } { dict } { \pdfdict_use:n { g__pdf_Core/Catalog/AcroForm/DR } } - \exp_args:Nnnx + \exp_args:Nnne \prop_gput:cnn %we have to use \prop here to avoid the handler ... { \__kernel_pdfdict_name:n { g__pdf_Core/Catalog/AcroForm } } { DR } @@ -824,10 +824,10 @@ \prop_if_empty:cF { \__kernel_pdfdict_name:n { g__pdf_Core/Catalog/AcroForm} } { \pdf_object_new:n { __pdfmanagement/Catalog/AcroForm } - \pdf_object_write:nnx + \pdf_object_write:nne { __pdfmanagement/Catalog/AcroForm } { dict } { \pdfdict_use:n { g__pdf_Core/Catalog/AcroForm } } - \exp_args:Nnnx + \exp_args:Nnne \__pdfmanagement_handler_gput:nnn { Catalog } { AcroForm } @@ -841,10 +841,10 @@ { g__pdfmanagement_/Catalog/AF_seq } { \pdf_object_new:n { __pdfmanagement/Catalog/AF } - \pdf_object_write:nnx + \pdf_object_write:nne { __pdfmanagement/Catalog/AF } { array } { \seq_use:cn { g__pdfmanagement_/Catalog/AF_seq } {~} } - \exp_args:Nnx + \exp_args:Nne \__pdf_backend_catalog_gput:nn {AF} { @@ -858,10 +858,10 @@ { \__kernel_pdfdict_name:n { g__pdf_Core/Catalog/MarkInfo } } { \pdf_object_new:n { __pdfmanagement/Catalog/MarkInfo } - \pdf_object_write:nnx + \pdf_object_write:nne { __pdfmanagement/Catalog/MarkInfo } { dict } { \pdfdict_use:n { g__pdf_Core/Catalog/MarkInfo } } - \exp_args:Nnx + \exp_args:Nne \__pdf_backend_catalog_gput:nn {MarkInfo} { @@ -881,7 +881,7 @@ { \pdf_object_new:n { __pdfmanagement/Catalog/OCProperties } \seq_gpop_left:cN { g__pdfmanagement_/Catalog/OCProperties/Configs_seq} \l__pdfmanagement_tmpa_tl - \pdf_object_write:nnx {__pdfmanagement/Catalog/OCProperties} {dict} + \pdf_object_write:nne {__pdfmanagement/Catalog/OCProperties} {dict} { /OCGs~[ \seq_use:cn { g__pdfmanagement_/Catalog/OCProperties/OCGs_seq } {~} ] /D~\l__pdfmanagement_tmpa_tl~ @@ -891,7 +891,7 @@ [ \seq_use:cn { g__pdfmanagement_/Catalog/OCProperties/Configs_seq} {~} ] } } - \exp_args:Nnx + \exp_args:Nne \__pdf_backend_catalog_gput:nn { OCProperties } { \__pdf_backend_object_ref:n {__pdfmanagement/Catalog/OCProperties} } @@ -903,10 +903,10 @@ { g__pdfmanagement_/Catalog/OutputIntents_seq } { \pdf_object_new:n { __pdfmanagement/Catalog/OutputIntents } - \pdf_object_write:nnx + \pdf_object_write:nne { __pdfmanagement/Catalog/OutputIntents } { array } { \seq_use:cn { g__pdfmanagement_/Catalog/OutputIntents_seq } {~} } - \exp_args:Nnx + \exp_args:Nne \__pdf_backend_catalog_gput:nn {OutputIntents} { @@ -920,10 +920,10 @@ { g__pdfmanagement_/Catalog/Requirements_seq } { \pdf_object_new:n { __pdfmanagement/Catalog/Requirements } - \pdf_object_write:nnx + \pdf_object_write:nne { __pdfmanagement/Catalog/Requirements } { array } { \seq_use:cn { g__pdfmanagement_/Catalog/Requirements_seq } {~} } - \exp_args:Nnx + \exp_args:Nne \__pdf_backend_catalog_gput:nn {Requirements} { @@ -937,10 +937,10 @@ { \__kernel_pdfdict_name:n { g__pdf_Core/Catalog/ViewerPreferences } } { \pdf_object_new:n { __pdfmanagement/Catalog/ViewerPreferences } - \pdf_object_write:nnx + \pdf_object_write:nne { __pdfmanagement/Catalog/ViewerPreferences } { dict } { \pdfdict_use:n { g__pdf_Core/Catalog/ViewerPreferences } } - \exp_args:Nnx + \exp_args:Nne \__pdf_backend_catalog_gput:nn {ViewerPreferences} { @@ -967,12 +967,12 @@ \cs_new_protected:cpn { __pdfmanagement_handler/Catalog/Names/EmbeddedFiles_gput:n } #1 { \int_gincr:N \g__pdfmanagement_EmbeddedFiles_int - \exp_args:Nnx + \exp_args:Nne \prop_gput:cnn { \__kernel_pdfdict_name:n { g__pdf_Core/Catalog/Names/EmbeddedFiles }} { \__pdfmanagement_EmbeddedFiles_name: } { #1 } - \exp_args:Nx + \exp_args:Ne \__pdf_backend_NamesEmbeddedFiles_add:nn {\__pdfmanagement_EmbeddedFiles_name:} { #1 } } \cs_new_protected:cpn { __pdfmanagement_/Catalog/Names_gpush:n } #1 %#1 name of name tree @@ -989,7 +989,7 @@ { \sort_return_swapped: } { \sort_return_same: } } - \exp_args:Nnx \__pdf_backend_Names_gpush:nn + \exp_args:Nne \__pdf_backend_Names_gpush:nn {#1} { \seq_use:Nn \l__pdfmanagement_tmpa_seq {~} @@ -998,7 +998,7 @@ } \cs_new_protected:cpn {__pdfmanagement_handler/Catalog/?_show:} { - \iow_term:x + \iow_term:e { \iow_newline: The~Catalog~contains~in~the~top~level~the~single~value~entries @@ -1010,7 +1010,7 @@ { \seq_if_empty:cF { g__pdfmanagement_/Catalog/##1_seq } { - \iow_term:x + \iow_term:e { The~'##1'~array~contains~the~entries \seq_map_function:cN { g__pdfmanagement_/Catalog/##1_seq } \msg_show_item:n @@ -1021,7 +1021,7 @@ { \prop_if_empty:cF { \__kernel_pdfdict_name:n { g__pdf_Core/Catalog/##1 } } { - \iow_term:x + \iow_term:e { The~Catalog~subdirectory~'##1'~contains~the~single~value~entries \prop_map_function:cN @@ -1030,7 +1030,7 @@ } } } - \tl_show:x {\tl_to_str:n{\pdfmanagement_show:n{Catalog}}} + \tl_show:e {\tl_to_str:n{\pdfmanagement_show:n{Catalog}}} } \pdfdict_new:n { g__pdf_Core/Xform/Resources/Properties} %% File: ltdocinit.dtx @@ -1053,7 +1053,7 @@ \prop_new:N \g__pdfmanagement_documentproperties_prop % \NewDocumentCommand\AddToDocumentProperties{O{\@currname}mm} { - \exp_args:NNx + \exp_args:NNe \prop_gput:Nnn \g__pdfmanagement_documentproperties_prop { \tl_if_blank:eTF {#1}{top-level/}{#1/} #2 @@ -1086,7 +1086,7 @@ } \NewDocumentCommand\ShowDocumentProperties {} { - \msg_show:nnx {pdfmanagement}{show-properties} + \msg_show:nne {pdfmanagement}{show-properties} { \prop_map_function:NN \g__pdfmanagement_documentproperties_prop \msg_show_item:nn } @@ -1112,7 +1112,7 @@ \__pdf_backend_annotation:nnnn {#1}{#2}{#3}{#4} \bool_gset_false:N\g__pdfannot_use_lastlink_bool } -\cs_generate_variant:Nn \pdfannot_box:nnnn {nnnx} +\cs_generate_variant:Nn \pdfannot_box:nnnn {nnne,nnnx} \cs_new:Npn \pdfannot_box_ref_last: { \__pdf_backend_annotation_last: @@ -1136,34 +1136,34 @@ { \pdfdict_if_empty:nF { l__pdfannot/widget/AA } { - \pdf_object_unnamed_write:nx {dict}{\pdfdict_use:n{l__pdfannot/widget/AA}} - \pdfdict_put:nnx { l__pdfannot/widget } + \pdf_object_unnamed_write:ne {dict}{\pdfdict_use:n{l__pdfannot/widget/AA}} + \pdfdict_put:nne { l__pdfannot/widget } {AA} {\pdf_object_ref_last:} } } \pdfdict_if_empty:nF { l__pdfannot/widget/AP } { - \pdf_object_unnamed_write:nx {dict}{\pdfdict_use:n{l__pdfannot/widget/AP}} - \pdfdict_put:nnx { l__pdfannot/widget } + \pdf_object_unnamed_write:ne {dict}{\pdfdict_use:n{l__pdfannot/widget/AP}} + \pdfdict_put:nne { l__pdfannot/widget } {AP} {\pdf_object_ref_last:} } \pdfdict_if_empty:nF { l__pdfannot/widget/MK } { - \pdf_object_unnamed_write:nx {dict}{\pdfdict_use:n{l__pdfannot/widget/MK}} - \pdfdict_put:nnx { l__pdfannot/widget } + \pdf_object_unnamed_write:ne {dict}{\pdfdict_use:n{l__pdfannot/widget/MK}} + \pdfdict_put:nne { l__pdfannot/widget } {MK} {\pdf_object_ref_last:} } \pdfdict_if_empty:nF { l__pdfannot/widget/BS } { - \pdf_object_unnamed_write:nx {dict}{\pdfdict_use:n{l__pdfannot/widget/BS}} - \pdfdict_put:nnx { l__pdfannot/widget } + \pdf_object_unnamed_write:ne {dict}{\pdfdict_use:n{l__pdfannot/widget/BS}} + \pdfdict_put:nne { l__pdfannot/widget } {BS} {\pdf_object_ref_last:} } - \pdfannot_box:nnnx {#1}{#2}{#3} + \pdfannot_box:nnne {#1}{#2}{#3} { \pdfdict_use:n { l__pdfannot/widget} } @@ -1190,7 +1190,7 @@ { \hook_use:n { pdfannot/link/#1/before} \mode_leave_vertical: - \exp_args:Nxx %xetex needs expansion + \exp_args:Nee %xetex needs expansion \__pdf_backend_link_begin_user:nnw { \pdfdict_if_exist:nT { l__pdfannot/link/#1 } @@ -1209,12 +1209,12 @@ \bool_gset_true:N \g__pdfannot_use_lastlink_bool \hook_use:n { pdfannot/link/#1/after} } -\cs_generate_variant:Nn \pdfannot_link:nnn {nxn} +\cs_generate_variant:Nn \pdfannot_link:nnn {nen,nxn} \cs_new_protected:Npn \pdfannot_link_begin:nnw #1 #2 %#1 type, #2 action spec { \hook_use:n { pdfannot/link/#1/before} \mode_leave_vertical: - \exp_args:Nxx %xetex needs expansion + \exp_args:Nee %xetex needs expansion \__pdf_backend_link_begin_user:nnw { \pdfdict_if_exist:nT { l__pdfannot/link/#1 } @@ -1234,13 +1234,13 @@ \bool_gset_true:N \g__pdfannot_use_lastlink_bool \hook_use:n { pdfannot/link/#1/after} } -\cs_generate_variant:Nn \pdfannot_link_begin:nnw {nxw} +\cs_generate_variant:Nn \pdfannot_link_begin:nnw {new,nxw} \cs_new_protected:Npn \pdfannot_link_goto_begin:nw #1 %#1 destination { \pdfdict_remove:nn { l__pdfannot/link/GoTo} {Subtype} \hook_use:n { pdfannot/link/GoTo/before} %the backend add it too \mode_leave_vertical: - \exp_args:Nxx %xetex needs expansion + \exp_args:Nee %xetex needs expansion \__pdf_backend_link_begin_goto:nnw { \pdfdict_use:n { l__pdfannot/link/GoTo} @@ -1277,7 +1277,7 @@ { \pdfdict_put:nnn { l__pdfannot/#1 } { #2 }{ #3 } } -\cs_generate_variant:Nn \pdfannot_dict_put:nnn {nnx} +\cs_generate_variant:Nn \pdfannot_dict_put:nnn {nne,nnx} \cs_new_protected:Npn \pdfannot_dict_remove:nn #1 #2 { \pdfdict_remove:nn { l__pdfannot/#1 } { #2 } @@ -1357,7 +1357,7 @@ { \cs_if_exist:cTF {__pdfmeta_standard_verify_handler_#1:nn} { - \exp_args:Nnnx + \exp_args:Nnne \use:c {__pdfmeta_standard_verify_handler_#1:nn} { #2 } @@ -1426,7 +1426,7 @@ { \__pdf_backend_omit_charset:n {1} } \pdfmeta_standard_verify:nnF { min_pdf_version } { \pdf_version: } - { \msg_warning:nnxxx {pdf}{wrong-pdfversion} + { \msg_warning:nneee {pdf}{wrong-pdfversion} {\pdf_version:}{low} { \pdfmeta_standard_item:n{type} @@ -1436,7 +1436,7 @@ } \pdfmeta_standard_verify:nnF { max_pdf_version } { \pdf_version: } - { \msg_warning:nnxxx {pdf}{wrong-pdfversion} + { \msg_warning:nneee {pdf}{wrong-pdfversion} {\pdf_version:}{high} { \pdfmeta_standard_item:n{type} @@ -1671,7 +1671,7 @@ \pdf_object_if_exist:nF { __color_icc_ #1 } { \pdf_object_new:n { __color_icc_ #1 } - \pdf_object_write:nnx { __color_icc_ #1 } { fstream } + \pdf_object_write:nne { __color_icc_ #1 } { fstream } { {/N\c_space_tl \prop_item:cn{c__pdfmeta_colorprofile_#1}{N} @@ -1684,8 +1684,8 @@ \cs_new_protected:Npn \__pdfmeta_write_outputintent:nn #1 #2 %#1 file name, #2 subtype { \group_begin: - \pdfdict_put:nnx {l_pdfmeta/outputintent}{S}{/\str_convert_pdfname:n{#2}} - \pdfdict_put:nnx {l_pdfmeta/outputintent} + \pdfdict_put:nne {l_pdfmeta/outputintent}{S}{/\str_convert_pdfname:n{#2}} + \pdfdict_put:nne {l_pdfmeta/outputintent} {DestOutputProfile} {\pdf_object_ref:n{ __color_icc_ #1 }} \clist_map_inline:nn { OutputConditionIdentifier, Info, RegistryName } @@ -1696,12 +1696,12 @@ \l__pdfmeta_tmpa_tl { \pdf_string_from_unicode:nVN {utf8/string}\l__pdfmeta_tmpa_tl\l__pdfmeta_tmpa_str - \pdfdict_put:nnx + \pdfdict_put:nne {l_pdfmeta/outputintent}{##1}{\l__pdfmeta_tmpa_str} } } - \pdf_object_unnamed_write:nx {dict}{\pdfdict_use:n {l_pdfmeta/outputintent} } - \pdfmanagement_add:nnx {Catalog}{OutputIntents}{\pdf_object_ref_last:} + \pdf_object_unnamed_write:ne {dict}{\pdfdict_use:n {l_pdfmeta/outputintent} } + \pdfmanagement_add:nne {Catalog}{OutputIntents}{\pdf_object_ref_last:} \group_end: } @@ -1719,18 +1719,18 @@ } } { - \exp_args:NNx + \exp_args:NNe \prop_if_in:NnF \g__pdfmeta_outputintents_prop { \pdfmeta_standard_item:n { outputintent_A } } { - \exp_args:NNx + \exp_args:NNe \prop_gput:Nnn \g__pdfmeta_outputintents_prop { \pdfmeta_standard_item:n { outputintent_A } } { sRGB.icc } } - \exp_args:NNx + \exp_args:NNe \prop_get:NnN \g__pdfmeta_outputintents_prop { \pdfmeta_standard_item:n { outputintent_A } } @@ -1752,8 +1752,8 @@ \bool_gset_true:N \g__pdfmeta_xmp_bool \hook_gput_code:nnn{pdfmanagement/add}{pdfmanagement} { - \pdfmanagement_add:nnx {Info}{Producer}{(\c_sys_engine_exec_str-\c_sys_engine_version_str)} - \pdfmanagement_add:nnx {Info}{Creator}{(LaTeX)} + \pdfmanagement_add:nne {Info}{Producer}{(\c_sys_engine_exec_str-\c_sys_engine_version_str)} + \pdfmanagement_add:nne {Info}{Creator}{(LaTeX)} } \keys_define:nn { document / metadata } { @@ -1883,7 +1883,7 @@ \cs_new_protected:Npn \__pdfmeta_xmp_date_get:nNN #1 #2 #3 %#1 property, #2 tl var with PDF date, #3 seq for splitted date { - \tl_set:Nx #2 { \GetDocumentProperties{#1} } + \tl_set:Ne #2 { \GetDocumentProperties{#1} } \tl_if_blank:VTF #2 { \seq_set_eq:NN #3 \l__pdfmeta_xmp_currentdate_seq @@ -1895,8 +1895,8 @@ } \cs_new_protected:Npn \__pdfmeta_xmp_create_uuid:nN #1 #2 { - \str_set:Nx#2 {\str_lowercase:f{\tex_mdfivesum:D{#1}}} - \str_set:Nx#2 + \str_set:Ne#2 {\str_lowercase:f{\tex_mdfivesum:D{#1}}} + \str_set:Ne#2 { uuid: \str_range:Nnn #2{1}{8} -\str_range:Nnn#2{9}{12} @@ -1910,8 +1910,8 @@ \group_begin: \text_declare_purify_equivalent:Nn \& {\tl_to_str:N & } \text_declare_purify_equivalent:Nn \texttilde {\c_tilde_str} - \tl_set:Nx \l__pdfmeta_tmpa_tl { \text_purify:n {#1} } - \str_gset:Nx \g__pdfmeta_tmpa_str { \tl_to_str:N \l__pdfmeta_tmpa_tl } + \tl_set:Ne \l__pdfmeta_tmpa_tl { \text_purify:n {#1} } + \str_gset:Ne \g__pdfmeta_tmpa_str { \tl_to_str:N \l__pdfmeta_tmpa_tl } \str_greplace_all:Nnn\g__pdfmeta_tmpa_str {&}{&} \str_greplace_all:Nnn\g__pdfmeta_tmpa_str {<}{<} \str_greplace_all:Nnn\g__pdfmeta_tmpa_str {>}{>} @@ -1934,8 +1934,8 @@ \tl_set:Nn #3 {#1} } { - \tl_set:Nx #2 {\seq_item:Nn\l__pdfmeta_tmpa_seq{2}} - \tl_set:Nx #3 {\seq_item:Nn\l__pdfmeta_tmpa_seq{3}} + \tl_set:Ne #2 {\seq_item:Nn\l__pdfmeta_tmpa_seq{2}} + \tl_set:Ne #3 {\seq_item:Nn\l__pdfmeta_tmpa_seq{3}} } } \cs_generate_variant:Nn \__pdfmeta_xmp_lang_get:nNN {eNN,VNN} @@ -1943,7 +1943,7 @@ \tl_new:N \g__pdfmeta_xmp_packet_tl \cs_new_protected:Npn \__pdfmeta_xmp_add_packet_chunk:n #1 { - \tl_gput_right:Nx\g__pdfmeta_xmp_packet_tl + \tl_gput_right:Ne\g__pdfmeta_xmp_packet_tl { \__pdfmeta_xmp_indent: \exp_not:n{#1} } @@ -1952,7 +1952,7 @@ \cs_new_protected:Npn \__pdfmeta_xmp_add_packet_chunk:nN #1 #2 { - \tl_put_right:Nx#2 + \tl_put_right:Ne#2 { \__pdfmeta_xmp_indent: \exp_not:n{#1} } @@ -2059,8 +2059,8 @@ \cs_generate_variant:Nn \__pdfmeta_xmp_add_packet_list:nnnn {nnne} \cs_new_protected:Npn \__pdfmeta_xmp_build_packet: { - \tl_set:Nx \l__pdfmeta_xmp_doclang_tl {\GetDocumentProperties{document/lang}} - \tl_set:Nx \l__pdfmeta_xmp_metalang_tl {\GetDocumentProperties{hyperref/pdfmetalang}} + \tl_set:Ne \l__pdfmeta_xmp_doclang_tl {\GetDocumentProperties{document/lang}} + \tl_set:Ne \l__pdfmeta_xmp_metalang_tl {\GetDocumentProperties{hyperref/pdfmetalang}} \tl_if_blank:VT \l__pdfmeta_xmp_metalang_tl { \cs_set_eq:NN \l__pdfmeta_xmp_metalang_tl\l__pdfmeta_xmp_doclang_tl} \__pdfmeta_xmp_build_iptc_data:N \l__pdfmeta_xmp_iptc_data_tl @@ -2110,32 +2110,32 @@ \cs_new_protected:Npn \__pdfmeta_xmp_xmlns_new:nn #1 #2 { \prop_gput:Nnn \g__pdfmeta_xmp_xmlns_prop {#1}{#2} - \tl_gput_right:Nx \g__pdfmeta_xmp_xmlns_tl + \tl_gput_right:Ne \g__pdfmeta_xmp_xmlns_tl { \__pdfmeta_xmp_indent:n{4} xmlns:\exp_not:n{#1="#2"} } } -\cs_generate_variant:Nn \__pdfmeta_xmp_xmlns_new:nn {nx} +\cs_generate_variant:Nn \__pdfmeta_xmp_xmlns_new:nn {ne} \__pdfmeta_xmp_xmlns_new:nn {pdf} {http://ns.adobe.com/pdf/1.3/} \__pdfmeta_xmp_xmlns_new:nn {xmpRights}{http://ns.adobe.com/xap/1.0/rights/} \__pdfmeta_xmp_xmlns_new:nn {dc} {http://purl.org/dc/elements/1.1/} \__pdfmeta_xmp_xmlns_new:nn {photoshop}{http://ns.adobe.com/photoshop/1.0/} \__pdfmeta_xmp_xmlns_new:nn {xmp} {http://ns.adobe.com/xap/1.0/} \__pdfmeta_xmp_xmlns_new:nn {xmpMM} {http://ns.adobe.com/xap/1.0/mm/} -\__pdfmeta_xmp_xmlns_new:nx {stEvt} +\__pdfmeta_xmp_xmlns_new:ne {stEvt} {http://ns.adobe.com/xap/1.0/sType/ResourceEvent\c_hash_str} \__pdfmeta_xmp_xmlns_new:nn {pdfaid} {http://www.aiim.org/pdfa/ns/id/} \__pdfmeta_xmp_xmlns_new:nn {pdfuaid} {http://www.aiim.org/pdfua/ns/id/} \__pdfmeta_xmp_xmlns_new:nn {pdfx} {http://ns.adobe.com/pdfx/1.3/} \__pdfmeta_xmp_xmlns_new:nn {pdfxid} {http://www.npes.org/pdfx/ns/id/} \__pdfmeta_xmp_xmlns_new:nn {prism} {http://prismstandard.org/namespaces/basic/3.0/} -\__pdfmeta_xmp_xmlns_new:nx {stFnt} {http://ns.adobe.com/xap/1.0/sType/Font\c_hash_str} +\__pdfmeta_xmp_xmlns_new:ne {stFnt} {http://ns.adobe.com/xap/1.0/sType/Font\c_hash_str} \__pdfmeta_xmp_xmlns_new:nn {Iptc4xmpCore}{http://iptc.org/std/Iptc4xmpCore/1.0/xmlns/} \__pdfmeta_xmp_xmlns_new:nn {pdfaExtension}{http://www.aiim.org/pdfa/ns/extension/} -\__pdfmeta_xmp_xmlns_new:nx {pdfaSchema}{http://www.aiim.org/pdfa/ns/schema\c_hash_str} -\__pdfmeta_xmp_xmlns_new:nx {pdfaProperty}{http://www.aiim.org/pdfa/ns/property\c_hash_str} -\__pdfmeta_xmp_xmlns_new:nx {pdfaType} {http://www.aiim.org/pdfa/ns/type\c_hash_str} -\__pdfmeta_xmp_xmlns_new:nx {pdfaField}{http://www.aiim.org/pdfa/ns/field\c_hash_str} +\__pdfmeta_xmp_xmlns_new:ne {pdfaSchema}{http://www.aiim.org/pdfa/ns/schema\c_hash_str} +\__pdfmeta_xmp_xmlns_new:ne {pdfaProperty}{http://www.aiim.org/pdfa/ns/property\c_hash_str} +\__pdfmeta_xmp_xmlns_new:ne {pdfaType} {http://www.aiim.org/pdfa/ns/type\c_hash_str} +\__pdfmeta_xmp_xmlns_new:ne {pdfaField}{http://www.aiim.org/pdfa/ns/field\c_hash_str} \seq_new:N \l__pdfmeta_xmp_schema_seq \cs_new_protected:Npn \__pdfmeta_xmp_schema_new:nnn #1 #2 #3 @@ -2390,11 +2390,11 @@ \__pdfmeta_xmp_date_get:nNN {document/creationdate}\l__pdfmeta_tmpa_tl\l__pdfmeta_tmpa_seq \__pdfmeta_xmp_add_packet_line:nne{xmp}{CreateDate}{\__pdfmeta_xmp_print_date:N\l__pdfmeta_tmpa_seq} - \pdfmanagement_add:nnx{Info}{CreationDate}{(\l__pdfmeta_tmpa_tl)} + \pdfmanagement_add:nne{Info}{CreationDate}{(\l__pdfmeta_tmpa_tl)} \__pdfmeta_xmp_date_get:nNN {document/moddate}\l__pdfmeta_tmpa_tl\l__pdfmeta_tmpa_seq \__pdfmeta_xmp_add_packet_line:nne{xmp}{ModifyDate}{\__pdfmeta_xmp_print_date:N\l__pdfmeta_tmpa_seq} - \pdfmanagement_add:nnx{Info}{ModDate}{(\l__pdfmeta_tmpa_tl)} + \pdfmanagement_add:nne{Info}{ModDate}{(\l__pdfmeta_tmpa_tl)} \__pdfmeta_xmp_date_get:nNN {hyperref/pdfmetadate}\l__pdfmeta_tmpa_tl\l__pdfmeta_tmpa_seq \__pdfmeta_xmp_add_packet_line:nne{xmp}{MetadataDate}{\__pdfmeta_xmp_print_date:N\l__pdfmeta_tmpa_seq} @@ -2429,7 +2429,7 @@ \cs_new_protected:Npn \__pdfmeta_xmp_build_xmpMM: { - \str_set:Nx\l__pdfmeta_tmpa_str {\GetDocumentProperties{hyperref/pdfdocumentid}} + \str_set:Ne\l__pdfmeta_tmpa_str {\GetDocumentProperties{hyperref/pdfdocumentid}} \str_if_empty:NT \l__pdfmeta_tmpa_str { \__pdfmeta_xmp_create_uuid:nN @@ -2438,7 +2438,7 @@ } \__pdfmeta_xmp_add_packet_line:nnV{xmpMM}{DocumentID} \l__pdfmeta_tmpa_str - \str_set:Nx\l__pdfmeta_tmpa_str {\GetDocumentProperties{hyperref/pdfinstanceid}} + \str_set:Ne\l__pdfmeta_tmpa_str {\GetDocumentProperties{hyperref/pdfinstanceid}} \str_if_empty:NT \l__pdfmeta_tmpa_str { \__pdfmeta_xmp_create_uuid:nN @@ -2539,7 +2539,7 @@ { \__pdfmeta_xmp_add_packet_open_attr:nnn {Iptc4xmpCore}{CreatorContactInfo}{rdf:parseType="Resource"} - \tl_gput_right:Nx\g__pdfmeta_xmp_packet_tl { \l__pdfmeta_xmp_iptc_data_tl } + \tl_gput_right:Ne\g__pdfmeta_xmp_packet_tl { \l__pdfmeta_xmp_iptc_data_tl } \__pdfmeta_xmp_add_packet_close:nn {Iptc4xmpCore}{CreatorContactInfo} } @@ -2590,7 +2590,7 @@ \__pdfmeta_xmp_add_packet_line:nne {prism}{url} {\GetDocumentProperties{hyperref/pdfurl}} - \tl_set:Nx \l__pdfmeta_tmpa_tl { \GetDocumentProperties{hyperref/pdfnumpages} } + \tl_set:Ne \l__pdfmeta_tmpa_tl { \GetDocumentProperties{hyperref/pdfnumpages} } \__pdfmeta_xmp_add_packet_line:nne {prism}{pageCount} {\tl_if_blank:VTF \l__pdfmeta_tmpa_tl {\PreviousTotalPages}{\l__pdfmeta_tmpa_tl}} @@ -2617,7 +2617,7 @@ \__pdfmeta_xmp_build_packet: \exp_args:No \__pdf_backend_metadata_stream:n {\g__pdfmeta_xmp_packet_tl} - \pdfmanagement_add:nnx {Catalog} {Metadata}{\pdf_object_ref_last:} + \pdfmanagement_add:nne {Catalog} {Metadata}{\pdf_object_ref_last:} \bool_if:NT \g__pdfmeta_xmp_export_bool { \iow_open:Nn\g_tmpa_iow{\g__pdfmeta_xmp_export_str.xmpi} @@ -2873,7 +2873,7 @@ \prop_new:N \g_pdffile_embed_prop \cs_new_protected:Npn \pdffile_embed_show: { - \msg_show:nnx + \msg_show:nne {pdffile}{show-files} { \prop_map_function:NN {\g_pdffile_embed_prop} \msg_show_item:nn @@ -2896,10 +2896,10 @@ \l__pdffile_ext_str \l__pdffile_tmpb_tl { - \tl_set:Nx #2 {/Subtype~\pdf_name_from_unicode_e:V \l__pdffile_tmpb_tl} + \tl_set:Ne #2 {/Subtype~\pdf_name_from_unicode_e:V \l__pdffile_tmpb_tl} } { - \msg_warning:nnx { pdffile }{ mimetype-missing} {#1} + \msg_warning:nne { pdffile }{ mimetype-missing} {#1} \tl_clear:N #2 } } @@ -2909,7 +2909,7 @@ \cs_new_protected:Npn \__pdffile_fstream_write:nN #1 #2 { - \pdf_object_unnamed_write:nx { fstream } + \pdf_object_unnamed_write:ne { fstream } { { #2 @@ -2931,7 +2931,7 @@ \cs_new_protected:Npn \__pdffile_stream_write:nN #1 #2 { - \pdf_object_unnamed_write:nx { stream } + \pdf_object_unnamed_write:ne { stream } { { #2 @@ -2960,9 +2960,9 @@ { \group_begin: \__pdffile_filename_convert_to_print:nN { #2 } \l__pdffile_tmpa_str - \pdfdict_put:nnx {l_pdffile/Filespec}{F} { \l__pdffile_tmpa_str } - \pdfdict_put:nnx {l_pdffile/Filespec}{UF}{ \l__pdffile_tmpa_str } - \pdf_object_write:nnx { #1 } { dict } + \pdfdict_put:nne {l_pdffile/Filespec}{F} { \l__pdffile_tmpa_str } + \pdfdict_put:nne {l_pdffile/Filespec}{UF}{ \l__pdffile_tmpa_str } + \pdf_object_write:nne { #1 } { dict } { \pdfdict_use:n { l_pdffile/Filespec} \tl_if_empty:nF { #3 } @@ -2983,9 +2983,9 @@ { \group_begin: \__pdffile_filename_convert_to_print:nN { #1 } \l__pdffile_tmpa_str - \pdfdict_put:nnx {l_pdffile/Filespec}{F} { \l__pdffile_tmpa_str } - \pdfdict_put:nnx {l_pdffile/Filespec}{UF}{ \l__pdffile_tmpa_str } - \pdf_object_unnamed_write:nx {dict} + \pdfdict_put:nne {l_pdffile/Filespec}{F} { \l__pdffile_tmpa_str } + \pdfdict_put:nne {l_pdffile/Filespec}{UF}{ \l__pdffile_tmpa_str } + \pdf_object_unnamed_write:ne {dict} { \pdfdict_use:n { l_pdffile/Filespec} \tl_if_empty:nF { #2 } @@ -2993,14 +2993,14 @@ /EF <</F~#2 /UF~#2>> } } - \tl_gset:Nx\g__pdffile_tmpa_tl{\pdf_object_ref_last:} + \tl_gset:Ne\g__pdffile_tmpa_tl{\pdf_object_ref_last:} \group_end: \tl_set_eq:NN#3\g__pdffile_tmpa_tl } } \cs_set_eq:NN \pdffile_filespec:nnn \__pdffile_filespec_write:nnn -\cs_generate_variant:Nn \pdffile_filespec:nnn {nnx} +\cs_generate_variant:Nn \pdffile_filespec:nnn {nne,nnx} \cs_new_protected:Npn \pdffile_embed_file:nnn #1 #2 #3 { % if #1 empty => only filespec % if #2 empty => = #1 @@ -3022,14 +3022,14 @@ \__pdffile_fstream_write:VN \l_pdffile_source_name_str \l__pdffile_automimetype_tl - \tl_set:Nx \l__pdffile_embed_ref_tl { \pdf_object_ref_last: } + \tl_set:Ne \l__pdffile_embed_ref_tl { \pdf_object_ref_last: } } { \msg_error:nnn { pdffile }{ file-not-found }{ #1 } } } - \prop_gput:Nnx + \prop_gput:Nne \g_pdffile_embed_prop { #3 } { @@ -3044,7 +3044,7 @@ \tl_if_blank:nTF { #2 } { \pdf_object_new:n { #3 } - \exp_args:Nnnx + \exp_args:Nnne \__pdffile_filespec_write:nnn %#1 dict, #2 target file name, #3 object ref { #3 } @@ -3053,7 +3053,7 @@ } { \pdf_object_new:n { #3 } - \exp_args:Nnnx + \exp_args:Nnne \__pdffile_filespec_write:nnn %#1 dict, #2 target file name, #3 object ref { #3 } @@ -3071,7 +3071,7 @@ \msg_error:nnn { pdffile }{ object-exists } { #3 } } { - \prop_gput:Nnx + \prop_gput:Nne \g_pdffile_embed_prop { #3 } {{stream}{}{\tl_if_blank:nTF {#2}{stream.txt}{\exp_not:n{#2}}}} @@ -3081,9 +3081,9 @@ \__pdffile_stream_write:nN { #1 } \l__pdffile_automimetype_tl - \tl_set:Nx \l__pdffile_embed_ref_tl { \pdf_object_ref_last: } + \tl_set:Ne \l__pdffile_embed_ref_tl { \pdf_object_ref_last: } \pdf_object_new:n { #3 } - \exp_args:Nnxx + \exp_args:Nnee \__pdffile_filespec_write:nnn %#1 dict, #2 target file name, #3 object ref { #3 } @@ -3100,14 +3100,14 @@ \__pdffile_stream_write:nN { #1 } \l__pdffile_automimetype_tl - \tl_set:Nx \l__pdffile_embed_ref_tl { \pdf_object_ref_last: } - \exp_args:Nxx + \tl_set:Ne \l__pdffile_embed_ref_tl { \pdf_object_ref_last: } + \exp_args:Nee \__pdffile_filespec_write:nnN %#1 target file name, #2 object ref of stream, #3 object ref of filespec { \tl_if_blank:nTF {#2}{stream.txt}{\exp_not:n{#2}} } {\l__pdffile_embed_ref_tl} #3 - \prop_gput:Nxx + \prop_gput:Nee \g_pdffile_embed_prop { #3 } {{stream}{}{\tl_if_blank:nTF {#2}{stream.txt}{\exp_not:n{#2}}}} |