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/source | |
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/source')
19 files changed, 351 insertions, 212 deletions
diff --git a/Master/texmf-dist/source/latex/pdfmanagement-testphase/hyperref-generic.dtx b/Master/texmf-dist/source/latex/pdfmanagement-testphase/hyperref-generic.dtx index e3d84d6ec63..4e0296c641c 100644 --- a/Master/texmf-dist/source/latex/pdfmanagement-testphase/hyperref-generic.dtx +++ b/Master/texmf-dist/source/latex/pdfmanagement-testphase/hyperref-generic.dtx @@ -86,7 +86,7 @@ % }^^A % } % -% \date{Version 0.95g, released 2021-07-21} +% \date{Version 0.95h, released 2021-07-31} % % \maketitle % \begin{documentation} @@ -906,9 +906,6 @@ %^^A %% \l_@@_para_tmpa_tl %^^A %% \l_@@_text_tmpa_str %^^A %% \g_@@_text_tmpa_str -%^^A %% \l_@@_CheckmarkYes_tl -%^^A %% \l_@@_CheckmarkOff_tl -%^^A %% \l_@@_RadioYes_tl %^^A %% \g_@@_bordercolormodel_tl % %^^A %% \l_@@_dest_pdfview_tl @@ -921,7 +918,7 @@ %<@@=hyp> % \end{macrocode} % \begin{macrocode} -\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? @@ -2482,7 +2479,7 @@ % \end{hypkey} % \begin{hypkey}{colorurl,colorlink,colorrun,colormenu,colorfile} % \begin{hypkey}{urlcolor,linkcolor,runcolor,menucolor,filecolor} -% \begin{hypkey}{allcolor} +% \begin{hypkey}{allcolors} % \begin{macrocode} \seq_map_inline:Nn \c_@@_annot_types_seq { @@ -4215,14 +4212,9 @@ \ExplSyntaxOff \ExplSyntaxOn -\tl_new:N \l_@@_CheckmarkYes_tl -\tl_set:Nn \l_@@_CheckmarkYes_tl { @@_xform_CheckMarkYes } -\tl_new:N \l_@@_CheckmarkOff_tl -\tl_set:Nn \l_@@_CheckmarkOff_tl { @@_xform_CheckMarkOff } \def\@Form[#1] { - \@ifundefined{textcolor}{\let\textcolor\@gobble}{} \kvsetkeys{Form}{#1} \pdf@ifdraftmode{} { @@ -4240,8 +4232,7 @@ } \seq_sort:Nn \l_@@_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: } } @@ -4271,64 +4262,6 @@ \pdfmanagement_remove:nn {Catalog / AcroForm }{NeedAppearances} } } - \MakeFieldObject - { - \group_begin: - \fontfamily{pzd} - \fontencoding{U} - \fontseries{m} - \fontshape{n} - \selectfont - \char123 - \group_end: - } - {@@_xform_Ding} - \MakeFieldObject - { - \group_begin: - \fontfamily{pzd} - \fontencoding{U} - \fontseries{m} - \fontshape{n} - \selectfont - \phantom{\char123} - \group_end: - } - {@@_xform_DingOff} - \MakeFieldObject - { - \group_begin: - \fontfamily{pzd} - \fontencoding{U} - \fontseries{m} - \fontshape{n} - \selectfont - \char51 - \group_end: - } - {@@_xform_CheckMarkYes} - \MakeFieldObject - { - \group_begin: - \fontfamily{pzd} - \fontencoding{U} - \fontseries{m} - \fontshape{n} - \selectfont - \phantom{\char51} %perhaps xetex needs some small glyph .. - \group_end: - } - {@@_xform_CheckMarkOff} - \MakeFieldObject - { - \fbox{\textcolor{yellow}{\textsf{Submit}}} %color? - } - {@@_xform_Submit} - \MakeFieldObject - { - \fbox{\textcolor{yellow}{\textsf{SubmitP}}} %color? - } - {@@_xform_SubmitP} } \ExplSyntaxOff \let\@endForm\ltx@empty @@ -4468,8 +4401,7 @@ }% \endgroup } -\tl_new:N \l_@@_RadioYes_tl -\tl_set:Nn \l_@@_RadioYes_tl { @@_xform_Ding } + \def\@@Radio#1{% \Fld@listcount=0~% %\show\Fld@default @@ -4484,7 +4416,21 @@ \leavevmode \HyAnn@AbsPageLabel \Hy@escapeform\PDFForm@Radio - \pdfannot_box:nnnn + \pdfxform_if_exist:nF { @@_xform_Ding } + { + \pdfxform_new:nnn { @@_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? @@ -4494,7 +4440,7 @@ << /N << - /\@currValue\c_space_tl \pdfxform_ref:o {@@_xform_Ding} + /\@currValue\c_space_tl \pdfxform_ref:n {@@_xform_Ding} %/Off \c_space_tl \pdfxform_ref:n {@@_xform_DingOff} %hm >> >> @@ -4582,6 +4528,18 @@ \HyAnn@AbsPageLabel \Hy@escapeform\PDFForm@Submit \hbox_set:Nn \l_tmpa_box { \MakeButtonField {#2}} + \pdfxform_if_exist:nF + { @@_xform_Submit } + { + \pdfxform_new:nnn { @@_xform_Submit }{} + { + \fbox{\color_select:n{yellow}\textsf{Submit}} + } + \pdfxform_new:nnn { @@_xform_SubmitP }{} + { + \fbox{\color_select:n{yellow}\textsf{SubmitP}} + } + } \pdfannot_box:nnnn {\box_wd:N\l_tmpa_box} {\box_ht:N\l_tmpa_box} @@ -4654,6 +4612,33 @@ \mode_leave_vertical: \HyAnn@AbsPageLabel \Hy@escapeform\PDFForm@Check + \pdfxform_if_exist:nF { @@_xform_CheckMarkYes } + { + \pdfxform_new:nnn + {@@_xform_CheckMarkYes}{} + { + \group_begin: + \fontfamily{pzd} + \fontencoding{U} + \fontseries{m} + \fontshape{n} + \selectfont + \char51 + \group_end: + } + \pdfxform_new:nnn + {@@_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} @@ -4874,8 +4859,8 @@ << /N << - /Yes~\pdfxform_ref:o{\l_@@_CheckmarkYes_tl} - /Off~\pdfxform_ref:o{\l_@@_CheckmarkOff_tl} + /Yes~\pdfxform_ref:n{@@_xform_CheckMarkYes} + /Off~\pdfxform_ref:n{@@_xform_CheckMarkOff} >> >> /MK<< diff --git a/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3backend-testphase.dtx b/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3backend-testphase.dtx index 7b4aad8fe6b..0102b1c5742 100644 --- a/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3backend-testphase.dtx +++ b/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3backend-testphase.dtx @@ -45,7 +45,7 @@ % }^^A % } % -% \date{Version 0.95g, released 2021-07-21} +% \date{Version 0.95h, released 2021-07-31} % % \maketitle % @@ -56,27 +56,27 @@ % \begin{macrocode} %<drivers>\ProvidesExplFile %<*dvipdfmx> - {l3backend-testphase-dvipdfmx.def}{2021-07-21}{} + {l3backend-testphase-dvipdfmx.def}{2021-07-31}{} {LaTeX~PDF~management~testphase~bundle~backend~support: dvipdfmx} %</dvipdfmx> %<*dvips> - {l3backend-testphase-dvips.def}{2021-07-21}{} + {l3backend-testphase-dvips.def}{2021-07-31}{} {LaTeX~PDF~management~testphase~bundle~backend~support: dvips} %</dvips> %<*dvisvgm> - {l3backend-testphase-dvisvgm.def}{2021-07-21}{} + {l3backend-testphase-dvisvgm.def}{2021-07-31}{} {LaTeX~PDF~management~testphase~bundle~backend~support: dvisvgm} %</dvisvgm> %<*luatex> - {l3backend-testphase-luatex.def}{2021-07-21}{} + {l3backend-testphase-luatex.def}{2021-07-31}{} {LaTeX~PDF~management~testphase~bundle~backend~support: PDF output (LuaTeX)} %</luatex> %<*pdftex> - {l3backend-testphase-pdftex.def}{2021-07-21}{} + {l3backend-testphase-pdftex.def}{2021-07-31}{} {LaTeX~PDF~management~testphase~bundle~backend~support: PDF output (pdfTeX)} %</pdftex> %<*xdvipdfmx> - {l3backend-testphase-xetex.def}{2021-07-21}{} + {l3backend-testphase-xetex.def}{2021-07-31}{} {LaTeX~PDF~management~testphase~bundle~backend~support: XeTeX} %</xdvipdfmx> % \end{macrocode} @@ -1086,116 +1086,70 @@ % \subsubsection { Special case: the /Names/EmbeddedFiles dictionary } % Entries to /Names are handled differently, in part (/Desc) it is automatic, for % other special commands like \cs{pdfnames} must be used. For EmbeddedFiles -% we need some code to push the tree if files have been added. dvips wants code -% for every file and then creates the Name tree automatically. +% dvips wants code for every file and then creates the Name tree automatically. +% Other name trees are ignored. +% TODO: Currently the code for EmbeddedFiles is still a bit +% different but this should be merged, all name trees should be handled with the +% same code. % \begin{macrocode} % pdflatex %<*pdftex> -\cs_new_protected:Npn \@@_backend_NamesEmbeddedFiles_gpush:n #1 %array content +\cs_new_protected:Npn \@@_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:} } %</pdftex> %<*luatex> -\cs_new_protected:Npn \@@_backend_NamesEmbeddedFiles_gpush:n #1 %array content +\cs_new_protected:Npn \@@_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:} } %</luatex> %<*dvipdfmx|xdvipdfmx> -\cs_new_protected:Npn \@@_backend_NamesEmbeddedFiles_gpush:n #1 %array content +\cs_new_protected:Npn \@@_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? - \@@_backend:x {put~@names~<</EmbeddedFiles~\pdf_object_ref_last: >>} + \pdf_object_unnamed_write:nn {dict} {/Names [#2] } + \@@_backend:x {put~@names~<</#1~\pdf_object_ref_last: >>} } %</dvipdfmx|xdvipdfmx> %dvips: noop %<*dvips> -\cs_new_protected:Npn \@@_backend_NamesEmbeddedFiles_gpush:n #1 {} +\cs_new_protected:Npn \@@_backend_Names_gpush:nn #1 #2 {} %</dvips> %dvisvgm: noop %<*dvisvgm> -\cs_new_protected:Npn \@@_backend_NamesEmbeddedFiles_gpush:n #1 {} +\cs_new_protected:Npn \@@_backend_Names_gpush:nn #1 #2 {} %</dvisvgm> - -% \end{macrocode} -% Names in the EmbeddedFiles name tree must sorted alphabetically, -% so we need commands to create this names. And we need a sequence to store -% the names and the objects. We use the prefix l3ef, and we assume that at -% most 9999 files will be used. -% \begin{variable}{\g_@@_backend_EmbeddedFiles_int} -% \end{variable} -% \begin{macro}{\@@_backend_EmbeddedFiles_name:} -% \begin{macrocode} -%<*drivers> -\int_new:N \g_@@_backend_EmbeddedFiles_int -\cs_new:Npn \@@_backend_EmbeddedFiles_name: - { - ( - l3ef - \int_compare:nNnT {\g_@@_backend_EmbeddedFiles_int} < {10} - {0} - \int_compare:nNnT {\g_@@_backend_EmbeddedFiles_int} < {100} - {0} - \int_compare:nNnT {\g_@@_backend_EmbeddedFiles_int} < {1000} - {0} - \int_use:N \g_@@_backend_EmbeddedFiles_int - ) - } -%</drivers> -% \end{macrocode} -% \end{macro} -% \begin{variable}{\g_@@_backend_EmbeddedFiles_seq,\g_@@_backend_EmbeddedFiles_named_prop} -% The sequence will hold the content of the array that is pushed out at then -% end (not with dvips), the prop holds the obj names-names relation. -% \end{variable} -% \begin{macrocode} -%<*drivers> -\seq_new:N \g_@@_backend_EmbeddedFiles_seq -\prop_new:N \g_@@_backend_EmbeddedFiles_named_prop -%</drivers> % \end{macrocode} -% \begin{macro}{\@@_backend_NamesEmbeddedFiles_add:n} -% This command saves an object reference of a filespec dictionary in the -% EmbeddedFiles name tree. We define a prop to store the relation between -% object name and name in the name tree. +% EmbeddedFiles is a bit special. +% For once we need backend commands for dvips. +% But we want also an option to create the name on the fly. +% \begin{macro}{\@@_backend_NamesEmbeddedFiles_add:nn} +% dvips need special backend code to create the name tree. +% With the other engines it does nothing. % \begin{macrocode} %<*pdftex|luatex|dvipdfmx|xdvipdfmx> -\cs_new_protected:Npn \@@_backend_NamesEmbeddedFiles_add:n #1 - %#1 object ref - { - \int_gincr:N \g_@@_backend_EmbeddedFiles_int - \prop_gput:Nnx \g_@@_backend_EmbeddedFiles_named_prop - { #1 } - { \@@_backend_EmbeddedFiles_name: } - \seq_gput_right:Nx \g_@@_backend_EmbeddedFiles_seq - { \@@_backend_EmbeddedFiles_name: \c_space_tl #1 } - } - +\cs_new_protected:Npn \@@_backend_NamesEmbeddedFiles_add:nn #1 #2 {} %</pdftex|luatex|dvipdfmx|xdvipdfmx> %<*dvips> -\cs_new_protected:Npn \@@_backend_NamesEmbeddedFiles_add:n #1 +\cs_new_protected:Npn \@@_backend_NamesEmbeddedFiles_add:nn #1 #2 { - \int_gincr:N \g_@@_backend_EmbeddedFiles_int - \prop_gput:Nnx \g_@@_backend_EmbeddedFiles_named_prop - { #1 } - { \@@_backend_EmbeddedFiles_name: } \@@_backend_pdfmark:x { - /Name~\@@_backend_EmbeddedFiles_name:~ - /FS~#1~ + /Name~#1~ + /FS~#2~ /EMBED } } %</dvips> %<*dvisvgm> %no op. Or is there any sensible use for it? -\cs_new_protected:Npn \@@_backend_NamesEmbeddedFiles_add:n #1 +\cs_new_protected:Npn \@@_backend_NamesEmbeddedFiles_add:nn #1 #2 {} + %</dvisvgm> % \end{macrocode} % \end{macro} diff --git a/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdfannot.dtx b/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdfannot.dtx index 4f4778699a9..8bd41b49c8d 100644 --- a/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdfannot.dtx +++ b/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdfannot.dtx @@ -52,7 +52,7 @@ % }^^A % } % -% \date{Version 0.95g, released 2021-07-21} +% \date{Version 0.95h, released 2021-07-31} % % \maketitle % \begin{documentation} @@ -424,7 +424,7 @@ % \begin{macrocode} %<@@=pdfannot> %<*header> -\ProvidesExplPackage{l3pdfannot}{2021-07-21}{0.95g} +\ProvidesExplPackage{l3pdfannot}{2021-07-31}{0.95h} {PDF-annotations} \RequirePackage{l3pdfdict} %</header> diff --git a/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdfdict.dtx b/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdfdict.dtx index ef283dd6640..e80d6097cbb 100644 --- a/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdfdict.dtx +++ b/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdfdict.dtx @@ -53,7 +53,7 @@ % }^^A % } % -% \date{Version 0.95g, released 2021-07-21} +% \date{Version 0.95h, released 2021-07-31} % % \maketitle % \begin{documentation} @@ -212,7 +212,7 @@ % \begin{macrocode} %<@@=pdfdict> %<*header> -\ProvidesExplPackage{l3pdfdict}{2021-07-21}{0.95g} +\ProvidesExplPackage{l3pdfdict}{2021-07-31}{0.95h} {Tools for PDF dictionaries (LaTeX PDF management testphase bundle)} %</header> % \end{macrocode} diff --git a/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdffield-action.dtx b/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdffield-action.dtx index 146214c7f15..77bf53bd856 100644 --- a/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdffield-action.dtx +++ b/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdffield-action.dtx @@ -53,7 +53,7 @@ % }^^A % } % -% \date{Version 0.95g, released 2021-07-21} +% \date{Version 0.95h, released 2021-07-31} % % \maketitle % \begin{documentation} diff --git a/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdffield-checkbox.dtx b/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdffield-checkbox.dtx index 32f2f76ffe3..a1386fcc086 100644 --- a/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdffield-checkbox.dtx +++ b/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdffield-checkbox.dtx @@ -68,7 +68,7 @@ % }^^A % } % -% \date{Version 0.95g, released 2021-07-21} +% \date{Version 0.95h, released 2021-07-31} % % \maketitle % \begin{documentation} diff --git a/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdffield-choice.dtx b/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdffield-choice.dtx index f247ef51425..de162d3ab7f 100644 --- a/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdffield-choice.dtx +++ b/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdffield-choice.dtx @@ -53,7 +53,7 @@ % }^^A % } % -% \date{Version 0.95g, released 2021-07-21} +% \date{Version 0.95h, released 2021-07-31} % % \maketitle % \begin{documentation} diff --git a/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdffield-pushbutton.dtx b/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdffield-pushbutton.dtx index 3d6ee2c6c2f..02889ec5e3e 100644 --- a/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdffield-pushbutton.dtx +++ b/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdffield-pushbutton.dtx @@ -59,7 +59,7 @@ % }^^A % } % -% \date{Version 0.95g, released 2021-07-21} +% \date{Version 0.95h, released 2021-07-31} % % \maketitle % \begin{documentation} diff --git a/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdffield-radiobutton.dtx b/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdffield-radiobutton.dtx index 3a451bceadc..b25b7ead14d 100644 --- a/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdffield-radiobutton.dtx +++ b/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdffield-radiobutton.dtx @@ -87,7 +87,7 @@ % }^^A % } % -% \date{Version 0.95g, released 2021-07-21} +% \date{Version 0.95h, released 2021-07-31} % % \maketitle % \begin{documentation} diff --git a/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdffield-textfield.dtx b/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdffield-textfield.dtx index 81330a65201..1289d54de9e 100644 --- a/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdffield-textfield.dtx +++ b/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdffield-textfield.dtx @@ -53,7 +53,7 @@ % }^^A % } % -% \date{Version 0.95g, released 2021-07-21} +% \date{Version 0.95h, released 2021-07-31} % % \maketitle % \begin{documentation} diff --git a/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdffield.dtx b/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdffield.dtx index 36e4415eef0..5a1d17809ec 100644 --- a/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdffield.dtx +++ b/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdffield.dtx @@ -73,7 +73,7 @@ % }^^A % } % -% \date{Version 0.95g, released 2021-07-21} +% \date{Version 0.95h, released 2021-07-31} % % \maketitle % \begin{documentation} @@ -970,7 +970,7 @@ %<*package> %<@@=pdffield> \NeedsTeXFormat{LaTeX2e} -\ProvidesExplPackage{l3pdffield-testphase}{2021-07-21}{0.95g}% +\ProvidesExplPackage{l3pdffield-testphase}{2021-07-31}{0.95h}% {form fields} % \end{macrocode} % \subsection{hyperref specific command} diff --git a/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdffile.dtx b/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdffile.dtx index 0fadfbe46f6..56e927b41df 100644 --- a/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdffile.dtx +++ b/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdffile.dtx @@ -53,7 +53,7 @@ % }^^A % } % -% \date{Version 0.95g, released 2021-07-21} +% \date{Version 0.95h, released 2021-07-31} % % \maketitle % \begin{documentation} @@ -400,7 +400,7 @@ % % \begin{macrocode} %<*header> -\ProvidesExplPackage{l3pdffile}{2021-07-21}{0.95g} +\ProvidesExplPackage{l3pdffile}{2021-07-31}{0.95h} {embedding and referencing files in PDF---LaTeX PDF management testphase bundle} \RequirePackage{l3pdftools} %temporarly!! %</header> diff --git a/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdfmanagement.dtx b/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdfmanagement.dtx index 0390980da5b..c3de57b74c5 100644 --- a/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdfmanagement.dtx +++ b/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdfmanagement.dtx @@ -61,7 +61,7 @@ % }^^A % } % -% \date{Version 0.95g, released 2021-07-21} +% \date{Version 0.95h, released 2021-07-31} % % \maketitle % \begin{documentation} @@ -137,9 +137,14 @@ % {\pdfmanagement_if_active:} % This conditional tests if the resource management code is active. % \end{function} -% -% \begin{function}[added = 2020-04-06] -% {\pdfmanagement_add:nnn,\pdfmanagement_add:nnx,\pdfmanagement_add:nxx} +% \begin{function}[added=2021-07-23] +% {\IfPDFManagementActiveTF} +% This is a LaTeX2e version of the conditional +% \end{function} + +% \begin{function}[added = 2020-04-06,updated=2021-07-23] +% {\pdfmanagement_add:nnn,\pdfmanagement_add:nnx,\pdfmanagement_add:nxx,\pdfmanagement_add:xxx, +% \PDFManagementAdd} % \begin{syntax} % \cs{pdfmanagement_add:nnn} \Arg{resource path} \Arg{name} \Arg{value} % \end{syntax} @@ -152,7 +157,8 @@ % keys used in PDF dictionaries (see the l3pdfdict module) the name is escaped % with \cs{str_convert_pdfname:n} when stored. % \Arg{value} should be a valid PDF value for this Name in the -% target dictionary. +% target dictionary. |\PDFManagementAdd| is a copy of |\pdfmanagement_add:xxx| +% and so expands all its arguments. % % % The code works with all major engines but not necessarily @@ -166,6 +172,10 @@ % backends. Some engines have to use labels and the aux-file to setup % the dictionaries and so need at least two compilations to put everything % in place. +% \item dvips doesn't support everything. It is for example not possible +% to add manually or through side effects +% a name tree like /AP or /JavaScript, pdfmark doesn't provide a handler +% here---at least I didn't find anything suitable. % \end{itemize} % \end{function} % @@ -549,6 +559,61 @@ % attach the file to the file panel. % \end{tabularx} % +% \paragraph{Catalog entries for name trees} +% +% \emph{Not supported in the dvips backend, pdfmark doesn't have an interface here}. +% +% In various places the PDF format allows to reference objects by name instead +% of by object reference. The relationship between a name and the object reference +% are store in so-called \emph{name trees}, which are stored in the +% Catalog/Names dictionary. The |/Dests| and the |/EmbeddedFiles| name trees are +% handled implicitly if destinations or files are added. Names to the other +% name trees can be added with |\pdfmanagement_add:nnn|, e.g. to add an value to +% the AP names (for appearance streams) use +% +% \begin{verbatim} +% \pdfmanagement_add:nnx { Catalog / Names / AP } {myAPname} {\pdf_object_ref_last:} +% \end{verbatim} +% +% Remarks: +% \begin{itemize} +% \item The name |myAPname| is processed through |\pdf_string_from_unicode:nnN{utf8/string}| +% and parentheses are added automatically. Ensure that the use of the name +% handles it in the same way. +% \item It is currently not possible to test if a name has already been used +% by another package or previous code, +% so use names where you can be confident that they are unique. +% (It would be possible to split up the first part and test, but it would slow +% down the compilation and I'm not sure if it is worth the trouble) +% \item The value is not preprocessed, it is up-to-you to ensure that it does the +% right thing. +% \item Currently the structure of the name tree is flat, it doesn't use +% Kids. But this can be changed if the need arise. +% \end{itemize} +% +% The following name trees can be filled with this method. Currently only the +% first three are activated. For the first, |EmbeddedFiles| there are two methods +% to add a value:\\ +% |\pdfmanagement_add:nnn{Catalog/Names/EmbeddedFiles}{name}{reference}| +% and +% |\pdfmanagement_add:nnn{Catalog/Names}{EmbeddedFiles}{reference}|. +% This is intended, the second methods creates a name on the fly (with the prefix l3ef) +% +% \medskip +% \noindent +% \begin{tabularx}{\linewidth}{ll>{\raggedright\arraybackslash}X} +% Catalog/Names/EmbeddedFiles & A name tree mapping name strings to file +% specifications for embedded file streams. The value should be a reference to a filespec +% dictionary\\ +% Catalog/Names/AP & A name tree mapping name strings to annotation appearance streams\\ +% Catalog/Names/JavaScript & A name tree mapping name strings to documentlevel ECMAScript actions\\ +% (inactive) Catalog/Names/Pages & A name tree mapping name strings to visible pages for use in interactive forms\\ +% (inactive) Catalog/Names/Templates & A name tree mapping name strings to invisible pages for use in interactive forms\\ +% (inactive) Catalog/Names/IDS & A name tree mapping digital identifiers to Web.Capture content sets\\ +% (inactive) Catalog/Names/URLS & A name tree mapping name strings to documentlevel ECMAScript actions\\ +% (inactive) Catalog/Names/Renditions & A name tree mapping name strings (which shall have Unicode encoding) to rendition objects +% (it is not quite clear yet, what unicode encoding means here. Perhaps this string will need special handling)\\ +% \end{tabularx} % \end{documentation} % % \begin{implementation} @@ -557,7 +622,7 @@ %<@@=pdfmanagement> %<*header> % -\ProvidesExplPackage{l3pdfmanagement}{2021-07-21}{0.95g} +\ProvidesExplPackage{l3pdfmanagement}{2021-07-31}{0.95h} {Management of core PDF dictionaries (LaTeX PDF management testphase bundle)} %</header> % \end{macrocode} @@ -576,6 +641,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'~ @@ -593,6 +661,16 @@ command~'#1'~ignored. } % \end{macrocode} +% +% \begin{variable}{\l_@@_tmpa_tl,\l_@@_tmpb_tl,\l_@@_tmpa_seq} +% Some temp variables +% \begin{macrocode} +\tl_new:N \l_@@_tmpa_tl +\tl_new:N \l_@@_tmpb_tl +\seq_new:N \l_@@_tmpa_seq +% \end{macrocode} +% \end{variable} + % \begin{variable}{\g_@@_active_bool} % This boolean will control the activation of the management code. % It is used in the hooks, and in some backend files. @@ -612,6 +690,7 @@ \prg_set_eq_conditional:NNn \pdfmanagement_if_active: \@@_if_active: { p , T , F , TF } +\cs_set_eq:NN \IfPDFManagementActiveTF\pdfmanagement_if_active:TF % \end{macrocode} % We use a hook, to collect value added before the backend is ready. % \begin{macrocode} @@ -639,7 +718,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 % \end{macrocode} % \subsection{Hooks -- shipout and end of run code} % Code is executed in three places: At shipout of every page, @@ -1006,6 +1086,7 @@ % \end{variable} % \begin{macro}{ \@@_catalog_XX_gput:n } % Various commands to handle subentries and special cases. +% At first we set up a few lists of the various types. % \begin{macrocode} \pdfdict_new:n { g__pdf_Core/Catalog} @@ -1059,8 +1140,24 @@ AcroForm/CO } - - +% \end{macrocode} +% Names trees in Catalog/Names. We prepare the full list +% but activate only AP and JavaScript for now. +% /EmbeddedFiles has special code and so is not in the name list. +% \begin{macrocode} +\clist_const:Nn \c_@@_Catalog_nametree_clist + { + AP, + JavaScript, +% Pages, +% Templates, +% IDS, +% URLS, +% Renditions + } +% \end{macrocode} +% now we create the handler. The entries in the seq-list store in a seq +% \begin{macrocode} \clist_map_inline:Nn \c_@@_Catalog_seq_clist { \seq_new:c { g_@@_/Catalog/#1_seq } % new name later @@ -1070,6 +1167,10 @@ } } +% \end{macrocode} +% OCProperties/D is special: it handles a default. This is done by adding to +% the left of the seq +% \begin{macrocode} \cs_new_protected:cpn { @@_handler/Catalog/OCProperties/D_gput:n } #1 { \seq_gput_left:cn @@ -1077,6 +1178,58 @@ { #1 } } % \end{macrocode} +% The name tree keys store in a property and check for duplicates. This is done +% with an auxiliary. +% \begin{macrocode} +\cs_new_protected:Npn \@@_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_@@_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 } + } + } +% \end{macrocode} +% This is the standard handler for most names trees: +% \begin{macrocode} +\clist_map_inline:Nn \c_@@_Catalog_nametree_clist + { + \pdfdict_new:n { g__pdf_Core/Catalog/Names/#1} + \cs_new_protected:cpn { @@_handler/Catalog/Names/#1/?_gput:nn } ##1 ##2 + { + \pdf_string_from_unicode:nnN {utf8/string}{##1}\l_@@_tmpa_tl + \exp_args:Nno + \@@_nametree_add_aux:nnn {#1}{\l_@@_tmpa_tl}{##2} + } + } +% \end{macrocode} +% EmbeddedFiles is a bit special. For once there is special backend code +% needed by dvips. Beside this we also want the option to create the file name +% on the fly, so they are actually two access methods: +% |\pdfmanagement_add:nnn{Catalog/Names/EmbeddedFiles}{name}{reference}| +% and +% |\pdfmanagement_add:nnn{Catalog/Names}{EmbeddedFiles}{reference}| +% \begin{macrocode} +\pdfdict_new:n { g__pdf_Core/Catalog/Names/EmbeddedFiles} +\cs_new_protected:cpn { @@_handler/Catalog/Names/EmbeddedFiles/?_gput:nn } #1 #2 + { + \pdf_string_from_unicode:nnN {utf8/string}{#1}\l_@@_tmpa_tl + \exp_args:Nno + \@@_nametree_add_aux:nnn + {EmbeddedFiles}{\l_@@_tmpa_tl}{#2} + \exp_args:No + \__pdf_backend_NamesEmbeddedFiles_add:nn {\l_@@_tmpa_tl}{#2} + } +% \end{macrocode} % \end{macro} % % \paragraph {Building the catalog: Push order} % \begin{macro}{\@@_Catalog_gpush:} @@ -1099,7 +1252,11 @@ { \__kernel_pdfdict_name:n { g__pdf_Core/Catalog} } \__pdf_backend_catalog_gput:nn % output names tree: - \use:c { @@_/Catalog/Names/EmbeddedFiles_gpush: } + \use:c{ @@_/Catalog/Names_gpush:n } {EmbeddedFiles} + \clist_map_inline:Nn \c_@@_Catalog_nametree_clist + { + \use:c{ @@_/Catalog/Names_gpush:n } {##1} + } } % \end{macrocode} % \end{macro} @@ -1283,12 +1440,12 @@ { 0 } { \__pdf_backend_object_new:nn { @@/Catalog/OCProperties } { dict } - \seq_gpop_left:cN { g_@@_/Catalog/OCProperties/Configs_seq} \l_tmpa_tl + \seq_gpop_left:cN { g_@@_/Catalog/OCProperties/Configs_seq} \l_@@_tmpa_tl \exp_args:Nnx \__pdf_backend_object_write:nn {@@/Catalog/OCProperties} { /OCGs~[ \seq_use:cn { g_@@_/Catalog/OCProperties/OCGs_seq } {~} ] - /D~\l_tmpa_tl~ + /D~\l_@@_tmpa_tl~ \seq_if_empty:cF { g_@@_/Catalog/OCProperties/Configs_seq } { /Configs~ @@ -1382,6 +1539,30 @@ % \begin{NOTE}{UF} % TODO access function for the name in the name tree % \end{NOTE} +% \begin{variable}{\g_@@_EmbeddedFiles_int} +% We want to create names for files on the fly. For this we use an int. +% \begin{macrocode} +\int_new:N \g_@@_EmbeddedFiles_int +% \end{macrocode} +% \end{variable} +% \begin{macro}{\@@_EmbeddedFiles_name:} +% We use the prefix l3ef, and pad numbers below 9999. +% \begin{macrocode} +\cs_new:Npn \@@_EmbeddedFiles_name: + { + ( + l3ef + \int_compare:nNnT {\g_@@_EmbeddedFiles_int} < {10} + {0} + \int_compare:nNnT {\g_@@_EmbeddedFiles_int} < {100} + {0} + \int_compare:nNnT {\g_@@_EmbeddedFiles_int} < {1000} + {0} + \int_use:N \g_@@_EmbeddedFiles_int + ) + } +% \end{macrocode} +% \end{macro} % \begin{macro}{ Handler} % EmbeddedFiles is an array and needs a special handler to add values. % \begin{macrocode} @@ -1389,25 +1570,44 @@ \cs_new_protected:cpn { @@_handler/Catalog/Names/EmbeddedFiles_gput:n } #1 { - \__pdf_backend_NamesEmbeddedFiles_add:n { #1 } + \int_gincr:N \g_@@_EmbeddedFiles_int + \exp_args:Nnx + \prop_gput:cnn + { \__kernel_pdfdict_name:n { g__pdf_Core/Catalog/Names/EmbeddedFiles }} + { \@@_EmbeddedFiles_name: } + { #1 } + \exp_args:Nx + \__pdf_backend_NamesEmbeddedFiles_add:nn {\@@_EmbeddedFiles_name:} { #1 } } % \end{macrocode} % \end{macro} -% The entry should only be added if there are actually embedded files. -% This can be tested by checking the names_seq -% \begin{macro}{\@@_/Catalog/Names/EmbeddedFiles_gpush:} +% This pushes out the other names trees (but not with dvips). +% TODO: currently it simply write in the root of the name tree. +% That is the fastest. +% If they get longer we perhaps need to build something with Kids and Limits. +% \begin{macro}{\@@_/Catalog/Names/?_gpush:} % \begin{macrocode} -% -\cs_new_protected:cpn { @@_/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 {~} - } - } - } +\cs_new_protected:cpn { @@_/Catalog/Names_gpush:n } #1 %#1 name of name tree + { + \pdfdict_if_empty:nF { g__pdf_Core/Catalog/Names/#1 } + { + \seq_clear:N \l_@@_tmpa_seq + \prop_map_inline:cn + {\__kernel_pdfdict_name:n { g__pdf_Core/Catalog/Names/#1 }} + { \seq_put_right:Nn \l_@@_tmpa_seq {##1~##2}} + \seq_sort:Nn \l_@@_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_@@_tmpa_seq {~} + } + } + } % \end{macrocode} % \end{macro} % \begin{macro}{@@_handler/Catalog/?_show:} diff --git a/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdfmeta.dtx b/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdfmeta.dtx index f590a2b8973..3ca574f02ad 100644 --- a/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdfmeta.dtx +++ b/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdfmeta.dtx @@ -53,7 +53,7 @@ % }^^A % } % -% \date{Version 0.95g, released 2021-07-21} +% \date{Version 0.95h, released 2021-07-31} % % \maketitle % \begin{documentation} @@ -343,7 +343,7 @@ % \begin{macrocode} %<@@=pdfmeta> %<*header> -\ProvidesExplPackage{l3pdfmeta}{2021-07-21}{0.95g} +\ProvidesExplPackage{l3pdfmeta}{2021-07-31}{0.95h} {PDF-Standards---LaTeX PDF management testphase bundle} %</header> % \end{macrocode} diff --git a/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdftools.dtx b/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdftools.dtx index 2df7203e0f8..efed778e785 100644 --- a/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdftools.dtx +++ b/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdftools.dtx @@ -53,7 +53,7 @@ % }^^A % } % -% \date{Version 0.95g, released 2021-07-21} +% \date{Version 0.95h, released 2021-07-31} % % \maketitle % \begin{documentation} @@ -215,7 +215,7 @@ % % \begin{macrocode} %<*header> -\ProvidesExplPackage{l3pdftools}{2021-07-21}{0.95g} +\ProvidesExplPackage{l3pdftools}{2021-07-31}{0.95h} {candidate commands for l3pdf---LaTeX PDF management testphase bundle} %</header> % \end{macrocode} diff --git a/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdfxform.dtx b/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdfxform.dtx index eef4ae7ee00..0591756bf0f 100644 --- a/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdfxform.dtx +++ b/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdfxform.dtx @@ -52,7 +52,7 @@ % }^^A % } % -% \date{Version 0.95g, released 2021-07-21} +% \date{Version 0.95h, released 2021-07-31} % % \maketitle % \begin{documentation} @@ -136,7 +136,7 @@ % \begin{macrocode} %<@@=pdf> %<*header> -\ProvidesExplPackage{l3pdfxform}{2021-07-21}{0.95g} +\ProvidesExplPackage{l3pdfxform}{2021-07-31}{0.95h} {command to create xforms (beta)---LaTeX PDF management testphase bundle} %</header> % \end{macrocode} diff --git a/Master/texmf-dist/source/latex/pdfmanagement-testphase/ltdocinit.dtx b/Master/texmf-dist/source/latex/pdfmanagement-testphase/ltdocinit.dtx index 0679203098f..4e7eecc1abf 100644 --- a/Master/texmf-dist/source/latex/pdfmanagement-testphase/ltdocinit.dtx +++ b/Master/texmf-dist/source/latex/pdfmanagement-testphase/ltdocinit.dtx @@ -51,7 +51,7 @@ % }^^A % } % -% \date{Version 0.95g, released 2021-07-21} +% \date{Version 0.95h, released 2021-07-31} % % \maketitle % \begin{documentation} @@ -182,7 +182,7 @@ % \begin{macrocode} %<@@=pdfmanagement> %<*header> -\ProvidesExplPackage{ltdocinit}{2021-07-21}{0.95g} +\ProvidesExplPackage{ltdocinit}{2021-07-31}{0.95h} {Initialize document metadata} %</header> % \end{macrocode} diff --git a/Master/texmf-dist/source/latex/pdfmanagement-testphase/pdfmanagement-firstaid.dtx b/Master/texmf-dist/source/latex/pdfmanagement-testphase/pdfmanagement-firstaid.dtx index 364304de2ca..1295c4b6bf3 100644 --- a/Master/texmf-dist/source/latex/pdfmanagement-testphase/pdfmanagement-firstaid.dtx +++ b/Master/texmf-dist/source/latex/pdfmanagement-testphase/pdfmanagement-firstaid.dtx @@ -51,7 +51,7 @@ % }^^A % } % -% \date{Version 0.95g, released 2021-07-21} +% \date{Version 0.95h, released 2021-07-31} % % \maketitle % \begin{documentation} @@ -67,7 +67,7 @@ % |firstaidoff={name1,name2,...}|. % \begin{macrocode} %<*package> -\ProvidesExplPackage{pdfmanagement-firstaid}{2021-07-21}{0.95g} +\ProvidesExplPackage{pdfmanagement-firstaid}{2021-07-31}{0.95h} {LaTeX PDF management testphase bundle / firstaid-patches} %<@@=pdfmanagement> diff --git a/Master/texmf-dist/source/latex/pdfmanagement-testphase/pdfmanagement-testphase.dtx b/Master/texmf-dist/source/latex/pdfmanagement-testphase/pdfmanagement-testphase.dtx index 7d0b20ee023..37dc11f65b1 100644 --- a/Master/texmf-dist/source/latex/pdfmanagement-testphase/pdfmanagement-testphase.dtx +++ b/Master/texmf-dist/source/latex/pdfmanagement-testphase/pdfmanagement-testphase.dtx @@ -51,7 +51,7 @@ % }^^A % } % -% \date{Version 0.95g, released 2021-07-21} +% \date{Version 0.95h, released 2021-07-31} % % \maketitle % \begin{documentation} @@ -384,7 +384,7 @@ % \begin{macrocode} %<@@=pdf> %<*package> -\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}{}{ @@ -411,7 +411,7 @@ % to allow to set it in the document. % \begin{macrocode} %<*header> -\ProvidesExplFile{pdfmanagement-testphase.ltx}{2021-07-21}{0.95g} +\ProvidesExplFile{pdfmanagement-testphase.ltx}{2021-07-31}{0.95h} {PDF~management~code~(testphase)} %</header> %<*package> |