diff options
Diffstat (limited to 'Master/texmf-dist/source/latex/hyperref/hyperref.dtx')
-rw-r--r-- | Master/texmf-dist/source/latex/hyperref/hyperref.dtx | 79 |
1 files changed, 62 insertions, 17 deletions
diff --git a/Master/texmf-dist/source/latex/hyperref/hyperref.dtx b/Master/texmf-dist/source/latex/hyperref/hyperref.dtx index ec3f7c3e2ea..9c2096a4027 100644 --- a/Master/texmf-dist/source/latex/hyperref/hyperref.dtx +++ b/Master/texmf-dist/source/latex/hyperref/hyperref.dtx @@ -2,7 +2,7 @@ %% File: hyperref.dtx Copyright 1995-2001 Sebastian Rahtz, %% with portions written by David Carlisle and Heiko Oberdiek, %% 2001-2012 Heiko Oberdiek. -%% 2016-2018 Oberdiek Package Suport Group +%% 2016-2019 Oberdiek Package Suport Group %% https://github.com/ho-tex/hyperref/issues %% %% This file is part of the `Hyperref Bundle'. @@ -48,7 +48,7 @@ %<puvnenc>\ProvidesFile{puvnenc.def} %<puarenc>\ProvidesFile{puarenc.def} %<psdextra>\ProvidesFile{psdextra.def} -%<!none> [2019/06/12 v6.88h % +%<!none> [2019/09/12 v6.88i % %<package> Hypertext links for LaTeX] %<nohyperref> Dummy hyperref (SR)] %<driver> Hyperref documentation driver file] @@ -11198,6 +11198,7 @@ % Package nameref uses five arguments for the ref system. % Fix provided by Felix Neubauer (\Email{felix.neubauer@gmx.net}). % \begin{macrocode} +\AtBeginDocument{% \def\Hy@varioref@undefined{{??}{??}{}{}{}} \@ifpackageloaded{varioref}{% \def\vref@pagenum#1#2{% @@ -11218,7 +11219,6 @@ \csname p@#1\expandafter\endcsname\csname the#1\endcsname }% } -\AtBeginDocument{% \ifx\refstepcounter\Hy@varioref@refstepcounter \let\H@refstepcounter\refstepcounter \let\refstepcounter\Hy@saved@refstepcounter @@ -13314,6 +13314,7 @@ \def\@namerefstar#1{% \HyRef@StarSetRef{#1}\@thirdoffive } + \Hy@AtBeginDocument{% \@ifpackageloaded{varioref}{% \def\@Refstar#1{% @@ -13328,26 +13329,70 @@ \def\HyRef@Ref#1{% \hyperref[{#1}]{\Ref*{#1}}% }% - \def\Vr@f#1{% - \leavevmode\unskip\vref@space - \hyperref[{#1}]{% - \Ref*{#1}% - \let\vref@space\nobreakspace - \@vpageref[\unskip]{#1}% - }% - }% - \def\vr@f#1{% - \leavevmode\unskip\vref@space +% \end{macrocode} +% Test if we are running new 2019 varioref or old one: +% \begin{macrocode} +%FMi + \ifdefined\vp@gerefstar + \renewcommand\Vref@star[2][]{% + \begingroup + \let\T@pageref\@pagerefstar + \Ref*{#2} + \vpageref[#1]{#2}% + \endgroup + }% + \renewcommand\Vr@f[2][]{% + \begingroup + \let\T@pageref\@pagerefstar + \hyperref[{#2}]{% + \Ref*{#2} + \vpageref[#1]{#2}% + }% + \endgroup + }% + \renewcommand\vr@f[2][]{% \begingroup \let\T@pageref\@pagerefstar - \hyperref[{#1}]{% - \ref*{#1}% - \vpageref[\unskip]{#1}% + \hyperref[{#2}]{% + \ref*{#2} + \vpageref[#1]{#2}% }% - \endgroup + \endgroup }% + \renewcommand\vref@star[2][]{% + \begingroup + \let\T@pageref\@pagerefstar + \ref*{#2} + \vpageref[#1]{#2}% + \endgroup + }% +% \end{macrocode} +% old varioref: +% \begin{macrocode} + \else + \def\Vr@f#1{% + \leavevmode\unskip\vref@space + \hyperref[{#1}]{% + \Ref*{#1}% + \let\vref@space\nobreakspace + \@vpageref[\unskip]{#1}% + }% + }% + \def\vr@f#1{% + \leavevmode\unskip\vref@space + \begingroup + \let\T@pageref\@pagerefstar + \hyperref[{#1}]{% + \ref*{#1}% + \vpageref[\unskip]{#1}% + }% + \endgroup + }% + \fi +%FMi -end mod }{}% } + \DeclareRobustCommand*{\autopageref}{% \@ifstar{% \HyRef@autopagerefname\pageref*% |