From 2440126072fff4cdd2f7c5e0b239504ff3504409 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 18 Mar 2021 21:09:35 +0000 Subject: pdfmanagement-testphase (18mar21) git-svn-id: svn://tug.org/texlive/trunk@58511 c570f23f-e606-0410-a88d-b1316a301751 --- .../latex/pdfmanagement-testphase/color-ltx.sty | 4 +- .../pdfmanagement-testphase/hgeneric-testphase.def | 265 ++++++++++++++++----- .../hyperxmp-patches-tmp-ltx.sty | 3 +- .../l3backend-testphase-dvipdfmx.def | 6 +- .../l3backend-testphase-dvips.def | 6 +- .../l3backend-testphase-dvisvgm.def | 6 +- .../l3backend-testphase-luatex.def | 6 +- .../l3backend-testphase-pdftex.def | 6 +- .../l3backend-testphase-xetex.def | 6 +- .../l3pdffield-testphase.sty | 43 ++-- .../pdfmanagement-testphase/pdflscape-ltx.sty | 4 +- .../pdfmanagement-firstaid.sty | 12 +- .../pdfmanagement-testphase.ltx | 5 +- .../pdfmanagement-testphase.sty | 2 +- .../pdfmanagement-testphase/transparent-ltx.sty | 4 +- .../xcolor-patches-tmp-ltx.sty | 2 +- 16 files changed, 274 insertions(+), 106 deletions(-) (limited to 'Master/texmf-dist/tex/latex') diff --git a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/color-ltx.sty b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/color-ltx.sty index 0fbe8eb6717..15754414a16 100644 --- a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/color-ltx.sty +++ b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/color-ltx.sty @@ -22,8 +22,8 @@ %% This file has the LPPL maintenance status "maintained". %% \NeedsTeXFormat{LaTeX2e}[1995/12/01] -\ProvidesPackage{color-ltx} - [2021/03/07 v1.2e Standard LaTeX Color (patched for l3color, part of pdfmanagement-testphase 2021-03-07 v0.95b) (DPC)] +\ProvidesPackage{color-ltx}[2021-03-17 v0.95c + Standard LaTeX Color (patched for l3color, part of pdfmanagement-testphase, original version 2021/03/07 v1.2e) (DPC)] \edef\Gin@codes{% \catcode`\noexpand\^^A\the\catcode`\^^A\relax \catcode`\noexpand\"\the\catcode`\"\relax diff --git a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/hgeneric-testphase.def b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/hgeneric-testphase.def index aa58d10853b..98d06175e9d 100644 --- a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/hgeneric-testphase.def +++ b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/hgeneric-testphase.def @@ -19,8 +19,7 @@ %% and all files in that bundle must be distributed together. %% %% File: hyperref-generic.dtx -\ProvidesFile{hgeneric-testphase.def} - [2021/02/22 v0.95b % +\ProvidesFile{hgeneric-testphase.def}[2021-03-17 v0.95c % generic Hyperref driver for the LaTeX PDF management testphase bundle] \RequirePackage{etoolbox} %why? @@ -152,6 +151,7 @@ No~value~is~equivalent~to~using~`true`. } \cs_generate_variant:Nn\pdf_destination:nn {nf} +\cs_generate_variant:Nn\pdf_object_ref:n {e} \chardef\Hy@VersionChecked=1 %don't check the version! \cs_set_eq:NN \hypercalcbp \dim_to_decimal_in_bp:n \providecommand\@pdfborder{} @@ -186,6 +186,150 @@ { hyp~/~setup }{ \l_keys_key_str } { #1 } } } + +\bool_new:N \l__hyp_href_url_encode_bool +\bool_new:N \l__hyp_href_url_ismap_bool +\tl_new:N \l__hyp_href_url_protocol_tl +\tl_new:N \l__hyp_href_pdf_destination_tl +\tl_new:N \l__hyp_href_pdf_page_tl +\tl_new:N \l__hyp_href_run_parameter_tl +\cs_new_protected:Npn \__hyp_href_url_format {\begingroup\Url} + +\keys_define:nn { hyp / href } + { + ,urlencode .bool_set:N = \l__hyp_href_url_encode_bool + ,format .code:n = { \cs_set_eq:NN \__hyp_href_url_format #1 }, + ,protocol .tl_set:N = \l__hyp_href_url_protocol_tl + ,destination .tl_set:N = \l__hyp_href_pdf_destination_tl + ,pdfremotestartview .code:n = + { + \keys_set:nn { hyp / setup } + { pdfremotestartview = #1 } + } + ,page .code:n = + { + \tl_set:Nn \l__hyp_href_pdf_page_tl {#1} + \tl_set:Nn \Hy@href@page {#1} + } + ,ismap .bool_set:N = \l__hyp_href_url_ismap_bool + ,run-parameter .tl_set:N = \l__hyp_href_run_parameter_tl + ,nextactionraw .code:n = + { %perhaps some safety match later, see hyperref code + \tl_if_empty:nTF + { + \pdfdict_remove:nn{l_hyp/annot/A}{Next} + } + { + \pdfdict_put:nnn{l_hyp/annot/A}{Next}{#1} + \tl_set:Nn \Hy@href@nextactionraw {/Next~#1} + \keys_set:nn {hyp / setup }{ pdfnewwindow = true} + } + } + ,afrelationship .code:n = + { + \pdfdict_put:nnx + { l_pdffile/Filespec}{AFRelationship}{ \pdf_name_from_unicode_e:n {#1}} + } + + } + +\keys_define:nn { hyp / setup } + { + ,href / urlencode .bool_set:N = \l__hyp_href_url_encode_bool + ,href / urlencode .default:n = {true} + ,href / urlencode .initial:n = {false} + ,href / protocol .tl_set:N = \l__hyp_href_url_protocol_tl + ,href / destination .tl_set:N = \l__hyp_href_pdf_destination_tl + ,href / format .code:n = { \cs_set_eq:NN \__hyp_href_url_format #1 } + } + +\DeclareRobustCommand*{\href}[1][]{% + \begingroup + \keys_set:nn { hyp / href } {#1} + \let\protect\@unexpandable@protect + \bool_if:NTF \l__hyp_href_url_encode_bool + { + \tl_set:Nn \l__hyp_text_enc_uri_print_tl {utf8/URI} + } + { + \tl_set:Nn \l__hyp_text_enc_uri_print_tl {utf8/string} + } + \@ifnextchar\bgroup\Hy@href{\hyper@normalise\href@}% +} + +\DeclareRobustCommand*{\hrefurl}[1][]{ + \group_begin: + \keys_set:nn { hyp / href } {#1} + \let\protect\@unexpandable@protect + \bool_if:NTF \l__hyp_href_url_encode_bool + { + \tl_set:Nn \l__hyp_text_enc_uri_print_tl {utf8/URI} + } + { + \tl_set:Nn \l__hyp_text_enc_uri_print_tl {utf8/string} + } + \hyper@normalise\__hyp_href_url_aux:nn} + +\cs_new_protected:Npn \__hyp_href_url_aux:nn #1 #2 + { + \exp_args:Nno\hyper@linkurl{#2}{\l__hyp_href_url_protocol_tl#1} + \group_end: + } + +\DeclareRobustCommand*{\hrefpdf}[1][] + { + \begingroup + \keys_set:nn { hyp / href } {#1} + \let\protect\@unexpandable@protect + \hyper@normalise\__hyp_href_pdf_aux:nn + } + +\cs_new_protected:Npn \__hyp_href_pdf_aux:nn #1 #2 + { + \exp_args:Nnno\hyper@linkfile{#2}{#1}{\l__hyp_href_pdf_destination_tl}\endgroup + } + +\DeclareRobustCommand*{\hrefrun}[1][] + { + \group_begin: + \keys_set:nn { hyp / href } {#1} + \let\protect\@unexpandable@protect + \hyper@normalise\__hyp_href_run_aux:nn + } + +\cs_new_protected:Npn \__hyp_href_run_aux:nn #1 #2 + { + \exp_args:Nnno\hyper@linklaunch{#2}{#1}{\l__hyp_href_run_parameter_tl} + \group_end: + } + +\DeclareRobustCommand*{\url}[1][] + { + \group_begin: + \keys_set:nn {hyp / href } {#1} + \let\protect \@unexpandable@protect + \bool_if:NTF \l__hyp_href_url_encode_bool + { + \tl_set:Nn \l__hyp_text_enc_uri_print_tl {utf8/URI} + } + { + \tl_set:Nn \l__hyp_text_enc_uri_print_tl {utf8/string} + } + \hyper@normalise\__hyp_href_url_aux:n + } + +\cs_new_protected:Npn \__hyp_href_url_aux:n #1 + { + \exp_args:Nno + \hyper@linkurl{\__hyp_href_url_format {#1}} + {\l__hyp_href_url_protocol_tl#1} + \group_end: + } + +\NewExpandableDocumentCommand\__hyp_secondoftwowithopt:wnn {omm}{#3} +\pdfstringdefDisableCommands{\let\hrefurl\__hyp_secondoftwowithopt:wnn} +\pdfstringdefDisableCommands{\let\hrefpdf\__hyp_secondoftwowithopt:wnn} +\pdfstringdefDisableCommands{\let\hrefrun\__hyp_secondoftwowithopt:wnn} \cs_new_protected:Npn \__hyp_store_metadata:nn #1 #2 %#1 key, #2 value. { %\tl_set:cn {@#1}{#2} @@ -456,7 +600,8 @@ \__hyp_link_goto_end: \group_end: \Hy@VerboseLinkStop - }{#3} + } + {{\let\protect\relax#3}} } \cs_new_protected:Npn \hyper@linkstart #1 #2 %#1 context, #2=destination name @@ -493,13 +638,9 @@ { \l__hyp_text_enc_uri_print_tl } \l__hyp_uri_tmpa_tl \pdfdict_put:nno{l_hyp/annot/A/URI}{URI}{\l__hyp_uri_tmpa_tl} - \ifHy@href@ismap - \pdfdict_put:nnn{l_hyp/annot/A/URI}{IsMap}{true} - \fi - \tl_if_empty:NF \Hy@href@nextactionraw + \bool_if:NT \l__hyp_href_url_ismap_bool { - \str_remove_once:Nn \Hy@href@nextactionraw {/Next} - \pdfdict_put:nno{l_hyp/annot/A/Next}{\Hy@href@nextactionraw} + \pdfdict_put:nnn{l_hyp/annot/A/URI}{IsMap}{true} } \cs_set_eq:NN \# \c_hash_str \cs_set_eq:NN \% \c_percent_str @@ -508,16 +649,16 @@ \pdfannot_dict_put:nnx {link/URI}{A}{<<\pdfdict_use:n {l_hyp/annot/A/URI}>>} \pdfannot_link:nxn { URI } { - % /A } { + \let\protect\relax #1 \Hy@xspace@end \Hy@VerboseLinkStop %where is the start?? } \group_end: } - {#1} + {{\let\protect\relax#1}} } \pdfdict_new:n {l_hyp/annot/A/GoToR} @@ -529,45 +670,54 @@ \bool_if:NTF \l__hyp_annot_GoToR_bool { \group_begin: - \tl_set:Nn \l__hyp_filename_tmpa_tl { #2 } - \Hy@CleanupFile \l__hyp_filename_tmpa_tl - \__hyp_text_pdfstring:ooN - { \l__hyp_filename_tmpa_tl } - { \l__hyp_text_enc_file_print_tl } - \l__hyp_filename_tmpa_tl - \pdfdict_put:nno {l_hyp/annot/A/GoToR}{F}{\l__hyp_filename_tmpa_tl} + \tl_set:Nx \l__hyp_filename_tmpa_tl { \text_expand:n { #2 } } + \exp_args:Nx + \pdf_object_if_exist:nF { __hyp_file_\tl_to_str:N \l__hyp_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 + {} + {\l__hyp_filename_tmpa_tl } + {__hyp_file_\tl_to_str:N \l__hyp_filename_tmpa_tl } + } + \pdfdict_put:nnx + {l_hyp/annot/A/GoToR} + {F} + {\pdf_object_ref:e {__hyp_file_\tl_to_str:N \l__hyp_filename_tmpa_tl}} \__hyp_text_pdfstring:nnN { #3 } { \l__hyp_text_enc_dest_print_tl } \l__hyp_dest_name_tmpa_tl - \Hy@MakeRemoteAction \tl_if_blank:eTF {#3} { \pdfdict_put:nnx {l_hyp/annot/A/GoToR}{D} - {[\Hy@href@page/\l__hyp_dest_pdfremotestartview_tl]} + { + [ + \int_eval:n + { \int_max:nn {0}{ 0\l__hyp_href_pdf_page_tl - 1 }} + /\l__hyp_dest_pdfremotestartview_tl + ] + } } { \pdfdict_put:nno {l_hyp/annot/A/GoToR}{D}{\l__hyp_dest_name_tmpa_tl} } - \tl_if_empty:NF \Hy@href@nextactionraw - { - \str_remove_once:Nn \Hy@href@nextactionraw {/Next} - \pdfdict_put:nno{l_hyp/annot/A/Next}{Next}{\Hy@href@nextactionraw} - } \mode_leave_vertical: - \pdfannot_dict_put:nnx {link/GoToR}{A}{<<\pdfdict_use:n {l_hyp/annot/A/GoToR}>>} + \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?? { GoToR } { - % /A<< } { + \let\protect\relax #1\Hy@xspace@end \Hy@VerboseLinkStop %where is the start?? } \group_end: } - {#1} + {{\let\protect\relax#1}} } \pdfdict_new:n {l_hyp/annot/A/Launch} \pdfdict_put:nnn {l_hyp/annot/A/Launch}{Type}{/Action} @@ -600,11 +750,6 @@ \pdfdict_put:nnx {l_hyp/annot/A/Launch}{Win} {<

>} } - \tl_if_empty:NF \Hy@href@nextactionraw - { - \str_remove_once:Nn \Hy@href@nextactionraw {/Next} - \pdfdict_put:nno{l_hyp/annot/A/Next}{Next}{\Hy@href@nextactionraw} - } \mode_leave_vertical: \pdfannot_dict_put:nnx {link/Launch}{A}{<<\pdfdict_use:n {l_hyp/annot/A/Launch}>>} \pdfannot_link:nxn @@ -613,12 +758,13 @@ % /A } { + \let\protect\relax #2\Hy@xspace@end \Hy@VerboseLinkStop %where is the start?? } \group_end: } - {#2} + {{\let\protect\relax#2}} } \use:x { % filename, anchor text, linkname @@ -641,11 +787,6 @@ \mode_leave_vertical: \pdfdict_put:nnx {l_hyp/annot/A/Named}{N} {\pdf_name_from_unicode_e:n{#1}} - \tl_if_empty:NF \Hy@href@nextactionraw - { - \str_remove_once:Nn \Hy@href@nextactionraw {/Next} - \pdfdict_put:nno{l_hyp/annot/A/Next}{Next}{\Hy@href@nextactionraw} - } \pdfannot_dict_put:nnx {link/Named}{A}{<<\pdfdict_use:n {l_hyp/annot/A/Named}>>} \pdfannot_link:nxn { Named } { @@ -662,7 +803,7 @@ } \group_end: } - {#2} + {{\let\protect\relax#2}} } \cs_new_protected:Npn \__hyp_color_export:nnN #1 #2 #3 @@ -1002,19 +1143,9 @@ } } } -\pdf_version_compare:NnTF < {1.5} - { - \keys_define:nn { hyp / setup } - { - ,_ocgcolorlinks .code:n = - { - \msg_warning:nnxx - { hyp } - { ignore-deprecated-or-unknown-option-in-pdf-version } - { ocgcolorlinks } { \pdf_version_major:.\pdf_version_minor: } - } - } - } +\bool_lazy_or:nnTF + { \pdf_version_compare_p:Nn > {1.4} } + { \str_if_eq_p:ee{\pdf_version_major:}{-1} } { \keys_define:nn { hyp / setup } { @@ -1029,6 +1160,18 @@ ,_ocgcolorlinks .default:n = true } } + { + \keys_define:nn { hyp / setup } + { + ,_ocgcolorlinks .code:n = + { + \msg_warning:nnxx + { hyp } + { ignore-deprecated-or-unknown-option-in-pdf-version } + { ocgcolorlinks } { \pdf_version_major:.\pdf_version_minor: } + } + } + } \keys_define:nn { hyp / setup } { @@ -1049,7 +1192,15 @@ \seq_map_inline:Nn \c__hyp_annot_types_seq { - \pdf_version_compare:NnTF < {1.5} + \bool_lazy_or:nnTF + { \pdf_version_compare_p:Nn > {1.4} } + { \str_if_eq_p:ee{\pdf_version_major:}{-1} } + { + \keys_define:nn { hyp / setup } + { + ,ocgcolor#1 .bool_set:c = { l_hyp_annot_ocgcolor#1_bool } + } + } { \keys_define:nn { hyp / setup } { @@ -1063,12 +1214,6 @@ } } } - { - \keys_define:nn { hyp / setup } - { - ,ocgcolor#1 .bool_set:c = { l_hyp_annot_ocgcolor#1_bool } - } - } } \prop_map_inline:Nn \c__hyp_map_hyp_annot_prop { diff --git a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/hyperxmp-patches-tmp-ltx.sty b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/hyperxmp-patches-tmp-ltx.sty index ee89218a7d2..b38a47f09c1 100644 --- a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/hyperxmp-patches-tmp-ltx.sty +++ b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/hyperxmp-patches-tmp-ltx.sty @@ -19,8 +19,7 @@ % % for those people who are interested. \NeedsTeXFormat{LaTeX2e}[2020/10/01] -\ProvidesExplPackage{hyperxmp-patches-tmp-ltx} - {2021-03-07} {0.95b} +\ProvidesExplPackage{hyperxmp-patches-tmp-ltx}{2021-03-17}{0.95c} {Store hyperref metadata in XMP format / temporay patches to test pdfresource management ... UF} \cs_if_exist:NT \pdfmanagement_add:nnn diff --git a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-dvipdfmx.def b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-dvipdfmx.def index 96dbc8e7360..da3b99f7cb4 100644 --- a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-dvipdfmx.def +++ b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-dvipdfmx.def @@ -20,7 +20,7 @@ %% %% File: l3backend-testphase.dtx \ProvidesExplFile - {l3backend-testphase-dvipdfmx.def}{2021-03-07}{} + {l3backend-testphase-dvipdfmx.def}{2021-03-17}{} {LaTeX~PDF~management~testphase~bundle~backend~support: dvipdfmx} \RequirePackage{l3ref-tmp} \cs_generate_variant:Nn \ref_label:nn {en} @@ -44,6 +44,10 @@ \int_new:N \g__pdf_backend_resourceid_int \int_new:N \g__pdf_backend_name_int \int_new:N \g__pdf_backend_page_int +\cs_new:Npn \__kernel_pdf_name_from_unicode_e:n #1 + { + / \str_convert_pdfname:e { \text_expand:n { #1 } } + } \tl_gput_right:Nn \@kernel@after@shipout@lastpage { \g__kernel_pdfmanagement_end_run_code_tl diff --git a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-dvips.def b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-dvips.def index 5e25e98b46e..a8baaf26b4d 100644 --- a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-dvips.def +++ b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-dvips.def @@ -20,7 +20,7 @@ %% %% File: l3backend-testphase.dtx \ProvidesExplFile - {l3backend-testphase-dvips.def}{2021-03-07}{} + {l3backend-testphase-dvips.def}{2021-03-17}{} {LaTeX~PDF~management~testphase~bundle~backend~support: dvips} \RequirePackage{l3ref-tmp} \cs_generate_variant:Nn \ref_label:nn {en} @@ -43,6 +43,10 @@ \int_new:N \g__pdf_backend_resourceid_int \int_new:N \g__pdf_backend_name_int \int_new:N \g__pdf_backend_page_int +\cs_new:Npn \__kernel_pdf_name_from_unicode_e:n #1 + { + ~ ( \text_expand:n { #1 } ) ~ cvn + } \tl_gput_right:Nn\@kernel@after@shipout@lastpage { \g__kernel_pdfmanagement_end_run_code_tl diff --git a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-dvisvgm.def b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-dvisvgm.def index 3a5cabd7792..ba0b8b91d95 100644 --- a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-dvisvgm.def +++ b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-dvisvgm.def @@ -20,7 +20,7 @@ %% %% File: l3backend-testphase.dtx \ProvidesExplFile - {l3backend-testphase-dvisvgm.def}{2021-03-07}{} + {l3backend-testphase-dvisvgm.def}{2021-03-17}{} {LaTeX~PDF~management~testphase~bundle~backend~support: dvisvgm} \RequirePackage{l3ref-tmp} \cs_generate_variant:Nn \ref_label:nn {en} @@ -43,6 +43,10 @@ \int_new:N \g__pdf_backend_resourceid_int \int_new:N \g__pdf_backend_name_int \int_new:N \g__pdf_backend_page_int +\cs_new:Npn \__kernel_pdf_name_from_unicode_e:n #1 + { + / \str_convert_pdfname:e { \text_expand:n { #1 } } + } \tl_if_exist:NTF \@kernel@after@shipout@background { \g@addto@macro \@kernel@before@shipout@background{\relax} diff --git a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-luatex.def b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-luatex.def index 585890eea24..866c334bbf4 100644 --- a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-luatex.def +++ b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-luatex.def @@ -20,7 +20,7 @@ %% %% File: l3backend-testphase.dtx \ProvidesExplFile - {l3backend-testphase-luatex.def}{2021-03-07}{} + {l3backend-testphase-luatex.def}{2021-03-17}{} {LaTeX~PDF~management~testphase~bundle~backend~support: PDF output (LuaTeX)} \RequirePackage{l3ref-tmp} \cs_generate_variant:Nn \ref_label:nn {en} @@ -44,6 +44,10 @@ \int_new:N \g__pdf_backend_name_int \int_new:N \g__pdf_backend_page_int \directlua { require("l3backend-testphase.lua") } +\cs_new:Npn \__kernel_pdf_name_from_unicode_e:n #1 + { + / \str_convert_pdfname:e { \text_expand:n { #1 } } + } \tl_gput_right:Nn \@kernel@after@enddocument@afterlastpage { \g__kernel_pdfmanagement_end_run_code_tl diff --git a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-pdftex.def b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-pdftex.def index 7dfb98a71b5..518c05f7376 100644 --- a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-pdftex.def +++ b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-pdftex.def @@ -20,7 +20,7 @@ %% %% File: l3backend-testphase.dtx \ProvidesExplFile - {l3backend-testphase-pdftex.def}{2021-03-07}{} + {l3backend-testphase-pdftex.def}{2021-03-17}{} {LaTeX~PDF~management~testphase~bundle~backend~support: PDF output (pdfTeX)} \RequirePackage{l3ref-tmp} \cs_generate_variant:Nn \ref_label:nn {en} @@ -43,6 +43,10 @@ \int_new:N \g__pdf_backend_resourceid_int \int_new:N \g__pdf_backend_name_int \int_new:N \g__pdf_backend_page_int +\cs_new:Npn \__kernel_pdf_name_from_unicode_e:n #1 + { + / \str_convert_pdfname:e { \text_expand:n { #1 } } + } \tl_gput_right:Nn \@kernel@after@enddocument@afterlastpage { \g__kernel_pdfmanagement_end_run_code_tl diff --git a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-xetex.def b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-xetex.def index 76ff8572398..7d9d4e523ab 100644 --- a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-xetex.def +++ b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-xetex.def @@ -20,7 +20,7 @@ %% %% File: l3backend-testphase.dtx \ProvidesExplFile - {l3backend-testphase-xetex.def}{2021-03-07}{} + {l3backend-testphase-xetex.def}{2021-03-17}{} {LaTeX~PDF~management~testphase~bundle~backend~support: XeTeX} \RequirePackage{l3ref-tmp} \cs_generate_variant:Nn \ref_label:nn {en} @@ -44,6 +44,10 @@ \int_new:N \g__pdf_backend_resourceid_int \int_new:N \g__pdf_backend_name_int \int_new:N \g__pdf_backend_page_int +\cs_new:Npn \__kernel_pdf_name_from_unicode_e:n #1 + { + / \str_convert_pdfname:e { \text_expand:n { #1 } } + } \tl_gput_right:Nn \@kernel@after@shipout@lastpage { \g__kernel_pdfmanagement_end_run_code_tl diff --git a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3pdffield-testphase.sty b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3pdffield-testphase.sty index ed28f7b00e6..b4d93ec6de4 100644 --- a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3pdffield-testphase.sty +++ b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3pdffield-testphase.sty @@ -20,7 +20,8 @@ %% %% File: l3pdfpdffield-checkbox.dtx \NeedsTeXFormat{LaTeX2e} -\ProvidesExplPackage{l3pdffield-checkbox}{0000-00-00}{v0.00a}{form field checkbox}% +\ProvidesExplPackage{l3pdffield-testphase}{2021-03-17}{0.95c}% + {form field checkboxes} \csname HyField@NeedAppearancesfalse\endcsname % suppress NeedAppearances \str_new:N \l__pdffield_field_name_str \str_new:N \l__pdffield_tmpa_str @@ -48,26 +49,26 @@ \bitset_new:Nn \l__pdffield_Ff_bitset { - ReadOnly = 0, - Required = 1, - NoExport = 2, - Multiline = 12,%Tx - Password = 13, - NoToggleToOff = 14,%Btn, radio button - Radio = 15,%Btn: Radio: 15=1, 16=0 - Pushbutton = 16,%Btn: Checkbox: 15=0, 16=0 + ReadOnly = 1, + Required = 2, + NoExport = 3, + Multiline = 13,%Tx + Password = 14, + NoToggleToOff = 15,%Btn, radio button + Radio = 16,%Btn: Radio: 15=1, 16=0 + Pushbutton = 17,%Btn: Checkbox: 15=0, 16=0 %Btn: Pushbutton: 16=1 - Combo = 17,%Ch: Combo=1 List=0 - Edit = 18,%Ch, Combo=1 -> + edit field - Sort = 19,%Ch, not relevant for view... - FileSelect = 20,%Tx - MultiSelect = 21,%Ch - DoNotSpellCheck = 22,%Tx, Ch (if Combo + Edit set) - DoNotScroll = 23,%Tx - Comb = 24,%Tx, requires MaxLen in dict - RadiosInUnison = 25,%Btn Radio - RichText = 25,%Tx - CommitOnSelChange = 26 + Combo = 18,%Ch: Combo=1 List=0 + Edit = 19,%Ch, Combo=1 -> + edit field + Sort = 20,%Ch, not relevant for view... + FileSelect = 21,%Tx + MultiSelect = 22,%Ch + DoNotSpellCheck = 23,%Tx, Ch (if Combo + Edit set) + DoNotScroll = 24,%Tx + Comb = 25,%Tx, requires MaxLen in dict + RadiosInUnison = 26,%Btn Radio + RichText = 26,%Tx + CommitOnSelChange = 27 } \bitset_new:Nn \l__pdffield_F_bitset @@ -443,7 +444,7 @@ \cs_new_protected:Npn \pdffield_setup:nn #1 #2 { - \keys_set:n {pdffield / #1 } {#2} + \keys_set:nn {pdffield / #1 } {#2} } \endinput% diff --git a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/pdflscape-ltx.sty b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/pdflscape-ltx.sty index ef27c06cf1e..d43c363fe5b 100644 --- a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/pdflscape-ltx.sty +++ b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/pdflscape-ltx.sty @@ -1,8 +1,6 @@ %% %% This is file `pdflscape-ltx.sty', %% -%% Version: 2021/02/22 v0.95b -%% %% Copyright (C) 2021 The LaTeX Project %% %% This work may be distributed and/or modified under the @@ -24,7 +22,7 @@ %% This work consists of the main source file pdflscape-ltx.sty %% \NeedsTeXFormat{LaTeX2e} -\ProvidesExplPackage {pdflscape-ltx}{2021/02/22}{v0.95b} +\ProvidesExplPackage{pdflscape-ltx}{2021-03-17}{0.95c} {Display of landscape pages in PDF - adaption of pdflscape to the PDFmanagement bundle (testphase)} \RequirePackage{lscape} diff --git a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/pdfmanagement-firstaid.sty b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/pdfmanagement-firstaid.sty index 382d32ad61e..0bd7d33a23b 100644 --- a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/pdfmanagement-firstaid.sty +++ b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/pdfmanagement-firstaid.sty @@ -19,7 +19,7 @@ %% and all files in that bundle must be distributed together. %% %% File: pdfmanagement-firstaid.dtx -\ProvidesExplPackage {pdfmanagement-firstaid} {2021-03-07} {0.95b} +\ProvidesExplPackage{pdfmanagement-firstaid}{2021-03-17}{0.95c} {LaTeX PDF management testphase bundle / firstaid-patches} \clist_map_inline:nn {pgf,transparent,hyperxmp,pdflscape,xcolor,color,beamer} @@ -91,7 +91,7 @@ % the commands to add page resources \def\pgf@sys@addpdfresource@extgs@plain##1 { - \exp_after:wN %for transparent which passes a command + %\exp_after:wN %for transparent which passes a command \__pdfmanagement_patch_pgfextgs:w ##1\q_stop } \def\pgf@sys@addpdfresource@patterns@plain##1 @@ -110,11 +110,13 @@ \tl_set:Nn #2 {#4} } +\cs_generate_variant:Nn \tl_trim_spaces:n{V} +\cs_generate_variant:Nn \__pdf_backend_PageResources_gput:nnn {nex} \cs_new:Npn \__pdfmanagement_patch_pgfextgs:w #1/#2<<#3>>#4\q_stop { - \exp_args:Nne - \__pdf_backend_PageResources_gput:nnn - {ExtGState}{\tl_trim_spaces:n{#2}}{<<#3>>} + \tl_set:Nx\l_tmpa_tl{#2} + \__pdf_backend_PageResources_gput:nex + {ExtGState}{\tl_trim_spaces:V\l_tmpa_tl}{<<#3 #4>>} } \cs_new:Npn \__pdfmanagement_patch_pgfpatterns:w #1/#2\space#3\q_stop { 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 eb1dbf97ad1..32de8d45bc7 100644 --- a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/pdfmanagement-testphase.ltx +++ b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/pdfmanagement-testphase.ltx @@ -27,8 +27,7 @@ %% and all files in that bundle must be distributed together. %% %% File: pdfmanagement-testphase.dtx -\ProvidesExplFile - {pdfmanagement-testphase.ltx}{2021-03-07}{0.95b} +\ProvidesExplFile{pdfmanagement-testphase.ltx}{2021-03-17}{0.95c} {PDF~management~code~(testphase)} %% File: l3pdfdict.dtx \cs_new:Npn \__pdfdict_get_type:n #1 @@ -1548,7 +1547,7 @@ \cs_new:Npn \pdf_name_from_unicode_e:n #1 { - / \str_convert_pdfname:e { \text_expand:n { #1 } } + \__kernel_pdf_name_from_unicode_e:n { #1 } } \cs_generate_variant:Nn \pdf_name_from_unicode_e:n {V} diff --git a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/pdfmanagement-testphase.sty b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/pdfmanagement-testphase.sty index 93bc00d080d..21614ec555a 100644 --- a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/pdfmanagement-testphase.sty +++ b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/pdfmanagement-testphase.sty @@ -19,7 +19,7 @@ %% and all files in that bundle must be distributed together. %% %% File: pdfmanagement-testphase.dtx -\ProvidesExplPackage {pdfmanagement-testphase} {2021-03-07} {0.95b} +\ProvidesExplPackage{pdfmanagement-testphase}{2021-03-17}{0.95c} {LaTeX PDF management testphase bundle} \providecommand\IfFormatAtLeastTF{\@ifl@t@r\fmtversion} \IfFormatAtLeastTF{2020-10-01}{}{ diff --git a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/transparent-ltx.sty b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/transparent-ltx.sty index 7fd747325db..8d5abb7e2a3 100644 --- a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/transparent-ltx.sty +++ b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/transparent-ltx.sty @@ -3,8 +3,8 @@ %% a replacement for transparent sty from Heiko Oberdiek %% \NeedsTeXFormat{LaTeX2e}[2020/10/01] -\ProvidesExplPackage{transparent-ltx}% - {2021-03-07}{v0.95b}{Transparency with color stacks (replacement for transparent.sty from Heiko Oberdiek)}% +\ProvidesExplPackage{transparent-ltx}{2021-03-17}{0.95c} + {Transparency with color stacks (replacement for transparent.sty from Heiko Oberdiek)}% \RequirePackage{l3opacity} diff --git a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/xcolor-patches-tmp-ltx.sty b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/xcolor-patches-tmp-ltx.sty index 5363a830773..aec0fbb6321 100644 --- a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/xcolor-patches-tmp-ltx.sty +++ b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/xcolor-patches-tmp-ltx.sty @@ -1,6 +1,6 @@ %% LaTeX2e file `xcolor-patches.sty' %% -\ProvidesPackage{xcolor-patches-tmp-ltx}[2021/02/22 v0.95b patch xcolor for l3color] +\ProvidesPackage{xcolor-patches-tmp-ltx}[2021-03-17 v0.95c patch xcolor for l3color] \@ifundefined{color_set:nn}{\RequirePackage{l3color}}{} \ExplSyntaxOn -- cgit v1.2.3