From 0960f77acb96f54f4ed602653f196e696923ec66 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 4 Jul 2018 21:28:02 +0000 Subject: xbmks (4jul18) git-svn-id: svn://tug.org/texlive/trunk@48138 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/xbmks/README.md | 5 ++++- Master/texmf-dist/doc/latex/xbmks/docs/xbmks.pdf | Bin 107353 -> 109548 bytes .../texmf-dist/doc/latex/xbmks/docs/xbmksman.pdf | Bin 213144 -> 211396 bytes .../texmf-dist/doc/latex/xbmks/docs/xbmksman.tex | 3 +-- .../texmf-dist/doc/latex/xbmks/examples/doc1.pdf | Bin 32892 -> 18419 bytes .../texmf-dist/doc/latex/xbmks/examples/doc2.pdf | Bin 31324 -> 17032 bytes .../texmf-dist/doc/latex/xbmks/examples/master.pdf | Bin 47430 -> 23076 bytes .../doc/latex/xbmks/examples/stand-alone.tex | 4 ++++ Master/texmf-dist/source/latex/xbmks/xbmks.dtx | 23 +++++++++++++++------ Master/texmf-dist/source/latex/xbmks/xbmks.ins | 2 +- .../texmf-dist/tex/latex/xbmks/xbmks-pdfmark.def | 2 +- Master/texmf-dist/tex/latex/xbmks/xbmks-pdftex.def | 2 +- Master/texmf-dist/tex/latex/xbmks/xbmks-xetex.def | 2 +- Master/texmf-dist/tex/latex/xbmks/xbmks.sty | 11 +++++++--- 14 files changed, 38 insertions(+), 16 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/doc/latex/xbmks/README.md b/Master/texmf-dist/doc/latex/xbmks/README.md index c74431f82ef..507038dafbd 100644 --- a/Master/texmf-dist/doc/latex/xbmks/README.md +++ b/Master/texmf-dist/doc/latex/xbmks/README.md @@ -1,6 +1,6 @@ The xbmks Package Author: D. P. Story -Dated: 2018/06/25 +Dated: 2018/07/04 Short description: Create a cross-document bookmark tree. @@ -16,6 +16,9 @@ the bundle. PDF Creator: no restrictions, use dvips->distiller|ps2pdf, pdflatex, lualatex, or xelatex. +What's New (2018/07/04) Fixed a problem wherein the bookmarks do not appear +after an even number of compilations. + What's New (2018/06/25) Defined new commands for creating bookmarks for which arbitrary actions, color and style can be applied. These commands build on hyperref's bookmark commands. diff --git a/Master/texmf-dist/doc/latex/xbmks/docs/xbmks.pdf b/Master/texmf-dist/doc/latex/xbmks/docs/xbmks.pdf index 85e05e14400..c6dd8519514 100644 Binary files a/Master/texmf-dist/doc/latex/xbmks/docs/xbmks.pdf and b/Master/texmf-dist/doc/latex/xbmks/docs/xbmks.pdf differ diff --git a/Master/texmf-dist/doc/latex/xbmks/docs/xbmksman.pdf b/Master/texmf-dist/doc/latex/xbmks/docs/xbmksman.pdf index cfbd36a2e44..8ddd2dbe35d 100644 Binary files a/Master/texmf-dist/doc/latex/xbmks/docs/xbmksman.pdf and b/Master/texmf-dist/doc/latex/xbmks/docs/xbmksman.pdf differ diff --git a/Master/texmf-dist/doc/latex/xbmks/docs/xbmksman.tex b/Master/texmf-dist/doc/latex/xbmks/docs/xbmksman.tex index aadc17e76a5..cf2980683bd 100644 --- a/Master/texmf-dist/doc/latex/xbmks/docs/xbmksman.tex +++ b/Master/texmf-dist/doc/latex/xbmks/docs/xbmksman.tex @@ -18,7 +18,6 @@ \usepackage[altbullet]{lucidbry} \DeclareInitView{layoutmag={navitab:UseOutlines}} - \xbmksetup{colors={int=red},styles={intbf}} \addtolength{\marginparwidth}{20pt} @@ -64,7 +63,7 @@ email={dpstory@acrotex.net}, subject={Documentation for the xbmks package from AcroTeX: cross-document bookmarks}, talksite={\url{www.acrotex.net}}, - version={2.0.1, 2018/06/25}, + version={v2.0.2, 2018/07/04}, Keywords={AcroTeX, bookmarks, cross-document, document bundle}, copyrightStatus=True, copyrightNotice={Copyright (C) \the\year, D. P. Story}, diff --git a/Master/texmf-dist/doc/latex/xbmks/examples/doc1.pdf b/Master/texmf-dist/doc/latex/xbmks/examples/doc1.pdf index 77ef2e1ccc2..f975d83b0e4 100644 Binary files a/Master/texmf-dist/doc/latex/xbmks/examples/doc1.pdf and b/Master/texmf-dist/doc/latex/xbmks/examples/doc1.pdf differ diff --git a/Master/texmf-dist/doc/latex/xbmks/examples/doc2.pdf b/Master/texmf-dist/doc/latex/xbmks/examples/doc2.pdf index 8870ca29400..488cae0379f 100644 Binary files a/Master/texmf-dist/doc/latex/xbmks/examples/doc2.pdf and b/Master/texmf-dist/doc/latex/xbmks/examples/doc2.pdf differ diff --git a/Master/texmf-dist/doc/latex/xbmks/examples/master.pdf b/Master/texmf-dist/doc/latex/xbmks/examples/master.pdf index 433ff95ac33..dbc1ca04510 100644 Binary files a/Master/texmf-dist/doc/latex/xbmks/examples/master.pdf and b/Master/texmf-dist/doc/latex/xbmks/examples/master.pdf differ diff --git a/Master/texmf-dist/doc/latex/xbmks/examples/stand-alone.tex b/Master/texmf-dist/doc/latex/xbmks/examples/stand-alone.tex index 44cf83374d6..9751e99c225 100644 --- a/Master/texmf-dist/doc/latex/xbmks/examples/stand-alone.tex +++ b/Master/texmf-dist/doc/latex/xbmks/examples/stand-alone.tex @@ -16,6 +16,10 @@ \maketitle +\pdfbookmarkx[1]{http://blog.acrotex.net}[action={/S/URI/URI(http://blog.acrotex.net)},% + color=magenta,style={bf}]{blog} + + \section{Section One} When the \texttt{docbundle} key is either empty or is not present, \textsf{xbmks} sets its value diff --git a/Master/texmf-dist/source/latex/xbmks/xbmks.dtx b/Master/texmf-dist/source/latex/xbmks/xbmks.dtx index 63e4cfd8b3d..b2ed3074c1b 100644 --- a/Master/texmf-dist/source/latex/xbmks/xbmks.dtx +++ b/Master/texmf-dist/source/latex/xbmks/xbmks.dtx @@ -16,7 +16,7 @@ % %\NeedsTeXFormat{LaTeX2e}[1997/12/01] %\ProvidesPackage{xbmks} -% [2018/06/25 v2.0.1 xbmks: Cross-document bookmarks (dps)] +% [2018/07/04 v2.0.2 xbmks: Cross-document bookmarks (dps)] %<*driver> \documentclass{ltxdoc} \usepackage{xcolor} @@ -202,7 +202,11 @@ % We evaluate the values of \cs{xbmksetup} by getting the values of % the \texttt{xbmksetup} family. % \begin{macrocode} -\newcommand{\xbmksetup}[1]{\setkeys{xbmksetup}{#1}% +\newcommand{\xbmksetup}[1]{\setkeys{xbmksetup}{docbundle,#1}% +% \end{macrocode} +% \changes{v2.0.2}{2018/07/04}{Added an empty docbundle argument. This solves a problem +% that the bookmarks not appearing after an even number of compiles.} +% \begin{macrocode} \ifx\x@bmks@docs\@empty % \end{macrocode} % If there is no \texttt{docbundle} is specified, we use \cs{jobname} as its @@ -212,6 +216,7 @@ is empty,\MessageBreak I will give it a value of `\jobname',\MessageBreak in hopes this is your intention}% + \gdef\xbmk@cnt{1}% \def\xbmks@next{\write@xbmks@cfg{docbundle={\jobname},#1}}\else \def\xbmks@next{\write@xbmks@cfg{#1}}\fi\xbmks@next } @@ -224,7 +229,7 @@ \def\write@xbmks@cfg#1{% \newwrite\xbmks@setup \immediate\openout \xbmks@setup xbmks.cfg \set@display@protect - \immediate\write\xbmks@setup{\protect\xbmksetupi{#1}} + \immediate\write\xbmks@setup{\protect\xbmksetupi{#1}}% \set@typeset@protect \immediate\closeout\xbmks@setup } @@ -447,6 +452,12 @@ but it will have no associated action}}} % \end{macrocode} % \end{macro} +% \begin{macrocode} +\def\x@outWarningMsg{\PackageWarningNoLine{xbmks}{% +@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\MessageBreak +@@ Outline files were not input, compile again @@\MessageBreak +@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@}}% +% \end{macrocode} % These commands are implemented in the driver dependent sections. % \begin{macrocode} % End package @@ -495,7 +506,7 @@ \calc@bm@number{##5}% }% \let\nextAction\@gobbletwo - \InputIfFileExists{\xbmk@filename.out}{}{}% + \InputIfFileExists{\xbmk@filename.out}{}{\x@outWarningMsg}% \def\@@BOOKMARK[##1][##2]##3##4##5{% \def\Hy@temp{##4}% % \end{macrocode} @@ -603,7 +614,7 @@ \calc@bm@number{##5}% }% \let\nextAction\@gobbletwo - \InputIfFileExists{\xbmk@filename.out}{}{}% + \InputIfFileExists{\xbmk@filename.out}{}{\x@outWarningMsg}% \gdef\@@BOOKMARK[##1][##2]##3##4##5{% \def\Hy@temp{##4}% \Hy@pstringdef\Hy@pstringName{\HyperDestNameFilter{##3}}% @@ -701,7 +712,7 @@ \calc@bm@number{##5}% }% \let\nextAction\@gobbletwo - \InputIfFileExists{\xbmk@filename.out}{}{}% + \InputIfFileExists{\xbmk@filename.out}{}{\x@outWarningMsg}% \def\@@BOOKMARK[##1][##2]##3##4##5{% \def\Hy@temp{##4}% \Hy@pstringdef\Hy@pstringName{\HyperDestNameFilter{##3}}% diff --git a/Master/texmf-dist/source/latex/xbmks/xbmks.ins b/Master/texmf-dist/source/latex/xbmks/xbmks.ins index c23326bbf0d..8341ef98de0 100644 --- a/Master/texmf-dist/source/latex/xbmks/xbmks.ins +++ b/Master/texmf-dist/source/latex/xbmks/xbmks.ins @@ -15,7 +15,7 @@ %% %% --------------- start of docstrip commands ------------------ %% -\def\filedate{2018/06/08} +\def\filedate{2018/07/04} \def\batchfile{xbmks.ins} \input docstrip diff --git a/Master/texmf-dist/tex/latex/xbmks/xbmks-pdfmark.def b/Master/texmf-dist/tex/latex/xbmks/xbmks-pdfmark.def index 4471d3dd5d4..1695a0302c5 100644 --- a/Master/texmf-dist/tex/latex/xbmks/xbmks-pdfmark.def +++ b/Master/texmf-dist/tex/latex/xbmks/xbmks-pdfmark.def @@ -54,7 +54,7 @@ \calc@bm@number{##5}% }% \let\nextAction\@gobbletwo - \InputIfFileExists{\xbmk@filename.out}{}{}% + \InputIfFileExists{\xbmk@filename.out}{}{\x@outWarningMsg}% \def\@@BOOKMARK[##1][##2]##3##4##5{% \def\Hy@temp{##4}% \xbmkcsarg\ifx{X_##3}\relax diff --git a/Master/texmf-dist/tex/latex/xbmks/xbmks-pdftex.def b/Master/texmf-dist/tex/latex/xbmks/xbmks-pdftex.def index 9931f2259b3..2dec86d5343 100644 --- a/Master/texmf-dist/tex/latex/xbmks/xbmks-pdftex.def +++ b/Master/texmf-dist/tex/latex/xbmks/xbmks-pdftex.def @@ -60,7 +60,7 @@ \calc@bm@number{##5}% }% \let\nextAction\@gobbletwo - \InputIfFileExists{\xbmk@filename.out}{}{}% + \InputIfFileExists{\xbmk@filename.out}{}{\x@outWarningMsg}% \gdef\@@BOOKMARK[##1][##2]##3##4##5{% \def\Hy@temp{##4}% \Hy@pstringdef\Hy@pstringName{\HyperDestNameFilter{##3}}% diff --git a/Master/texmf-dist/tex/latex/xbmks/xbmks-xetex.def b/Master/texmf-dist/tex/latex/xbmks/xbmks-xetex.def index eea0df0aae1..9eacc51b225 100644 --- a/Master/texmf-dist/tex/latex/xbmks/xbmks-xetex.def +++ b/Master/texmf-dist/tex/latex/xbmks/xbmks-xetex.def @@ -54,7 +54,7 @@ \calc@bm@number{##5}% }% \let\nextAction\@gobbletwo - \InputIfFileExists{\xbmk@filename.out}{}{}% + \InputIfFileExists{\xbmk@filename.out}{}{\x@outWarningMsg}% \def\@@BOOKMARK[##1][##2]##3##4##5{% \def\Hy@temp{##4}% \Hy@pstringdef\Hy@pstringName{\HyperDestNameFilter{##3}}% diff --git a/Master/texmf-dist/tex/latex/xbmks/xbmks.sty b/Master/texmf-dist/tex/latex/xbmks/xbmks.sty index 8fa488964e2..010dafffbdc 100644 --- a/Master/texmf-dist/tex/latex/xbmks/xbmks.sty +++ b/Master/texmf-dist/tex/latex/xbmks/xbmks.sty @@ -19,7 +19,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \NeedsTeXFormat{LaTeX2e}[1997/12/01] \ProvidesPackage{xbmks} - [2018/06/25 v2.0.1 xbmks: Cross-document bookmarks (dps)] + [2018/07/04 v2.0.2 xbmks: Cross-document bookmarks (dps)] \RequirePackage{xkeyval} \RequirePackage{ifpdf}[2006/02/20] \RequirePackage{ifxetex}[2006/08/21] @@ -63,19 +63,20 @@ \define@boolkey{xbmk@styles}{extbf}[true]{} \define@boolkey{xbmk@styles}{intit}[true]{} \define@boolkey{xbmk@styles}{extit}[true]{} -\newcommand{\xbmksetup}[1]{\setkeys{xbmksetup}{#1}% +\newcommand{\xbmksetup}[1]{\setkeys{xbmksetup}{docbundle,#1}% \ifx\x@bmks@docs\@empty \PackageInfo{xbmks}{The docbundle key of \string\xbmksetup\space is empty,\MessageBreak I will give it a value of `\jobname',\MessageBreak in hopes this is your intention}% + \gdef\xbmk@cnt{1}% \def\xbmks@next{\write@xbmks@cfg{docbundle={\jobname},#1}}\else \def\xbmks@next{\write@xbmks@cfg{#1}}\fi\xbmks@next } \def\write@xbmks@cfg#1{% \newwrite\xbmks@setup \immediate\openout \xbmks@setup xbmks.cfg \set@display@protect - \immediate\write\xbmks@setup{\protect\xbmksetupi{#1}} + \immediate\write\xbmks@setup{\protect\xbmksetupi{#1}}% \set@typeset@protect \immediate\closeout\xbmks@setup } @@ -209,6 +210,10 @@ {The anchor name `#1' is already defined,\MessageBreak change this name, the bookmark will be created\MessageBreak but it will have no associated action}}} +\def\x@outWarningMsg{\PackageWarningNoLine{xbmks}{% +@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\MessageBreak +@@ Outline files were not input, compile again @@\MessageBreak +@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@}}% \InputIfFileExists{xbmks.cfg}{}{} \@ifpackageloaded{bookmark}{\PackageWarningNoLine{xbmks}{The bookmark package is not supported;\MessageBreak -- cgit v1.2.3