diff options
author | Karl Berry <karl@freefriends.org> | 2021-07-31 20:56:25 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2021-07-31 20:56:25 +0000 |
commit | 0f16883734671b9de034bb28b54771c4e509783f (patch) | |
tree | d9a699c3a7ab83e6203b18fa618693b922dc9ab9 /Master/texmf-dist/tex | |
parent | 908d657f38d20fce93644b10ae715d8512f44215 (diff) |
pdfmanagement-testphase (31jul21)
git-svn-id: svn://tug.org/texlive/trunk@60127 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
17 files changed, 219 insertions, 273 deletions
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 b7765e97ed6..fca7c1c3ac5 100644 --- a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/color-ltx.sty +++ b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/color-ltx.sty @@ -22,7 +22,7 @@ %% This file has the LPPL maintenance status "maintained". %% \NeedsTeXFormat{LaTeX2e}[1995/12/01] -\ProvidesPackage{color-ltx}[2021-07-21 v0.95g +\ProvidesPackage{color-ltx}[2021-07-31 v0.95h 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 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 4003c62cc7d..fd3ad3b4cb0 100644 --- a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/hgeneric-testphase.def +++ b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/hgeneric-testphase.def @@ -19,7 +19,7 @@ %% and all files in that bundle must be distributed together. %% %% File: hyperref-generic.dtx -\ProvidesFile{hgeneric-testphase.def}[2021-07-21 v0.95g % +\ProvidesFile{hgeneric-testphase.def}[2021-07-31 v0.95h % generic Hyperref driver for the LaTeX PDF management testphase bundle] \RequirePackage{etoolbox} %why? @@ -2464,14 +2464,9 @@ \ExplSyntaxOff \ExplSyntaxOn -\tl_new:N \l__hyp_CheckmarkYes_tl -\tl_set:Nn \l__hyp_CheckmarkYes_tl { __hyp_xform_CheckMarkYes } -\tl_new:N \l__hyp_CheckmarkOff_tl -\tl_set:Nn \l__hyp_CheckmarkOff_tl { __hyp_xform_CheckMarkOff } \def\@Form[#1] { - \@ifundefined{textcolor}{\let\textcolor\@gobble}{} \kvsetkeys{Form}{#1} \pdf@ifdraftmode{} { @@ -2489,8 +2484,7 @@ } \seq_sort:Nn \l__hyp_tmpa_seq { - \int_compare:nNnTF { \pdf@strcmp{##1}{##2} } > { 0 } - %\str_compare:nNnTF {##1} > {##2} + \str_compare:nNnTF {##1} > {##2} { \sort_return_swapped: } { \sort_return_same: } } @@ -2520,64 +2514,6 @@ \pdfmanagement_remove:nn {Catalog / AcroForm }{NeedAppearances} } } - \MakeFieldObject - { - \group_begin: - \fontfamily{pzd} - \fontencoding{U} - \fontseries{m} - \fontshape{n} - \selectfont - \char123 - \group_end: - } - {__hyp_xform_Ding} - \MakeFieldObject - { - \group_begin: - \fontfamily{pzd} - \fontencoding{U} - \fontseries{m} - \fontshape{n} - \selectfont - \phantom{\char123} - \group_end: - } - {__hyp_xform_DingOff} - \MakeFieldObject - { - \group_begin: - \fontfamily{pzd} - \fontencoding{U} - \fontseries{m} - \fontshape{n} - \selectfont - \char51 - \group_end: - } - {__hyp_xform_CheckMarkYes} - \MakeFieldObject - { - \group_begin: - \fontfamily{pzd} - \fontencoding{U} - \fontseries{m} - \fontshape{n} - \selectfont - \phantom{\char51} %perhaps xetex needs some small glyph .. - \group_end: - } - {__hyp_xform_CheckMarkOff} - \MakeFieldObject - { - \fbox{\textcolor{yellow}{\textsf{Submit}}} %color? - } - {__hyp_xform_Submit} - \MakeFieldObject - { - \fbox{\textcolor{yellow}{\textsf{SubmitP}}} %color? - } - {__hyp_xform_SubmitP} } \ExplSyntaxOff \let\@endForm\ltx@empty @@ -2717,8 +2653,7 @@ }% \endgroup } -\tl_new:N \l__hyp_RadioYes_tl -\tl_set:Nn \l__hyp_RadioYes_tl { __hyp_xform_Ding } + \def\__hypRadio#1{% \Fld@listcount=0~% %\show\Fld@default @@ -2733,7 +2668,21 @@ \leavevmode \HyAnn@AbsPageLabel \Hy@escapeform\PDFForm@Radio - \pdfannot_box:nnnn + \pdfxform_if_exist:nF { __hyp_xform_Ding } + { + \pdfxform_new:nnn { __hyp_xform_Ding } {} + { + \group_begin: + \fontfamily{pzd} + \fontencoding{U} + \fontseries{m} + \fontshape{n} + \selectfont + \char123 + \group_end: + } + } + \pdfannot_box:nnnx {\Fld@width} {\Fld@height} {0pt} %is this correct? @@ -2743,7 +2692,7 @@ << /N << - /\@currValue\c_space_tl \pdfxform_ref:o {__hyp_xform_Ding} + /\@currValue\c_space_tl \pdfxform_ref:n {__hyp_xform_Ding} %/Off \c_space_tl \pdfxform_ref:n {__hyp_xform_DingOff} %hm >> >> @@ -2830,6 +2779,18 @@ \HyAnn@AbsPageLabel \Hy@escapeform\PDFForm@Submit \hbox_set:Nn \l_tmpa_box { \MakeButtonField {#2}} + \pdfxform_if_exist:nF + { __hyp_xform_Submit } + { + \pdfxform_new:nnn { __hyp_xform_Submit }{} + { + \fbox{\color_select:n{yellow}\textsf{Submit}} + } + \pdfxform_new:nnn { __hyp_xform_SubmitP }{} + { + \fbox{\color_select:n{yellow}\textsf{SubmitP}} + } + } \pdfannot_box:nnnn {\box_wd:N\l_tmpa_box} {\box_ht:N\l_tmpa_box} @@ -2902,6 +2863,33 @@ \mode_leave_vertical: \HyAnn@AbsPageLabel \Hy@escapeform\PDFForm@Check + \pdfxform_if_exist:nF { __hyp_xform_CheckMarkYes } + { + \pdfxform_new:nnn + {__hyp_xform_CheckMarkYes}{} + { + \group_begin: + \fontfamily{pzd} + \fontencoding{U} + \fontseries{m} + \fontshape{n} + \selectfont + \char51 + \group_end: + } + \pdfxform_new:nnn + {__hyp_xform_CheckMarkOff}{} + { + \group_begin: + \fontfamily{pzd} + \fontencoding{U} + \fontseries{m} + \fontshape{n} + \selectfont + \phantom{\char51} %perhaps xetex needs some small glyph .. + \group_end: + } + } \pdfannot_box:nnnn {\Fld@width} {\Fld@height} @@ -3121,8 +3109,8 @@ << /N << - /Yes~\pdfxform_ref:o{\l__hyp_CheckmarkYes_tl} - /Off~\pdfxform_ref:o{\l__hyp_CheckmarkOff_tl} + /Yes~\pdfxform_ref:n{__hyp_xform_CheckMarkYes} + /Off~\pdfxform_ref:n{__hyp_xform_CheckMarkOff} >> >> /MK<< 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 96e9d086a67..f948928f94e 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,7 +19,7 @@ % % for those people who are interested. \NeedsTeXFormat{LaTeX2e}[2020/10/01] -\ProvidesExplPackage{hyperxmp-patches-tmp-ltx}{2021-07-21}{0.95g} +\ProvidesExplPackage{hyperxmp-patches-tmp-ltx}{2021-07-31}{0.95h} {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 00c28edb532..89c47d1a1d4 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-07-21}{} + {l3backend-testphase-dvipdfmx.def}{2021-07-31}{} {LaTeX~PDF~management~testphase~bundle~backend~support: dvipdfmx} \RequirePackage{l3ref-tmp} \cs_generate_variant:Nn \ref_label:nn {en} @@ -224,41 +224,13 @@ } } } -\cs_new_protected:Npn \__pdf_backend_NamesEmbeddedFiles_gpush:n #1 %array content +\cs_new_protected:Npn \__pdf_backend_Names_gpush:nn #1 #2 %#1 name of name tree, #2 array content { - \pdf_object_unnamed_write:nn {dict} { /Names [#1] } - %n or x? - \__pdf_backend:x {put~@names~<</EmbeddedFiles~\pdf_object_ref_last: >>} + \pdf_object_unnamed_write:nn {dict} {/Names [#2] } + \__pdf_backend:x {put~@names~<</#1~\pdf_object_ref_last: >>} } - -\int_new:N \g__pdf_backend_EmbeddedFiles_int -\cs_new:Npn \__pdf_backend_EmbeddedFiles_name: - { - ( - l3ef - \int_compare:nNnT {\g__pdf_backend_EmbeddedFiles_int} < {10} - {0} - \int_compare:nNnT {\g__pdf_backend_EmbeddedFiles_int} < {100} - {0} - \int_compare:nNnT {\g__pdf_backend_EmbeddedFiles_int} < {1000} - {0} - \int_use:N \g__pdf_backend_EmbeddedFiles_int - ) - } -\seq_new:N \g__pdf_backend_EmbeddedFiles_seq -\prop_new:N \g__pdf_backend_EmbeddedFiles_named_prop -\cs_new_protected:Npn \__pdf_backend_NamesEmbeddedFiles_add:n #1 - %#1 object ref - { - \int_gincr:N \g__pdf_backend_EmbeddedFiles_int - \prop_gput:Nnx \g__pdf_backend_EmbeddedFiles_named_prop - { #1 } - { \__pdf_backend_EmbeddedFiles_name: } - \seq_gput_right:Nx \g__pdf_backend_EmbeddedFiles_seq - { \__pdf_backend_EmbeddedFiles_name: \c_space_tl #1 } - } - +\cs_new_protected:Npn \__pdf_backend_NamesEmbeddedFiles_add:nn #1 #2 {} % it needs a bit testing if it really works to set the box to 0 before the special ... % does it disturb viewing the xobject? % what happens with the resources (bdc)? (should work as they are specials too) 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 c0950a361a9..66229a56112 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-07-21}{} + {l3backend-testphase-dvips.def}{2021-07-31}{} {LaTeX~PDF~management~testphase~bundle~backend~support: dvips} \RequirePackage{l3ref-tmp} \cs_generate_variant:Nn \ref_label:nn {en} @@ -146,34 +146,13 @@ -\cs_new_protected:Npn \__pdf_backend_NamesEmbeddedFiles_gpush:n #1 {} - -\int_new:N \g__pdf_backend_EmbeddedFiles_int -\cs_new:Npn \__pdf_backend_EmbeddedFiles_name: - { - ( - l3ef - \int_compare:nNnT {\g__pdf_backend_EmbeddedFiles_int} < {10} - {0} - \int_compare:nNnT {\g__pdf_backend_EmbeddedFiles_int} < {100} - {0} - \int_compare:nNnT {\g__pdf_backend_EmbeddedFiles_int} < {1000} - {0} - \int_use:N \g__pdf_backend_EmbeddedFiles_int - ) - } -\seq_new:N \g__pdf_backend_EmbeddedFiles_seq -\prop_new:N \g__pdf_backend_EmbeddedFiles_named_prop -\cs_new_protected:Npn \__pdf_backend_NamesEmbeddedFiles_add:n #1 +\cs_new_protected:Npn \__pdf_backend_Names_gpush:nn #1 #2 {} +\cs_new_protected:Npn \__pdf_backend_NamesEmbeddedFiles_add:nn #1 #2 { - \int_gincr:N \g__pdf_backend_EmbeddedFiles_int - \prop_gput:Nnx \g__pdf_backend_EmbeddedFiles_named_prop - { #1 } - { \__pdf_backend_EmbeddedFiles_name: } \__pdf_backend_pdfmark:x { - /Name~\__pdf_backend_EmbeddedFiles_name:~ - /FS~#1~ + /Name~#1~ + /FS~#2~ /EMBED } } 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 34ac07b1393..a5efc0b2cfe 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-07-21}{} + {l3backend-testphase-dvisvgm.def}{2021-07-31}{} {LaTeX~PDF~management~testphase~bundle~backend~support: dvisvgm} \RequirePackage{l3ref-tmp} \cs_generate_variant:Nn \ref_label:nn {en} @@ -112,26 +112,10 @@ -\cs_new_protected:Npn \__pdf_backend_NamesEmbeddedFiles_gpush:n #1 {} - -\int_new:N \g__pdf_backend_EmbeddedFiles_int -\cs_new:Npn \__pdf_backend_EmbeddedFiles_name: - { - ( - l3ef - \int_compare:nNnT {\g__pdf_backend_EmbeddedFiles_int} < {10} - {0} - \int_compare:nNnT {\g__pdf_backend_EmbeddedFiles_int} < {100} - {0} - \int_compare:nNnT {\g__pdf_backend_EmbeddedFiles_int} < {1000} - {0} - \int_use:N \g__pdf_backend_EmbeddedFiles_int - ) - } -\seq_new:N \g__pdf_backend_EmbeddedFiles_seq -\prop_new:N \g__pdf_backend_EmbeddedFiles_named_prop -\cs_new_protected:Npn \__pdf_backend_NamesEmbeddedFiles_add:n #1 +\cs_new_protected:Npn \__pdf_backend_Names_gpush:nn #1 #2 {} +\cs_new_protected:Npn \__pdf_backend_NamesEmbeddedFiles_add:nn #1 #2 {} + \cs_new_protected:Npn \__pdf_backend_xform_new:nnnn #1 #2 #3 #4 {} \cs_new_protected:Npn \__pdf_backend_xform_use:n #1 {} \cs_new:Npn \__pdf_backend_xform_ref:n {} 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 fa60269d932..4dfc258997a 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-07-21}{} + {l3backend-testphase-luatex.def}{2021-07-31}{} {LaTeX~PDF~management~testphase~bundle~backend~support: PDF output (LuaTeX)} \RequirePackage{l3ref-tmp} \cs_generate_variant:Nn \ref_label:nn {en} @@ -262,40 +262,13 @@ } \cs_new_protected:Npn \__pdf_backend_PageResources_gpush:n #1 {} -\cs_new_protected:Npn \__pdf_backend_NamesEmbeddedFiles_gpush:n #1 %array content +\cs_new_protected:Npn \__pdf_backend_Names_gpush:nn #1 #2 %#1 name of name tree, #2 array content { - \pdf_object_unnamed_write:nn {dict} {/Names [#1] } - \tex_pdfextension:D~names~{/EmbeddedFiles~\pdf_object_ref_last: } + \pdf_object_unnamed_write:nn {dict} {/Names [#2] } + \tex_pdfextension:D~names~ {/#1~\pdf_object_ref_last:} } - -\int_new:N \g__pdf_backend_EmbeddedFiles_int -\cs_new:Npn \__pdf_backend_EmbeddedFiles_name: - { - ( - l3ef - \int_compare:nNnT {\g__pdf_backend_EmbeddedFiles_int} < {10} - {0} - \int_compare:nNnT {\g__pdf_backend_EmbeddedFiles_int} < {100} - {0} - \int_compare:nNnT {\g__pdf_backend_EmbeddedFiles_int} < {1000} - {0} - \int_use:N \g__pdf_backend_EmbeddedFiles_int - ) - } -\seq_new:N \g__pdf_backend_EmbeddedFiles_seq -\prop_new:N \g__pdf_backend_EmbeddedFiles_named_prop -\cs_new_protected:Npn \__pdf_backend_NamesEmbeddedFiles_add:n #1 - %#1 object ref - { - \int_gincr:N \g__pdf_backend_EmbeddedFiles_int - \prop_gput:Nnx \g__pdf_backend_EmbeddedFiles_named_prop - { #1 } - { \__pdf_backend_EmbeddedFiles_name: } - \seq_gput_right:Nx \g__pdf_backend_EmbeddedFiles_seq - { \__pdf_backend_EmbeddedFiles_name: \c_space_tl #1 } - } - +\cs_new_protected:Npn \__pdf_backend_NamesEmbeddedFiles_add:nn #1 #2 {} \cs_new_protected:Npn \__pdf_backend_xform_new:nnnn #1 #2 #3 #4 { \hbox_set:Nn \l__pdf_backend_tmpa_box 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 d8563623fe5..ecf670257fe 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-07-21}{} + {l3backend-testphase-pdftex.def}{2021-07-31}{} {LaTeX~PDF~management~testphase~bundle~backend~support: PDF output (pdfTeX)} \RequirePackage{l3ref-tmp} \cs_generate_variant:Nn \ref_label:nn {en} @@ -280,40 +280,13 @@ } } -\cs_new_protected:Npn \__pdf_backend_NamesEmbeddedFiles_gpush:n #1 %array content +\cs_new_protected:Npn \__pdf_backend_Names_gpush:nn #1 #2 %#1 name of name tree, #2 array content { - \pdf_object_unnamed_write:nn {dict} {/Names [#1] } - \tex_pdfnames:D {/EmbeddedFiles~\pdf_object_ref_last:} + \pdf_object_unnamed_write:nn {dict} {/Names [#2] } + \tex_pdfnames:D {/#1~\pdf_object_ref_last:} } - -\int_new:N \g__pdf_backend_EmbeddedFiles_int -\cs_new:Npn \__pdf_backend_EmbeddedFiles_name: - { - ( - l3ef - \int_compare:nNnT {\g__pdf_backend_EmbeddedFiles_int} < {10} - {0} - \int_compare:nNnT {\g__pdf_backend_EmbeddedFiles_int} < {100} - {0} - \int_compare:nNnT {\g__pdf_backend_EmbeddedFiles_int} < {1000} - {0} - \int_use:N \g__pdf_backend_EmbeddedFiles_int - ) - } -\seq_new:N \g__pdf_backend_EmbeddedFiles_seq -\prop_new:N \g__pdf_backend_EmbeddedFiles_named_prop -\cs_new_protected:Npn \__pdf_backend_NamesEmbeddedFiles_add:n #1 - %#1 object ref - { - \int_gincr:N \g__pdf_backend_EmbeddedFiles_int - \prop_gput:Nnx \g__pdf_backend_EmbeddedFiles_named_prop - { #1 } - { \__pdf_backend_EmbeddedFiles_name: } - \seq_gput_right:Nx \g__pdf_backend_EmbeddedFiles_seq - { \__pdf_backend_EmbeddedFiles_name: \c_space_tl #1 } - } - +\cs_new_protected:Npn \__pdf_backend_NamesEmbeddedFiles_add:nn #1 #2 {} \cs_new_protected:Npn \__pdf_backend_xform_new:nnnn #1 #2 #3 #4 { \hbox_set:Nn \l__pdf_backend_tmpa_box 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 cdbb435a46e..42ee1e7fdf3 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-07-21}{} + {l3backend-testphase-xetex.def}{2021-07-31}{} {LaTeX~PDF~management~testphase~bundle~backend~support: XeTeX} \RequirePackage{l3ref-tmp} \cs_generate_variant:Nn \ref_label:nn {en} @@ -224,41 +224,13 @@ } } } -\cs_new_protected:Npn \__pdf_backend_NamesEmbeddedFiles_gpush:n #1 %array content +\cs_new_protected:Npn \__pdf_backend_Names_gpush:nn #1 #2 %#1 name of name tree, #2 array content { - \pdf_object_unnamed_write:nn {dict} { /Names [#1] } - %n or x? - \__pdf_backend:x {put~@names~<</EmbeddedFiles~\pdf_object_ref_last: >>} + \pdf_object_unnamed_write:nn {dict} {/Names [#2] } + \__pdf_backend:x {put~@names~<</#1~\pdf_object_ref_last: >>} } - -\int_new:N \g__pdf_backend_EmbeddedFiles_int -\cs_new:Npn \__pdf_backend_EmbeddedFiles_name: - { - ( - l3ef - \int_compare:nNnT {\g__pdf_backend_EmbeddedFiles_int} < {10} - {0} - \int_compare:nNnT {\g__pdf_backend_EmbeddedFiles_int} < {100} - {0} - \int_compare:nNnT {\g__pdf_backend_EmbeddedFiles_int} < {1000} - {0} - \int_use:N \g__pdf_backend_EmbeddedFiles_int - ) - } -\seq_new:N \g__pdf_backend_EmbeddedFiles_seq -\prop_new:N \g__pdf_backend_EmbeddedFiles_named_prop -\cs_new_protected:Npn \__pdf_backend_NamesEmbeddedFiles_add:n #1 - %#1 object ref - { - \int_gincr:N \g__pdf_backend_EmbeddedFiles_int - \prop_gput:Nnx \g__pdf_backend_EmbeddedFiles_named_prop - { #1 } - { \__pdf_backend_EmbeddedFiles_name: } - \seq_gput_right:Nx \g__pdf_backend_EmbeddedFiles_seq - { \__pdf_backend_EmbeddedFiles_name: \c_space_tl #1 } - } - +\cs_new_protected:Npn \__pdf_backend_NamesEmbeddedFiles_add:nn #1 #2 {} % it needs a bit testing if it really works to set the box to 0 before the special ... % does it disturb viewing the xobject? % what happens with the resources (bdc)? (should work as they are specials too) diff --git a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase.lua b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase.lua index 8d8f5e3c635..f7702b51c0c 100644 --- a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase.lua +++ b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase.lua @@ -21,7 +21,6 @@ -- File: l3backend-testphase.dtx - ltx= ltx or {} ltx.__pdf = ltx.__pdf or {} ltx.__pdf.Page = ltx.__pdf.Page or {} 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 6741b15587f..d65b52ee8be 100644 --- a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3pdffield-testphase.sty +++ b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3pdffield-testphase.sty @@ -27,7 +27,7 @@ %% File: l3pdffield.dtx \NeedsTeXFormat{LaTeX2e} -\ProvidesExplPackage{l3pdffield-testphase}{2021-07-21}{0.95g}% +\ProvidesExplPackage{l3pdffield-testphase}{2021-07-31}{0.95h}% {form fields} \csname HyField@NeedAppearancesfalse\endcsname % suppress NeedAppearances \str_new:N \l__pdffield_tmpa_str 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 d123a701152..fdfe7b4279d 100644 --- a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/pdflscape-ltx.sty +++ b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/pdflscape-ltx.sty @@ -22,7 +22,7 @@ %% This work consists of the main source file pdflscape-ltx.sty %% \NeedsTeXFormat{LaTeX2e} -\ProvidesExplPackage{pdflscape-ltx}{2021-07-21}{0.95g} +\ProvidesExplPackage{pdflscape-ltx}{2021-07-31}{0.95h} {Display of landscape pages in PDF - adaption of pdflscape to the PDFmanagement bundle (testphase)} \DeclareOption*{\PassOptionsToPackage\CurrentOption{graphics}} 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 b413c730ba1..040738df443 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-07-21}{0.95g} +\ProvidesExplPackage{pdfmanagement-firstaid}{2021-07-31}{0.95h} {LaTeX PDF management testphase bundle / firstaid-patches} \clist_map_inline:nn {pgf,transparent,hyperxmp,pdflscape,xcolor,color,beamer} 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 094041b27d7..ecfa1e60a1b 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}{2021-07-21}{0.95g} +\ProvidesExplFile{pdfmanagement-testphase.ltx}{2021-07-31}{0.95h} {PDF~management~code~(testphase)} %% File: l3pdfdict.dtx \cs_new:Npn \__pdfdict_get_type:n #1 @@ -270,6 +270,7 @@ \cs_set_eq:NN \pdfdict_use:n \__pdfdict_use:n %% File: l3pdfmanagement.dtx + \msg_new:nnn { pdfmanagement } { unknown-dict } { The~PDF~management~resource~'#1'~is~unknown. } @@ -282,6 +283,9 @@ \msg_new:nnn { pdfmanagement } { no-show } { It~is~not~possible~to~show~the~content~of~'#1'.} +\msg_new:nnn { pdfmanagement } { name-exist } + { The~name~'#1'~has~already~been~used~for~name~tree~'#2'.} + \msg_new:nnn { pdfmanagement } { show-dict } { The~PDF~resource~'#1'~ @@ -298,6 +302,10 @@ The~PDF~resources~management~is~not~active\\ command~'#1'~ignored. } +\tl_new:N \l__pdfmanagement_tmpa_tl +\tl_new:N \l__pdfmanagement_tmpb_tl +\seq_new:N \l__pdfmanagement_tmpa_seq + \bool_new:N \g__pdfmanagement_active_bool \prg_new_conditional:Npnn \__pdfmanagement_if_active: { p , T , F , TF } { @@ -308,6 +316,7 @@ \prg_set_eq_conditional:NNn \pdfmanagement_if_active: \__pdfmanagement_if_active: { p , T , F , TF } +\cs_set_eq:NN \IfPDFManagementActiveTF\pdfmanagement_if_active:TF \hook_new:n {pdfmanagement/add} \cs_new_protected:Npn \pdfmanagement_add:nnn #1 #2 #3 { @@ -332,7 +341,8 @@ } } -\cs_generate_variant:Nn \pdfmanagement_add:nnn {nnx,nxx} +\cs_generate_variant:Nn \pdfmanagement_add:nnn {nnx,nxx,xxx} +\cs_set_eq:NN \PDFManagementAdd \pdfmanagement_add:xxx \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 @@ -622,6 +632,11 @@ AcroForm/CO } +\clist_const:Nn \c__pdfmanagement_Catalog_nametree_clist + { + AP, + JavaScript, + } \clist_map_inline:Nn \c__pdfmanagement_Catalog_seq_clist { \seq_new:c { g__pdfmanagement_/Catalog/#1_seq } % new name later @@ -637,6 +652,43 @@ { g__pdfmanagement_/Catalog/OCProperties/Configs_seq } { #1 } } +\cs_new_protected:Npn \__pdfmanagement_nametree_add_aux:nnn #1 #2 #3 + %#1 name tree, #2 sanitized name #3 value + { + \prop_get:coNTF + { \__kernel_pdfdict_name:n { g__pdf_Core/Catalog/Names/#1 }} + { #2 } + \l__pdfmanagement_tmpb_tl + { + \msg_error:nnnn{pdfmanagement}{name-exist}{#2}{#1} + } + { + \prop_gput:con + { \__kernel_pdfdict_name:n { g__pdf_Core/Catalog/Names/#1 }} + { #2 } + { #3 } + } + } +\clist_map_inline:Nn \c__pdfmanagement_Catalog_nametree_clist + { + \pdfdict_new:n { g__pdf_Core/Catalog/Names/#1} + \cs_new_protected:cpn { __pdfmanagement_handler/Catalog/Names/#1/?_gput:nn } ##1 ##2 + { + \pdf_string_from_unicode:nnN {utf8/string}{##1}\l__pdfmanagement_tmpa_tl + \exp_args:Nno + \__pdfmanagement_nametree_add_aux:nnn {#1}{\l__pdfmanagement_tmpa_tl}{##2} + } + } +\pdfdict_new:n { g__pdf_Core/Catalog/Names/EmbeddedFiles} +\cs_new_protected:cpn { __pdfmanagement_handler/Catalog/Names/EmbeddedFiles/?_gput:nn } #1 #2 + { + \pdf_string_from_unicode:nnN {utf8/string}{#1}\l__pdfmanagement_tmpa_tl + \exp_args:Nno + \__pdfmanagement_nametree_add_aux:nnn + {EmbeddedFiles}{\l__pdfmanagement_tmpa_tl}{#2} + \exp_args:No + \__pdf_backend_NamesEmbeddedFiles_add:nn {\l__pdfmanagement_tmpa_tl}{#2} + } \cs_new_protected:Npn \__pdfmanagement_Catalog_gpush: { \use:c { __pdfmanagement_/Catalog/AA_gpush: } @@ -655,7 +707,11 @@ { \__kernel_pdfdict_name:n { g__pdf_Core/Catalog} } \__pdf_backend_catalog_gput:nn % output names tree: - \use:c { __pdfmanagement_/Catalog/Names/EmbeddedFiles_gpush: } + \use:c{ __pdfmanagement_/Catalog/Names_gpush:n } {EmbeddedFiles} + \clist_map_inline:Nn \c__pdfmanagement_Catalog_nametree_clist + { + \use:c{ __pdfmanagement_/Catalog/Names_gpush:n } {##1} + } } \cs_new_protected:cpn { __pdfmanagement_/Catalog/AA_gpush: } { @@ -789,12 +845,12 @@ { 0 } { \__pdf_backend_object_new:nn { __pdfmanagement/Catalog/OCProperties } { dict } - \seq_gpop_left:cN { g__pdfmanagement_/Catalog/OCProperties/Configs_seq} \l_tmpa_tl + \seq_gpop_left:cN { g__pdfmanagement_/Catalog/OCProperties/Configs_seq} \l__pdfmanagement_tmpa_tl \exp_args:Nnx \__pdf_backend_object_write:nn {__pdfmanagement/Catalog/OCProperties} { /OCGs~[ \seq_use:cn { g__pdfmanagement_/Catalog/OCProperties/OCGs_seq } {~} ] - /D~\l_tmpa_tl~ + /D~\l__pdfmanagement_tmpa_tl~ \seq_if_empty:cF { g__pdfmanagement_/Catalog/OCProperties/Configs_seq } { /Configs~ @@ -861,22 +917,54 @@ } } } +\int_new:N \g__pdfmanagement_EmbeddedFiles_int +\cs_new:Npn \__pdfmanagement_EmbeddedFiles_name: + { + ( + l3ef + \int_compare:nNnT {\g__pdfmanagement_EmbeddedFiles_int} < {10} + {0} + \int_compare:nNnT {\g__pdfmanagement_EmbeddedFiles_int} < {100} + {0} + \int_compare:nNnT {\g__pdfmanagement_EmbeddedFiles_int} < {1000} + {0} + \int_use:N \g__pdfmanagement_EmbeddedFiles_int + ) + } \pdfdict_new:n { g__pdf_Core/Catalog/Names } \cs_new_protected:cpn { __pdfmanagement_handler/Catalog/Names/EmbeddedFiles_gput:n } #1 { - \__pdf_backend_NamesEmbeddedFiles_add:n { #1 } - } -\cs_new_protected:cpn { __pdfmanagement_/Catalog/Names/EmbeddedFiles_gpush: } - { - \seq_if_empty:NF \g__pdf_backend_EmbeddedFiles_seq - { - \exp_args:Nx \__pdf_backend_NamesEmbeddedFiles_gpush:n - { - \seq_use:Nn \g__pdf_backend_EmbeddedFiles_seq {~} - } - } + \int_gincr:N \g__pdfmanagement_EmbeddedFiles_int + \exp_args:Nnx + \prop_gput:cnn + { \__kernel_pdfdict_name:n { g__pdf_Core/Catalog/Names/EmbeddedFiles }} + { \__pdfmanagement_EmbeddedFiles_name: } + { #1 } + \exp_args:Nx + \__pdf_backend_NamesEmbeddedFiles_add:nn {\__pdfmanagement_EmbeddedFiles_name:} { #1 } } +\cs_new_protected:cpn { __pdfmanagement_/Catalog/Names_gpush:n } #1 %#1 name of name tree + { + \pdfdict_if_empty:nF { g__pdf_Core/Catalog/Names/#1 } + { + \seq_clear:N \l__pdfmanagement_tmpa_seq + \prop_map_inline:cn + {\__kernel_pdfdict_name:n { g__pdf_Core/Catalog/Names/#1 }} + { \seq_put_right:Nn \l__pdfmanagement_tmpa_seq {##1~##2}} + \seq_sort:Nn \l__pdfmanagement_tmpa_seq + { + \str_compare:nNnTF {##1} > {##2} + { \sort_return_swapped: } + { \sort_return_same: } + } + \exp_args:Nnx \__pdf_backend_Names_gpush:nn + {#1} + { + \seq_use:Nn \l__pdfmanagement_tmpa_seq {~} + } + } + } \cs_new_protected:cpn {__pdfmanagement_handler/Catalog/?_show:} { \iow_term:x 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 5337c62f0c8..54cce745475 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-07-21}{0.95g} +\ProvidesExplPackage{pdfmanagement-testphase}{2021-07-31}{0.95h} {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 5151ea4ff95..e7cf7c36e56 100644 --- a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/transparent-ltx.sty +++ b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/transparent-ltx.sty @@ -3,7 +3,7 @@ %% a replacement for transparent sty from Heiko Oberdiek %% \NeedsTeXFormat{LaTeX2e}[2020/10/01] -\ProvidesExplPackage{transparent-ltx}{2021-07-21}{0.95g} +\ProvidesExplPackage{transparent-ltx}{2021-07-31}{0.95h} {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 0861462d6bb..12c87fdd33a 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-07-21 v0.95g patch xcolor for l3color] +\ProvidesPackage{xcolor-patches-tmp-ltx}[2021-07-31 v0.95h patch xcolor for l3color] \@ifundefined{color_set:nn}{\RequirePackage{l3color}}{} \ExplSyntaxOn @@ -116,3 +116,21 @@ {\noexpand\xcolor@{\@@cls}{\the\toks@}{\@@mod}{\@@clr}}}% \fi}% \expandafter\endgroup\@@tmp\xglobal@stop} + +%re-predefine the colors +\definecolorset{rgb/hsb/cmyk/gray}{}{}% + {brown,.75,.5,.25/.083333,.66667,.75/0,.25,.5,.25/.5475;% + lime,.75,1,0/.20833,1,1/.25,0,1,0/.815;% + orange,1,.5,0/.083333,1,1/0,.5,1,0/.595;% + pink,1,.75,.75/0,.25,1/0,.25,.25,0/.825;% + purple,.75,0,.25/.94444,1,.75/0,.75,.5,.25/.2525;% + teal,0,.5,.5/.5,1,.5/.5,0,0,.5/.35;% + violet,.5,0,.5/.83333,1,.5/0,.5,0,.5/.205}% +\definecolorset{cmyk/rgb/hsb/gray}{}{}% + {olive,0,0,1,.5/.5,.5,0/.16667,1,.5/.39} +\definecolorset{gray/rgb/hsb/cmyk}{}{}% + {darkgray,.25/.25,.25,.25/0,0,.25/0,0,0,.75;% + gray,.5/.5,.5,.5/0,0,.5/0,0,0,.5;% + lightgray,.75/.75,.75,.75/0,0,.75/0,0,0,.25} + +\endinput |