merge develop

latex3 · Oct 30, 2024 · a081289 · a081289
2 parents 1882f6d + 76043f7
commit a081289
Show file tree

Hide file tree

Showing 30 changed files with 232 additions and 228 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,9 +6,16 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 this project uses date-based 'snapshot' version identifiers.
 
 ## [Unreleased]
+### Changed 
+ - hyp/link/GoTo/Contents and hyp/link/URI/Contents now fill also the dictionary entry. 
+   This allows to replace it fully.
+ - hyp/link/GoTo/Contents socket has been added to \hyper@linkstart too.  
+
+## [2024-10-27]
+Version: 2024-10-27 v0.96n
 
 ### Changed
- - \pdf_bdc:nn creates inline dictionaries if the engine support this.
+ - \pdf_bdc:nn now creates by default inline dictionaries if the engine support this.
 
 ## [2024-09-29]
 Version: 2024-09-29 v0.96m

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # LaTeX PDF management testphase bundle
 
-Version: 0.96m, 2024-09-29
+Version: 0.96n, 2024-10-27
 
 This package is used during a test phase to load the new PDF management code
 of LaTeX.

diff --git a/build.lua b/build.lua
@@ -1,6 +1,6 @@
 #!/usr/bin/env texlua
-packageversion="0.96m"
-packagedate="2024-09-29"
+packageversion="0.96n"
+packagedate="2024-10-27"
 
 local luatexstatus = status.list()
 

diff --git a/firstaid/color-ltx.sty b/firstaid/color-ltx.sty
@@ -24,7 +24,7 @@
 %% This file has the LPPL maintenance status "maintained".
 %%
 \NeedsTeXFormat{LaTeX2e}[1995/12/01]
-\ProvidesPackage{color-ltx}[2024-09-29 v0.96m
+\ProvidesPackage{color-ltx}[2024-10-27 v0.96n
   Standard LaTeX Color (patched for l3color, part of pdfmanagement-testphase, original version 2022/01/06 v1.3d) (DPC)]
 \edef\Gin@codes{%
  \catcode`\noexpand\^^A\the\catcode`\^^A\relax

diff --git a/firstaid/colorspace-patches-tmp-ltx.sty b/firstaid/colorspace-patches-tmp-ltx.sty
@@ -19,7 +19,7 @@
 %
 % for those people who are interested.
 \NeedsTeXFormat{LaTeX2e}[2020/10/01]
-\ProvidesExplPackage{colorspace-patches-tmp-ltx}{2024-09-29}{0.96m}
+\ProvidesExplPackage{colorspace-patches-tmp-ltx}{2024-10-27}{0.96n}
   {temporary patches for the colorspace package to test pdfresource management ... UF}
 
 

diff --git a/firstaid/xcolor-patches-tmp-ltx.sty b/firstaid/xcolor-patches-tmp-ltx.sty
@@ -1,6 +1,6 @@
 %% LaTeX2e file `xcolor-patches-tmp-ltx.sty'
 %%
-\ProvidesPackage{xcolor-patches-tmp-ltx}[2024-09-29 v0.96m patch xcolor for l3color]
+\ProvidesPackage{xcolor-patches-tmp-ltx}[2024-10-27 v0.96n patch xcolor for l3color]
 \@ifundefined{color_set:nn}{\RequirePackage{l3color}}{}
 
 \ExplSyntaxOn

diff --git a/hyperref-generic.dtx b/hyperref-generic.dtx
@@ -82,7 +82,7 @@
 %    }^^A
 % }
 %
-% \date{Version 0.96m, released 2024-09-29}
+% \date{Version 0.96n, released 2024-10-27}
 %
 % \maketitle
 % \begin{documentation}
@@ -456,22 +456,21 @@
 %   \end{hypkey}
 %
 %  \subsection{Public interfaces}
-%  The |colorlinks| and |ocgcolorlinks| and related keys are
-%  using these booleans:
-%  \begin{verbatim}
-%     \l_hyp_annot_colorlink_bool,
-%     \l_hyp_annot_colorurl_bool,
-%     \l_hyp_annot_colorfile_bool,
-%     \l_hyp_annot_colorrun_bool,
-%     \l_hyp_annot_colormenu_bool,
-%     \l_hyp_annot_ocgcolorlink_bool,
-%     \l_hyp_annot_ocgcolorurl_bool,
-%     \l_hyp_annot_ocgcolorfile_bool,
-%     \l_hyp_annot_ocgcolorrun_bool,
-%     \l_hyp_annot_ocgcolormenu_bool,
-%  \end{verbatim}
-%
-%   They are both inserting hook code in the |pdfannot/link/|\meta{type}|/begin|
+%  
+%  \begin{variable}
+%   {\l_hyp_annot_colorlink_bool,
+%  \l_hyp_annot_colorurl_bool,
+%  \l_hyp_annot_colorfile_bool,
+%  \l_hyp_annot_colorrun_bool,
+%  \l_hyp_annot_colormenu_bool,
+%  \l_hyp_annot_ocgcolorlink_bool,
+%  \l_hyp_annot_ocgcolorurl_bool,
+%  \l_hyp_annot_ocgcolorfile_bool,
+%  \l_hyp_annot_ocgcolorrun_bool,
+%  \l_hyp_annot_ocgcolormenu_bool
+%   }
+%  These boolean are used by the |colorlinks| and |ocgcolorlinks| and related keys.
+%  These keys insert hook code in the |pdfannot/link/|\meta{type}|/begin|
 %   and |pdfannot/link/|\meta{type}|/end| hooks. \meta{type} is one of
 %   |GoTo|, |URI|, |GoToR|, |Named| or |Launch|.
 %
@@ -484,6 +483,7 @@
 %
 %   The border colors aren't saved in color names currently, but if the need
 %   would arise it would possible to change this.
+%   \end{variable}
 %  \subsection{Changed behaviour}
 %   \begin{description}
 %   \item[colorlinks] |colorlinks| or |colorlinks=true| will as before disable the |pdfborder| 
@@ -965,7 +965,7 @@
 %<@@=hyp>
 %    \end{macrocode}
 %    \begin{macrocode}
-\ProvidesFile{hgeneric-testphase.def}[2024-09-29 v0.96m %
+\ProvidesFile{hgeneric-testphase.def}[2024-10-27 v0.96n %
   generic Hyperref driver for the LaTeX PDF management testphase bundle]
 
 \RequirePackage{etoolbox} %why?
@@ -1712,8 +1712,10 @@
 % It is also unclear how the /Contents entry would look at best. 
 % So we use sockets. The first argument is the target (url or destination),
 % For GoTo we also pass the text as argument.
-% The sockets should define \cs{l_@@_link_Contents_tl}
-% %    \begin{macrocode}
+% The sockets should put something into the relevant annotation dictionaries.
+% \changes{v0.96o}{2024-10-27}{moved dictionary command into socket so that
+% it can be fully replaced.}
+%    \begin{macrocode}
 \tl_new:N\l_@@_link_Contents_tl
 \socket_new:nn {hyp/link/GoTo/Contents}{2}
 \socket_new:nn {hyp/link/URI/Contents}{1}
@@ -1722,14 +1724,18 @@
     \@@_text_pdfstring:eoN
       { Go~to~destination~#1  }
       { \l_@@_text_enc_info_print_tl }
-      \l_@@_link_Contents_tl    
+      \l_@@_link_Contents_tl  
+    \pdfannot_dict_put:nne {link/GoTo}{Contents}
+      {\l_@@_link_Contents_tl}    
   }
 \socket_new_plug:nnn {hyp/link/URI/Contents}{default}
   {
     \@@_text_pdfstring:eoN
       { #1  }
       { \l_@@_text_enc_info_print_tl }
-      \l_@@_link_Contents_tl    
+      \l_@@_link_Contents_tl
+    \pdfannot_dict_put:nne {link/URI}{Contents}
+      {\l_@@_link_Contents_tl}       
   }
 \socket_assign_plug:nn{hyp/link/GoTo/Contents}{default}
 \socket_assign_plug:nn{hyp/link/URI/Contents}{default}
@@ -1860,7 +1866,7 @@
 % replaced if some more generic PDF string command/module exists.
 % All commands here use the \enquote{submodule} name \texttt{text}.
 % At first a hook for user additions:
-% \begin{macro}{hyp/text/pdfstring}
+% \begin{macro}[no-user-doc]{hyp/text/pdfstring}
 %    \begin{macrocode}
 \hook_new:n {hyp/text/pdfstring}
 %    \end{macrocode}
@@ -1995,7 +2001,7 @@
 % The code has to define |\Hy@PutCatalog| as we can't yet
 % change code in hyperref. The switch for draftmode has been removed.
 %
-% \begin{macro}
+% \begin{macro}[no-user-doc]
 %   {
 %     \@@_PageLabels_gpush:,
 %     \Hy@PutCatalog,
@@ -2127,7 +2133,7 @@
 % to create also a structured destination.
 % We don't use the cmd hook, as we want the same hook for both start commands.
 % We make the current dest name available so that the hook code can use it.
-%  \begin{macro}
+%  \begin{macro}[no-user-doc]
 %    {
 %      \hyper@anchor,
 %      \hyper@anchorstart,
@@ -2251,11 +2257,9 @@
             \group_begin:
             \tl_set:Nn \l_hyp_current_dest_name_tl {#2}
 %    \end{macrocode}
-% this socket defines \cs{l_@@_link_Contents_tl}
+% this socket adds something to the /Contents key.
 %    \begin{macrocode}
-            \socket_use:nnn{hyp/link/GoTo/Contents}{#2}{#3}
-            \pdfannot_dict_put:nne {link/GoTo}{Contents}
-              {\l_@@_link_Contents_tl}
+            \socket_use:nnn{hyp/link/GoTo/Contents}{#2}{#3}            
             \hook_use:n {hyp/link/#1}
             \@@_link_goto_begin:nw {#2}#3\Hy@xspace@end
             \@@_link_goto_end:
@@ -2279,6 +2283,7 @@
             \Hy@VerboseLinkStart{#1}{#2}% only for debug
             \group_begin:
             \tl_set:Nn \l_hyp_current_dest_name_tl {#2}
+            \socket_use:nnn{hyp/link/GoTo/Contents}{#2}{}
             \hook_use:n {hyp/link/#1}
             \@@_link_goto_begin:nw {#2}
           } 
@@ -2331,10 +2336,9 @@
                \pdfdict_put:nnn{l_hyp/annot/A/URI}{IsMap}{true}
               }
 %    \end{macrocode}
-% This socket defines \cs{l_@@_link_Contents_tl}
+% This socket adds something to the /Contents key.
 %    \begin{macrocode}
-            \socket_use:nn{hyp/link/URI/Contents}{#2}                    
-            \pdfannot_dict_put:nne {link/URI}{Contents}{\l_@@_link_Contents_tl}              
+            \socket_use:nn{hyp/link/URI/Contents}{#2}                         
             \cs_set_eq:NN \# \c_hash_str
             \cs_set_eq:NN \% \c_percent_str
             \Hy@safe@activestrue

diff --git a/l3backend-testphase.dtx b/l3backend-testphase.dtx
@@ -45,7 +45,7 @@
 %    }^^A
 % }
 %
-% \date{Version 0.96m, released 2024-09-29}
+% \date{Version 0.96n, released 2024-10-27}
 %
 % \maketitle
 %
@@ -56,27 +56,27 @@
 %    \begin{macrocode}
 %<drivers>\ProvidesExplFile
 %<*dvipdfmx>
-  {l3backend-testphase-dvipdfmx.def}{2024-09-29}{}
+  {l3backend-testphase-dvipdfmx.def}{2024-10-27}{}
   {LaTeX~PDF~management~testphase~bundle~backend~support: dvipdfmx}
 %</dvipdfmx>
 %<*dvips>
-  {l3backend-testphase-dvips.def}{2024-09-29}{}
+  {l3backend-testphase-dvips.def}{2024-10-27}{}
   {LaTeX~PDF~management~testphase~bundle~backend~support: dvips}
 %</dvips>
 %<*dvisvgm>
-  {l3backend-testphase-dvisvgm.def}{2024-09-29}{}
+  {l3backend-testphase-dvisvgm.def}{2024-10-27}{}
   {LaTeX~PDF~management~testphase~bundle~backend~support: dvisvgm}
 %</dvisvgm>
 %<*luatex>
-  {l3backend-testphase-luatex.def}{2024-09-29}{}
+  {l3backend-testphase-luatex.def}{2024-10-27}{}
   {LaTeX~PDF~management~testphase~bundle~backend~support: PDF output (LuaTeX)}
 %</luatex>
 %<*pdftex>
-  {l3backend-testphase-pdftex.def}{2024-09-29}{}
+  {l3backend-testphase-pdftex.def}{2024-10-27}{}
   {LaTeX~PDF~management~testphase~bundle~backend~support: PDF output (pdfTeX)}
 %</pdftex>
 %<*xdvipdfmx>
-  {l3backend-testphase-xetex.def}{2024-09-29}{}
+  {l3backend-testphase-xetex.def}{2024-10-27}{}
   {LaTeX~PDF~management~testphase~bundle~backend~support: XeTeX}
 %</xdvipdfmx>
 %    \end{macrocode}
@@ -813,9 +813,9 @@
 %
 % dvips is easy: create an object, and reference it in the bdc
 % ghostscript will then automatically replace it by a name
-% and add the name to the /Properties dict
+% and add the name to the /Properties dict,
 % special variant von accsupp
-% https://chat.stackexchange.com/transcript/message/50831812#50831812
+% \url{https://chat.stackexchange.com/transcript/message/50831812#50831812}
 %    \begin{macrocode}
 %<*dvips>
 %

diff --git a/l3pdfannot.dtx b/l3pdfannot.dtx
@@ -48,7 +48,7 @@
 %    }^^A
 % }
 %
-% \date{Version 0.96m, released 2024-09-29}
+% \date{Version 0.96n, released 2024-10-27}
 %
 % \maketitle
 % \begin{documentation}
@@ -432,7 +432,7 @@
 %    \begin{macrocode}
 %<@@=pdfannot>
 %<*header>
-\ProvidesExplPackage{l3pdfannot}{2024-09-29}{0.96m}
+\ProvidesExplPackage{l3pdfannot}{2024-10-27}{0.96n}
   {PDF-annotations}
 \RequirePackage{l3pdfdict}
 %</header>

diff --git a/l3pdfdict.dtx b/l3pdfdict.dtx
@@ -49,7 +49,7 @@
 %    }^^A
 % }
 %
-% \date{Version 0.96m, released 2024-09-29}
+% \date{Version 0.96n, released 2024-10-27}
 %
 % \maketitle
 % \begin{documentation}
@@ -208,7 +208,7 @@
 %    \begin{macrocode}
 %<@@=pdfdict>
 %<*header>
-\ProvidesExplPackage{l3pdfdict}{2024-09-29}{0.96m}
+\ProvidesExplPackage{l3pdfdict}{2024-10-27}{0.96n}
   {Tools for PDF dictionaries (LaTeX PDF management testphase bundle)}
 %</header>
 %    \end{macrocode}

diff --git a/l3pdffield-action.dtx b/l3pdffield-action.dtx
@@ -49,7 +49,7 @@
 %    }^^A
 % }
 %
-% \date{Version 0.96m, released 2024-09-29}
+% \date{Version 0.96n, released 2024-10-27}
 %
 % \maketitle
 % \begin{documentation}

diff --git a/l3pdffield-checkbox.dtx b/l3pdffield-checkbox.dtx
@@ -64,7 +64,7 @@
 %    }^^A
 % }
 %
-% \date{Version 0.96m, released 2024-09-29}
+% \date{Version 0.96n, released 2024-10-27}
 %
 % \maketitle
 % \begin{documentation}

diff --git a/l3pdffield-choice.dtx b/l3pdffield-choice.dtx
@@ -49,7 +49,7 @@
 %    }^^A
 % }
 %
-% \date{Version 0.96m, released 2024-09-29}
+% \date{Version 0.96n, released 2024-10-27}
 %
 % \maketitle
 % \begin{documentation}

diff --git a/l3pdffield-pushbutton.dtx b/l3pdffield-pushbutton.dtx
@@ -55,7 +55,7 @@
 %    }^^A
 % }
 %
-% \date{Version 0.96m, released 2024-09-29}
+% \date{Version 0.96n, released 2024-10-27}
 %
 % \maketitle
 % \begin{documentation}

diff --git a/l3pdffield-radiobutton.dtx b/l3pdffield-radiobutton.dtx
@@ -83,7 +83,7 @@
 %    }^^A
 % }
 %
-% \date{Version 0.96m, released 2024-09-29}
+% \date{Version 0.96n, released 2024-10-27}
 %
 % \maketitle
 % \begin{documentation}

diff --git a/l3pdffield-textfield.dtx b/l3pdffield-textfield.dtx
@@ -49,7 +49,7 @@
 %    }^^A
 % }
 %
-% \date{Version 0.96m, released 2024-09-29}
+% \date{Version 0.96n, released 2024-10-27}
 %
 % \maketitle
 % \begin{documentation}

diff --git a/l3pdffield.dtx b/l3pdffield.dtx
@@ -69,7 +69,7 @@
 %    }^^A
 % }
 %
-% \date{Version 0.96m, released 2024-09-29}
+% \date{Version 0.96n, released 2024-10-27}
 %
 % \maketitle
 % \begin{documentation}
@@ -972,7 +972,7 @@
 %<*package>
 %<@@=pdffield>
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesExplPackage{l3pdffield-testphase}{2024-09-29}{0.96m}%
+\ProvidesExplPackage{l3pdffield-testphase}{2024-10-27}{0.96n}%
   {form fields}
 %    \end{macrocode}
 % \subsection{hyperref specific command}