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/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 ++++++++--- 4 files changed, 11 insertions(+), 6 deletions(-) (limited to 'Master/texmf-dist/tex/latex/xbmks') 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