hyperref (14nov22)

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

5 files changed, 46 insertions, 29 deletions

diff --git a/Master/texmf-dist/source/latex/hyperref/hluatex.dtx b/Master/texmf-dist/source/latex/hyperref/hluatex.dtx
index 3675cd0cec2..4a4eb9af12f 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-09-22 v7.00t
+% 2022-11-13 v7.00u
 %
 % Copyright
 % 2016-2019 Oberdiek Package Support Group
@@ -31,7 +31,7 @@
 %
 %    \begin{macrocode}
 %<*luatex>
-%% 2022-09-22 v7.00t
+%% 2022-11-13 v7.00u
 %% force unicode encoding, see issue #101
 %% code mostly copied from hxetex.def
 \HyPsd@LoadUnicode
diff --git a/Master/texmf-dist/source/latex/hyperref/hyperref-linktarget.dtx b/Master/texmf-dist/source/latex/hyperref/hyperref-linktarget.dtx
index d31a2009e2e..5d6799a2064 100644
--- a/Master/texmf-dist/source/latex/hyperref/hyperref-linktarget.dtx
+++ b/Master/texmf-dist/source/latex/hyperref/hyperref-linktarget.dtx
@@ -53,7 +53,7 @@
 %    }^^A
 % }
 %
-% \date{Version 2022-09-22 v7.00t}
+% \date{Version 2022-11-13 v7.00u}
 %
 % \maketitle
 % \begin{documentation}
diff --git a/Master/texmf-dist/source/latex/hyperref/hyperref-patches.dtx b/Master/texmf-dist/source/latex/hyperref/hyperref-patches.dtx
index ebe25f7f623..b7c0f828e30 100644
--- a/Master/texmf-dist/source/latex/hyperref/hyperref-patches.dtx
+++ b/Master/texmf-dist/source/latex/hyperref/hyperref-patches.dtx
@@ -55,7 +55,7 @@
 %    }^^A
 % }
 %
-% \date{Version 2022-09-22 v7.00t}
+% \date{Version 2022-11-13 v7.00u}
 %
 % \maketitle
 % \begin{documentation}
diff --git a/Master/texmf-dist/source/latex/hyperref/hyperref.dtx b/Master/texmf-dist/source/latex/hyperref/hyperref.dtx
index fb6aefd9b2e..bc8d936c814 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-09-22 v7.00t %
+%<!none&!packageEnd>  [2022-11-13 v7.00u %
 %<package>  Hypertext links for LaTeX]
 %<nohyperref>  Dummy hyperref (SR)]
 %<driver>  Hyperref documentation driver file]
@@ -8226,8 +8226,8 @@
 %    \end{macro}
 %    \begin{macro}{\HyperDestRename}
 %    \begin{macrocode}
-%    \end{macrocode}
   \let\HyperDestRename\ltx@gobbletwo
+%    \end{macrocode}
 %    \end{macro}
 %    \begin{macrocode}
 \fi
@@ -12016,7 +12016,14 @@
 %    \begin{macro}{\contentsline}
 %    The page number might be empty. In this case the link for the
 %    page number is suppressed to avoid little link boxes.
+%    
+%    change 2022-11-13: To avoid problems if |MakeUppercase| is used
+%    around the entry we use special protected commands:
+%    
 %    \begin{macrocode}
+\protected\def\Hy@toclinkstart{\hyper@linkstart{link}{\Hy@tocdestname}}
+\protected\def\Hy@toclinkend{\hyper@linkend}
+
 \def\contentsline#1#2#3#4{%
   \begingroup
     \Hy@safe@activestrue
@@ -12030,7 +12037,7 @@
       \csname l@#1\endcsname{#2}{#3}%
     \or % section
       \csname l@#1\endcsname{%
-        \hyper@linkstart{link}{\Hy@tocdestname}{#2}\hyper@linkend
+        \Hy@toclinkstart{#2}\Hy@toclinkend
       }{#3}%
     \or % page
       \def\Hy@temp{#3}%
@@ -12038,20 +12045,20 @@
         \csname l@#1\endcsname{#2}{#3}%
       \else
         \csname l@#1\endcsname{{#2}}{%
-          \hyper@linkstart{link}{\Hy@tocdestname}{#3}\hyper@linkend
+          \Hy@toclinkstart{#3}\Hy@toclinkend
         }%
       \fi
     \else % all
       \def\Hy@temp{#3}%
       \ifx\Hy@temp\ltx@empty
         \csname l@#1\endcsname{%
-          \hyper@linkstart{link}{\Hy@tocdestname}{#2}\hyper@linkend
+          \Hy@toclinkstart{#2}\Hy@toclinkend
         }{}%
       \else
         \csname l@#1\endcsname{%
-          \hyper@linkstart{link}{\Hy@tocdestname}{#2}\hyper@linkend
+          \Hy@toclinkstart{#2}\Hy@toclinkend
         }{%
-          \hyper@linkstart{link}{\Hy@tocdestname}{#3}\hyper@linkend
+          \Hy@toclinkstart{#3}\Hy@toclinkend
         }%
       \fi
     \fi
@@ -12442,6 +12449,8 @@
 % normal text (which is used as an anchor).
 % (|\endinput| have to be on the same line like |\fi|, or you
 % have to use |\expandafter| before.)
+% 
+% change 2022-11-13: added an |\@empty| for issue\#261.
 %    \begin{macrocode}
 \ifHy@texht
   \expandafter\endinput
@@ -12455,7 +12464,7 @@
       Reference `#3' on page \thepage \space undefined%
     }%
   \else
-    \expandafter\Hy@setref@link#1\@empty\@empty\@nil{#2}%
+    \expandafter\Hy@setref@link#1\@empty\@empty\@empty\@nil{#2}%
   \fi
 }
 %    \end{macrocode}
@@ -13527,24 +13536,26 @@
         \fi
       \fi
     }{%
-      \ifdim\stockwidth>\z@
-        \ifdim\stockheight>\z@
-         \setlength{\pdfpagewidth}{\stockwidth}%
-         \setlength{\pdfpageheight}{\stockheight}%
-        \else
-          \ifdim\paperwidth>\z@
-            \ifdim\paperheight>\z@
-              \setlength{\pdfpagewidth}{\paperwidth}%
-              \setlength{\pdfpageheight}{\paperheight}%
+      \ifnum\mag=\@m
+        \ifdim\stockwidth>\z@
+          \ifdim\stockheight>\z@
+           \setlength{\pdfpagewidth}{\stockwidth}%
+           \setlength{\pdfpageheight}{\stockheight}%
+          \else
+            \ifdim\paperwidth>\z@
+              \ifdim\paperheight>\z@
+                \setlength{\pdfpagewidth}{\paperwidth}%
+                \setlength{\pdfpageheight}{\paperheight}%
+              \fi
             \fi
           \fi
-        \fi
-      \else
-        \ifdim\stockwidth=\z@
-          \ifdim\paperwidth>\z@
-            \ifdim\paperheight>\z@
-              \setlength{\pdfpagewidth}{\paperwidth}%
-              \setlength{\pdfpageheight}{\paperheight}%
+        \else
+          \ifdim\stockwidth=\z@
+            \ifdim\paperwidth>\z@
+              \ifdim\paperheight>\z@
+                \setlength{\pdfpagewidth}{\paperwidth}%
+                \setlength{\pdfpageheight}{\paperheight}%
+              \fi
             \fi
           \fi
         \fi
@@ -14600,6 +14611,7 @@
 \AtBeginShipoutFirst{%
   \ifHy@setpagesize
     \begingroup
+     \ifnum\mag=\@m
       \ifdim\stockwidth>\z@
         \ifdim\stockheight>\z@
          \special{papersize=\the\stockwidth,\the\stockheight}%
@@ -14619,6 +14631,7 @@
           \fi
         \fi
       \fi
+     \fi
     \endgroup
   \fi
   \Hy@DisableOption{setpagesize}%
@@ -14757,6 +14770,7 @@
 \ifcsname mediaheight\endcsname
   \ifHy@setpagesize
      \providecommand*{\VTeXInitMediaSize}{%
+       \ifnum\mag=\@m
         \ifdim\stockwidth>\z@
           \ifdim\stockheight>\z@
            \setlength\mediaheight\stockheight
@@ -14779,6 +14793,7 @@
             \fi
           \fi
         \fi
+       \fi
      }%
      \Hy@AtBeginDocument{\VTeXInitMediaSize}%
   \fi
@@ -16409,6 +16424,7 @@
 \AtBeginShipoutFirst{%
   \ifHy@setpagesize
     \begingroup
+     \ifnum\mag=\@m
       \ifdim\stockwidth>\z@
         \ifdim\stockheight>\z@
          \special{papersize=\the\stockwidth,\the\stockheight}%
@@ -16428,6 +16444,7 @@
           \fi
         \fi
       \fi
+     \fi 
     \endgroup
   \fi
   \Hy@DisableOption{setpagesize}%
diff --git a/Master/texmf-dist/source/latex/hyperref/nameref.dtx b/Master/texmf-dist/source/latex/hyperref/nameref.dtx
index 0c2c3b96062..e2b9624c019 100644
--- a/Master/texmf-dist/source/latex/hyperref/nameref.dtx
+++ b/Master/texmf-dist/source/latex/hyperref/nameref.dtx
@@ -535,7 +535,7 @@
 %    \begin{macrocode}
   \ltx@IfUndefined{descriptionlabel}{%
   }{%
-    \@ifundefined{NR@nopatch@longtable}
+    \@ifundefined{NR@nopatch@lists}
      {\let\NRorg@descriptionlabel\descriptionlabel
       \def\descriptionlabel#1{%
        \NR@gettitle{#1}%