From e69da46b982f29e90a4f1ebcfe6835d410b973ea Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 14 Jun 2022 20:21:14 +0000 Subject: hypdoc (14jun22) git-svn-id: svn://tug.org/texlive/trunk@63592 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/hypdoc/README.md | 4 +-- Master/texmf-dist/doc/latex/hypdoc/hypdoc.pdf | Bin 333212 -> 334342 bytes Master/texmf-dist/source/latex/hypdoc/hypdoc.dtx | 37 ++++++++++++++--------- Master/texmf-dist/tex/latex/hypdoc/hypdoc.sty | 21 +++++++------ 4 files changed, 36 insertions(+), 26 deletions(-) diff --git a/Master/texmf-dist/doc/latex/hypdoc/README.md b/Master/texmf-dist/doc/latex/hypdoc/README.md index 96e1aa6fe31..742390e8ccf 100644 --- a/Master/texmf-dist/doc/latex/hypdoc/README.md +++ b/Master/texmf-dist/doc/latex/hypdoc/README.md @@ -1,6 +1,6 @@ # hypdoc -Version: 2021-11-15 v1.15 +Version: 2022-06-14 v1.16 This package adds hyper features to the package doc that is used in the documentation @@ -10,7 +10,7 @@ are linked as far as possible. ## Copyright (C) * 2002, 2006, 2007, 2009-2011 Heiko Oberdiek -* 2016-2021 Oberdiek Package Support Group +* 2016-2022 Oberdiek Package Support Group ## License LATEX Project Public License, version 1.3c or later. diff --git a/Master/texmf-dist/doc/latex/hypdoc/hypdoc.pdf b/Master/texmf-dist/doc/latex/hypdoc/hypdoc.pdf index f890ea3a1eb..bd0f77458bb 100644 Binary files a/Master/texmf-dist/doc/latex/hypdoc/hypdoc.pdf and b/Master/texmf-dist/doc/latex/hypdoc/hypdoc.pdf differ diff --git a/Master/texmf-dist/source/latex/hypdoc/hypdoc.dtx b/Master/texmf-dist/source/latex/hypdoc/hypdoc.dtx index 91fef651b0d..ae0b7836333 100644 --- a/Master/texmf-dist/source/latex/hypdoc/hypdoc.dtx +++ b/Master/texmf-dist/source/latex/hypdoc/hypdoc.dtx @@ -1,12 +1,12 @@ % \iffalse meta-comment % % File: hypdoc.dtx -% Version: 2021-11-15 v1.15 +% Version: 2022-06-14 v1.16 % Info: Hyper extensions for doc.sty % % Copyright (C) % 2002, 2006, 2007, 2009-2011 Heiko Oberdiek -% 2016-2021 Oberdiek Package Support Group +% 2016-2022 Oberdiek Package Support Group % https://github.com/ho-tex/hypdoc/issues % % This work may be distributed and/or modified under the @@ -79,7 +79,7 @@ \input docstrip.tex \Msg{************************************************************************} \Msg{* Installation} -\Msg{* Package: hypdoc 2021-11-15 v1.15 Hyper extensions for doc.sty (HO)} +\Msg{* Package: hypdoc 2022-06-14 v1.16 Hyper extensions for doc.sty (HO)} \Msg{************************************************************************} \keepsilent @@ -91,11 +91,11 @@ This is a generated file. Project: hypdoc -Version: 2021-11-15 v1.15 +Version: 2022-06-14 v1.16 Copyright (C) 2002, 2006, 2007, 2009-2011 Heiko Oberdiek - 2016-2021 Oberdiek Package Support Group + 2016-2022 Oberdiek Package Support Group This work may be distributed and/or modified under the conditions of the LaTeX Project Public License, either @@ -152,7 +152,8 @@ and the derived files %<*driver> \NeedsTeXFormat{LaTeX2e} \ProvidesFile{hypdoc.drv}% - [2021-11-15 v1.15 Hyper extensions for doc.sty (HO)]% + [2022-06-14 v1.16 Hyper extensions for doc.sty (HO)]% +\PassOptionsToPackage{numbered}{hypdoc} \documentclass{ltxdoc} \usepackage{holtxdoc}[2011/11/22] \begin{document} @@ -166,7 +167,7 @@ and the derived files % \GetFileInfo{hypdoc.drv} % % \title{The \xpackage{hypdoc} package} -% \date{2021-11-15 v1.15} +% \date{2022-06-14 v1.16} % \author{Heiko Oberdiek\thanks % {Please report any issues at \url{https://github.com/ho-tex/hypdoc/issues}}} % @@ -212,7 +213,7 @@ and the derived files % and \verb|\author| and sets the corresponding PDF % information fields. In case of problems see the previous % item about bookmarks. -% These enries can be overwritten or new ones added by +% These entries can be overwritten or new ones added by % \verb|\hypersetup| after the packages is loaded, see % documentation of package \verb|hyperref|. % \item[References, links:] Because of package \verb|\hyperref| @@ -344,7 +345,7 @@ and the derived files %<*package> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{hypdoc}% - [2021-11-15 v1.15 Hyper extensions for doc.sty (HO)]% + [2022-06-14 v1.16 Hyper extensions for doc.sty (HO)]% % \end{macrocode} % The package identification is done at the top of the |.dtx| file % in order to use only one identification string. @@ -375,13 +376,16 @@ and the derived files \fi % \end{macrocode} % \begin{macrocode} -\RequirePackage[% - hyperindex=false,% - pdfusetitle,% - colorlinks,% - pdfpagelabels% -]{hyperref}[2002/05/09]% +\@ifpackageloaded{hyperref} + {\PackageWarning{hypdoc}{hyperref has been loaded before. Check the options!}} + {\RequirePackage[% + hyperindex=false,% + pdfusetitle,% + pdfpagelabels% + ]{hyperref}[2002/05/09]% + } \hypersetup{% + colorlinks,% plainpages=false,% bookmarksopen,% bookmarksnumbered,% @@ -1330,6 +1334,9 @@ and the derived files % \item removed an old, unneeded patch for latex/4096 % \item added a \cs{pdfstringdefDisableCommands} setting for \cs{autoindex} % \end{Version} +% \begin{Version}{2022-06-14 v1.16} +% \item Avoid to load hyperref if has been already loaded, issue \#1 +% \end{Version} % \end{History} % % \PrintIndex diff --git a/Master/texmf-dist/tex/latex/hypdoc/hypdoc.sty b/Master/texmf-dist/tex/latex/hypdoc/hypdoc.sty index 156b7ddae62..58ce0223656 100644 --- a/Master/texmf-dist/tex/latex/hypdoc/hypdoc.sty +++ b/Master/texmf-dist/tex/latex/hypdoc/hypdoc.sty @@ -9,11 +9,11 @@ %% This is a generated file. %% %% Project: hypdoc -%% Version: 2021-11-15 v1.15 +%% Version: 2022-06-14 v1.16 %% %% Copyright (C) %% 2002, 2006, 2007, 2009-2011 Heiko Oberdiek -%% 2016-2021 Oberdiek Package Support Group +%% 2016-2022 Oberdiek Package Support Group %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either @@ -37,7 +37,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{hypdoc}% - [2021-11-15 v1.15 Hyper extensions for doc.sty (HO)]% + [2022-06-14 v1.16 Hyper extensions for doc.sty (HO)]% \newif\ifHD@numbered \DeclareOption{numbered}{\HD@numberedtrue} \ProcessOptions*\relax @@ -46,13 +46,16 @@ \ifx\numexpr\@undefined \RequirePackage{calc}% \fi -\RequirePackage[% - hyperindex=false,% - pdfusetitle,% - colorlinks,% - pdfpagelabels% -]{hyperref}[2002/05/09]% +\@ifpackageloaded{hyperref} + {\PackageWarning{hypdoc}{hyperref has been loaded before. Check the options!}} + {\RequirePackage[% + hyperindex=false,% + pdfusetitle,% + pdfpagelabels% + ]{hyperref}[2002/05/09]% + } \hypersetup{% + colorlinks,% plainpages=false,% bookmarksopen,% bookmarksnumbered,% -- cgit v1.2.3