xbmks (18jan20)

git-svn-id: svn://tug.org/texlive/trunk@53448 c570f23f-e606-0410-a88d-b1316a301751

8 files changed, 22 insertions, 14 deletions

diff --git a/Master/texmf-dist/doc/latex/xbmks/README.md b/Master/texmf-dist/doc/latex/xbmks/README.md
index 507038dafbd..05d3514ff9e 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/07/04
+Dated: 2020-01-16
 
 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 (2020/01/16) Minor modifications to conform to the 
+new web.cfg, which is read, if it exists. 
+
 What's New (2018/07/04) Fixed a problem wherein the bookmarks do not appear
 after an even number of compilations.
 
diff --git a/Master/texmf-dist/doc/latex/xbmks/docs/xbmksman.pdf b/Master/texmf-dist/doc/latex/xbmks/docs/xbmksman.pdf
index 8ddd2dbe35d..d11b3eb5d44 100644
--- a/Master/texmf-dist/doc/latex/xbmks/docs/xbmksman.pdf
+++ b/Master/texmf-dist/doc/latex/xbmks/docs/xbmksman.pdf
diff --git a/Master/texmf-dist/doc/latex/xbmks/docs/xbmksman.tex b/Master/texmf-dist/doc/latex/xbmks/docs/xbmksman.tex
index cf2980683bd..e9093491f8d 100644
--- a/Master/texmf-dist/doc/latex/xbmks/docs/xbmksman.tex
+++ b/Master/texmf-dist/doc/latex/xbmks/docs/xbmksman.tex
@@ -11,12 +11,12 @@
     aebxmp
 ]{aeb_pro}
 \usepackage{aeb_mlink}
-\usepackage{xbmks}
 \usepackage{graphicx,array}
 %\usepackage{myriadpro}
 %\usepackage{calibri}
 \usepackage[altbullet]{lucidbry}
 
+\usepackage{xbmks}
 \DeclareInitView{layoutmag={navitab:UseOutlines}}
 \xbmksetup{colors={int=red},styles={intbf}}
 
@@ -63,7 +63,7 @@
     email={dpstory@acrotex.net},
     subject={Documentation for the xbmks package from AcroTeX: cross-document bookmarks},
     talksite={\url{www.acrotex.net}},
-    version={v2.0.2, 2018/07/04},
+    version={2.0.3, 2020/01/16},
     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 f975d83b0e4..afa19e9a198 100644
--- a/Master/texmf-dist/doc/latex/xbmks/examples/doc1.pdf
+++ b/Master/texmf-dist/doc/latex/xbmks/examples/doc1.pdf
diff --git a/Master/texmf-dist/doc/latex/xbmks/examples/doc2.pdf b/Master/texmf-dist/doc/latex/xbmks/examples/doc2.pdf
index 488cae0379f..5156dadf356 100644
--- a/Master/texmf-dist/doc/latex/xbmks/examples/doc2.pdf
+++ b/Master/texmf-dist/doc/latex/xbmks/examples/doc2.pdf
diff --git a/Master/texmf-dist/doc/latex/xbmks/examples/master.pdf b/Master/texmf-dist/doc/latex/xbmks/examples/master.pdf
index dbc1ca04510..ff8fa5e8659 100644
--- a/Master/texmf-dist/doc/latex/xbmks/examples/master.pdf
+++ b/Master/texmf-dist/doc/latex/xbmks/examples/master.pdf
diff --git a/Master/texmf-dist/source/latex/xbmks/xbmks.dtx b/Master/texmf-dist/source/latex/xbmks/xbmks.dtx
index b2ed3074c1b..01cb22b427b 100644
--- a/Master/texmf-dist/source/latex/xbmks/xbmks.dtx
+++ b/Master/texmf-dist/source/latex/xbmks/xbmks.dtx
@@ -16,7 +16,7 @@
 %</copyright>
 %<package>\NeedsTeXFormat{LaTeX2e}[1997/12/01]
 %<package>\ProvidesPackage{xbmks}
-%<package> [2018/07/04 v2.0.2 xbmks: Cross-document bookmarks (dps)]
+%<package> [2020/01/16 v2.0.3 xbmks: Cross-document bookmarks (dps)]
 %<*driver>
 \documentclass{ltxdoc}
 \usepackage{xcolor}
@@ -55,18 +55,18 @@
 \newcommand{\negthickspace}{\tmspace-\thickmuskip{.2777em}}
 \makeatletter
 \renewcommand{\paragraph}
-    {\@startsection{paragraph}{4}{0pt}{6pt}{-3pt}
-    {\normalfont\normalsize\bfseries}}
+  {\@startsection{paragraph}{4}{0pt}{6pt}{-3pt}
+  {\normalfont\normalsize\bfseries}}
 \renewenvironment{quote}[1][]
-   {\def\@rgi{#1}\ifx\@rgi\@empty
-    \let\rghtm\@empty\else\def\rghtm{\rightmargin\leftmargin}\fi
-    \list{}{\rghtm} %{\rightmargin\leftmargin}%
-    \item\relax}
-   {\endlist}
+ {\def\@rgi{#1}\ifx\@rgi\@empty
+  \let\rghtm\@empty\else\def\rghtm{\rightmargin\leftmargin}\fi
+  \list{}{\rghtm} %{\rightmargin\leftmargin}%
+  \item\relax}
+ {\endlist}
 \makeatother
 \InputIfFileExists{aebdocfmt.def}{\PackageInfo{xbmks}{Inputting aebdocfmt.def}}
-    {\def\IndexOpt{\DescribeMacro}\def\IndexKey{\DescribeMacro}\let\setupFullwidth\relax
-     \PackageInfo{xbmks}{aebdocfmt.def cannot be found}}
+  {\def\IndexOpt{\DescribeMacro}\def\IndexKey{\DescribeMacro}\let\setupFullwidth\relax
+   \PackageInfo{xbmks}{aebdocfmt.def cannot be found}}
 \begin{document}
 \def\CMD#1{\textbackslash#1}
   \GetFileInfo{xbmks.sty}
@@ -121,7 +121,10 @@
 \DeclareOptionX{xetex}{\def\xbmk@driver{xbmks-xetex.def}}
 %    \end{macrocode}
 %    \section{Process the options}
+%    \changes{v2.0.3}{2020/01/16}{Modification to conform to the new \string\texttt{web.cfg} format}
 %    \begin{macrocode}
+\let\bWebCustomize\endinput
+\let\eWebCustomize\relax
 \ifpdf\ExecuteOptionsX{pdftex}\else
 \ifxetex\ExecuteOptionsX{xetex}\else
   \let\ExecuteOptions@SAVE\ExecuteOptions
diff --git a/Master/texmf-dist/tex/latex/xbmks/xbmks.sty b/Master/texmf-dist/tex/latex/xbmks/xbmks.sty
index 010dafffbdc..d3dfa52c38c 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/07/04 v2.0.2 xbmks: Cross-document bookmarks (dps)]
+ [2020/01/16 v2.0.3 xbmks: Cross-document bookmarks (dps)]
 \RequirePackage{xkeyval}
 \RequirePackage{ifpdf}[2006/02/20]
 \RequirePackage{ifxetex}[2006/08/21]
@@ -29,6 +29,8 @@
 \DeclareOptionX{pdftex}{\def\xbmk@driver{xbmks-pdftex.def}}
 \DeclareOptionX{luatex}{\def\xbmk@driver{xbmks-pdftex.def}}
 \DeclareOptionX{xetex}{\def\xbmk@driver{xbmks-xetex.def}}
+\let\bWebCustomize\endinput
+\let\eWebCustomize\relax
 \ifpdf\ExecuteOptionsX{pdftex}\else
 \ifxetex\ExecuteOptionsX{xetex}\else
   \let\ExecuteOptions@SAVE\ExecuteOptions