summaryrefslogtreecommitdiff
path: root/macros/latex/contrib/hyperref/hyperref.dtx
diff options
context:
space:
mode:
Diffstat (limited to 'macros/latex/contrib/hyperref/hyperref.dtx')
-rw-r--r--macros/latex/contrib/hyperref/hyperref.dtx160
1 files changed, 90 insertions, 70 deletions
diff --git a/macros/latex/contrib/hyperref/hyperref.dtx b/macros/latex/contrib/hyperref/hyperref.dtx
index 6baf1e5480..fb6aefd9b2 100644
--- a/macros/latex/contrib/hyperref/hyperref.dtx
+++ b/macros/latex/contrib/hyperref/hyperref.dtx
@@ -52,7 +52,7 @@
%<puvnenc>\ProvidesFile{puvnenc.def}
%<puarenc>\ProvidesFile{puarenc.def}
%<psdextra>\ProvidesFile{psdextra.def}
-%<!none&!packageEnd> [2022-06-20 v7.00s %
+%<!none&!packageEnd> [2022-09-22 v7.00t %
%<package> Hypertext links for LaTeX]
%<nohyperref> Dummy hyperref (SR)]
%<driver> Hyperref documentation driver file]
@@ -6696,7 +6696,7 @@
\def\HyperDestNameFilter#1{#1}
\Hy@AtBeginDocument{%
\begingroup
- \edef\x{\@ifundefined{stockheight}\paperheight\stockheight}%
+ \edef\x{\ifdim\stockheight>\z@ \stockheight\else\paperheight\fi}%
\dimen@=\x\relax
\ifdim\dimen@>\z@
\else
@@ -6985,6 +6985,11 @@
% \end{macrocode}
%
% \subsubsection{Driver loading}
+% Ensure that |\stockwidth| and |\stockheight| are defined
+% \begin{macrocode}
+\@ifundefined{stockwidth}{\newdimen\stockwidth}{}
+\@ifundefined{stockheight}{\newdimen\stockheight}{}
+% \end{macrocode}
%
% \begin{macrocode}
\Hy@AtEndOfPackage{%
@@ -8235,9 +8240,10 @@
% Provide a dummy default definition of \cs{hyper@newdestlabel}
% inside the .aux files.
% \begin{macrocode}
-\AddLineBeginAux{%
- \string\providecommand\string\hyper@newdestlabel[2]{}%
-}
+\AddToHook{include/before}
+ {\immediate\write\@partaux{\string\providecommand\string\hyper@newdestlabel[2]{}}}
+\AddToHook{begindocument}
+ {\immediate\write\@mainaux{\string\providecommand\string\hyper@newdestlabel[2]{}}}
% \end{macrocode}
%
% \section{Forms creation}
@@ -12704,15 +12710,7 @@
\fi
\fi
}
-\@ifpackageloaded{showkeys}{%
- \HyRef@ShowKeysInit
-}{%
- \Hy@AtBeginDocument{%
- \@ifpackageloaded{showkeys}{%
- \HyRef@ShowKeysInit
- }{}%
- }%
-}
+\AddToHook{package/showkeys/after}{\HyRef@ShowKeysInit}
% \end{macrocode}
% \end{macro}
%
@@ -13529,21 +13527,28 @@
\fi
\fi
}{%
- \ltx@IfUndefined{stockwidth}{%
- \ifdim\paperwidth>\z@
- \setlength{\pdfpagewidth}{\paperwidth}%
- \fi
- \ifdim\paperheight>\z@
- \setlength{\pdfpageheight}{\paperheight}%
- \fi
- }{%
- \ifdim\stockwidth>\z@
- \setlength{\pdfpagewidth}{\stockwidth}%
- \fi
+ \ifdim\stockwidth>\z@
\ifdim\stockheight>\z@
- \setlength{\pdfpageheight}{\stockheight}%
+ \setlength{\pdfpagewidth}{\stockwidth}%
+ \setlength{\pdfpageheight}{\stockheight}%
+ \else
+ \ifdim\paperwidth>\z@
+ \ifdim\paperheight>\z@
+ \setlength{\pdfpagewidth}{\paperwidth}%
+ \setlength{\pdfpageheight}{\paperheight}%
+ \fi
+ \fi
\fi
- }%
+ \else
+ \ifdim\stockwidth=\z@
+ \ifdim\paperwidth>\z@
+ \ifdim\paperheight>\z@
+ \setlength{\pdfpagewidth}{\paperwidth}%
+ \setlength{\pdfpageheight}{\paperheight}%
+ \fi
+ \fi
+ \fi
+ \fi
}%
}%
\Hy@DisableOption{setpagesize}%
@@ -14595,19 +14600,25 @@
\AtBeginShipoutFirst{%
\ifHy@setpagesize
\begingroup
- \@ifundefined{stockwidth}{%
- \ifdim\paperwidth>\z@
- \ifdim\paperheight>\z@
- \special{papersize=\the\paperwidth,\the\paperheight}%
+ \ifdim\stockwidth>\z@
+ \ifdim\stockheight>\z@
+ \special{papersize=\the\stockwidth,\the\stockheight}%
+ \else
+ \ifdim\paperwidth>\z@
+ \ifdim\paperheight>\z@
+ \special{papersize=\the\paperwidth,\the\paperheight}%
+ \fi
\fi
\fi
- }{%
- \ifdim\stockwidth>\z@
- \ifdim\stockheight>\z@
- \special{papersize=\the\stockwidth,\the\stockheight}%
+ \else
+ \ifdim\stockwidth=\z@
+ \ifdim\paperwidth>\z@
+ \ifdim\paperheight>\z@
+ \special{papersize=\the\paperwidth,\the\paperheight}%
+ \fi
\fi
\fi
- }%
+ \fi
\endgroup
\fi
\Hy@DisableOption{setpagesize}%
@@ -14743,32 +14754,35 @@
% it avoids the definition and the hash table entry of a
% previous undefined macro.
% \begin{macrocode}
-\ifx\mediaheight\@undefined
-\else
- \ifx\mediaheight\relax
- \else
- \ifHy@setpagesize
- \providecommand*{\VTeXInitMediaSize}{%
- \ltx@IfUndefined{stockwidth}{%
- \ifdim\paperheight>0pt %
- \setlength\mediaheight\paperheight
- \fi
- \ifdim\paperheight>0pt %
- \setlength\mediawidth\paperwidth
- \fi
- }{%
- \ifdim\stockheight>0pt %
- \setlength\mediaheight\stockheight
- \fi
- \ifdim\stockwidth>0pt %
- \setlength\mediawidth\stockwidth
- \fi
- }%
- }%
- \Hy@AtBeginDocument{\VTeXInitMediaSize}%
- \fi
- \Hy@DisableOption{setpagesize}%
+\ifcsname mediaheight\endcsname
+ \ifHy@setpagesize
+ \providecommand*{\VTeXInitMediaSize}{%
+ \ifdim\stockwidth>\z@
+ \ifdim\stockheight>\z@
+ \setlength\mediaheight\stockheight
+ \setlength\mediawidth\stockwidth
+ \else
+ \ifdim\paperwidth>\z@
+ \ifdim\paperheight>\z@
+ \setlength\mediaheight\paperheight
+ \setlength\mediawidth\paperwidth
+ \fi
+ \fi
+ \fi
+ \else
+ \ifdim\stockwidth=\z@
+ \ifdim\paperwidth>\z@
+ \ifdim\paperheight>\z@
+ \setlength\mediaheight\paperheight
+ \setlength\mediawidth\paperwidth
+ \fi
+ \fi
+ \fi
+ \fi
+ }%
+ \Hy@AtBeginDocument{\VTeXInitMediaSize}%
\fi
+ \Hy@DisableOption{setpagesize}%
\fi
% \end{macrocode}
% Older versions of VTeX require |xyz| in lower case.
@@ -16395,19 +16409,25 @@
\AtBeginShipoutFirst{%
\ifHy@setpagesize
\begingroup
- \@ifundefined{stockwidth}{%
- \ifdim\paperwidth>\z@
- \ifdim\paperheight>\z@
- \special{papersize=\the\paperwidth,\the\paperheight}%
+ \ifdim\stockwidth>\z@
+ \ifdim\stockheight>\z@
+ \special{papersize=\the\stockwidth,\the\stockheight}%
+ \else
+ \ifdim\paperwidth>\z@
+ \ifdim\paperheight>\z@
+ \special{papersize=\the\paperwidth,\the\paperheight}%
+ \fi
\fi
\fi
- }{%
- \ifdim\stockwidth>\z@
- \ifdim\stockheight>\z@
- \special{papersize=\the\stockwidth,\the\stockheight}%
+ \else
+ \ifdim\stockwidth=\z@
+ \ifdim\paperwidth>\z@
+ \ifdim\paperheight>\z@
+ \special{papersize=\the\paperwidth,\the\paperheight}%
+ \fi
\fi
\fi
- }%
+ \fi
\endgroup
\fi
\Hy@DisableOption{setpagesize}%