diff options
author | Norbert Preining <norbert@preining.info> | 2019-09-14 03:00:50 +0000 |
---|---|---|
committer | Norbert Preining <norbert@preining.info> | 2019-09-14 03:00:50 +0000 |
commit | 0eea86bf18826522b3686f54fc3afb8ddc31e62a (patch) | |
tree | 297ca130d9a87803b835596c3a194841045cce43 /macros/latex/contrib/hyperref/nameref.dtx | |
parent | 215532ea28200f7e90dd8339cf62a8d6dc746bc6 (diff) |
CTAN sync 201909140300
Diffstat (limited to 'macros/latex/contrib/hyperref/nameref.dtx')
-rw-r--r-- | macros/latex/contrib/hyperref/nameref.dtx | 88 |
1 files changed, 4 insertions, 84 deletions
diff --git a/macros/latex/contrib/hyperref/nameref.dtx b/macros/latex/contrib/hyperref/nameref.dtx index ace38a90d7..d955ff41ed 100644 --- a/macros/latex/contrib/hyperref/nameref.dtx +++ b/macros/latex/contrib/hyperref/nameref.dtx @@ -32,9 +32,8 @@ %<driver>\ProvidesFile{nameref.drv} % \fi % \ProvidesFile{nameref.dtx} - [2016/05/21 v2.44 Cross-referencing by name of section]% + [2019/09/12 v2.45 Cross-referencing by name of section]% % -% \CheckSum{714} % % \iffalse %<*driver> @@ -752,10 +751,13 @@ % % [This section was derived by Corey Minyard \texttt{minyard@acm.org} % from the \xpackage{varioref} package] +% Changed in 2019-09-12 by Frank Mittelbach to adapt to changes in +% varioref % \begin{macrocode} \AtBeginDocument{% \ifx\csname @@vpageref\endcsname\relax \else + \let\NR@@vpageref\@@vpageref \def\@@vpageref#1[#2]#3{% \begingroup \csname @safe@activestrue\endcsname @@ -769,88 +771,6 @@ }% \x }% - \def\NR@@vpageref#1[#2]#3{% - \leavevmode\unskip - \global\advance\c@vrcnt\@ne - \@ifundefined{r@\the\c@vrcnt @vr}% - {\@namedef{r@\the\c@vrcnt @vr}{{??}{??}{}{}{}}}{}% - \edef\@tempa{% - \expandafter\expandafter\expandafter - \@secondoffive\csname r@\the\c@vrcnt @vr\endcsname - }% - \@ifundefined{r@\the\c@vrcnt @xvr}% - {\@namedef{r@\the\c@vrcnt @xvr}{{??}{??}{}{}{}}}{}% - \edef\@tempb{% - \expandafter\expandafter\expandafter - \@secondoffive\csname r@\the\c@vrcnt @xvr\endcsname - }% - {% - \let\@currentlabel\@empty - \expandafter\label\expandafter{\the\c@vrcnt @xvr}% - }% - \ifx\@tempa\@tempb - \else - \vref@err{% - \noexpand\vref at page boundary % - \@tempb-\@tempa\space (may loop)% - }% - \fi - \@ifundefined{r@#3}{\@namedef{r@#3}{{??}{??}{}{}{}}}{}% - \edef\thevpagerefnum{% - \expandafter\expandafter\expandafter - \@secondoffive\csname r@#3\endcsname - }% - \ifx\vref@space\@undefined - \space - \else - \vref@space - \fi - \ifx\@tempa\thevpagerefnum - #1% - \else - #2% - \is@pos@number\thevpagerefnum{% - \is@pos@number\@tempa{% - \@tempcnta\@tempa - \advance\@tempcnta\@ne - }{% - \@tempcnta\maxdimen - }% - \ifnum \thevpagerefnum =\@tempcnta - \ifodd\@tempcnta - \if@twoside - \reftextfaceafter - \else - \reftextafter - \fi - \else - \reftextafter - \fi - \else - \advance\@tempcnta-2 % - \ifnum \thevpagerefnum =\@tempcnta - \ifodd\@tempcnta - \reftextbefore - \else - \if@twoside - \reftextfacebefore - \else - \reftextbefore - \fi - \fi - \else - \reftextfaraway{#3}% - \fi - \fi - }{% - \reftextfaraway{#3}% - }% - \fi - {% - \let\@currentlabel\@empty - \expandafter\label\expandafter{\the\c@vrcnt @vr}% - }% - }% \DeclareRobustCommand\vnameref[1]{% \unskip~\nameref{#1}% \@vpageref[\unskip]{#1}% |