diff options
Diffstat (limited to 'Master/texmf-dist/tex')
| -rw-r--r-- | Master/texmf-dist/tex/latex/bookmark/bkm-dvipdfm-2019-12-03.def | 191 | ||||
| -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 (renamed from Master/texmf-dist/tex/latex/bookmark/bkm-dvipsone.def) | 22 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/bookmark/bkm-dvips.def | 32 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/bookmark/bkm-pdftex-2019-12-03.def (renamed from Master/texmf-dist/tex/latex/bookmark/bkm-textures.def) | 165 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/bookmark/bkm-pdftex.def | 21 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/bookmark/bkm-vtex-2019-12-03.def | 300 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/bookmark/bkm-vtex.def | 16 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/bookmark/bookmark.sty | 45 |
9 files changed, 616 insertions, 195 deletions
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 new file mode 100644 index 00000000000..ad256b40fd5 --- /dev/null +++ b/Master/texmf-dist/tex/latex/bookmark/bkm-dvipdfm-2019-12-03.def @@ -0,0 +1,191 @@ +%% +%% This is file `bkm-dvipdfm-2019-12-03.def', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% bookmark-frozen.dtx (with options: `dvipdfmfrozen') +%% +%% This is a generated file. +%% +%% Project: bookmark +%% Version: 2020-11-06 v1.29 +%% +%% Copyright (C) +%% 2007-2011 Heiko Oberdiek +%% 2016-2020 Oberdiek Package Support Group +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either +%% version 1.3c of this license or (at your option) any later +%% version. This version of this license is in +%% https://www.latex-project.org/lppl/lppl-1-3c.txt +%% and the latest version of this license is in +%% https://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of +%% LaTeX version 2005/12/01 or later. +%% +%% This work has the LPPL maintenance status "maintained". +%% +%% The Current Maintainers of this work are +%% 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, +%% bkm-dvipdfm.def, bkm-dvips.def, bkm-pdftex.def, bkm-vtex.def, +%% bkm-dvipdfm-2019-12-03.def, bkm-dvips-2019-12-03.def, +%% bkm-pdftex-2019-12-03.def, bkm-vtex-2019-12-03.def, +%% bookmark-example.tex. +%% +\NeedsTeXFormat{LaTeX2e} +\ProvidesFile{bkm-dvipdfm.def}% + [2019/12/03 v1.28 bookmark driver for dvipdfm (HO)]% +\newcount\BKM@id +\BKM@id=\z@ +\@namedef{BKM@0}{000} +\newif\ifBKM@sw +\newcommand*{\bookmark}[2][]{% + \if@filesw + \begingroup + \def\bookmark@text{#2}% + \BKM@setup{#1}% + \edef\BKM@prev{\the\BKM@id}% + \global\advance\BKM@id\@ne + \BKM@swtrue + \@whilesw\ifBKM@sw\fi{% + \def\BKM@abslevel{1}% + \ifnum\ifBKM@startatroot\z@\else\BKM@prev\fi=\z@ + \BKM@startatrootfalse + \expandafter\xdef\csname BKM@\the\BKM@id\endcsname{% + 0{\BKM@level}\BKM@abslevel + }% + \BKM@swfalse + \else + \expandafter\expandafter\expandafter\BKM@getx + \csname BKM@\BKM@prev\endcsname + \ifnum\BKM@level>\BKM@x@level\relax + \BKM@CalcExpr\BKM@abslevel\BKM@x@abslevel+1% + \expandafter\xdef\csname BKM@\the\BKM@id\endcsname{% + {\BKM@prev}{\BKM@level}\BKM@abslevel + }% + \BKM@swfalse + \else + \let\BKM@prev\BKM@x@parent + \fi + \fi + }% + \csname HyPsd@XeTeXBigCharstrue\endcsname + \pdfstringdef\BKM@title{\bookmark@text}% + \edef\BKM@FLAGS{\BKM@PrintStyle}% + \let\BKM@action\@empty + \ifx\BKM@gotor\@empty + \ifx\BKM@dest\@empty + \ifx\BKM@named\@empty + \ifx\BKM@rawaction\@empty + \ifx\BKM@uri\@empty + \ifx\BKM@page\@empty + \PackageError{bookmark}{Missing action}\@ehc + \edef\BKM@action{/Dest[@page1/Fit]}% + \else + \ifx\BKM@view\@empty + \def\BKM@view{Fit}% + \fi + \edef\BKM@action{/Dest[@page\BKM@page/\BKM@view]}% + \fi + \else + \BKM@EscapeString\BKM@uri + \edef\BKM@action{% + /A<<% + /S/URI% + /URI(\BKM@uri)% + >>% + }% + \fi + \else + \edef\BKM@action{/A<<\BKM@rawaction>>}% + \fi + \else + \BKM@EscapeName\BKM@named + \edef\BKM@action{% + /A<</S/Named/N/\BKM@named>>% + }% + \fi + \else + \BKM@EscapeString\BKM@dest + \edef\BKM@action{% + /A<<% + /S/GoTo% + /D(\BKM@dest)% + >>% + }% + \fi + \else + \ifx\BKM@dest\@empty + \ifx\BKM@page\@empty + \def\BKM@page{0}% + \else + \BKM@CalcExpr\BKM@page\BKM@page-1% + \fi + \ifx\BKM@view\@empty + \def\BKM@view{Fit}% + \fi + \edef\BKM@action{/D[\BKM@page/\BKM@view]}% + \else + \BKM@EscapeString\BKM@dest + \edef\BKM@action{/D(\BKM@dest)}% + \fi + \BKM@EscapeString\BKM@gotor + \edef\BKM@action{% + /A<<% + /S/GoToR% + /F(\BKM@gotor)% + \BKM@action + >>% + }% + \fi + \special{pdf:% + out \ifBKM@DvipdfmxOutlineOpen + [% + \ifBKM@open + \ifnum\BKM@level<% + \expandafter\ltx@firstofone\expandafter + {\number\BKM@openlevel} % + \else + -% + \fi + \else + -% + \fi + ] % + \fi + \BKM@abslevel + <<% + /Title(\BKM@title)% + \ifx\BKM@color\@empty + \else + /C[\BKM@color]% + \fi + \ifnum\BKM@FLAGS>\z@ + /F \BKM@FLAGS + \fi + \BKM@action + >>% + }% + \endgroup + \fi +} +\def\BKM@getx#1#2#3{% + \def\BKM@x@parent{#1}% + \def\BKM@x@level{#2}% + \def\BKM@x@abslevel{#3}% +} +\ifBKM@atend + \RequirePackage{atenddvi}% + \AtEndDvi{\BKM@EndHook}% +\fi +\endinput +%% +%% End of file `bkm-dvipdfm-2019-12-03.def'. diff --git a/Master/texmf-dist/tex/latex/bookmark/bkm-dvipdfm.def b/Master/texmf-dist/tex/latex/bookmark/bkm-dvipdfm.def index 9f0be1f7f8e..a57fddacfad 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: 2019/12/03 v1.28 +%% Version: 2020-11-06 v1.29 %% %% Copyright (C) %% 2007-2011 Heiko Oberdiek -%% 2016-2019 Oberdiek Package Support Group +%% 2016-2020 Oberdiek Package Support Group %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either @@ -32,16 +32,17 @@ %% https://github.com/ho-tex/bookmark/issues %% %% -%% This work consists of the main source file bookmark.dtx +%% 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, -%% bkm-dvipdfm.def, bkm-dvips.def, bkm-dvipsone.def, -%% bkm-textures.def, bkm-pdftex.def, bkm-vtex.def, +%% bkm-dvipdfm.def, bkm-dvips.def, bkm-pdftex.def, bkm-vtex.def, +%% bkm-dvipdfm-2019-12-03.def, bkm-dvips-2019-12-03.def, +%% bkm-pdftex-2019-12-03.def, bkm-vtex-2019-12-03.def, %% bookmark-example.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesFile{bkm-dvipdfm.def}% - [2019/12/03 v1.28 bookmark driver for dvipdfm (HO)]% + [2020-11-06 v1.29 bookmark driver for dvipdfm (HO)]% \newcount\BKM@id \BKM@id=\z@ \@namedef{BKM@0}{000} @@ -146,7 +147,7 @@ }% \fi \special{pdf:% - out \ifBKM@DvipdfmxOutlineOpen + out [% \ifBKM@open \ifnum\BKM@level<% @@ -159,7 +160,6 @@ -% \fi ] % - \fi \BKM@abslevel <<% /Title(\BKM@title)% @@ -182,8 +182,7 @@ \def\BKM@x@abslevel{#3}% } \ifBKM@atend - \RequirePackage{atenddvi}% - \AtEndDvi{\BKM@EndHook}% + \AddToHook{shipout/lastpage}{\BKM@EndHook}% \fi \endinput diff --git a/Master/texmf-dist/tex/latex/bookmark/bkm-dvipsone.def b/Master/texmf-dist/tex/latex/bookmark/bkm-dvips-2019-12-03.def index 2e075100348..a0556864b86 100644 --- a/Master/texmf-dist/tex/latex/bookmark/bkm-dvipsone.def +++ b/Master/texmf-dist/tex/latex/bookmark/bkm-dvips-2019-12-03.def @@ -1,19 +1,19 @@ %% -%% This is file `bkm-dvipsone.def', +%% This is file `bkm-dvips-2019-12-03.def', %% generated with the docstrip utility. %% %% The original source files were: %% -%% bookmark.dtx (with options: `dvipsone,pdfmark') +%% bookmark-frozen.dtx (with options: `dvipsfrozen') %% %% This is a generated file. %% %% Project: bookmark -%% Version: 2019/12/03 v1.28 +%% Version: 2020-11-06 v1.29 %% %% Copyright (C) %% 2007-2011 Heiko Oberdiek -%% 2016-2019 Oberdiek Package Support Group +%% 2016-2020 Oberdiek Package Support Group %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either @@ -32,11 +32,12 @@ %% https://github.com/ho-tex/bookmark/issues %% %% -%% This work consists of the main source file bookmark.dtx +%% 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, -%% bkm-dvipdfm.def, bkm-dvips.def, bkm-dvipsone.def, -%% bkm-textures.def, bkm-pdftex.def, bkm-vtex.def, +%% bkm-dvipdfm.def, bkm-dvips.def, bkm-pdftex.def, bkm-vtex.def, +%% bkm-dvipdfm-2019-12-03.def, bkm-dvips-2019-12-03.def, +%% bkm-pdftex-2019-12-03.def, bkm-vtex-2019-12-03.def, %% bookmark-example.tex. %% \def\BKM@SourceLocation{% @@ -57,8 +58,8 @@ \fi } \NeedsTeXFormat{LaTeX2e} -\ProvidesFile{bkm-dvipsone.def}% - [2019/12/03 v1.28 bookmark driver for dvipsone (HO)]% +\ProvidesFile{bkm-dvips.def}% + [2019/12/03 v1.28 bookmark driver for dvips (HO)]% \def\BKM@PSHeaderFile#1{% \special{header=#1}% } @@ -352,7 +353,6 @@ \BKM@EndHook }% \fi - \endinput %% -%% End of file `bkm-dvipsone.def'. +%% End of file `bkm-dvips-2019-12-03.def'. diff --git a/Master/texmf-dist/tex/latex/bookmark/bkm-dvips.def b/Master/texmf-dist/tex/latex/bookmark/bkm-dvips.def index 2d1d697b0b2..87384f54ac9 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: 2019/12/03 v1.28 +%% Version: 2020-11-06 v1.29 %% %% Copyright (C) %% 2007-2011 Heiko Oberdiek -%% 2016-2019 Oberdiek Package Support Group +%% 2016-2020 Oberdiek Package Support Group %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either @@ -32,11 +32,12 @@ %% https://github.com/ho-tex/bookmark/issues %% %% -%% This work consists of the main source file bookmark.dtx +%% 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, -%% bkm-dvipdfm.def, bkm-dvips.def, bkm-dvipsone.def, -%% bkm-textures.def, bkm-pdftex.def, bkm-vtex.def, +%% bkm-dvipdfm.def, bkm-dvips.def, bkm-pdftex.def, bkm-vtex.def, +%% bkm-dvipdfm-2019-12-03.def, bkm-dvips-2019-12-03.def, +%% bkm-pdftex-2019-12-03.def, bkm-vtex-2019-12-03.def, %% bookmark-example.tex. %% \def\BKM@SourceLocation{% @@ -58,14 +59,15 @@ } \NeedsTeXFormat{LaTeX2e} \ProvidesFile{bkm-dvips.def}% - [2019/12/03 v1.28 bookmark driver for dvips (HO)]% + [2020-11-06 v1.29 bookmark driver for dvips (HO)]% \def\BKM@PSHeaderFile#1{% - \special{header=#1}% + \special{PSfile=#1}% } \def\BKM@filename{\jobname.out.ps} -\BKM@PSHeaderFile\BKM@filename -\RequirePackage{atveryend}[2009/12/07] -\AfterLastShipout{\BKM@pdfmark@out} +\AddToHook{shipout/lastpage}{% + \BKM@pdfmark@out + \BKM@PSHeaderFile\BKM@filename + } \def\BKM@pdfmark@out{% \if@filesw \newwrite\BKM@file @@ -207,10 +209,8 @@ \BKM@write{/OUT pdfmark}% \endgroup } -\RequirePackage{auxhook} -\AddLineBeginMainAux{% - \string\providecommand\string\BKM@entry[2]{}% -} +\AddToHook{begindocument}{% + \immediate\write\@mainaux{\string\providecommand\string\BKM@entry[2]{}}} \newcount\BKM@id \BKM@id=\z@ \@namedef{BKM@0}{000} @@ -348,9 +348,7 @@ \let\BKM@entry\BKM@DO@entry } \ifBKM@atend - \AfterLastShipout{% - \BKM@EndHook - }% + \AddToHook{shipout/lastpage}{\BKM@EndHook}% \fi \endinput diff --git a/Master/texmf-dist/tex/latex/bookmark/bkm-textures.def b/Master/texmf-dist/tex/latex/bookmark/bkm-pdftex-2019-12-03.def index 770ec109756..0bc80576fc7 100644 --- a/Master/texmf-dist/tex/latex/bookmark/bkm-textures.def +++ b/Master/texmf-dist/tex/latex/bookmark/bkm-pdftex-2019-12-03.def @@ -1,19 +1,19 @@ %% -%% This is file `bkm-textures.def', +%% This is file `bkm-pdftex-2019-12-03.def', %% generated with the docstrip utility. %% %% The original source files were: %% -%% bookmark.dtx (with options: `textures,pdfmark') +%% bookmark-frozen.dtx (with options: `pdftexfrozen') %% %% This is a generated file. %% %% Project: bookmark -%% Version: 2019/12/03 v1.28 +%% Version: 2020-11-06 v1.29 %% %% Copyright (C) %% 2007-2011 Heiko Oberdiek -%% 2016-2019 Oberdiek Package Support Group +%% 2016-2020 Oberdiek Package Support Group %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either @@ -32,69 +32,25 @@ %% https://github.com/ho-tex/bookmark/issues %% %% -%% This work consists of the main source file bookmark.dtx +%% 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, -%% bkm-dvipdfm.def, bkm-dvips.def, bkm-dvipsone.def, -%% bkm-textures.def, bkm-pdftex.def, bkm-vtex.def, +%% bkm-dvipdfm.def, bkm-dvips.def, bkm-pdftex.def, bkm-vtex.def, +%% bkm-dvipdfm-2019-12-03.def, bkm-dvips-2019-12-03.def, +%% bkm-pdftex-2019-12-03.def, bkm-vtex-2019-12-03.def, %% bookmark-example.tex. %% -\def\BKM@SourceLocation{% - \ifx\BKM@DO@srcfile\@empty - \ifx\BKM@DO@srcline\@empty - \else - .\MessageBreak - Source: line \BKM@DO@srcline - \fi - \else - \ifx\BKM@DO@srcline\@empty - .\MessageBreak - Source: file `\BKM@DO@srcfile'% - \else - .\MessageBreak - Source: file `\BKM@DO@srcfile', line \BKM@DO@srcline - \fi - \fi -} \NeedsTeXFormat{LaTeX2e} -\ProvidesFile{bkm-textures.def}% - [2019/12/03 v1.28 bookmark driver for textures (HO)]% -\def\BKM@PSHeaderFile#1{% - \special{prePostScriptfile #1}% -} -\def\BKM@filename{\jobname.out.ps} -\BKM@PSHeaderFile\BKM@filename -\RequirePackage{atveryend}[2009/12/07] -\AfterLastShipout{\BKM@pdfmark@out} -\def\BKM@pdfmark@out{% - \if@filesw - \newwrite\BKM@file - \immediate\openout\BKM@file=\BKM@filename\relax - \BKM@write{\@percentchar!}% - \BKM@write{/pdfmark where{pop}}% - \BKM@write{% - {% - /globaldict where{pop globaldict}{userdict}ifelse% - /pdfmark/cleartomark load put% - }% - }% - \BKM@write{ifelse}% - \else - \let\BKM@write\@gobble - \let\BKM@DO@entry\@gobbletwo - \fi -} -\def\BKM@write#{% - \immediate\write\BKM@file -} +\ProvidesFile{bkm-pdftex.def}% + [2019/12/03 v1.28 bookmark driver for pdfTeX (HO)]% \def\BKM@DO@entry#1#2{% \begingroup \kvsetkeys{BKM@DO}{#1}% + \def\BKM@DO@title{#2}% \ifx\BKM@DO@srcfile\@empty \else \BKM@UnescapeHex\BKM@DO@srcfile \fi - \def\BKM@DO@title{#2}% \BKM@UnescapeHex\BKM@DO@title \expandafter\expandafter\expandafter\BKM@getx \csname BKM@\BKM@DO@id\endcsname\@empty\@empty @@ -107,6 +63,10 @@ \else \edef\BKM@attr{\BKM@attr/C[\BKM@DO@color]}% \fi + \ifx\BKM@attr\@empty + \else + \edef\BKM@attr{attr{\BKM@attr}}% + \fi \let\BKM@action\@empty \ifx\BKM@DO@gotor\@empty \ifx\BKM@DO@dest\@empty @@ -117,95 +77,91 @@ \PackageError{bookmark}{% Missing action\BKM@SourceLocation }\@ehc - \edef\BKM@action{% - /Action/GoTo% - /Page 1% - /View[/Fit]% - }% + \edef\BKM@action{goto page1{/Fit}}% \else \ifx\BKM@DO@view\@empty \def\BKM@DO@view{Fit}% \fi - \edef\BKM@action{% - /Action/GoTo% - /Page \BKM@DO@page - /View[/\BKM@DO@view]% - }% + \edef\BKM@action{goto page\BKM@DO@page{/\BKM@DO@view}}% \fi \else \BKM@UnescapeHex\BKM@DO@uri \BKM@EscapeString\BKM@DO@uri - \edef\BKM@action{% - /Action<<% - /Subtype/URI% - /URI(\BKM@DO@uri)% - >>% - }% + \edef\BKM@action{user{<</S/URI/URI(\BKM@DO@uri)>>}}% \fi \else \BKM@UnescapeHex\BKM@DO@rawaction \edef\BKM@action{% - /Action<<% - \BKM@DO@rawaction - >>% + user{% + <<% + \BKM@DO@rawaction + >>% + }% }% \fi \else \BKM@EscapeName\BKM@DO@named \edef\BKM@action{% - /Action<<% - /Subtype/Named% - /N/\BKM@DO@named - >>% + user{<</S/Named/N/\BKM@DO@named>>}% }% \fi \else \BKM@UnescapeHex\BKM@DO@dest - \BKM@EscapeString\BKM@DO@dest - \edef\BKM@action{% - /Action/GoTo% - /Dest(\BKM@DO@dest)cvn% - }% + \BKM@DefGotoNameAction\BKM@action\BKM@DO@dest \fi \else \ifx\BKM@DO@dest\@empty \ifx\BKM@DO@page\@empty - \def\BKM@DO@page{1}% + \def\BKM@DO@page{0}% + \else + \BKM@CalcExpr\BKM@DO@page\BKM@DO@page-1% \fi \ifx\BKM@DO@view\@empty \def\BKM@DO@view{Fit}% \fi - \edef\BKM@action{% - /Page \BKM@DO@page - /View[/\BKM@DO@view]% - }% + \edef\BKM@action{/D[\BKM@DO@page/\BKM@DO@view]}% \else \BKM@UnescapeHex\BKM@DO@dest \BKM@EscapeString\BKM@DO@dest - \edef\BKM@action{% - /Dest(\BKM@DO@dest)cvn% - }% + \edef\BKM@action{/D(\BKM@DO@dest)}% \fi \BKM@UnescapeHex\BKM@DO@gotor \BKM@EscapeString\BKM@DO@gotor \edef\BKM@action{% - /Action/GoToR% - /File(\BKM@DO@gotor)% - \BKM@action + user{% + <<% + /S/GoToR% + /F(\BKM@DO@gotor)% + \BKM@action + >>% + }% }% \fi - \BKM@write{[}% - \BKM@write{/Title(\BKM@DO@title)}% - \ifnum\BKM@x@childs>\z@ - \BKM@write{/Count \ifBKM@DO@open\else-\fi\BKM@x@childs}% + \pdfoutline\BKM@attr\BKM@action + count\ifBKM@DO@open\else-\fi\BKM@x@childs + {\BKM@DO@title}% + \endgroup +} +\def\BKM@DefGotoNameAction#1#2{% + \BKM@EscapeString\BKM@DO@dest + \edef#1{goto name{#2}}% +} +\def\BKM@SourceLocation{% + \ifx\BKM@DO@srcfile\@empty + \ifx\BKM@DO@srcline\@empty + \else + .\MessageBreak + Source: line \BKM@DO@srcline \fi - \ifx\BKM@attr\@empty + \else + \ifx\BKM@DO@srcline\@empty + .\MessageBreak + Source: file `\BKM@DO@srcfile'% \else - \BKM@write{\BKM@attr}% + .\MessageBreak + Source: file `\BKM@DO@srcfile', line \BKM@DO@srcline \fi - \BKM@write{\BKM@action}% - \BKM@write{/OUT pdfmark}% - \endgroup + \fi } \RequirePackage{auxhook} \AddLineBeginMainAux{% @@ -352,7 +308,6 @@ \BKM@EndHook }% \fi - \endinput %% -%% End of file `bkm-textures.def'. +%% End of file `bkm-pdftex-2019-12-03.def'. diff --git a/Master/texmf-dist/tex/latex/bookmark/bkm-pdftex.def b/Master/texmf-dist/tex/latex/bookmark/bkm-pdftex.def index d06474fb553..329a0dcfb5f 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: 2019/12/03 v1.28 +%% Version: 2020-11-06 v1.29 %% %% Copyright (C) %% 2007-2011 Heiko Oberdiek -%% 2016-2019 Oberdiek Package Support Group +%% 2016-2020 Oberdiek Package Support Group %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either @@ -32,16 +32,17 @@ %% https://github.com/ho-tex/bookmark/issues %% %% -%% This work consists of the main source file bookmark.dtx +%% 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, -%% bkm-dvipdfm.def, bkm-dvips.def, bkm-dvipsone.def, -%% bkm-textures.def, bkm-pdftex.def, bkm-vtex.def, +%% bkm-dvipdfm.def, bkm-dvips.def, bkm-pdftex.def, bkm-vtex.def, +%% bkm-dvipdfm-2019-12-03.def, bkm-dvips-2019-12-03.def, +%% bkm-pdftex-2019-12-03.def, bkm-vtex-2019-12-03.def, %% bookmark-example.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesFile{bkm-pdftex.def}% - [2019/12/03 v1.28 bookmark driver for pdfTeX (HO)]% + [2020-11-06 v1.29 bookmark driver for pdfTeX (HO)]% \def\BKM@DO@entry#1#2{% \begingroup \kvsetkeys{BKM@DO}{#1}% @@ -162,10 +163,8 @@ \fi \fi } -\RequirePackage{auxhook} -\AddLineBeginMainAux{% - \string\providecommand\string\BKM@entry[2]{}% -} +\AddToHook{begindocument}{% + \immediate\write\@mainaux{\string\providecommand\string\BKM@entry[2]{}}} \newcount\BKM@id \BKM@id=\z@ \@namedef{BKM@0}{000} @@ -303,7 +302,7 @@ \let\BKM@entry\BKM@DO@entry } \ifBKM@atend - \AfterLastShipout{% + \AddToHook{enddocument/afterlastpage}{% \BKM@EndHook }% \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 new file mode 100644 index 00000000000..cf50f6e70de --- /dev/null +++ b/Master/texmf-dist/tex/latex/bookmark/bkm-vtex-2019-12-03.def @@ -0,0 +1,300 @@ +%% +%% This is file `bkm-vtex-2019-12-03.def', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% bookmark-frozen.dtx (with options: `vtexfrozen') +%% +%% This is a generated file. +%% +%% Project: bookmark +%% Version: 2020-11-06 v1.29 +%% +%% Copyright (C) +%% 2007-2011 Heiko Oberdiek +%% 2016-2020 Oberdiek Package Support Group +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either +%% version 1.3c of this license or (at your option) any later +%% version. This version of this license is in +%% https://www.latex-project.org/lppl/lppl-1-3c.txt +%% and the latest version of this license is in +%% https://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of +%% LaTeX version 2005/12/01 or later. +%% +%% This work has the LPPL maintenance status "maintained". +%% +%% The Current Maintainers of this work are +%% 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, +%% bkm-dvipdfm.def, bkm-dvips.def, bkm-pdftex.def, bkm-vtex.def, +%% bkm-dvipdfm-2019-12-03.def, bkm-dvips-2019-12-03.def, +%% bkm-pdftex-2019-12-03.def, bkm-vtex-2019-12-03.def, +%% bookmark-example.tex. +%% +\NeedsTeXFormat{LaTeX2e} +\ProvidesFile{bkm-vtex.def}% + [2019/12/03 v1.28 bookmark driver for VTeX (HO)]% +\ifvtexpdf +\else + \PackageWarningNoLine{bookmark}{% + The VTeX driver only supports PDF mode% + }% +\fi +\newcount\BKM@id +\BKM@id=\z@ +\@namedef{BKM@0}{00} +\newif\ifBKM@sw +\newcommand*{\bookmark}[2][]{% + \if@filesw + \begingroup + \def\bookmark@text{#2}% + \BKM@setup{#1}% + \edef\BKM@prev{\the\BKM@id}% + \global\advance\BKM@id\@ne + \BKM@swtrue + \@whilesw\ifBKM@sw\fi{% + \ifnum\ifBKM@startatroot\z@\else\BKM@prev\fi=\z@ + \BKM@startatrootfalse + \def\BKM@parent{0}% + \expandafter\xdef\csname BKM@\the\BKM@id\endcsname{% + 0{\BKM@level}% + }% + \BKM@swfalse + \else + \expandafter\expandafter\expandafter\BKM@getx + \csname BKM@\BKM@prev\endcsname + \ifnum\BKM@level>\BKM@x@level\relax + \let\BKM@parent\BKM@prev + \expandafter\xdef\csname BKM@\the\BKM@id\endcsname{% + {\BKM@prev}{\BKM@level}% + }% + \BKM@swfalse + \else + \let\BKM@prev\BKM@x@parent + \fi + \fi + }% + \pdfstringdef\BKM@title{\bookmark@text}% + \BKM@vtex@title + \edef\BKM@FLAGS{\BKM@PrintStyle}% + \let\BKM@action\@empty + \ifx\BKM@gotor\@empty + \ifx\BKM@dest\@empty + \ifx\BKM@named\@empty + \ifx\BKM@rawaction\@empty + \ifx\BKM@uri\@empty + \ifx\BKM@page\@empty + \PackageError{bookmark}{Missing action}\@ehc + \def\BKM@action{!1}% + \else + \edef\BKM@action{!\BKM@page}% + \fi + \else + \BKM@EscapeString\BKM@uri + \edef\BKM@action{% + <u=% + /S/URI% + /URI(\BKM@uri)% + >% + }% + \fi + \else + \edef\BKM@action{<u=\BKM@rawaction>}% + \fi + \else + \BKM@EscapeName\BKM@named + \edef\BKM@action{% + <u=% + /S/Named% + /N/\BKM@named + >% + }% + \fi + \else + \BKM@EscapeString\BKM@dest + \edef\BKM@action{\BKM@dest}% + \fi + \else + \ifx\BKM@dest\@empty + \ifx\BKM@page\@empty + \def\BKM@page{1}% + \fi + \ifx\BKM@view\@empty + \def\BKM@view{Fit}% + \fi + \edef\BKM@action{/D[\BKM@page/\BKM@view]}% + \else + \BKM@EscapeString\BKM@dest + \edef\BKM@action{/D(\BKM@dest)}% + \fi + \BKM@EscapeString\BKM@gotor + \edef\BKM@action{% + <u=% + /S/GoToR% + /F(\BKM@gotor)% + \BKM@action + >>% + }% + \fi + \ifx\BKM@color\@empty + \let\BKM@RGBcolor\@empty + \else + \expandafter\BKM@toRGB\BKM@color\@nil + \fi + \special{% + !outline \BKM@action;% + p=\BKM@parent,% + i=\number\BKM@id,% + s=% + \ifBKM@open + \ifnum\BKM@level<\BKM@openlevel + o% + \else + c% + \fi + \else + c% + \fi,% + \ifx\BKM@RGBcolor\@empty + \else + c=\BKM@RGBcolor,% + \fi + \ifnum\BKM@FLAGS>\z@ + f=\BKM@FLAGS,% + \fi + t=\BKM@title + }% + \endgroup + \fi +} +\def\BKM@getx#1#2{% + \def\BKM@x@parent{#1}% + \def\BKM@x@level{#2}% +} +\def\BKM@toRGB#1 #2 #3\@nil{% + \let\BKM@RGBcolor\@empty + \BKM@toRGBComponent{#1}% + \BKM@toRGBComponent{#2}% + \BKM@toRGBComponent{#3}% +} +\def\BKM@toRGBComponent#1{% + \dimen@=#1pt\relax + \ifdim\dimen@>\z@ + \ifdim\dimen@<\p@ + \dimen@=255\dimen@ + \advance\dimen@ by 32768sp\relax + \divide\dimen@ by 65536\relax + \dimen@ii=\dimen@ + \divide\dimen@ii by 16\relax + \edef\BKM@RGBcolor{% + \BKM@RGBcolor + \BKM@toHexDigit\dimen@ii + }% + \dimen@ii=16\dimen@ii + \advance\dimen@-\dimen@ii + \edef\BKM@RGBcolor{% + \BKM@RGBcolor + \BKM@toHexDigit\dimen@ + }% + \else + \edef\BKM@RGBcolor{\BKM@RGBcolor FF}% + \fi + \else + \edef\BKM@RGBcolor{\BKM@RGBcolor00}% + \fi +} +\def\BKM@toHexDigit#1{% + \ifcase\expandafter\@firstofone\expandafter{\number#1} % + 0\or 1\or 2\or 3\or 4\or 5\or 6\or 7\or + 8\or 9\or A\or B\or C\or D\or E\or F% + \fi +} +\begingroup + \catcode`\|=0 % + \catcode`\\=12 % + |gdef|BKM@vtex@title{% + |@onelevel@sanitize|BKM@title + |edef|BKM@title{|expandafter|BKM@vtex@leftparen|BKM@title\(|@nil}% + |edef|BKM@title{|expandafter|BKM@vtex@rightparen|BKM@title\)|@nil}% + |edef|BKM@title{|expandafter|BKM@vtex@zero|BKM@title\0|@nil}% + |edef|BKM@title{|expandafter|BKM@vtex@one|BKM@title\1|@nil}% + |edef|BKM@title{|expandafter|BKM@vtex@two|BKM@title\2|@nil}% + |edef|BKM@title{|expandafter|BKM@vtex@three|BKM@title\3|@nil}% + }% + |gdef|BKM@vtex@leftparen#1\(#2|@nil{% + #1% + |ifx||#2||% + |else + (% + |ltx@ReturnAfterFi{% + |BKM@vtex@leftparen#2|@nil + }% + |fi + }% + |gdef|BKM@vtex@rightparen#1\)#2|@nil{% + #1% + |ifx||#2||% + |else + )% + |ltx@ReturnAfterFi{% + |BKM@vtex@rightparen#2|@nil + }% + |fi + }% + |gdef|BKM@vtex@zero#1\0#2|@nil{% + #1% + |ifx||#2||% + |else + |noexpand|hv@pdf@char0% + |ltx@ReturnAfterFi{% + |BKM@vtex@zero#2|@nil + }% + |fi + }% + |gdef|BKM@vtex@one#1\1#2|@nil{% + #1% + |ifx||#2||% + |else + |noexpand|hv@pdf@char1% + |ltx@ReturnAfterFi{% + |BKM@vtex@one#2|@nil + }% + |fi + }% + |gdef|BKM@vtex@two#1\2#2|@nil{% + #1% + |ifx||#2||% + |else + |noexpand|hv@pdf@char2% + |ltx@ReturnAfterFi{% + |BKM@vtex@two#2|@nil + }% + |fi + }% + |gdef|BKM@vtex@three#1\3#2|@nil{% + #1% + |ifx||#2||% + |else + |noexpand|hv@pdf@char3% + |ltx@ReturnAfterFi{% + |BKM@vtex@three#2|@nil + }% + |fi + }% +|endgroup +\ifBKM@atend + \RequirePackage{atenddvi}% + \AtEndDvi{\BKM@EndHook}% +\fi +\endinput +%% +%% End of file `bkm-vtex-2019-12-03.def'. diff --git a/Master/texmf-dist/tex/latex/bookmark/bkm-vtex.def b/Master/texmf-dist/tex/latex/bookmark/bkm-vtex.def index ddb0cdf14c5..4e14e31c735 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: 2019/12/03 v1.28 +%% Version: 2020-11-06 v1.29 %% %% Copyright (C) %% 2007-2011 Heiko Oberdiek -%% 2016-2019 Oberdiek Package Support Group +%% 2016-2020 Oberdiek Package Support Group %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either @@ -32,16 +32,17 @@ %% https://github.com/ho-tex/bookmark/issues %% %% -%% This work consists of the main source file bookmark.dtx +%% 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, -%% bkm-dvipdfm.def, bkm-dvips.def, bkm-dvipsone.def, -%% bkm-textures.def, bkm-pdftex.def, bkm-vtex.def, +%% bkm-dvipdfm.def, bkm-dvips.def, bkm-pdftex.def, bkm-vtex.def, +%% bkm-dvipdfm-2019-12-03.def, bkm-dvips-2019-12-03.def, +%% bkm-pdftex-2019-12-03.def, bkm-vtex-2019-12-03.def, %% bookmark-example.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesFile{bkm-vtex.def}% - [2019/12/03 v1.28 bookmark driver for VTeX (HO)]% + [2020-11-06 v1.29 bookmark driver for VTeX (HO)]% \ifvtexpdf \else \PackageWarningNoLine{bookmark}{% @@ -291,8 +292,7 @@ }% |endgroup \ifBKM@atend - \RequirePackage{atenddvi}% - \AtEndDvi{\BKM@EndHook}% + \AddToHook{shipout/lastpage}{\BKM@EndHook}% \fi \endinput diff --git a/Master/texmf-dist/tex/latex/bookmark/bookmark.sty b/Master/texmf-dist/tex/latex/bookmark/bookmark.sty index 9b8e40ec642..7181bd2b6ed 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: 2019/12/03 v1.28 +%% Version: 2020-11-06 v1.29 %% %% Copyright (C) %% 2007-2011 Heiko Oberdiek -%% 2016-2019 Oberdiek Package Support Group +%% 2016-2020 Oberdiek Package Support Group %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either @@ -32,16 +32,17 @@ %% https://github.com/ho-tex/bookmark/issues %% %% -%% This work consists of the main source file bookmark.dtx +%% 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, -%% bkm-dvipdfm.def, bkm-dvips.def, bkm-dvipsone.def, -%% bkm-textures.def, bkm-pdftex.def, bkm-vtex.def, +%% bkm-dvipdfm.def, bkm-dvips.def, bkm-pdftex.def, bkm-vtex.def, +%% bkm-dvipdfm-2019-12-03.def, bkm-dvips-2019-12-03.def, +%% bkm-pdftex-2019-12-03.def, bkm-vtex-2019-12-03.def, %% bookmark-example.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{bookmark}% - [2019/12/03 v1.28 PDF bookmarks (HO)]% + [2020-11-06 v1.29 PDF bookmarks (HO)]% \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname numexpr\endcsname\relax \def\BKM@CalcExpr#1#2#3#4{% @@ -570,23 +571,13 @@ } \BKM@DefineDriverKey{pdftex} \BKM@DefineDriverKey{dvips} -\BKM@DefineDriverKey{dvipsone} -\BKM@DefineDriverKey{textures} \BKM@DefineDriverKey{dvipdfm} \BKM@DefineDriverKey{dvipdfmx} \BKM@DefineDriverKey{xetex} \BKM@DefineDriverKey{vtex} \define@key{BKM}{dvipdfmx-outline-open}[true]{% - \expandafter\ifx\csname if#1\expandafter\endcsname - \csname iftrue\endcsname - \chardef\SpecialDvipdfmxOutlineOpen\@ne - \else - \chardef\SpecialDvipdfmxOutlineOpen\z@ - \fi -} -\g@addto@macro\BKM@DisableOptions{% - \DisableKeyvalOption{BKM}{dvipdfmx-outline-open}% -} + \PackageWarning{bookmark}{Option 'dvipdfmx-outline-open' is obsolete + and ignored}{}} \def\bookmark@driver{\BKM@driver} \InputIfFileExists{bookmark.cfg}{}{} \providecommand*{\BookmarkDriverDefault}{dvips} @@ -627,20 +618,6 @@ \let\BKM@DefGotoNameAction\ltx@gobbletwo % package `hypdestopt' \expandafter\endinput \fi -\newif\ifBKM@DvipdfmxOutlineOpen -\ltx@IfUndefined{SpecialDvipdfmxOutlineOpen}{% - \ifxetex - \ifdim\number\XeTeXversion\XeTeXrevision in<0.9995in % - \else - \chardef\SpecialDvipdfmxOutlineOpen\ltx@one - \BKM@DvipdfmxOutlineOpentrue - \fi - \fi -}{% - \ifnum\SpecialDvipdfmxOutlineOpen>\z@ - \BKM@DvipdfmxOutlineOpentrue - \fi -} \def\BKM@temp{dvipdfmx}% \ifx\BKM@temp\BKM@driver \def\BKM@driver{dvipdfm}% @@ -694,6 +671,8 @@ \fi \fi \fi +\providecommand\IfFormatAtLeastTF{\@ifl@t@r\fmtversion} +\IfFormatAtLeastTF{2020/10/01}{}{\edef\BKM@driver{\BKM@driver-2019-12-03}} \InputIfFileExists{bkm-\BKM@driver.def}{}{% \PackageError{bookmark}{% Unsupported driver `\BKM@driver'.\MessageBreak @@ -735,7 +714,7 @@ \let\partnumberline\@gobble \let\chapternumberline\@gobble \fi - \bookmark[level=#4,dest={#3}]{#2}% + \bookmark[level=#4,dest={\HyperDestNameFilter{#3}}]{#2}% \endgroup \fi \fi |