diff options
Diffstat (limited to 'Master/texmf-dist/source')
-rw-r--r-- | Master/texmf-dist/source/latex/hyperref/hluatex.dtx | 7 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/hyperref/hyperref.dtx | 40 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/hyperref/nameref.dtx | 14 |
3 files changed, 18 insertions, 43 deletions
diff --git a/Master/texmf-dist/source/latex/hyperref/hluatex.dtx b/Master/texmf-dist/source/latex/hyperref/hluatex.dtx index ac45cb0d0ce..2dc487fcbef 100644 --- a/Master/texmf-dist/source/latex/hyperref/hluatex.dtx +++ b/Master/texmf-dist/source/latex/hyperref/hluatex.dtx @@ -1,6 +1,6 @@ % \iffalse % Source File: hluatex.dtx -% 2022-05-13 v7.00o +% 2022-05-16 v7.00p % % Copyright % 2016-2019 Oberdiek Package Support Group @@ -31,7 +31,7 @@ % % \begin{macrocode} %<*luatex> -%% 2022-05-13 v7.00o +%% 2022-05-16 v7.00p %% force unicode encoding, see issue #101 %% code mostly copied from hxetex.def \HyPsd@LoadUnicode @@ -1834,9 +1834,6 @@ \newwrite\@outlinefile \Hy@OutlineRerunCheck \immediate\openout\@outlinefile=\jobname.out\relax - \ifHy@typexml - \immediate\write\@outlinefile{<relaxxml>\relax}% - \fi \fi \fi } diff --git a/Master/texmf-dist/source/latex/hyperref/hyperref.dtx b/Master/texmf-dist/source/latex/hyperref/hyperref.dtx index 6096fad1d1c..ba503fa255c 100644 --- a/Master/texmf-dist/source/latex/hyperref/hyperref.dtx +++ b/Master/texmf-dist/source/latex/hyperref/hyperref.dtx @@ -52,7 +52,7 @@ %<puvnenc>\ProvidesFile{puvnenc.def} %<puarenc>\ProvidesFile{puarenc.def} %<psdextra>\ProvidesFile{psdextra.def} -%<!none&!packageEnd> [2022-05-13 v7.00o % +%<!none&!packageEnd> [2022-05-16 v7.00p % %<package> Hypertext links for LaTeX] %<nohyperref> Dummy hyperref (SR)] %<driver> Hyperref documentation driver file] @@ -609,6 +609,7 @@ \RequirePackage{hycolor} \RequirePackage{letltxmacro}[2008/06/13] \RequirePackage{auxhook}[2009/12/14] +\RequirePackage{nameref}[2012/07/28] \def\Hy@Error{\@PackageError{hyperref}} \def\Hy@Warning{\@PackageWarning{hyperref}} \def\Hy@WarningNoLine{\@PackageWarningNoLine{hyperref}} @@ -883,7 +884,6 @@ \Hy@texhtfalse \Hy@psdextrafalse \Hy@pdftoolbartrue -\Hy@typexmlfalse \Hy@unicodetrue \ifx\kanjiskip\@undefined \else @@ -4676,9 +4676,6 @@ \define@key{Hyp}{verbose}[true]{% \Hy@boolkey{verbose}{#1}% } -\define@key{Hyp}{typexml}[true]{% - \Hy@boolkey{typexml}{#1}% -} % \end{macrocode} % If we are going to PDF via HyperTeX |\special| commands, % the dvips (-z option) processor does not know @@ -6927,13 +6924,6 @@ \else \Hy@Info{Backreferencing OFF}% \fi -\ifHy@typexml - \Hy@AtEndOfPackage{% - \RequirePackage{color}% - \RequirePackage{nameref}[2012/07/28]% - }% -\fi -\Hy@DisableOption{typexml} \ifHy@implicit \Hy@InfoNoLine{Implicit mode ON; LaTeX internals redefined}% \else @@ -7268,12 +7258,9 @@ \ifHy@colorlinks \def\@pdfborder{0 0 0}% \let\@pdfborderstyle\@empty - \ifHy@typexml - \else - \Hy@CatcodeWrapper{% - \RequirePackage{color}% - }% - \fi + \Hy@CatcodeWrapper{% + \RequirePackage{color}% + }% \def\Hy@colorlink#1{% \begingroup \HyColor@UseColor#1% @@ -7298,12 +7285,6 @@ \Hy@DisableOption{frenchlinks}% \ifHy@texht \else - \ifHy@typexml - \else - \Hy@CatcodeWrapper{% - \RequirePackage{nameref}[2012/07/28]% - }% - \fi % \end{macrocode} % With active links we have to redefine the starred versions % to avoid that they get links from the include |\@setref|: @@ -9512,11 +9493,6 @@ % longer needed as |\contentsline| has now always four arguments. % \begin{macrocode} \if@filesw - \ifHy@typexml - \immediate\closeout\@mainaux - \immediate\openout\@mainaux\jobname.aux\relax - \immediate\write\@auxout{<relaxxml>\relax}% - \fi \immediate\write\@auxout{% \string\providecommand\string\HyperFirstAtBeginDocument{% \string\AtBeginDocument}^^J% @@ -19626,9 +19602,6 @@ \newwrite\@outlinefile \Hy@OutlineRerunCheck \immediate\openout\@outlinefile=\jobname.out\relax - \ifHy@typexml - \immediate\write\@outlinefile{<relaxxml>\relax}% - \fi \fi \fi } @@ -19713,9 +19686,6 @@ \newwrite\@outlinefile \Hy@OutlineRerunCheck \immediate\openout\@outlinefile=\jobname.out\relax - \ifHy@typexml - \immediate\write\@outlinefile{<relaxxml>\relax}% - \fi \fi \fi } diff --git a/Master/texmf-dist/source/latex/hyperref/nameref.dtx b/Master/texmf-dist/source/latex/hyperref/nameref.dtx index dabe4b6d908..d49735cb427 100644 --- a/Master/texmf-dist/source/latex/hyperref/nameref.dtx +++ b/Master/texmf-dist/source/latex/hyperref/nameref.dtx @@ -33,7 +33,7 @@ %<driver>\ProvidesFile{nameref.drv} % \fi % \ProvidesFile{nameref.dtx} - [2022-05-13 v2.48 Cross-referencing by name of section]% + [2022-05-16 v2.49 Cross-referencing by name of section]% % % % \iffalse @@ -843,8 +843,16 @@ % \end{macrocode} % \begin{macro}{\nameref} % \begin{macrocode} -\NewDocumentCommand\nameref{s} - {\IfBooleanTF{#1}{\@namerefstar}{\T@nameref}} +\@ifundefined{nameref} + { + \NewDocumentCommand\nameref{s} + {\IfBooleanTF{#1}{\@namerefstar}{\T@nameref}} + } + { + \PackageWarning{nameref}{Redefining \string\nameref} + \RenewDocumentCommand\nameref{s} + {\IfBooleanTF{#1}{\@namerefstar}{\T@nameref}} + } % \end{macrocode} % \end{macro} % \begin{macro}{\Nameref} |