hyperref (14sep19)

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

3 files changed, 71 insertions, 108 deletions

diff --git a/Master/texmf-dist/source/latex/hyperref/doc/manual.tex b/Master/texmf-dist/source/latex/hyperref/doc/manual.tex
index a1ac2fa3072..0e443c8a90f 100644
--- a/Master/texmf-dist/source/latex/hyperref/doc/manual.tex
+++ b/Master/texmf-dist/source/latex/hyperref/doc/manual.tex
@@ -1,6 +1,9 @@
 % This is the manual for the LaTeX hyperref package.
 %
-% Copyright (C) 1998, 2003 Sebastian Rahtz.
+% Copyright (C) 1998-2003 Sebastian Rahtz.
+% Copyright (C) 2003 Steve Peter and Karl Berry
+% Copyright (C) 2006-2012 Heiko Oberdiek.
+% Copyright (C) 2017-2019 David Carlisle Ulrike Fischer
 %
 % Permission is granted to copy, distribute and/or modify this document
 % under the terms of the GNU Free Documentation License, Version 1.1 or
@@ -9,13 +12,8 @@
 % Texts.  A copy of the license is included in the section entitled
 % ``GNU Free Documentation License.''
 %
-% Manual updates:
-% * Steve Peter and Karl Berry, 7/03.
-% * Heiko Oberdiek, 2006-2012.
-% * HO-support 2017-2018
-%
 
-\def\mydate{September 2018}
+\def\mydate{September 2019}
 
 \RequirePackage{ifpdf}
 \ifpdf % We are running pdfTeX in pdf mode
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*%
diff --git a/Master/texmf-dist/source/latex/hyperref/nameref.dtx b/Master/texmf-dist/source/latex/hyperref/nameref.dtx
index ace38a90d7e..d955ff41ed0 100644
--- a/Master/texmf-dist/source/latex/hyperref/nameref.dtx
+++ b/Master/texmf-dist/source/latex/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}%