diff options
author | Karl Berry <karl@freefriends.org> | 2023-12-09 22:18:58 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2023-12-09 22:18:58 +0000 |
commit | a9c1c1383048903d5aaf71ba170c3b4195235fb4 (patch) | |
tree | e22d315e280fd2818a6819fc5b4d9027ef8aecb1 | |
parent | e8df5e1620ae293f3bb069fe094017c9f7b473bc (diff) |
bookmark (9dec23)
git-svn-id: svn://tug.org/texlive/trunk@69081 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r-- | Master/texmf-dist/doc/latex/bookmark/README.md | 4 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/bookmark/bookmark-example.tex | 5 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/bookmark/bookmark.pdf | bin | 479157 -> 503992 bytes | |||
-rw-r--r-- | Master/texmf-dist/source/latex/bookmark/bookmark-frozen.dtx | 4 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/bookmark/bookmark.dtx | 124 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/bookmark/bkm-dvipdfm-2019-12-03.def | 5 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/bookmark/bkm-dvipdfm.def | 19 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/bookmark/bkm-dvips-2019-12-03.def | 5 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/bookmark/bkm-dvips.def | 11 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/bookmark/bkm-pdftex-2019-12-03.def | 5 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/bookmark/bkm-pdftex.def | 32 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/bookmark/bkm-vtex-2019-12-03.def | 5 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/bookmark/bkm-vtex.def | 7 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/bookmark/bookmark.sty | 9 | ||||
-rwxr-xr-x | Master/tlpkg/libexec/ctan2tds | 2 |
15 files changed, 139 insertions, 98 deletions
diff --git a/Master/texmf-dist/doc/latex/bookmark/README.md b/Master/texmf-dist/doc/latex/bookmark/README.md index 5e373e0e7cf..6c024a40fab 100644 --- a/Master/texmf-dist/doc/latex/bookmark/README.md +++ b/Master/texmf-dist/doc/latex/bookmark/README.md @@ -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 @@ Package hyperref uses two runs. ## 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. diff --git a/Master/texmf-dist/doc/latex/bookmark/bookmark-example.tex b/Master/texmf-dist/doc/latex/bookmark/bookmark-example.tex index 14137f03164..89de08eb631 100644 --- a/Master/texmf-dist/doc/latex/bookmark/bookmark-example.tex +++ b/Master/texmf-dist/doc/latex/bookmark/bookmark-example.tex @@ -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, diff --git a/Master/texmf-dist/doc/latex/bookmark/bookmark.pdf b/Master/texmf-dist/doc/latex/bookmark/bookmark.pdf Binary files differindex 75c9c98b244..a298e3e76c2 100644 --- a/Master/texmf-dist/doc/latex/bookmark/bookmark.pdf +++ b/Master/texmf-dist/doc/latex/bookmark/bookmark.pdf diff --git a/Master/texmf-dist/source/latex/bookmark/bookmark-frozen.dtx b/Master/texmf-dist/source/latex/bookmark/bookmark-frozen.dtx index bf4456829f3..0223846a14c 100644 --- a/Master/texmf-dist/source/latex/bookmark/bookmark-frozen.dtx +++ b/Master/texmf-dist/source/latex/bookmark/bookmark-frozen.dtx @@ -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 diff --git a/Master/texmf-dist/source/latex/bookmark/bookmark.dtx b/Master/texmf-dist/source/latex/bookmark/bookmark.dtx index c4431428b95..9ead2a0c9af 100644 --- a/Master/texmf-dist/source/latex/bookmark/bookmark.dtx +++ b/Master/texmf-dist/source/latex/bookmark/bookmark.dtx @@ -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 @@ and the derived files %<*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 @@ and the derived files % \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 @@ and the derived files % \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 @@ and the derived files % \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 @@ and the derived files % 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 @@ and the derived files %<*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 @@ and the derived files \def\Hy@writebookmark#1#2#3#4#5{% \ifnum#4>\BKM@depth\relax \else - \def\BKM@type{#5}% + \edef\BKM@type{#5}% \ifx\BKM@type\Hy@bookmarkstype \begingroup \ifBKM@numbered @@ -1853,7 +1864,7 @@ and the derived files %<*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@id} @@ -1873,6 +1884,23 @@ and the derived files \newif\ifBKM@sw % \end{macrocode} % \end{macro} +% +% \begin{macro}{\BKM@struct@dest} +% Support for structure destinations in the outline. +% \begin{macrocode} +\newcommand\BKM@struct@dest{} +\ExplSyntaxOn +\IfDocumentMetadataTF + { + \tag_if_active:T + { + \def\BKM@struct@dest{/SD~@pdf.SDest.\BKM@dest} + } + + }{} +\ExplSyntaxOff +% \end{macrocode} +% \end{macro} % % \begin{macro}{\bookmark} % \begin{macrocode} @@ -1948,6 +1976,7 @@ and the derived files /A<<% /S/GoTo% /D(\BKM@dest)% + \BKM@struct@dest >>% }% \fi @@ -2027,7 +2056,7 @@ and the derived files %<*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 @@ and the derived files %<*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@DO@entry} @@ -2468,10 +2497,27 @@ and the derived files % Macro \cs{BKM@DefGotoNameAction} is a hook for % package \xpackage{hypdestopt}. % \begin{macrocode} -\def\BKM@DefGotoNameAction#1#2{% - \BKM@EscapeString\BKM@DO@dest - \edef#1{goto name{#2}}% -} + \def\BKM@DefGotoNameAction#1#2{% + \BKM@EscapeString\BKM@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@DefGotoNameAction#1#2 + { + \BKM@EscapeString\BKM@DO@dest + \edef#1{goto~struct~name~{#2}~name~{#2}}% + } + } + }{} +\ExplSyntaxOff % \end{macrocode} % \end{macro} % \begin{macrocode} @@ -2509,12 +2555,14 @@ and the derived files % \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@PSHeaderFile} % \begin{macrocode} @@ -2851,7 +2899,6 @@ and the derived files % \begin{macro}{\BKM@LuaTeX@InitFile} % \begin{macrocode} \ifluatex - \ifnum\luatexversion>36 % \def\BKM@LuaTeX@InitFile{% \begingroup \ltx@LocToksA={}% @@ -2866,9 +2913,6 @@ and the derived files }% }\x }% - \else - \let\BKM@LuaTeX@InitFile\relax - \fi \else \let\BKM@LuaTeX@InitFile\relax \fi @@ -2950,7 +2994,7 @@ and the derived files % (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 @@ and the derived files % \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 @@ and the derived files % 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 the derived files % 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 diff --git a/Master/texmf-dist/tex/latex/bookmark/bkm-dvipdfm-2019-12-03.def b/Master/texmf-dist/tex/latex/bookmark/bkm-dvipdfm-2019-12-03.def index ad256b40fd5..f6cd631e85c 100644 --- a/Master/texmf-dist/tex/latex/bookmark/bkm-dvipdfm-2019-12-03.def +++ b/Master/texmf-dist/tex/latex/bookmark/bkm-dvipdfm-2019-12-03.def @@ -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, diff --git a/Master/texmf-dist/tex/latex/bookmark/bkm-dvipdfm.def b/Master/texmf-dist/tex/latex/bookmark/bkm-dvipdfm.def index a57fddacfad..6b9333dea95 100644 --- a/Master/texmf-dist/tex/latex/bookmark/bkm-dvipdfm.def +++ b/Master/texmf-dist/tex/latex/bookmark/bkm-dvipdfm.def @@ -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@id \BKM@id=\z@ \@namedef{BKM@0}{000} \newif\ifBKM@sw +\newcommand\BKM@struct@dest{} +\ExplSyntaxOn +\IfDocumentMetadataTF + { + \tag_if_active:T + { + \def\BKM@struct@dest{/SD~@pdf.SDest.\BKM@dest} + } + + }{} +\ExplSyntaxOff \newcommand*{\bookmark}[2][]{% \if@filesw \begingroup @@ -119,6 +129,7 @@ /A<<% /S/GoTo% /D(\BKM@dest)% + \BKM@struct@dest >>% }% \fi diff --git a/Master/texmf-dist/tex/latex/bookmark/bkm-dvips-2019-12-03.def b/Master/texmf-dist/tex/latex/bookmark/bkm-dvips-2019-12-03.def index a0556864b86..b28ab118d21 100644 --- a/Master/texmf-dist/tex/latex/bookmark/bkm-dvips-2019-12-03.def +++ b/Master/texmf-dist/tex/latex/bookmark/bkm-dvips-2019-12-03.def @@ -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, diff --git a/Master/texmf-dist/tex/latex/bookmark/bkm-dvips.def b/Master/texmf-dist/tex/latex/bookmark/bkm-dvips.def index 87384f54ac9..04f90c41018 100644 --- a/Master/texmf-dist/tex/latex/bookmark/bkm-dvips.def +++ b/Master/texmf-dist/tex/latex/bookmark/bkm-dvips.def @@ -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@PSHeaderFile#1{% \special{PSfile=#1}% } @@ -309,7 +308,6 @@ \fi } \ifluatex - \ifnum\luatexversion>36 % \def\BKM@LuaTeX@InitFile{% \begingroup \ltx@LocToksA={}% @@ -324,9 +322,6 @@ }% }\x }% - \else - \let\BKM@LuaTeX@InitFile\relax - \fi \else \let\BKM@LuaTeX@InitFile\relax \fi diff --git a/Master/texmf-dist/tex/latex/bookmark/bkm-pdftex-2019-12-03.def b/Master/texmf-dist/tex/latex/bookmark/bkm-pdftex-2019-12-03.def index 0bc80576fc7..361fe2ec38a 100644 --- a/Master/texmf-dist/tex/latex/bookmark/bkm-pdftex-2019-12-03.def +++ b/Master/texmf-dist/tex/latex/bookmark/bkm-pdftex-2019-12-03.def @@ -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, diff --git a/Master/texmf-dist/tex/latex/bookmark/bkm-pdftex.def b/Master/texmf-dist/tex/latex/bookmark/bkm-pdftex.def index 329a0dcfb5f..8447250968c 100644 --- a/Master/texmf-dist/tex/latex/bookmark/bkm-pdftex.def +++ b/Master/texmf-dist/tex/latex/bookmark/bkm-pdftex.def @@ -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@DO@entry#1#2{% \begingroup \kvsetkeys{BKM@DO}{#1}% @@ -142,10 +141,23 @@ {\BKM@DO@title}% \endgroup } -\def\BKM@DefGotoNameAction#1#2{% - \BKM@EscapeString\BKM@DO@dest - \edef#1{goto name{#2}}% -} + \def\BKM@DefGotoNameAction#1#2{% + \BKM@EscapeString\BKM@DO@dest + \edef#1{goto name{#2}}% + } +\ExplSyntaxOn +\IfDocumentMetadataTF + { + \tag_if_active:T + { + \def\BKM@DefGotoNameAction#1#2 + { + \BKM@EscapeString\BKM@DO@dest + \edef#1{goto~struct~name~{#2}~name~{#2}}% + } + } + }{} +\ExplSyntaxOff \def\BKM@SourceLocation{% \ifx\BKM@DO@srcfile\@empty \ifx\BKM@DO@srcline\@empty @@ -263,7 +275,6 @@ \fi } \ifluatex - \ifnum\luatexversion>36 % \def\BKM@LuaTeX@InitFile{% \begingroup \ltx@LocToksA={}% @@ -278,9 +289,6 @@ }% }\x }% - \else - \let\BKM@LuaTeX@InitFile\relax - \fi \else \let\BKM@LuaTeX@InitFile\relax \fi diff --git a/Master/texmf-dist/tex/latex/bookmark/bkm-vtex-2019-12-03.def b/Master/texmf-dist/tex/latex/bookmark/bkm-vtex-2019-12-03.def index cf50f6e70de..4b79f923cc1 100644 --- a/Master/texmf-dist/tex/latex/bookmark/bkm-vtex-2019-12-03.def +++ b/Master/texmf-dist/tex/latex/bookmark/bkm-vtex-2019-12-03.def @@ -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, diff --git a/Master/texmf-dist/tex/latex/bookmark/bkm-vtex.def b/Master/texmf-dist/tex/latex/bookmark/bkm-vtex.def index 4e14e31c735..63bb686a894 100644 --- a/Master/texmf-dist/tex/latex/bookmark/bkm-vtex.def +++ b/Master/texmf-dist/tex/latex/bookmark/bkm-vtex.def @@ -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}{% diff --git a/Master/texmf-dist/tex/latex/bookmark/bookmark.sty b/Master/texmf-dist/tex/latex/bookmark/bookmark.sty index 7181bd2b6ed..8efdce5e0f6 100644 --- a/Master/texmf-dist/tex/latex/bookmark/bookmark.sty +++ b/Master/texmf-dist/tex/latex/bookmark/bookmark.sty @@ -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@CalcExpr#1#2#3#4{% @@ -700,7 +699,7 @@ \def\Hy@writebookmark#1#2#3#4#5{% \ifnum#4>\BKM@depth\relax \else - \def\BKM@type{#5}% + \edef\BKM@type{#5}% \ifx\BKM@type\Hy@bookmarkstype \begingroup \ifBKM@numbered diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds index 74efdc337c7..7144dc9d551 100755 --- a/Master/tlpkg/libexec/ctan2tds +++ b/Master/tlpkg/libexec/ctan2tds @@ -3209,6 +3209,7 @@ my $core_latex = "$Master/texmf-dist/tex/latex"; '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 @@ $standardclean = '\.head|\.tmp|\.dvi|\.log|\.out|\.aux|\.toc|\.lof|\.lot' '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', |