texlive[69081] Master: bookmark (9dec23)

commits+karl at tug.org commits+karl at tug.org
Sat Dec 9 23:18:58 CET 2023


Revision: 69081
          https://tug.org/svn/texlive?view=revision&revision=69081
Author:   karl
Date:     2023-12-09 23:18:58 +0100 (Sat, 09 Dec 2023)
Log Message:
-----------
bookmark (9dec23)

Modified Paths:
--------------
    trunk/Master/texmf-dist/doc/latex/bookmark/README.md
    trunk/Master/texmf-dist/doc/latex/bookmark/bookmark-example.tex
    trunk/Master/texmf-dist/doc/latex/bookmark/bookmark.pdf
    trunk/Master/texmf-dist/source/latex/bookmark/bookmark-frozen.dtx
    trunk/Master/texmf-dist/source/latex/bookmark/bookmark.dtx
    trunk/Master/texmf-dist/tex/latex/bookmark/bkm-dvipdfm-2019-12-03.def
    trunk/Master/texmf-dist/tex/latex/bookmark/bkm-dvipdfm.def
    trunk/Master/texmf-dist/tex/latex/bookmark/bkm-dvips-2019-12-03.def
    trunk/Master/texmf-dist/tex/latex/bookmark/bkm-dvips.def
    trunk/Master/texmf-dist/tex/latex/bookmark/bkm-pdftex-2019-12-03.def
    trunk/Master/texmf-dist/tex/latex/bookmark/bkm-pdftex.def
    trunk/Master/texmf-dist/tex/latex/bookmark/bkm-vtex-2019-12-03.def
    trunk/Master/texmf-dist/tex/latex/bookmark/bkm-vtex.def
    trunk/Master/texmf-dist/tex/latex/bookmark/bookmark.sty
    trunk/Master/tlpkg/libexec/ctan2tds

Modified: trunk/Master/texmf-dist/doc/latex/bookmark/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/bookmark/README.md	2023-12-09 21:35:56 UTC (rev 69080)
+++ trunk/Master/texmf-dist/doc/latex/bookmark/README.md	2023-12-09 22:18:58 UTC (rev 69081)
@@ -1,6 +1,6 @@
 # bookmark package for LaTeX
 
-Version: 2020-11-06 v1.29
+Version: 2023-12-05 v1.30
 
 
 This package implements a new bookmark (outline) organization for
@@ -13,7 +13,7 @@
 
 ## Copyright (C)
 * 2007, 2009-2011  Heiko Oberdiek
-* 2016-2020        Oberdiek Package Support Group
+* 2016-2023        Oberdiek Package Support Group
 
 ## License
 LATEX Project Public License, version 1.3c or later.

Modified: trunk/Master/texmf-dist/doc/latex/bookmark/bookmark-example.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/bookmark/bookmark-example.tex	2023-12-09 21:35:56 UTC (rev 69080)
+++ trunk/Master/texmf-dist/doc/latex/bookmark/bookmark-example.tex	2023-12-09 22:18:58 UTC (rev 69081)
@@ -9,11 +9,11 @@
 %% This is a generated file.
 %% 
 %% Project: bookmark
-%% Version: 2020-11-06 v1.29
+%% Version: 2023-12-05 v1.30
 %% 
 %% Copyright (C)
 %%    2007-2011 Heiko Oberdiek
-%%    2016-2020 Oberdiek Package Support Group
+%%    2016-2023 Oberdiek Package Support Group
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either
@@ -31,7 +31,6 @@
 %% Heiko Oberdiek and the Oberdiek Package Support Group
 %% https://github.com/ho-tex/bookmark/issues
 %% 
-%% 
 %% This work consists of the main source file bookmark.dtx and bookmark-frozen.dtx
 %% and the derived files
 %%    bookmark.sty, bookmark.pdf, bookmark.ins, bookmark.drv,

Modified: trunk/Master/texmf-dist/doc/latex/bookmark/bookmark.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/source/latex/bookmark/bookmark-frozen.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/bookmark/bookmark-frozen.dtx	2023-12-09 21:35:56 UTC (rev 69080)
+++ trunk/Master/texmf-dist/source/latex/bookmark/bookmark-frozen.dtx	2023-12-09 22:18:58 UTC (rev 69081)
@@ -1,12 +1,12 @@
 % \iffalse meta-comment
 %
 % File: bookmark-frozen.dtx
-% Version: 2020-11-06 v1.29
+% Version: 2023-12-05 v1.30
 % Info: PDF bookmarks
 %
 % Copyright (C)
 %    2007-2011 Heiko Oberdiek
-%    2016-2020 Oberdiek Package Support Group
+%    2016-2023 Oberdiek Package Support Group
 %    https://github.com/ho-tex/bookmark/issues
 %
 % This work may be distributed and/or modified under the

Modified: trunk/Master/texmf-dist/source/latex/bookmark/bookmark.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/bookmark/bookmark.dtx	2023-12-09 21:35:56 UTC (rev 69080)
+++ trunk/Master/texmf-dist/source/latex/bookmark/bookmark.dtx	2023-12-09 22:18:58 UTC (rev 69081)
@@ -1,12 +1,12 @@
 % \iffalse meta-comment
 %
 % File: bookmark.dtx
-% Version: 2020-11-06 v1.29
+% Version: 2023-12-05 v1.30
 % Info: PDF bookmarks
 %
 % Copyright (C)
 %    2007-2011 Heiko Oberdiek
-%    2016-2020 Oberdiek Package Support Group
+%    2016-2023 Oberdiek Package Support Group
 %    https://github.com/ho-tex/bookmark/issues
 %
 % This work may be distributed and/or modified under the
@@ -95,7 +95,7 @@
 \input docstrip.tex
 \Msg{************************************************************************}
 \Msg{* Installation}
-\Msg{* Package: bookmark 2020-11-06 v1.29 PDF bookmarks (HO)}
+\Msg{* Package: bookmark 2023-12-05 v1.30 PDF bookmarks (HO)}
 \Msg{************************************************************************}
 
 \keepsilent
@@ -107,11 +107,11 @@
 This is a generated file.
 
 Project: bookmark
-Version: 2020-11-06 v1.29
+Version: 2023-12-05 v1.30
 
 Copyright (C)
    2007-2011 Heiko Oberdiek
-   2016-2020 Oberdiek Package Support Group
+   2016-2023 Oberdiek Package Support Group
 
 This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either
@@ -185,7 +185,7 @@
 %<*driver>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{bookmark.drv}%
-  [2020-11-06 v1.29 PDF bookmarks (HO)]%
+  [2023-12-05 v1.30 PDF bookmarks (HO)]%
 \documentclass{ltxdoc}
 \usepackage{holtxdoc}[2011/11/22]
 \begin{document}
@@ -199,7 +199,7 @@
 % \GetFileInfo{bookmark.drv}
 %
 % \title{The \xpackage{bookmark} package}
-% \date{2020-11-06 v1.29}
+% \date{2023-12-05 v1.30}
 % \author{Heiko Oberdiek\thanks
 % {Please report any issues at \url{https://github.com/ho-tex/bookmark/issues}}}
 %
@@ -297,7 +297,8 @@
 % \subsubsection{Driver options}
 %
 % Supported drivers are \xoption{pdftex}, \xoption{dvips},
-% \xoption{dvipdfm} (\xoption{xetex}), and \xoption{vtex}.
+% \xoption{dvipdfmx} (\xoption{xetex} and older name 
+% \xoption{dvipdfm}), and \xoption{vtex}.
 % The \hologo{TeX} engines \hologo{pdfTeX}, \hologo{XeTeX},
 % and \hologo{VTeX} are automatically detected.
 % The default for the DVI drivers is \xoption{dvips}. This can
@@ -400,7 +401,7 @@
 % \xoption{dvips} and friends) the package detects it quite late
 % at the end of the document. Since version 2011/04/21 v1.21
 % the package tries printing the line number and file name
-% of the corresponding occurence of \cs{bookmark}.
+% of the corresponding occurrence of \cs{bookmark}.
 % However, \hologo{TeX} does provide the line number, but
 % unhappily the file name is a secret. The package supports
 % some ways to get the file name:
@@ -638,6 +639,16 @@
 %   of the document.
 % \end{itemize}
 %
+% \subsection{Structure destinations}
+% If tagging is activated with e.g. 
+% \begin{verbatim}
+% \DocumentMetadata{testphase=phase-III} %or some other phase a
+% \end{verbatim}
+% the outlines will also use structure destinations, these are destination
+% bound not to a page but to a structure. This works only with pdftex, luatex and
+% xetex/dvipdfmx. 
+% 
+% 
 % \subsection{Limitations/ToDos}
 %
 % \begin{itemize}
@@ -762,7 +773,7 @@
 %<*package>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{bookmark}%
-  [2020-11-06 v1.29 PDF bookmarks (HO)]%
+  [2023-12-05 v1.30 PDF bookmarks (HO)]%
 %    \end{macrocode}
 %
 % \subsubsection{Requirements}
@@ -1815,7 +1826,7 @@
 \def\Hy at writebookmark#1#2#3#4#5{%
   \ifnum#4>\BKM at depth\relax
   \else
-    \def\BKM at type{#5}%
+    \edef\BKM at type{#5}%
     \ifx\BKM at type\Hy at bookmarkstype
       \begingroup
         \ifBKM at numbered
@@ -1853,7 +1864,7 @@
 %<*dvipdfm>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{bkm-dvipdfm.def}%
-  [2020-11-06 v1.29 bookmark driver for dvipdfm (HO)]%
+  [2023-12-05 v1.30 bookmark driver for dvipdfm (HO)]%
 %    \end{macrocode}
 %
 %    \begin{macro}{\BKM at id}
@@ -1873,6 +1884,23 @@
 \newif\ifBKM at sw
 %    \end{macrocode}
 %    \end{macro}
+%    
+% \begin{macro}{\BKM at struct@dest}
+% Support for structure destinations in the outline.
+%    \begin{macrocode}
+\newcommand\BKM at struct@dest{}
+\ExplSyntaxOn
+\IfDocumentMetadataTF
+  {
+    \tag_if_active:T
+     {
+       \def\BKM at struct@dest{/SD~@pdf.SDest.\BKM at dest} 
+     }
+     
+  }{}
+\ExplSyntaxOff
+%    \end{macrocode}
+% \end{macro}
 %
 %    \begin{macro}{\bookmark}
 %    \begin{macrocode}
@@ -1948,6 +1976,7 @@
             /A<<%
               /S/GoTo%
               /D(\BKM at dest)%
+              \BKM at struct@dest
             >>%
           }%
         \fi
@@ -2027,7 +2056,7 @@
 %<*vtex>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{bkm-vtex.def}%
-  [2020-11-06 v1.29 bookmark driver for VTeX (HO)]%
+  [2023-12-05 v1.30 bookmark driver for VTeX (HO)]%
 %    \end{macrocode}
 %
 %    \begin{macrocode}
@@ -2358,7 +2387,7 @@
 %<*pdftex>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{bkm-pdftex.def}%
-  [2020-11-06 v1.29 bookmark driver for pdfTeX (HO)]%
+  [2023-12-05 v1.30 bookmark driver for pdfTeX and luaTeX (HO)]%
 %    \end{macrocode}
 %
 %    \begin{macro}{\BKM at DO@entry}
@@ -2468,11 +2497,28 @@
 %    Macro \cs{BKM at DefGotoNameAction} is a hook for
 %    package \xpackage{hypdestopt}.
 %    \begin{macrocode}
-\def\BKM at DefGotoNameAction#1#2{%
-  \BKM at EscapeString\BKM at DO@dest
-  \edef#1{goto name{#2}}%
-}
+  \def\BKM at DefGotoNameAction#1#2{%
+    \BKM at EscapeString\BKM at DO@dest
+    \edef#1{goto name{#2}}%
+   }
 %    \end{macrocode}
+% If tagging is active we use also structure destinations.
+% If hypdestopt is actually used this will be overwritten again.
+%    \begin{macrocode}
+\ExplSyntaxOn
+\IfDocumentMetadataTF
+ {
+   \tag_if_active:T
+     {
+       \def\BKM at DefGotoNameAction#1#2
+        {
+         \BKM at EscapeString\BKM at DO@dest
+         \edef#1{goto~struct~name~{#2}~name~{#2}}%
+        }     
+     }    
+ }{} 
+\ExplSyntaxOff
+%    \end{macrocode}
 %    \end{macro}
 %    \begin{macrocode}
 %</pdftex>
@@ -2509,12 +2555,14 @@
 % \subsection{Drivers with pdfmark specials}
 %
 % \subsubsection{Driver dvips}
-%
+% The dvips driver uses PSfile to include the bookmark to resolve a
+% clash with pgf, see
+% https://github.com/pgf-tikz/pgf/issues/944\#issuecomment-723099952
 %    \begin{macrocode}
 %<*dvips>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{bkm-dvips.def}%
-  [2020-11-06 v1.29 bookmark driver for dvips (HO)]%
+  [2023-12-05 v1.30 bookmark driver for dvips (HO)]%
 %    \end{macrocode}
 %    \begin{macro}{\BKM at PSHeaderFile}
 %    \begin{macrocode}
@@ -2851,7 +2899,6 @@
 %    \begin{macro}{\BKM at LuaTeX@InitFile}
 %    \begin{macrocode}
 \ifluatex
-  \ifnum\luatexversion>36 %
     \def\BKM at LuaTeX@InitFile{%
       \begingroup
         \ltx at LocToksA={}%
@@ -2866,9 +2913,6 @@
         }%
       }\x
     }%
-  \else
-    \let\BKM at LuaTeX@InitFile\relax
-  \fi
 \else
   \let\BKM at LuaTeX@InitFile\relax
 \fi
@@ -2950,7 +2994,7 @@
 %    (which is equivalent to the previously used
 %    \cs{AfterLastShipout} of \xpackage{atveryend}'s),
 %    because it still needs the \xext{aux} file. It uses
-%    uses \cs{pdfoutline} for the bookmakrs that can  be used after the last page.
+%    \cs{pdfoutline} for the bookmarks that can  be used after the last page.
 %    \begin{itemize}
 %    \item
 %      Driver \xoption{pdftex} uses \cs{pdfoutline} that can
@@ -2997,27 +3041,6 @@
 % \item[\CTAN{macros/latex/contrib/bookmark/bookmark.pdf}] Documentation.
 % \end{description}
 %
-%
-% \paragraph{Bundle.} All the packages of the bundle `bookmark'
-% are also available in a TDS compliant ZIP archive. There
-% the packages are already unpacked and the documentation files
-% are generated. The files and directories obey the TDS standard.
-% \begin{description}
-% \item[\CTANinstall{install/macros/latex/contrib/bookmark.tds.zip}]
-% \end{description}
-% \emph{TDS} refers to the standard ``A Directory Structure
-% for \TeX\ Files'' (\CTANpkg{tds}). Directories
-% with \xfile{texmf} in their name are usually organized this way.
-%
-% \subsection{Bundle installation}
-%
-% \paragraph{Unpacking.} Unpack the \xfile{bookmark.tds.zip} in the
-% TDS tree (also known as \xfile{texmf} tree) of your choice.
-% Example (linux):
-% \begin{quote}
-%   |unzip bookmark.tds.zip -d ~/texmf|
-% \end{quote}
-%
 % \subsection{Package installation}
 %
 % \paragraph{Unpacking.} The \xfile{.dtx} file is a self-extracting
@@ -3038,6 +3061,10 @@
 %   bkm-dvips.def & tex/latex/bookmark/bkm-dvips.def\\
 %   bkm-pdftex.def & tex/latex/bookmark/bkm-pdftex.def\\
 %   bkm-vtex.def & tex/latex/bookmark/bkm-vtex.def\\
+%   bkm-dvipdfm-2019-12-03.def & tex/latex/bookmark/bkm-dvipdfm-2019-12-03.def\\
+%   bkm-dvips-2019-12-03.def & tex/latex/bookmark/bkm-dvips-2019-12-03.def\\
+%   bkm-pdftex-2019-12-03.def & tex/latex/bookmark/bkm-pdftex-2019-12-03.def\\
+%   bkm-vtex-2019-12-03.def & tex/latex/bookmark/bkm-vtex-2019-12-03.def\\
 %   bookmark.pdf & doc/latex/bookmark/bookmark.pdf\\
 %   bookmark-example.tex & doc/latex/bookmark/bookmark-example.tex\\
 %   bookmark.dtx & source/latex/bookmark/bookmark.dtx\\
@@ -3387,6 +3414,11 @@
 %     and \cs{SpecialDvipdfmxOutlineOpen}. All dvipdfmx version should now support
 %     this out-of-the-box.
 %   \end{Version}
+%   \begin{Version}{2023-12-05 v1.30}
+%   \item Corrected support for option \xoption{bookmarkstype} of
+%   \xpackage{hyperref}, https://github.com/ho-tex/bookmark/issues/4
+%   \item Added support for structure destinations, https://github.com/ho-tex/bookmark/issues/7   
+%   \end{Version}
 % \end{History}
 %
 % \PrintIndex

Modified: trunk/Master/texmf-dist/tex/latex/bookmark/bkm-dvipdfm-2019-12-03.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/bookmark/bkm-dvipdfm-2019-12-03.def	2023-12-09 21:35:56 UTC (rev 69080)
+++ trunk/Master/texmf-dist/tex/latex/bookmark/bkm-dvipdfm-2019-12-03.def	2023-12-09 22:18:58 UTC (rev 69081)
@@ -9,11 +9,11 @@
 %% This is a generated file.
 %% 
 %% Project: bookmark
-%% Version: 2020-11-06 v1.29
+%% Version: 2023-12-05 v1.30
 %% 
 %% Copyright (C)
 %%    2007-2011 Heiko Oberdiek
-%%    2016-2020 Oberdiek Package Support Group
+%%    2016-2023 Oberdiek Package Support Group
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either
@@ -31,7 +31,6 @@
 %% Heiko Oberdiek and the Oberdiek Package Support Group
 %% https://github.com/ho-tex/bookmark/issues
 %% 
-%% 
 %% This work consists of the main source file bookmark.dtx and bookmark-frozen.dtx
 %% and the derived files
 %%    bookmark.sty, bookmark.pdf, bookmark.ins, bookmark.drv,

Modified: trunk/Master/texmf-dist/tex/latex/bookmark/bkm-dvipdfm.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/bookmark/bkm-dvipdfm.def	2023-12-09 21:35:56 UTC (rev 69080)
+++ trunk/Master/texmf-dist/tex/latex/bookmark/bkm-dvipdfm.def	2023-12-09 22:18:58 UTC (rev 69081)
@@ -9,11 +9,11 @@
 %% This is a generated file.
 %% 
 %% Project: bookmark
-%% Version: 2020-11-06 v1.29
+%% Version: 2023-12-05 v1.30
 %% 
 %% Copyright (C)
 %%    2007-2011 Heiko Oberdiek
-%%    2016-2020 Oberdiek Package Support Group
+%%    2016-2023 Oberdiek Package Support Group
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either
@@ -31,7 +31,6 @@
 %% Heiko Oberdiek and the Oberdiek Package Support Group
 %% https://github.com/ho-tex/bookmark/issues
 %% 
-%% 
 %% This work consists of the main source file bookmark.dtx and bookmark-frozen.dtx
 %% and the derived files
 %%    bookmark.sty, bookmark.pdf, bookmark.ins, bookmark.drv,
@@ -42,11 +41,22 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{bkm-dvipdfm.def}%
-  [2020-11-06 v1.29 bookmark driver for dvipdfm (HO)]%
+  [2023-12-05 v1.30 bookmark driver for dvipdfm (HO)]%
 \newcount\BKM at id
 \BKM at id=\z@
 \@namedef{BKM at 0}{000}
 \newif\ifBKM at sw
+\newcommand\BKM at struct@dest{}
+\ExplSyntaxOn
+\IfDocumentMetadataTF
+  {
+    \tag_if_active:T
+     {
+       \def\BKM at struct@dest{/SD~@pdf.SDest.\BKM at dest}
+     }
+
+  }{}
+\ExplSyntaxOff
 \newcommand*{\bookmark}[2][]{%
   \if at filesw
     \begingroup
@@ -119,6 +129,7 @@
             /A<<%
               /S/GoTo%
               /D(\BKM at dest)%
+              \BKM at struct@dest
             >>%
           }%
         \fi

Modified: trunk/Master/texmf-dist/tex/latex/bookmark/bkm-dvips-2019-12-03.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/bookmark/bkm-dvips-2019-12-03.def	2023-12-09 21:35:56 UTC (rev 69080)
+++ trunk/Master/texmf-dist/tex/latex/bookmark/bkm-dvips-2019-12-03.def	2023-12-09 22:18:58 UTC (rev 69081)
@@ -9,11 +9,11 @@
 %% This is a generated file.
 %% 
 %% Project: bookmark
-%% Version: 2020-11-06 v1.29
+%% Version: 2023-12-05 v1.30
 %% 
 %% Copyright (C)
 %%    2007-2011 Heiko Oberdiek
-%%    2016-2020 Oberdiek Package Support Group
+%%    2016-2023 Oberdiek Package Support Group
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either
@@ -31,7 +31,6 @@
 %% Heiko Oberdiek and the Oberdiek Package Support Group
 %% https://github.com/ho-tex/bookmark/issues
 %% 
-%% 
 %% This work consists of the main source file bookmark.dtx and bookmark-frozen.dtx
 %% and the derived files
 %%    bookmark.sty, bookmark.pdf, bookmark.ins, bookmark.drv,

Modified: trunk/Master/texmf-dist/tex/latex/bookmark/bkm-dvips.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/bookmark/bkm-dvips.def	2023-12-09 21:35:56 UTC (rev 69080)
+++ trunk/Master/texmf-dist/tex/latex/bookmark/bkm-dvips.def	2023-12-09 22:18:58 UTC (rev 69081)
@@ -9,11 +9,11 @@
 %% This is a generated file.
 %% 
 %% Project: bookmark
-%% Version: 2020-11-06 v1.29
+%% Version: 2023-12-05 v1.30
 %% 
 %% Copyright (C)
 %%    2007-2011 Heiko Oberdiek
-%%    2016-2020 Oberdiek Package Support Group
+%%    2016-2023 Oberdiek Package Support Group
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either
@@ -31,7 +31,6 @@
 %% Heiko Oberdiek and the Oberdiek Package Support Group
 %% https://github.com/ho-tex/bookmark/issues
 %% 
-%% 
 %% This work consists of the main source file bookmark.dtx and bookmark-frozen.dtx
 %% and the derived files
 %%    bookmark.sty, bookmark.pdf, bookmark.ins, bookmark.drv,
@@ -59,7 +58,7 @@
 }
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{bkm-dvips.def}%
-  [2020-11-06 v1.29 bookmark driver for dvips (HO)]%
+  [2023-12-05 v1.30 bookmark driver for dvips (HO)]%
 \def\BKM at PSHeaderFile#1{%
   \special{PSfile=#1}%
 }
@@ -309,7 +308,6 @@
   \fi
 }
 \ifluatex
-  \ifnum\luatexversion>36 %
     \def\BKM at LuaTeX@InitFile{%
       \begingroup
         \ltx at LocToksA={}%
@@ -324,9 +322,6 @@
         }%
       }\x
     }%
-  \else
-    \let\BKM at LuaTeX@InitFile\relax
-  \fi
 \else
   \let\BKM at LuaTeX@InitFile\relax
 \fi

Modified: trunk/Master/texmf-dist/tex/latex/bookmark/bkm-pdftex-2019-12-03.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/bookmark/bkm-pdftex-2019-12-03.def	2023-12-09 21:35:56 UTC (rev 69080)
+++ trunk/Master/texmf-dist/tex/latex/bookmark/bkm-pdftex-2019-12-03.def	2023-12-09 22:18:58 UTC (rev 69081)
@@ -9,11 +9,11 @@
 %% This is a generated file.
 %% 
 %% Project: bookmark
-%% Version: 2020-11-06 v1.29
+%% Version: 2023-12-05 v1.30
 %% 
 %% Copyright (C)
 %%    2007-2011 Heiko Oberdiek
-%%    2016-2020 Oberdiek Package Support Group
+%%    2016-2023 Oberdiek Package Support Group
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either
@@ -31,7 +31,6 @@
 %% Heiko Oberdiek and the Oberdiek Package Support Group
 %% https://github.com/ho-tex/bookmark/issues
 %% 
-%% 
 %% This work consists of the main source file bookmark.dtx and bookmark-frozen.dtx
 %% and the derived files
 %%    bookmark.sty, bookmark.pdf, bookmark.ins, bookmark.drv,

Modified: trunk/Master/texmf-dist/tex/latex/bookmark/bkm-pdftex.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/bookmark/bkm-pdftex.def	2023-12-09 21:35:56 UTC (rev 69080)
+++ trunk/Master/texmf-dist/tex/latex/bookmark/bkm-pdftex.def	2023-12-09 22:18:58 UTC (rev 69081)
@@ -9,11 +9,11 @@
 %% This is a generated file.
 %% 
 %% Project: bookmark
-%% Version: 2020-11-06 v1.29
+%% Version: 2023-12-05 v1.30
 %% 
 %% Copyright (C)
 %%    2007-2011 Heiko Oberdiek
-%%    2016-2020 Oberdiek Package Support Group
+%%    2016-2023 Oberdiek Package Support Group
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either
@@ -31,7 +31,6 @@
 %% Heiko Oberdiek and the Oberdiek Package Support Group
 %% https://github.com/ho-tex/bookmark/issues
 %% 
-%% 
 %% This work consists of the main source file bookmark.dtx and bookmark-frozen.dtx
 %% and the derived files
 %%    bookmark.sty, bookmark.pdf, bookmark.ins, bookmark.drv,
@@ -42,7 +41,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{bkm-pdftex.def}%
-  [2020-11-06 v1.29 bookmark driver for pdfTeX (HO)]%
+  [2023-12-05 v1.30 bookmark driver for pdfTeX and luaTeX (HO)]%
 \def\BKM at DO@entry#1#2{%
   \begingroup
     \kvsetkeys{BKM at DO}{#1}%
@@ -142,10 +141,23 @@
                 {\BKM at DO@title}%
   \endgroup
 }
-\def\BKM at DefGotoNameAction#1#2{%
-  \BKM at EscapeString\BKM at DO@dest
-  \edef#1{goto name{#2}}%
-}
+  \def\BKM at DefGotoNameAction#1#2{%
+    \BKM at EscapeString\BKM at DO@dest
+    \edef#1{goto name{#2}}%
+   }
+\ExplSyntaxOn
+\IfDocumentMetadataTF
+ {
+   \tag_if_active:T
+     {
+       \def\BKM at DefGotoNameAction#1#2
+        {
+         \BKM at EscapeString\BKM at DO@dest
+         \edef#1{goto~struct~name~{#2}~name~{#2}}%
+        }
+     }
+ }{}
+\ExplSyntaxOff
 \def\BKM at SourceLocation{%
   \ifx\BKM at DO@srcfile\@empty
     \ifx\BKM at DO@srcline\@empty
@@ -263,7 +275,6 @@
   \fi
 }
 \ifluatex
-  \ifnum\luatexversion>36 %
     \def\BKM at LuaTeX@InitFile{%
       \begingroup
         \ltx at LocToksA={}%
@@ -278,9 +289,6 @@
         }%
       }\x
     }%
-  \else
-    \let\BKM at LuaTeX@InitFile\relax
-  \fi
 \else
   \let\BKM at LuaTeX@InitFile\relax
 \fi

Modified: trunk/Master/texmf-dist/tex/latex/bookmark/bkm-vtex-2019-12-03.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/bookmark/bkm-vtex-2019-12-03.def	2023-12-09 21:35:56 UTC (rev 69080)
+++ trunk/Master/texmf-dist/tex/latex/bookmark/bkm-vtex-2019-12-03.def	2023-12-09 22:18:58 UTC (rev 69081)
@@ -9,11 +9,11 @@
 %% This is a generated file.
 %% 
 %% Project: bookmark
-%% Version: 2020-11-06 v1.29
+%% Version: 2023-12-05 v1.30
 %% 
 %% Copyright (C)
 %%    2007-2011 Heiko Oberdiek
-%%    2016-2020 Oberdiek Package Support Group
+%%    2016-2023 Oberdiek Package Support Group
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either
@@ -31,7 +31,6 @@
 %% Heiko Oberdiek and the Oberdiek Package Support Group
 %% https://github.com/ho-tex/bookmark/issues
 %% 
-%% 
 %% This work consists of the main source file bookmark.dtx and bookmark-frozen.dtx
 %% and the derived files
 %%    bookmark.sty, bookmark.pdf, bookmark.ins, bookmark.drv,

Modified: trunk/Master/texmf-dist/tex/latex/bookmark/bkm-vtex.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/bookmark/bkm-vtex.def	2023-12-09 21:35:56 UTC (rev 69080)
+++ trunk/Master/texmf-dist/tex/latex/bookmark/bkm-vtex.def	2023-12-09 22:18:58 UTC (rev 69081)
@@ -9,11 +9,11 @@
 %% This is a generated file.
 %% 
 %% Project: bookmark
-%% Version: 2020-11-06 v1.29
+%% Version: 2023-12-05 v1.30
 %% 
 %% Copyright (C)
 %%    2007-2011 Heiko Oberdiek
-%%    2016-2020 Oberdiek Package Support Group
+%%    2016-2023 Oberdiek Package Support Group
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either
@@ -31,7 +31,6 @@
 %% Heiko Oberdiek and the Oberdiek Package Support Group
 %% https://github.com/ho-tex/bookmark/issues
 %% 
-%% 
 %% This work consists of the main source file bookmark.dtx and bookmark-frozen.dtx
 %% and the derived files
 %%    bookmark.sty, bookmark.pdf, bookmark.ins, bookmark.drv,
@@ -42,7 +41,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{bkm-vtex.def}%
-  [2020-11-06 v1.29 bookmark driver for VTeX (HO)]%
+  [2023-12-05 v1.30 bookmark driver for VTeX (HO)]%
 \ifvtexpdf
 \else
   \PackageWarningNoLine{bookmark}{%

Modified: trunk/Master/texmf-dist/tex/latex/bookmark/bookmark.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/bookmark/bookmark.sty	2023-12-09 21:35:56 UTC (rev 69080)
+++ trunk/Master/texmf-dist/tex/latex/bookmark/bookmark.sty	2023-12-09 22:18:58 UTC (rev 69081)
@@ -9,11 +9,11 @@
 %% This is a generated file.
 %% 
 %% Project: bookmark
-%% Version: 2020-11-06 v1.29
+%% Version: 2023-12-05 v1.30
 %% 
 %% Copyright (C)
 %%    2007-2011 Heiko Oberdiek
-%%    2016-2020 Oberdiek Package Support Group
+%%    2016-2023 Oberdiek Package Support Group
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either
@@ -31,7 +31,6 @@
 %% Heiko Oberdiek and the Oberdiek Package Support Group
 %% https://github.com/ho-tex/bookmark/issues
 %% 
-%% 
 %% This work consists of the main source file bookmark.dtx and bookmark-frozen.dtx
 %% and the derived files
 %%    bookmark.sty, bookmark.pdf, bookmark.ins, bookmark.drv,
@@ -42,7 +41,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{bookmark}%
-  [2020-11-06 v1.29 PDF bookmarks (HO)]%
+  [2023-12-05 v1.30 PDF bookmarks (HO)]%
 \begingroup\expandafter\expandafter\expandafter\endgroup
 \expandafter\ifx\csname numexpr\endcsname\relax
   \def\BKM at CalcExpr#1#2#3#4{%
@@ -700,7 +699,7 @@
 \def\Hy at writebookmark#1#2#3#4#5{%
   \ifnum#4>\BKM at depth\relax
   \else
-    \def\BKM at type{#5}%
+    \edef\BKM at type{#5}%
     \ifx\BKM at type\Hy at bookmarkstype
       \begingroup
         \ifBKM at numbered

Modified: trunk/Master/tlpkg/libexec/ctan2tds
===================================================================
--- trunk/Master/tlpkg/libexec/ctan2tds	2023-12-09 21:35:56 UTC (rev 69080)
+++ trunk/Master/tlpkg/libexec/ctan2tds	2023-12-09 22:18:58 UTC (rev 69081)
@@ -3209,6 +3209,7 @@
  'bguq'         => 'latex',  # requires interaction
  'bhcexam'      => 'latex',  # requires interaction
  'bnumexpr'	=> 'etex',
+ 'bookmark'	=> "latex '\\let\\install=y\\input '",
  'bosisio'      => 'latex -translate-file=empty.tcx',   # ^^, no 8-bit
  'bullcntr'     => 'latex',  # requires interaction
  'canoniclayout'=> 'tex',
@@ -3933,6 +3934,7 @@
  'beebe'	=> '^([^bt].*|bibmods|bibunits)\.sty$|(gut.*|komoedie|litprog|sgml.*)\.bib$|\.ltx$',	# omit some bibs and support files
  'bibleref'	=> $standardclean . '|sample.tex|sample-.*', # derived uploaded
  'bbm-macros'   => $standardclean . '|^bbm$',           # symlink
+ 'bookmark'	=> $standardclean . '|\.(drv|ins)$',	# strays
  'bundledoc'    => $standardclean . '|\.pdf$',          # regen for a4
  'catoptions'   => $standardclean . '|Thumbs.db',       # bogus file
  'chklref'	=> $standardclean . '|\.tds\.zip',



More information about the tex-live-commits mailing list.