diff options
Diffstat (limited to 'macros/latex/contrib/pdfmanagement-testphase/hyperref-generic.dtx')
-rw-r--r-- | macros/latex/contrib/pdfmanagement-testphase/hyperref-generic.dtx | 253 |
1 files changed, 128 insertions, 125 deletions
diff --git a/macros/latex/contrib/pdfmanagement-testphase/hyperref-generic.dtx b/macros/latex/contrib/pdfmanagement-testphase/hyperref-generic.dtx index dc722effbe..47b957c2ec 100644 --- a/macros/latex/contrib/pdfmanagement-testphase/hyperref-generic.dtx +++ b/macros/latex/contrib/pdfmanagement-testphase/hyperref-generic.dtx @@ -82,7 +82,7 @@ % }^^A % } % -% \date{Version 0.96a, released 2023-10-09} +% \date{Version 0.96b, released 2023-11-05} % % \maketitle % \begin{documentation} @@ -956,7 +956,7 @@ %<@@=hyp> % \end{macrocode} % \begin{macrocode} -\ProvidesFile{hgeneric-testphase.def}[2023-10-09 v0.96a % +\ProvidesFile{hgeneric-testphase.def}[2023-11-05 v0.96b % generic Hyperref driver for the LaTeX PDF management testphase bundle] \RequirePackage{etoolbox} %why? @@ -1213,7 +1213,7 @@ % \begin{macrocode} % TODO should go at some time ... % \kv@set@family@handler{Hyp} -% { \msg_warning:nnx {hyp}{unknown-key-to-Hyp}{#1} } +% { \msg_warning:nne {hyp}{unknown-key-to-Hyp}{#1} } \cs_set_protected:Npn \hypersetup #1 { %\kvsetkeys{Hyp} {#1} @@ -1224,7 +1224,7 @@ { unknown .code:n = { - \msg_warning:nnxxx { hyp } { unknown-key } + \msg_warning:nneee { hyp } { unknown-key } { hyp~/~setup }{ \l_keys_key_str } { #1 } } } @@ -1294,7 +1294,7 @@ } ,afrelationship .code:n = { - \pdfdict_put:nnx + \pdfdict_put:nne { l_pdffile/Filespec}{AFRelationship}{ \pdf_name_from_unicode_e:n {#1}} } @@ -1454,7 +1454,7 @@ %\tl_set:cn {@#1}{#2} \AddToDocumentProperties[hyperref]{#1}{#2} } -\cs_generate_variant:Nn \@@_store_metadata:nn {xn,nx,xx} +\cs_generate_variant:Nn \@@_store_metadata:nn {en,ne,ee} % \end{macrocode} % \subsection{citecolor} % cite is a link context. So we define a hook, and the keys in terms of this hook. @@ -1878,7 +1878,7 @@ % \begin{macrocode} \cs_new_protected:Npn \@@_text_purify:nN #1 #2 %#1 input, #2 str command { - \str_set:Nx #2 {\text_purify:n { #1 } } + \str_set:Ne #2 {\text_purify:n { #1 } } } % \end{macrocode} % \end{macro} @@ -1936,7 +1936,7 @@ \group_end: \str_set_eq:NN #3 \g_@@_text_tmpa_str } -\cs_generate_variant:Nn \@@_text_pdfstring:nnN {xnN,onN,xoN,ooN,noN} +\cs_generate_variant:Nn \@@_text_pdfstring:nnN {enN,onN,eoN,ooN,noN} % \end{macrocode} % \end{macro} % !!! temporary until all instances are gone @@ -1947,7 +1947,7 @@ %^^A \char_set_catcode_active:N \~ % \begin{macrocode} \cs_new_protected:Npn\Hy@pstringdef #1 #2 - { \@@_text_pdfstring:xnN {#2} {utf8/string-raw}#1 } + { \@@_text_pdfstring:enN {#2} {utf8/string-raw}#1 } % \end{macrocode} % % This is a special version for info keys: @@ -2009,7 +2009,7 @@ % \begin{macrocode} \cs_new_protected:Npn\@@_PageLabels_gpush: { - \pdfmanagement_add:nnx {Catalog} {PageLabels}{<</Nums[\HyPL@Labels]>>} + \pdfmanagement_add:nne {Catalog} {PageLabels}{<</Nums[\HyPL@Labels]>>} } \def\Hy@PutCatalog #1 {} @@ -2019,7 +2019,7 @@ { \cs_set_protected:Npn \HyPL@StorePageLabel #1 { - \tl_gput_right:Nx \HyPL@Labels { \the\Hy@abspage<<#1>> } + \tl_gput_right:Ne \HyPL@Labels { \the\Hy@abspage<<#1>> } \@@_PageLabels_gpush: } } @@ -2062,7 +2062,7 @@ \mode_if_horizontal:T { \@savsf\spacefactor } \Hy@SaveLastskip %defined in hyperref \Hy@VerboseAnchor{#1} %defined in hyperref, for debugging - \@@_text_pdfstring:xoN + \@@_text_pdfstring:eoN { \HyperDestNameFilter{#1} } { \l_@@_text_enc_dest_tl } \l_@@_tmpa_tl @@ -2144,14 +2144,14 @@ \protected@edef \l_@@_dest_name_tmpa_tl { #1 } \tl_if_empty:NTF \l_@@_dest_name_tmpa_tl { - \msg_warning:nnx + \msg_warning:nne { hyp } { empty-destination-name } { \c_@@_dest_undefined_tl } \tl_set_eq:NN \l_@@_dest_name_tmpa_tl \c_@@_dest_undefined_tl } { - \@@_text_pdfstring:xoN + \@@_text_pdfstring:eoN { \exp_args:No \HyperDestNameFilter { \l_@@_dest_name_tmpa_tl } } { \l_@@_text_enc_dest_tl } \l_@@_dest_name_tmpa_tl @@ -2257,7 +2257,7 @@ \bool_if:NTF \l_@@_annot_URI_bool { \group_begin: - \@@_text_pdfstring:xoN + \@@_text_pdfstring:eoN { #2} { \l_@@_text_enc_uri_print_tl } \l_@@_uri_tmpa_tl @@ -2270,8 +2270,8 @@ \cs_set_eq:NN \% \c_percent_str \Hy@safe@activestrue \mode_leave_vertical: - \pdfannot_dict_put:nnx {link/URI}{A}{<<\pdfdict_use:n {l_hyp/annot/A/URI}>>} - \pdfannot_link:nxn { URI } + \pdfannot_dict_put:nne {link/URI}{A}{<<\pdfdict_use:n {l_hyp/annot/A/URI}>>} + \pdfannot_link:nen { URI } { } { @@ -2292,24 +2292,23 @@ \pdfdict_put:nnn {l_hyp/annot/A/GoToR}{Type}{/Action} \pdfdict_put:nnn {l_hyp/annot/A/GoToR}{S}{/GoToR} - +\cs_generate_variant:Nn \pdffile_embed_file:nnn {noe} \cs_new_protected:Npn \hyper@linkfile #1 #2 #3 % link text, filename, destname { \bool_if:NTF \l_@@_annot_GoToR_bool { \group_begin: - \tl_set:Nx \l_@@_filename_tmpa_tl { \text_expand:n { #2 } } - \exp_args:Nx + \tl_set:Ne \l_@@_filename_tmpa_tl { \text_expand:n { #2 } } + \exp_args:Ne \pdf_object_if_exist:nF { @@_file_\tl_to_str:N \l_@@_filename_tmpa_tl } { - \pdfdict_put:nnx { l_pdffile/Filespec}{Subtype}{\pdf_name_from_unicode_e:n {application/pdf}} - \exp_args:Nnox - \pdffile_embed_file:nnn + \pdfdict_put:nne { l_pdffile/Filespec}{Subtype}{\pdf_name_from_unicode_e:n {application/pdf}} + \pdffile_embed_file:noe {} {\l_@@_filename_tmpa_tl } {@@_file_\tl_to_str:N \l_@@_filename_tmpa_tl } } - \pdfdict_put:nnx + \pdfdict_put:nne {l_hyp/annot/A/GoToR} {F} {\pdf_object_ref:e {@@_file_\tl_to_str:N \l_@@_filename_tmpa_tl}} @@ -2319,7 +2318,7 @@ \l_@@_dest_name_tmpa_tl \tl_if_blank:eTF {#3} { - \pdfdict_put:nnx {l_hyp/annot/A/GoToR}{D} + \pdfdict_put:nne {l_hyp/annot/A/GoToR}{D} { [ \int_eval:n @@ -2337,9 +2336,9 @@ % object reference in the dict % \url{https://chat.stackexchange.com/transcript/message/57361080#57361080} % \begin{macrocode} - \pdf_object_unnamed_write:nx{dict}{\pdfdict_use:n {l_hyp/annot/A/GoToR}} - \pdfannot_dict_put:nnx {link/GoToR}{A}{\pdf_object_ref_last:} - \pdfannot_link:nxn %expansion?? + \pdf_object_unnamed_write:ne{dict}{\pdfdict_use:n {l_hyp/annot/A/GoToR}} + \pdfannot_dict_put:nne {link/GoToR}{A}{\pdf_object_ref_last:} + \pdfannot_link:nnn %expansion?? { GoToR } { } @@ -2386,12 +2385,14 @@ \pdfdict_remove:nn {l_hyp/annot/A/Launch}{Win} } { - \pdfdict_put:nnx {l_hyp/annot/A/Launch}{Win} + \pdfdict_put:nne + {l_hyp/annot/A/Launch} + {Win} {<</P \l_@@_para_tmpa_tl /F \l_@@_filename_tmpa_tl >>} } \mode_leave_vertical: - \pdfannot_dict_put:nnx {link/Launch}{A}{<<\pdfdict_use:n {l_hyp/annot/A/Launch}>>} - \pdfannot_link:nxn + \pdfannot_dict_put:nne {link/Launch}{A}{<<\pdfdict_use:n {l_hyp/annot/A/Launch}>>} + \pdfannot_link:nen { Launch } { % /A @@ -2412,9 +2413,9 @@ % The actually command used by \pkg{hyperref} is \cs{@hyper@launch} which uses a delimited % argument, because of the color the definition is a bit convoluted. % \begin{macrocode} -\use:x +\use:e { % filename, anchor text, linkname - \cs_set_protected:Npn \exp_not:N \@hyper@launch run \c_colon_str ##1 \exp_not:N \\ ##2 ##3 + \cs_set_protected:Npn \exp_not:N \@hyper@launch run \c_colon_str #1 \exp_not:N \\ #2 #3 } { \hyper@linklaunch {#1}{#2}{#3} @@ -2436,10 +2437,10 @@ \pdfmeta_standard_verify:nnTF {named_actions}{#1} { \mode_leave_vertical: - \pdfdict_put:nnx {l_hyp/annot/A/Named}{N} + \pdfdict_put:nne {l_hyp/annot/A/Named}{N} {\pdf_name_from_unicode_e:n{#1}} - \pdfannot_dict_put:nnx {link/Named}{A}{<<\pdfdict_use:n {l_hyp/annot/A/Named}>>} - \pdfannot_link:nxn { Named } + \pdfannot_dict_put:nne {link/Named}{A}{<<\pdfdict_use:n {l_hyp/annot/A/Named}>>} + \pdfannot_link:nnn { Named } { % /A % << @@ -2648,7 +2649,7 @@ {hyp/color/#1border} \g_@@_bordercolormodel_str \l_@@_tmpa_tl - \pdfannot_dict_put:nnx + \pdfannot_dict_put:nne {link/#2} { C } { [\l_@@_tmpa_tl] } @@ -2791,7 +2792,7 @@ \pdf_object_new:n { @@/OCG/Print } \pdf_object_new:n { @@/OCG/config } \pdf_object_new:n { @@/OCG/refarray } - \pdf_object_write:nnx { @@/OCG/refarray } { array } + \pdf_object_write:nne { @@/OCG/refarray } { array } { \pdf_object_ref:n { @@/OCG/View } \c_space_tl @@ -2817,9 +2818,9 @@ /View <</ViewState/OFF>>~ >> } - \pdfmanagement_add:nnx { Catalog / OCProperties }{OCGs }{ \pdf_object_ref:n {@@/OCG/View} } - \pdfmanagement_add:nnx { Catalog / OCProperties }{OCGs }{ \pdf_object_ref:n {@@/OCG/Print} } - \pdf_object_write:nnx { @@/OCG/config } { dict } + \pdfmanagement_add:nne { Catalog / OCProperties }{OCGs }{ \pdf_object_ref:n {@@/OCG/View} } + \pdfmanagement_add:nne { Catalog / OCProperties }{OCGs }{ \pdf_object_ref:n {@@/OCG/Print} } + \pdf_object_write:nne { @@/OCG/config } { dict } { /OFF[\pdf_object_ref:n { @@/OCG/Print }] /AS[ @@ -2840,7 +2841,7 @@ >> ] } - \pdfmanagement_add:nnx { Catalog / OCProperties }{ D }{ \pdf_object_ref:n { @@/OCG/config} } + \pdfmanagement_add:nne { Catalog / OCProperties }{ D }{ \pdf_object_ref:n { @@/OCG/config} } \cs_gset:Npn \@@_ocg_init: {} } % \end{macrocode} @@ -2920,7 +2921,7 @@ { ,_ocgcolorlinks .code:n = { - \msg_warning:nnxx + \msg_warning:nnee { hyp } { ignore-deprecated-or-unknown-option-in-pdf-version } { ocgcolorlinks } { \pdf_version_major:.\pdf_version_minor: } @@ -2961,7 +2962,7 @@ { ,ocgcolor#1 .code:n= { - \msg_warning:nnxx + \msg_warning:nnee { hyp } { ignore-deprecated-or-unknown-option-in-pdf-version } { ocgcolor#1 } @@ -2997,7 +2998,7 @@ } ,#1highlight / unknown .code:n = { - \msg_warning:nnxxx { hyp } { unknown-choice+empty } + \msg_warning:nneee { hyp } { unknown-choice+empty } { pdfhighlight } { /I~(inverse), /N~(no effect), /O~(outline), /P~(inset) } { \exp_not:n {##1} } @@ -3031,7 +3032,7 @@ ,pdfhighlight .initial:n = {/I}, ,pdfhighlight / unknown .code:n = { - \msg_warning:nnxxx { hyp } { unknown-choice+empty } + \msg_warning:nneee { hyp } { unknown-choice+empty } { pdfhighlight } { /I~(inverse), /N~(no effect), /O~(outline), /P~(inset) } { \exp_not:n {#1} } @@ -3158,7 +3159,7 @@ } ,linktoc / unknown .code:n = { - \msg_warning:nnxxx { hyp } { unknown-choice } + \msg_warning:nneee { hyp } { unknown-choice } { linktoc } { none, section, all, page } { \exp_not:n {#1} } @@ -3195,7 +3196,7 @@ \pdfmanagement_remove:nn {Catalog} { URI } } { - \pdfmanagement_add:nnx {Catalog} { URI }{ <</Base \l_@@_tmpa_tl>> } + \pdfmanagement_add:nne {Catalog} { URI }{ <</Base \l_@@_tmpa_tl>> } } \@@_store_metadata:nn {baseurl}{#1} } @@ -3223,7 +3224,7 @@ } ,pdfcenterwindow / unknown .code:n = { - \msg_warning:nnxx { hyp } { no-bool } + \msg_warning:nnee { hyp } { no-bool } { pdfcenterwindow } { \exp_not:n {#1} } } @@ -3243,7 +3244,7 @@ } ,pdfdirection / unknown .code:n = { - \msg_warning:nnxxx { hyp } { unknown-choice+empty } + \msg_warning:nneee { hyp } { unknown-choice+empty } { pdfdirection } { L2R , R2L } { \exp_not:n {#1} } @@ -3267,7 +3268,7 @@ { PrintDuplex } { /#1 } } { - \msg_warning:nnxx + \msg_warning:nnee {hyp} {ignore-deprecated-or-unknown-option-in-pdf-version} {pdfduplex} @@ -3280,7 +3281,7 @@ } ,pdfduplex / unknown .code:n = { - \msg_warning:nnxxx { hyp } { unknown-choice+empty } + \msg_warning:nneee { hyp } { unknown-choice+empty } { pdfduplex } { Simplex, DuplexFlipShortEdge, DuplexFlipLongEdge } { \exp_not:n {#1} } @@ -3301,7 +3302,7 @@ ,pdffitwindow .default:n = true ,pdffitwindow / unknown .code:n = { - \msg_warning:nnxx { hyp } { no-bool } + \msg_warning:nnee { hyp } { no-bool } { pdffitwindow } { \exp_not:n {#1} } } @@ -3324,7 +3325,7 @@ ,pdfmenubar .default:n = true ,pdfmenubar / unknown .code:n = { - \msg_warning:nnxx { hyp } { no-bool } + \msg_warning:nnee { hyp } { no-bool } { pdfmenubar } { \exp_not:n {#1} } } @@ -3347,7 +3348,7 @@ ,pdfnonfullscreenpagemode .choices:nn = { UseNone, UseOutlines, UseThumbs, FullScreen, UseOC } %pdf 1.5 { - \pdfmanagement_add:nnx {Catalog / ViewerPreferences } + \pdfmanagement_add:nne {Catalog / ViewerPreferences } { NonFullScreenPageMode} {/#1} } ,pdfnonfullscreenpagemode / UseAttachments .code:n = @@ -3357,7 +3358,7 @@ %message } { - \pdfmanagement_add:nnx {Catalog / ViewerPreferences } + \pdfmanagement_add:nne {Catalog / ViewerPreferences } {NonFullScreenPageMode}{/UseAttachments} } } @@ -3367,7 +3368,7 @@ } ,pdfnonfullscreenpagemode / unknown .code:n = { - \msg_warning:nnxxx { hyp } { unknown-choice+empty } + \msg_warning:nneee { hyp } { unknown-choice+empty } { pdfnonfullscreenpagemode } { UseNone, UseOutlines, UseThumbs, FullScreen, UseOC, UseAttachments (PDF 1.6) } { \exp_not:n {#1} } @@ -3381,12 +3382,12 @@ \pdfmanagement_remove:nn {Catalog / ViewerPreferences } { NumCopies } } { - \pdfmanagement_add:nnx {Catalog / ViewerPreferences } + \pdfmanagement_add:nne {Catalog / ViewerPreferences } {NumCopies}{#1} } } { - \msg_warning:nnxx + \msg_warning:nnee {hyp} {ignore-deprecated-or-unknown-option-in-pdf-version} {pdfnumcopies} @@ -3395,27 +3396,27 @@ } ,pdfpagelayout .choices:nn = { SinglePage, OneColumn, TwoColumnLeft, TwoColumnRight, TwoPageLeft, TwoPageRight} - { \pdfmanagement_add:nnx {Catalog} { PageLayout }{ /#1 } } + { \pdfmanagement_add:nne {Catalog} { PageLayout }{ /#1 } } ,pdfpagelayout / .code:n = { \pdfmanagement_remove:nn {Catalog} { PageLayout } } ,pdfpagelayout / unknown .code:n = { - \msg_warning:nnxxx { hyp } { unknown-choice+empty } + \msg_warning:nneee { hyp } { unknown-choice+empty } { pdfpagelayout } { SinglePage, OneColumn, TwoColumnLeft, TwoColumnRight, TwoPageLeft, TwoPageRight } { \exp_not:n {#1} } } ,pdfpagemode .choices:nn = { UseNone, UseOutlines, UseThumbs, FullScreen, UseOC } %pdf 1.5 - { \pdfmanagement_add:nnx {Catalog} { PageMode }{ /#1 } } + { \pdfmanagement_add:nne {Catalog} { PageMode }{ /#1 } } ,pdfpagemode / UseAttachments .code:n = { \pdf_version_compare:NnTF > {1.5} { - \pdfmanagement_add:nnx {Catalog} { PageMode }{ /UseAttachments } + \pdfmanagement_add:nne {Catalog} { PageMode }{ /UseAttachments } } { - \msg_warning:nnxx + \msg_warning:nnee {hyp} {ignore-deprecated-or-unknown-value-in-pdf-version} {UseAttachments} @@ -3425,7 +3426,7 @@ ,pdfpagemode .initial:n = { UseOutlines } %for now ... ,pdfpagemode / unknown .code:n = { - \msg_warning:nnxxx { hyp } { unknown-choice+empty } + \msg_warning:nneee { hyp } { unknown-choice+empty } { pdfpagemode } { UseNone, UseOutlines, UseThumbs, FullScreen, UseOC, UseAttachments (PDF 1.6) } { \exp_not:n {#1} } @@ -3437,7 +3438,7 @@ \pdfmanagement_remove:nn {Pages} { CropBox } } { - \pdfmanagement_add:nnx {Pages} { CropBox } { [#1] } + \pdfmanagement_add:nne {Pages} { CropBox } { [#1] } } } ,pdfpicktraybypdfsize .choice: @@ -3449,7 +3450,7 @@ { PickTrayByPDFSize } { true } } { - \msg_warning:nnxx + \msg_warning:nnee {hyp} {ignore-deprecated-or-unknown-option-in-pdf-version} {pdfpicktraybypdfsize} @@ -3464,7 +3465,7 @@ { PickTrayByPDFSize } { false } } { - \msg_warning:nnxx + \msg_warning:nnee {hyp} {ignore-deprecated-or-unknown-option-in-pdf-version} {pdfpicktraybypdfsize} @@ -3477,7 +3478,7 @@ } ,pdfpicktraybypdfsize / unknown .code:n = { - \msg_warning:nnxx { hyp } { no-bool } + \msg_warning:nnee { hyp } { no-bool } { picktraybypdfsize } { \exp_not:n {#1} } } @@ -3486,11 +3487,11 @@ { \pdf_version_compare:NnTF < {2.0} { - \pdfmanagement_add:nnx {Catalog / ViewerPreferences } + \pdfmanagement_add:nne {Catalog / ViewerPreferences } { PrintArea } { /#1 } } { - \msg_warning:nnxx + \msg_warning:nnee {hyp} {ignore-deprecated-or-unknown-option-in-pdf-version} {pdfprintarea} @@ -3501,7 +3502,7 @@ { \pdfmanagement_remove:nn {Catalog / ViewerPreferences } { PrintArea } } ,pdfprintarea / unknown .code:n = { - \msg_warning:nnxxx { hyp } { unknown-choice+empty } + \msg_warning:nneee { hyp } { unknown-choice+empty } { pdfprintarea } { MediaBox, CropBox, BleedBox, TrimBox, ArtBox } { \exp_not:n {#1} } @@ -3511,11 +3512,11 @@ { \pdf_version_compare:NnTF < {2.0} { - \pdfmanagement_add:nnx {Catalog / ViewerPreferences } + \pdfmanagement_add:nne {Catalog / ViewerPreferences } { PrintClip } { /#1 } } { - \msg_warning:nnxx + \msg_warning:nnee {hyp} {ignore-deprecated-or-unknown-option-in-pdf-version} {pdfprintclip} @@ -3528,7 +3529,9 @@ } ,pdfprintclip / unknown .code:n = { - \msg_warning:nnxxx { hyp } { unknown-choice+empty } + \msg_warning:nneee + { hyp } + { unknown-choice+empty } { pdfprintclip } { MediaBox, CropBox, BleedBox, TrimBox, ArtBox } { \exp_not:n {#1} } @@ -3543,12 +3546,12 @@ { PrintPageRange } } { - \pdfmanagement_add:nnx {Catalog / ViewerPreferences } + \pdfmanagement_add:nne {Catalog / ViewerPreferences } {PrintPageRange}{[#1]} } } { - \msg_warning:nnxx + \msg_warning:nnee {hyp} {ignore-deprecated-or-unknown-option-in-pdf-version} {pdfprintpagerange} @@ -3560,11 +3563,11 @@ { \pdf_version_compare:NnTF > {1.5} { - \pdfmanagement_add:nnx {Catalog / ViewerPreferences } + \pdfmanagement_add:nne {Catalog / ViewerPreferences } { PrintScaling } { /#1 } } { - \msg_warning:nnxx + \msg_warning:nnee {hyp} {ignore-deprecated-or-unknown-option-in-pdf-version} {pdfprintscaling} @@ -3577,18 +3580,18 @@ } ,pdfprintscaling / unknown .code:n = { - \msg_warning:nnxxx { hyp } { unknown-choice+empty } + \msg_warning:nneee { hyp } { unknown-choice+empty } { pdfprintarea } { None, AppDefault } { \exp_not:n {#1} } } ,pdfremotestartview .code:n = { - \tl_set:Nx \l_@@_tmpa_tl {#1~null~null~null~} + \tl_set:Ne \l_@@_tmpa_tl {#1~null~null~null~} \exp_args:NNV \regex_extract_once:NnNTF \c_@@_dest_startview_regex \l_@@_tmpa_tl \l_@@_tmpa_seq { - \tl_set:Nx \l_@@_dest_pdfremotestartview_tl {\seq_item:Nn \l_@@_tmpa_seq {1}} + \tl_set:Ne \l_@@_dest_pdfremotestartview_tl {\seq_item:Nn \l_@@_tmpa_seq {1}} } { \msg_warning:nnnn {hyp}{invalid-destination-value}{#1}{pdfremotestartview} @@ -3599,14 +3602,14 @@ % pdfstartpage is special as it shares code with pdfstartview ,pdfstartpage .code:n = { - \tl_gset:Nx \g_@@_dest_pdfstartpage_tl { #1 } + \tl_gset:Ne \g_@@_dest_pdfstartpage_tl { #1 } \bool_if:nTF { \tl_if_empty_p:N \g_@@_dest_pdfstartpage_tl || \tl_if_empty_p:N \g_@@_dest_pdfstartview_tl } { \pdfmanagement_remove:nn {Catalog} { OpenAction } } { - \pdfmanagement_add:nnx {Catalog} { OpenAction } + \pdfmanagement_add:nne {Catalog} { OpenAction } { [\pdf_pageobject_ref:n {\g_@@_dest_pdfstartpage_tl}~/\g_@@_dest_pdfstartview_tl] } @@ -3615,11 +3618,11 @@ ,pdfstartpage .initial:n =1 ,pdfstartview .code:n = { - \tl_set:Nx \l_@@_tmpa_tl {#1~null~null~null~} + \tl_set:Ne \l_@@_tmpa_tl {#1~null~null~null~} \exp_args:NNV \regex_extract_once:NnNTF \c_@@_dest_startview_regex \l_@@_tmpa_tl \l_@@_tmpa_seq { - \tl_gset:Nx \g_@@_dest_pdfstartview_tl {\seq_item:Nn \l_@@_tmpa_seq {1}} + \tl_gset:Ne \g_@@_dest_pdfstartview_tl {\seq_item:Nn \l_@@_tmpa_seq {1}} } { \msg_warning:nnnn {hyp}{invalid-destination-value}{#1}{pdfstartview} @@ -3631,7 +3634,7 @@ \pdfmanagement_remove:nn {Catalog} { OpenAction } } { - \pdfmanagement_add:nnx {Catalog} { OpenAction } + \pdfmanagement_add:nne {Catalog} { OpenAction } { [\pdf_pageobject_ref:n {\g_@@_dest_pdfstartpage_tl}~/\g_@@_dest_pdfstartview_tl] } @@ -3655,7 +3658,7 @@ ,pdftoolbar .default:n = true ,pdftoolbar / unknown .code:n = { - \msg_warning:nnxx { hyp } { no-bool } + \msg_warning:nnee { hyp } { no-bool } { pdftoolbar } { \exp_not:n {#1} } } @@ -3669,7 +3672,7 @@ { ViewArea } { /#1 } } { - \msg_warning:nnxx + \msg_warning:nnee {hyp} {ignore-deprecated-or-unknown-option-in-pdf-version} {pdfviewarea} @@ -3682,7 +3685,7 @@ } ,pdfviewarea / unknown .code:n = { - \msg_warning:nnxxx { hyp } { unknown-choice+empty } + \msg_warning:nneee { hyp } { unknown-choice+empty } { pdfviewarea } { MediaBox, CropBox, BleedBox, TrimBox, ArtBox } { \exp_not:n {#1} } @@ -3696,7 +3699,7 @@ { ViewClip } { /#1 } } { - \msg_warning:nnxx + \msg_warning:nnee {hyp} {ignore-deprecated-or-unknown-option-in-pdf-version} {pdfviewclip} @@ -3709,7 +3712,7 @@ } ,pdfviewclip / unknown .code:n = { - \msg_warning:nnxxx { hyp } { unknown-choice+empty } + \msg_warning:nneee { hyp } { unknown-choice+empty } { pdfviewclip } { MediaBox, CropBox, BleedBox, TrimBox, ArtBox } { \exp_not:n {#1} } @@ -3730,7 +3733,7 @@ } ,pdfwindowui / unknown .code:n = { - \msg_warning:nnxx { hyp } { no-bool } + \msg_warning:nnee { hyp } { no-bool } { pdfwindowui } { \exp_not:n {#1} } } @@ -3758,7 +3761,7 @@ \tl_set:Nn \l_@@_dest_pdfview_tl {xyz} } { - \tl_set:Nx \l_@@_dest_pdfview_tl + \tl_set:Ne \l_@@_dest_pdfview_tl { \fp_eval:n { \l_@@_tmpa_tl * 100 } } @@ -3837,7 +3840,7 @@ { \tl_if_empty:nF { #1 } { - \pdfmanagement_add:nnx {Catalog} { Lang } { (#1) } + \pdfmanagement_add:nne {Catalog} { Lang } { (#1) } \AddToDocumentProperties[document]{lang}{#1} } } @@ -3868,12 +3871,12 @@ {creator} { \msg_info:nnn { hyp }{ empty-info-value } { pdfcreator } - \pdfmanagement_add:nnx {Info}{Creator}{()} + \pdfmanagement_add:nne {Info}{Creator}{()} } {producer} { \msg_info:nnn { hyp }{ empty-info-value } { pdfproducer } - \pdfmanagement_add:nnx {Info}{Producer}{()} + \pdfmanagement_add:nne {Info}{Producer}{()} } } { @@ -3881,7 +3884,7 @@ } } { - \tl_set:Nx\l_@@_tmpa_tl {\clist_item:nn{##1}{1}} + \tl_set:Ne\l_@@_tmpa_tl {\clist_item:nn{##1}{1}} \exp_args:NNV \regex_extract_once:NnN \l_@@_optlang_regex \l_@@_tmpa_tl\l_@@_tmpa_seq \seq_if_empty:NTF\l_@@_tmpa_seq @@ -3889,12 +3892,12 @@ \@@_text_pdfstring_info:nN {##1}\l_@@_tmpa_str } { - \exp_args:Nx + \exp_args:Ne \@@_text_pdfstring_info:nN {\seq_item:Nn \l_@@_tmpa_seq{3}}\l_@@_tmpa_str } \str_if_eq:VnF\l_@@_tmpa_str{<FEFF>} { - \pdfmanagement_add:nnx {Info}{#2}{\l_@@_tmpa_str} + \pdfmanagement_add:nne {Info}{#2}{\l_@@_tmpa_str} } } \@@_store_metadata:nn {pdf#1}{##1} @@ -3912,10 +3915,10 @@ \@@_text_pdfstring_info:nN {##1}\l_@@_tmpa_str \str_if_eq:VnF\l_@@_tmpa_str{<FEFF>} { - \pdfmanagement_add:nnx {Info}{#2}{\l_@@_tmpa_str} + \pdfmanagement_add:nne {Info}{#2}{\l_@@_tmpa_str} } } - \exp_args:Nx \@@_store_metadata:nn {pdf\str_lowercase:n{#1}}{##1} + \exp_args:Ne \@@_store_metadata:nn {pdf\str_lowercase:n{#1}}{##1} } ,unknown .code:n = { @@ -3923,7 +3926,7 @@ \str_if_eq:VnF\l_@@_tmpa_str{<FEFF>} { \exp_args:Nno - \pdfmanagement_add:nnx {Info} + \pdfmanagement_add:nne {Info} { \l_keys_key_str } {\l_@@_tmpa_str} } } @@ -3953,7 +3956,7 @@ \pdfmanagement_remove:nn {Info}{#2} } { - \pdfmanagement_add:nnx {Info}{#2}{(##1)} + \pdfmanagement_add:nne {Info}{#2}{(##1)} } \@@_store_metadata:nn {pdf#1}{##1} \AddToDocumentProperties[document]{#1}{##1} @@ -3968,9 +3971,9 @@ \pdfmanagement_remove:nn {Info}{#2} } { - \pdfmanagement_add:nnx {Info}{#2}{(##1)} + \pdfmanagement_add:nne {Info}{#2}{(##1)} } - \exp_args:Nx \@@_store_metadata:nn {pdf\str_lowercase:n{#1}}{##1} + \exp_args:Ne \@@_store_metadata:nn {pdf\str_lowercase:n{#1}}{##1} } } } @@ -3995,12 +3998,12 @@ } ,_pdftrapped .choices:nn = {TRUE,FALSE,UNKNOWN} { - \pdfmanagement_add:nnx {Info}{Trapped} + \pdfmanagement_add:nne {Info}{Trapped} {/ \str_uppercase:f { \str_head:n { #1 } } \str_lowercase:f { \str_tail:n { #1 } } } - \@@_store_metadata:nx {pdftrapped} + \@@_store_metadata:ne {pdftrapped} { \str_uppercase:f { \str_head:n { #1 } } \str_lowercase:f { \str_tail:n { #1 } } @@ -4008,7 +4011,7 @@ } ,_pdftrapped / unknown .code:n = { - \msg_warning:nnxxx { hyp } { unknown-choice } + \msg_warning:nneee { hyp } { unknown-choice } { pdftrapped } { true~(case~insensitive), false~(case~insensitive), unknown~(case~insensitive) } { \exp_not:n {#1} } @@ -4149,11 +4152,11 @@ { \group_begin: \keys_set:nn { hyp / trans }{style=R,#1} - \pdf_object_unnamed_write:nx { dict } + \pdf_object_unnamed_write:ne { dict } { \pdfdict_use:n {l_@@_page/Trans} } - \pdfmanagement_add:nnx {Page}{Trans}{\pdf_object_ref_last:} + \pdfmanagement_add:nne {Page}{Trans}{\pdf_object_ref_last:} \group_end: } } @@ -4165,7 +4168,7 @@ { \pdfdict_put:nnn {l_@@_page/Trans}{ S }{/#1} } ,style / unknown .code:n = { - \msg_warning:nnxxx { hyp } { unknown-choice } + \msg_warning:nneee { hyp } { unknown-choice } { trans / style } { Split,Blinds,Box,Wipe,Dissolve,Glitter,R,Fly,Push,Cover,Uncover,Fade } { \exp_not:n {#1} } @@ -4184,7 +4187,7 @@ { \pdfdict_put:nnn {l_@@_page/Trans}{ Di }{ /None } } ,direction / unknown .code:n = { - \msg_warning:nnxxx { hyp } { unknown-choice } + \msg_warning:nneee { hyp } { unknown-choice } { trans / direction } { H~(horizontal,~only~Split,~Blinds), @@ -4203,7 +4206,7 @@ { \pdfdict_put:nnn {l_@@_page/Trans}{ M }{/#1} } ,motion / unknown .code:n = { - \msg_warning:nnxxx { hyp } { unknown-choice } + \msg_warning:nneee { hyp } { unknown-choice } { trans / motion } { I~(inwards) , O~(outwards) } { \exp_not:n {#1} } @@ -4214,7 +4217,7 @@ { \pdfdict_put:nnn { l_@@_page/Trans }{ B } { #1} } ,opaque / unknown .code:n = { - \msg_warning:nnxxx { hyp } { unknown-choice } + \msg_warning:nneee { hyp } { unknown-choice } { trans / B } { true~(opaque~back,~only~Fly), false~(opaque~back,~only~Fly) } { \exp_not:n {#1} } @@ -4223,7 +4226,7 @@ ,unknown .code:n = { % warning ... - \exp_args:Nnx\keys_set:nn {hyp/trans}{ style=\l_keys_key_str } + \exp_args:Nne\keys_set:nn {hyp/trans}{ style=\l_keys_key_str } } } % \end{macrocode} @@ -4281,7 +4284,7 @@ \def\HyField@AddToFields { - \exp_args:Nx\HyField@@AddToFields + \exp_args:Ne\HyField@@AddToFields { \pdfannot_box_ref_last: } @@ -4329,7 +4332,7 @@ \Hy@FormObjects \prop_map_inline:Nn \g_@@_AcroForm_Fields_prop { - \pdfmanagement_add:nnx { Catalog / AcroForm } { Fields }{##1} + \pdfmanagement_add:nne { Catalog / AcroForm } { Fields }{##1} %\pdfmanagement_show:n { Catalog / AcroForm } } \prop_if_empty:NF \g_@@_AcroForm_CoFields_prop @@ -4346,18 +4349,18 @@ } \seq_map_inline:Nn \l_@@_tmpa_seq { - \pdfmanagement_add:nnx { Catalog / AcroForm } + \pdfmanagement_add:nne { Catalog / AcroForm } { CO } { \prop_item:Nn \g_@@_AcroForm_CoFields_prop {##1} } } } - \pdfmanagement_add:nnx {Catalog / AcroForm/DR/Font } + \pdfmanagement_add:nne {Catalog / AcroForm/DR/Font } {ZaDb} {\pdf_object_ref:n {@@/Font/ZaDb} } - \pdfmanagement_add:nnx {Catalog / AcroForm/DR/Font } + \pdfmanagement_add:nne {Catalog / AcroForm/DR/Font } {Helv} {\pdf_object_ref:n {@@/Font/Helv} } - \pdfmanagement_add:nnx {Catalog /AcroForm} + \pdfmanagement_add:nne {Catalog /AcroForm} {DA}{(/Helv~10~Tf~0~g)} \pdfmeta_standard_verify:nTF {form_no_NeedAppearance} { @@ -4538,7 +4541,7 @@ \group_end: } } - \pdfannot_box:nnnx + \pdfannot_box:nnne {\Fld@width} {\Fld@height} {0pt} %is this correct? @@ -4765,7 +4768,7 @@ \pdf_object_new:n {@@/Encoding/pdfdoc } \pdf_object_new:n {@@/Font/ZaDb } \pdf_object_new:n {@@/Font/Helv } - \pdf_object_write:nnx {@@/Encoding/pdfdoc } { dict } + \pdf_object_write:nne {@@/Encoding/pdfdoc } { dict } { /Type/Encoding /Differences[ @@ -4814,7 +4817,7 @@ /Name/ZaDb /BaseFont/ZapfDingbats } - \pdf_object_write:nnx {@@/Font/Helv } { dict } + \pdf_object_write:nne {@@/Font/Helv } { dict } { /Type/Font /Subtype/Type1 |