From 046927b57b0a0739186f6d42b6af76218d6d2f6a Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 13 Jun 2018 21:44:46 +0000 Subject: xbmks (13jun18) git-svn-id: svn://tug.org/texlive/trunk@48005 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/xbmks/xbmks-luatex.def | 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 | 48 +++++++++++----------- 5 files changed, 29 insertions(+), 27 deletions(-) (limited to 'Master/texmf-dist/tex/latex/xbmks') diff --git a/Master/texmf-dist/tex/latex/xbmks/xbmks-luatex.def b/Master/texmf-dist/tex/latex/xbmks/xbmks-luatex.def index 5e6634404f9..6f3d50316aa 100644 --- a/Master/texmf-dist/tex/latex/xbmks/xbmks-luatex.def +++ b/Master/texmf-dist/tex/latex/xbmks/xbmks-luatex.def @@ -7,7 +7,7 @@ %% xbmks.dtx (with options: `copyright,luatex') %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%% xbmks.sty package, %% +%% xbmks.sty package, %% %% Copyright (C) 2016--2018 %% %% dpstory@uakron.edu %% %% %% diff --git a/Master/texmf-dist/tex/latex/xbmks/xbmks-pdfmark.def b/Master/texmf-dist/tex/latex/xbmks/xbmks-pdfmark.def index 953910afe17..d769e3436eb 100644 --- a/Master/texmf-dist/tex/latex/xbmks/xbmks-pdfmark.def +++ b/Master/texmf-dist/tex/latex/xbmks/xbmks-pdfmark.def @@ -7,7 +7,7 @@ %% xbmks.dtx (with options: `copyright,pdfmark') %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%% xbmks.sty package, %% +%% xbmks.sty package, %% %% Copyright (C) 2016--2018 %% %% dpstory@uakron.edu %% %% %% diff --git a/Master/texmf-dist/tex/latex/xbmks/xbmks-pdftex.def b/Master/texmf-dist/tex/latex/xbmks/xbmks-pdftex.def index 42f2f79cf65..2adc7f171c6 100644 --- a/Master/texmf-dist/tex/latex/xbmks/xbmks-pdftex.def +++ b/Master/texmf-dist/tex/latex/xbmks/xbmks-pdftex.def @@ -7,7 +7,7 @@ %% xbmks.dtx (with options: `copyright,pdftex') %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%% xbmks.sty package, %% +%% xbmks.sty package, %% %% Copyright (C) 2016--2018 %% %% dpstory@uakron.edu %% %% %% diff --git a/Master/texmf-dist/tex/latex/xbmks/xbmks-xetex.def b/Master/texmf-dist/tex/latex/xbmks/xbmks-xetex.def index 56211641a90..18622b9ee3c 100644 --- a/Master/texmf-dist/tex/latex/xbmks/xbmks-xetex.def +++ b/Master/texmf-dist/tex/latex/xbmks/xbmks-xetex.def @@ -7,7 +7,7 @@ %% xbmks.dtx (with options: `copyright,xetex') %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%% xbmks.sty package, %% +%% xbmks.sty package, %% %% Copyright (C) 2016--2018 %% %% dpstory@uakron.edu %% %% %% diff --git a/Master/texmf-dist/tex/latex/xbmks/xbmks.sty b/Master/texmf-dist/tex/latex/xbmks/xbmks.sty index 4185e81eaea..700bd082eeb 100644 --- a/Master/texmf-dist/tex/latex/xbmks/xbmks.sty +++ b/Master/texmf-dist/tex/latex/xbmks/xbmks.sty @@ -7,7 +7,7 @@ %% xbmks.dtx (with options: `copyright,package') %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%% xbmks.sty package, %% +%% xbmks.sty package, %% %% Copyright (C) 2016--2018 %% %% dpstory@uakron.edu %% %% %% @@ -19,25 +19,25 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \NeedsTeXFormat{LaTeX2e}[1997/12/01] \ProvidesPackage{xbmks} - [2018/06/11 v1.0 xbmks: Cross-document bookmarks (dps)] + [2018/06/13 v1.1 xbmks: Cross-document bookmarks (dps)] \RequirePackage{xkeyval} \RequirePackage{ifpdf}[2006/02/20] \RequirePackage{ifxetex}[2006/08/21] -\def\xbmk@driver{bmks-pdfmark.def} -\DeclareOptionX{dvipsone}{\def\xbmk@driver{bmks-pdfmark.def}} +\def\xbmk@driver{xbmks-pdfmark.def} +\DeclareOptionX{dvipsone}{\def\xbmk@driver{xbmks-pdfmark.def}} \DeclareOptionX{dvips}{\def\xbmk@driver{xbmks-pdfmark.def}} \DeclareOptionX{pdftex}{\def\xbmk@driver{xbmks-pdftex.def}} \DeclareOptionX{luatex}{\def\xbmk@driver{xbmks-pdftex.def}} \DeclareOptionX{xetex}{\def\xbmk@driver{xbmks-xetex.def}} \ifpdf\ExecuteOptionsX{pdftex}\else - \ifxetex\ExecuteOptionsX{xetex}\else - \let\ExecuteOptions@SAVE\ExecuteOptions - \let\ExecuteOptions\ExecuteOptionsX - \InputIfFileExists{web.cfg}{} - {\@ifundefined{l@tex@@@@driver}{\ExecuteOptionsX{dvips}} - {\ExecuteOptionsX{dvipsone}}}% - \let\ExecuteOptions\ExecuteOptions@SAVE - \fi\fi +\ifxetex\ExecuteOptionsX{xetex}\else + \let\ExecuteOptions@SAVE\ExecuteOptions + \let\ExecuteOptions\ExecuteOptionsX + \InputIfFileExists{web.cfg}{} + {\@ifundefined{l@tex@@@@driver}{\ExecuteOptionsX{dvips}} + {\ExecuteOptionsX{dvipsone}}}% + \let\ExecuteOptions\ExecuteOptions@SAVE +\fi\fi \ProcessOptionsX \RequirePackage{hyperref} \define@key{xbmksetup}{docbundle}[]{\def\x@bmks@docs{#1}} @@ -49,22 +49,29 @@ \define@key{xbmk@colors}{intdoc}[]{% \HyColor@BookmarkColor{#1}{\xbmks@intdoc}{xbmks}{intdoc}% \ifx\xbmks@intdoc\@empty\else - \edef\xbmks@intdoc{/C [\xbmks@intdoc]}\fi + \edef\xbmks@intdoc{/C[\xbmks@intdoc]}\fi } \let\xbmks@intdoc\@empty \define@key{xbmk@colors}{extdoc}[]{% \HyColor@BookmarkColor{#1}{\xbmks@extdoc}{xbmks}{extdoc}% \ifx\xbmks@extdoc\@empty\else - \edef\xbmks@extdoc{/C [\xbmks@extdoc]}\fi + \edef\xbmks@extdoc{/C[\xbmks@extdoc]}\fi } \let\xbmks@extdoc\@empty -\let\xbmks@Yes=y -\let\xbmks@No=n +\let\xbmks@Yes=y \let\xbmks@No=n \define@boolkey{xbmk@style}{intbf}[true]{} %\ifKV@xbmk@style@intbf \define@boolkey{xbmk@style}{extbf}[true]{} \define@boolkey{xbmk@style}{intit}[true]{} \define@boolkey{xbmk@style}{extit}[true]{} -\newcommand{\xbmksetup}[1]{\write@xbmks@cfg{#1}} +\newcommand{\xbmksetup}[1]{\setkeys{xbmksetup}{#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}% + \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 @@ -74,12 +81,8 @@ } \newcommand{\xbmksetupi}[1]{% \setkeys{xbmksetup}{#1}% - \ifx\x@bmks@docs\@empty - \PackageWarning{xbmks}{The docbundle key is empty,\MessageBreak - this key must have a value for cross-document bookmarks\MessageBreak - to be generated}\else \edef\@exp@for{\noexpand\docbundle{\x@bmks@docs}}\expandafter - \@exp@for\fi + \@exp@for \edef\@exp@keys{\noexpand \setkeys{xbmk@colors}{\x@bmks@colors}}\@exp@keys \edef\@exp@keys{\noexpand @@ -127,7 +130,6 @@ bookmark package is not supported;\MessageBreak this package does nothing, as a result}} {\InputIfFileExists{\xbmk@driver}{}{}} - \endinput %% %% End of file `xbmks.sty'. -- cgit v1.2.3