From 262cf5e1ccaa88f12309ca9843e742843df05c0b Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 26 Nov 2023 21:05:03 +0000 Subject: hyperref (26nov23) git-svn-id: svn://tug.org/texlive/trunk@68972 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/hyperref/backref.sty | 5 +- Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def | 28 +- Master/texmf-dist/tex/latex/hyperref/hdvips.def | 4 +- Master/texmf-dist/tex/latex/hyperref/hdvipson.def | 4 +- Master/texmf-dist/tex/latex/hyperref/hdviwind.def | 22 +- Master/texmf-dist/tex/latex/hyperref/hluatex.def | 104 ++--- Master/texmf-dist/tex/latex/hyperref/hpdftex.def | 100 ++--- Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg | 2 +- Master/texmf-dist/tex/latex/hyperref/htex4ht.def | 12 +- Master/texmf-dist/tex/latex/hyperref/htexture.def | 2 +- Master/texmf-dist/tex/latex/hyperref/hvtex.def | 24 +- Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def | 6 +- Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def | 4 +- Master/texmf-dist/tex/latex/hyperref/hxetex.def | 28 +- Master/texmf-dist/tex/latex/hyperref/hyperref.sty | 452 +++++++++++---------- Master/texmf-dist/tex/latex/hyperref/hypertex.def | 10 +- Master/texmf-dist/tex/latex/hyperref/nameref.sty | 18 +- .../texmf-dist/tex/latex/hyperref/nohyperref.sty | 2 +- Master/texmf-dist/tex/latex/hyperref/pd1enc.def | 2 +- Master/texmf-dist/tex/latex/hyperref/pdfmark.def | 50 +-- Master/texmf-dist/tex/latex/hyperref/psdextra.def | 2 +- Master/texmf-dist/tex/latex/hyperref/puarenc.def | 2 +- .../texmf-dist/tex/latex/hyperref/puenc-extra.def | 2 +- Master/texmf-dist/tex/latex/hyperref/puenc.def | 4 +- Master/texmf-dist/tex/latex/hyperref/puvnenc.def | 2 +- Master/texmf-dist/tex/latex/hyperref/xr-hyper.sty | 26 +- 26 files changed, 463 insertions(+), 454 deletions(-) (limited to 'Master/texmf-dist/tex/latex/hyperref') diff --git a/Master/texmf-dist/tex/latex/hyperref/backref.sty b/Master/texmf-dist/tex/latex/hyperref/backref.sty index 41f914b662d..7e26c01ec74 100644 --- a/Master/texmf-dist/tex/latex/hyperref/backref.sty +++ b/Master/texmf-dist/tex/latex/hyperref/backref.sty @@ -57,17 +57,16 @@ %% given in the file `manifest.txt'. \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{backref} - [2023-08-01 v1.43 Bibliographical back referencing]% + [2023-11-26 v1.44 Bibliographical back referencing]% \RequirePackage{kvoptions}[2011/06/30] \RequirePackage{kvsetkeys}[2009/07/30] -\RequirePackage{ltxcmds}[2009/12/12] \SetupKeyvalOptions{% family=backref,% prefix=BR@,% } \newcommand*{\backrefsetup}{\kvsetkeys{backref}} \DeclareBoolOption[% - \ltx@ifundefined{ifHy@verbose}{% + \@ifundefined{ifHy@verbose}{% false% }{% \ifx\ifHy@verbose\iftrue true\else false\fi diff --git a/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def b/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def index 884260c2905..acd6a4dcd7c 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def +++ b/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def @@ -33,7 +33,7 @@ %% %% File: hyperref.dtx \ProvidesFile{hdvipdfm.def} - [2023-11-09 v7.01f % + [2023-11-26 v7.01g % Hyperref driver for dvipdfm] \Hy@VersionCheck{hdvipdfm.def} \special{pdf:majorversion \Hy@pdf@majorversion} @@ -92,7 +92,7 @@ |ifx|\#2|\%% |else \\% - |ltx@ReturnAfterFi{% + |Hy@ReturnAfterFi{% |Hy@ExchangeBackslash#2|@nil }% |fi @@ -103,7 +103,7 @@ \ifx\\#2\\% \else \@backslashchar(% - \ltx@ReturnAfterFi{% + \Hy@ReturnAfterFi{% \Hy@ExchangeLeftParenthesis#2\@nil }% \fi @@ -113,7 +113,7 @@ \ifx\\#2\\% \else \@backslashchar)% - \ltx@ReturnAfterFi{% + \Hy@ReturnAfterFi{% \Hy@ExchangeRightParenthesis#2\@nil }% \fi @@ -687,7 +687,7 @@ }% \@pdfm@mark{put @catalog <>}% } -\let\@endForm\ltx@empty +\let\@endForm\@empty \def\dvipdfm@setdim{% height \the\ht\pdfm@box\space width \the\wd\pdfm@box\space @@ -704,14 +704,14 @@ \def\Fld@pageobjref{/P @thispage}% \def\HyField@AddToFields#1{% \@pdfm@mark{put @afields @#1\HyField@TheAnnotCount}% - \ifx\Fld@calculate@code\ltx@empty + \ifx\Fld@calculate@code\@empty \else \@pdfm@mark{put @corder @#1\HyField@TheAnnotCount}% \fi } \def\@TextField[#1]#2{% parameters, label \def\Fld@name{#2}% - \let\Fld@default\ltx@empty + \let\Fld@default\@empty \let\Fld@value\@empty \def\Fld@width{\DefaultWidthofText}% \def\Fld@height{% @@ -1062,7 +1062,7 @@ \else \expandafter \Hy@pstringdef\csname Hy@esc@\string#2\endcsname{#2}% - \ltx@ReturnAfterFi{% + \Hy@ReturnAfterFi{% \Hy@@escapeform#3\@nil }% \fi @@ -1495,9 +1495,9 @@ \def\HyPsd@SanitizeOut@BraceLeft#1(#2\@nil{% #1% \ifx\\#2\\% - \expandafter\ltx@gobble + \expandafter\@gobble \else - \expandafter\ltx@firstofone + \expandafter\@firstofone \fi {% \string\173% @@ -1507,9 +1507,9 @@ \def\HyPsd@SanitizeOut@BraceRight#1)#2\@nil{% #1% \ifx\\#2\\% - \expandafter\ltx@gobble + \expandafter\@gobble \else - \expandafter\ltx@firstofone + \expandafter\@firstofone \fi {% \string\175% @@ -1670,7 +1670,7 @@ \endgroup \H@old@schapter{#1}% } -\ltx@IfUndefined{@chapter}{}{% +\@ifundefined{@chapter}{}{% \let\Hy@org@chapter\@chapter \def\@chapter{% \def\Hy@next{% @@ -1680,7 +1680,7 @@ }% }% \ifnum\c@secnumdepth>\m@ne - \ltx@IfUndefined{if@mainmatter}% + \@ifundefined{if@mainmatter}% \iftrue{\csname if@mainmatter\endcsname}% \let\Hy@next\relax \fi diff --git a/Master/texmf-dist/tex/latex/hyperref/hdvips.def b/Master/texmf-dist/tex/latex/hyperref/hdvips.def index 5742c0c2a00..06c6a48b854 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hdvips.def +++ b/Master/texmf-dist/tex/latex/hyperref/hdvips.def @@ -33,11 +33,11 @@ %% %% File: hyperref.dtx \ProvidesFile{hdvips.def} - [2023-11-09 v7.01f % + [2023-11-26 v7.01g % Hyperref driver for dvips] \Hy@VersionCheck{hdvips.def} \providecommand*{\XR@ext}{pdf} -\let\Hy@raisedlink\ltx@empty +\let\Hy@raisedlink\@empty \def\literalps@out#1{\special{ps:SDict begin #1 end}}% \def\headerps@out#1{\special{! #1}}% \input{pdfmark.def}% diff --git a/Master/texmf-dist/tex/latex/hyperref/hdvipson.def b/Master/texmf-dist/tex/latex/hyperref/hdvipson.def index c938e1e750a..f040629508f 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hdvipson.def +++ b/Master/texmf-dist/tex/latex/hyperref/hdvipson.def @@ -33,11 +33,11 @@ %% %% File: hyperref.dtx \ProvidesFile{hdvipson.def} - [2023-11-09 v7.01f % + [2023-11-26 v7.01g % Hyperref driver for dvipsone] \Hy@VersionCheck{hdvipson.def} \providecommand*{\XR@ext}{pdf} -\let\Hy@raisedlink\ltx@empty +\let\Hy@raisedlink\@empty \providecommand*\@pdfborder{0 0 1} \providecommand*\@pdfborderstyle{} \def\literalps@out#1{\special{ps:#1}}% diff --git a/Master/texmf-dist/tex/latex/hyperref/hdviwind.def b/Master/texmf-dist/tex/latex/hyperref/hdviwind.def index 4dff8eac3a9..f819aee4fb0 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hdviwind.def +++ b/Master/texmf-dist/tex/latex/hyperref/hdviwind.def @@ -33,7 +33,7 @@ %% %% File: hyperref.dtx \ProvidesFile{hdviwind.def} - [2023-11-09 v7.01f % + [2023-11-26 v7.01g % Hyperref driver for dviwindo] \Hy@VersionCheck{hdviwind.def} \begingroup @@ -110,7 +110,7 @@ |ifx|\#2|\%% |else \\% - |ltx@ReturnAfterFi{% + |Hy@ReturnAfterFi{% |Hy@ExchangeBackslash#2|@nil }% |fi @@ -121,7 +121,7 @@ \ifx\\#2\\% \else \@backslashchar(% - \ltx@ReturnAfterFi{% + \Hy@ReturnAfterFi{% \Hy@ExchangeLeftParenthesis#2\@nil }% \fi @@ -131,7 +131,7 @@ \ifx\\#2\\% \else \@backslashchar)% - \ltx@ReturnAfterFi{% + \Hy@ReturnAfterFi{% \Hy@ExchangeRightParenthesis#2\@nil }% \fi @@ -445,7 +445,7 @@ \edef\@processme{\noexpand\pdf@toks={\the\pdf@defaulttoks}}% \@processme \let\pdf@type\relax - \let\pdf@objdef\ltx@empty + \let\pdf@objdef\@empty \kvsetkeys{PDF}{#2}% \ifHy@pdfmarkerror \else @@ -459,14 +459,14 @@ \ifx\\#1\\% \literalps@out{% [% - \ifx\pdf@objdef\ltx@empty + \ifx\pdf@objdef\@empty \else /_objdef\string{\pdf@objdef\string}% \fi \the\pdf@toks\space\pdf@type\space pdfmark% }% \else - \ltx@IfUndefined{@\pdf@linktype color}{% + \@ifundefined{@\pdf@linktype color}{% \Hy@colorlink\@linkcolor }{% \expandafter\Hy@colorlink @@ -475,7 +475,7 @@ \pdf@rect{#1}% \literalps@out{% [% - \ifx\pdf@objdef\ltx@empty + \ifx\pdf@objdef\@empty \else /_objdef\string{\pdf@objdef\string}% \fi @@ -494,7 +494,7 @@ \begingroup \chardef\x=1 % \def\Hy@temp{#1}% - \ifx\Hy@temp\ltx@empty + \ifx\Hy@temp\@empty \chardef\x=0 % \else \def\y{\anchor@spot}% @@ -515,7 +515,7 @@ \ifmmode \def\Hy@LinkMath{$}% \else - \let\Hy@LinkMath\ltx@empty + \let\Hy@LinkMath\@empty \fi \ifHy@breaklinks \Hy@setouterhbox\pdf@box{% @@ -579,7 +579,7 @@ \define@key{PDF}{linktype}{\def\pdf@linktype{#1}} \def\pdf@linktype{link} \define@key{PDF}{objdef}{\edef\pdf@objdef{#1}} -\let\pdf@objdef\ltx@empty +\let\pdf@objdef\@empty \define@key{PDF}{Raw}{\pdf@addtoksx{#1}} \define@key{PDF}{Action}{\pdf@addtoks{#1}{Action}} \define@key{PDF}{Border}{% diff --git a/Master/texmf-dist/tex/latex/hyperref/hluatex.def b/Master/texmf-dist/tex/latex/hyperref/hluatex.def index 8e760542986..ceaddc4b04d 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hluatex.def +++ b/Master/texmf-dist/tex/latex/hyperref/hluatex.def @@ -34,10 +34,10 @@ %% %% File: hyperref.dtx \ProvidesFile{hluatex.def} - [2023-11-09 v7.01f % + [2023-11-26 v7.01g % Hyperref driver for luaTeX] \Hy@VersionCheck{hluatex.def} -%% 2023-11-09 v7.01f +%% 2023-11-26 v7.01g %% force unicode encoding, see issue #101 %% code mostly copied from hxetex.def \HyPsd@LoadUnicode @@ -70,7 +70,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \pdf@ifdraftmode{% - \let\Hy@PutCatalog\ltx@gobble + \let\Hy@PutCatalog\@gobble }{% \let\Hy@PutCatalog\pdfcatalog } @@ -109,7 +109,7 @@ |ifx|\#2|\%% |else \\% - |ltx@ReturnAfterFi{% + |Hy@ReturnAfterFi{% |Hy@ExchangeBackslash#2|@nil }% |fi @@ -120,7 +120,7 @@ \ifx\\#2\\% \else \@backslashchar(% - \ltx@ReturnAfterFi{% + \Hy@ReturnAfterFi{% \Hy@ExchangeLeftParenthesis#2\@nil }% \fi @@ -130,7 +130,7 @@ \ifx\\#2\\% \else \@backslashchar)% - \ltx@ReturnAfterFi{% + \Hy@ReturnAfterFi{% \Hy@ExchangeRightParenthesis#2\@nil }% \fi @@ -160,7 +160,7 @@ \fi \ifHy@setpdfversion \ifnum\Hy@pdf@majorminor@version<105 % - \ltx@IfUndefined{pdfobjcompresslevel}{% + \@ifundefined{pdfobjcompresslevel}{% }{% \ifHy@verbose \Hy@InfoNoLine{% @@ -170,19 +170,19 @@ \Hy@pdf@majorversion.\Hy@pdf@minorversion }% \fi - \pdfobjcompresslevel=\ltx@zero + \pdfobjcompresslevel=\z@ }% \fi \ifnum\Hy@pdfmajorminor@version=\Hy@pdf@majorminor@version\relax \else - \let\Hy@temp\ltx@empty + \let\Hy@temp\@empty \def\Hy@temp@A#1#2{% - \ifnum#1>\ltx@zero + \ifnum#1>\z@ \edef\Hy@temp{% \Hy@temp \space\space \the#1\space #2% - \ifnum#1=\ltx@one\else s\fi + \ifnum#1=\@ne\else s\fi \MessageBreak }% \fi @@ -191,15 +191,15 @@ \Hy@temp@A\lastsavedboxresourceindex{form XObject}% \Hy@temp@A\lastsavedimageresourceindex{image XObject}% \Hy@temp@A\pdflastannot{annotation}% - \ltx@IfUndefined{pdflastlink}{% + \@ifundefined{pdflastlink}{% }{% \Hy@temp@A\pdflastlink{link}% }% - \ifx\Hy@temp\ltx@empty + \ifx\Hy@temp\@empty \Hy@pdfmajorversion=\Hy@pdf@majorversion\relax \Hy@pdfminorversion=\Hy@pdf@minorversion\relax \else - \let\Hy@temp@A\ltx@empty + \let\Hy@temp@A\@empty \ifnum\Hy@pdf@majorminor@version=104 % \IfFileExists{pdf14.sty}{% \def\Hy@temp@A{% @@ -222,7 +222,7 @@ \expandafter\string\Hy@pdfminorversion=\Hy@pdf@minorversion \string\relax \ifnum\Hy@pdf@majorminor@version<105 % - \ltx@ifundefined{pdfobjcompresslevel}{% + \@ifundefined{pdfobjcompresslevel}{% }{% \MessageBreak \space\space @@ -430,7 +430,7 @@ } \def\hyper@linkstart#1#2{% \Hy@VerboseLinkStart{#1}{#2}% - \ltx@IfUndefined{@#1bordercolor}{% + \@ifundefined{@#1bordercolor}{% \let\CurrentBorderColor\relax }{% \edef\CurrentBorderColor{\csname @#1bordercolor\endcsname}% @@ -440,7 +440,7 @@ \def\hyper@linkend{\close@pdflink} \def\hyper@link#1#2#3{% \Hy@VerboseLinkStart{#1}{#2}% - \ltx@IfUndefined{@#1bordercolor}{% + \@ifundefined{@#1bordercolor}{% \let\CurrentBorderColor\relax }{% \edef\CurrentBorderColor{\csname @#1bordercolor\endcsname}% @@ -745,7 +745,7 @@ \fi \fi }{% - \ltx@IfUndefined{stockwidth}{% + \@ifundefined{stockwidth}{% \ifdim\paperwidth>\z@ \setlength{\pagewidth}{\paperwidth}% \fi @@ -816,8 +816,8 @@ \the\lastsavedboxresourceindex\space 0 R% }% }% -\let\HyField@afields\ltx@empty -\let\HyField@cofields\ltx@empty +\let\HyField@afields\@empty +\let\HyField@cofields\@empty \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname pdflastlink\endcsname\relax \let\HyField@AddToFields\relax @@ -829,37 +829,37 @@ but other PDF viewers might complain% }% \else - \let\HyField@AuxAddToFields\ltx@gobble - \let\HyField@AuxAddToCoFields\ltx@gobbletwo + \let\HyField@AuxAddToFields\@gobble + \let\HyField@AuxAddToCoFields\@gobbletwo \def\HyField@AfterAuxOpen{\Hy@AtBeginDocument}% \def\HyField@ABD@AuxAddToCoFields#1#2{% \begingroup \Hy@safe@activestrue - \let\ltx@secondoftwo\relax - \ifx\HyField@cofields\ltx@empty + \let\@secondoftwo\relax + \ifx\HyField@cofields\@empty \xdef\HyField@cofields{% - \ltx@secondoftwo{#1}{ #2 0 R}% + \@secondoftwo{#1}{ #2 0 R}% }% \else - \let\ltx@secondoftwo\relax + \let\@secondoftwo\relax \def\HyField@AddCoField##1##2##3{% - \ifx##1\ltx@empty - \ltx@secondoftwo{#1}{ #2 0 R}% - \expandafter\ltx@gobble + \ifx##1\@empty + \@secondoftwo{#1}{ #2 0 R}% + \expandafter\@gobble \else - \ifnum\pdf@strcmp{##2}{#1}>\ltx@zero - \ltx@secondoftwo{#1}{ #2 0 R}% - \ltx@secondoftwo{##2}{##3}% - \expandafter\expandafter\expandafter\ltx@gobble + \ifnum\pdf@strcmp{##2}{#1}>\z@ + \@secondoftwo{#1}{ #2 0 R}% + \@secondoftwo{##2}{##3}% + \expandafter\expandafter\expandafter\@gobble \else - \ltx@secondoftwo{##2}{##3}% + \@secondoftwo{##2}{##3}% \fi \fi \HyField@AddCoField }% \xdef\HyField@cofields{% \expandafter\HyField@AddCoField - \HyField@cofields\ltx@empty\ltx@empty\ltx@empty + \HyField@cofields\@empty\@empty\@empty }% \fi \endgroup @@ -890,7 +890,7 @@ \expandafter\HyField@@AddToFields\expandafter{% \the\pdflastlink }% - \ifx\Fld@calculate@code\ltx@empty + \ifx\Fld@calculate@code\@empty \else \begingroup \Hy@safe@activestrue @@ -931,7 +931,7 @@ \immediate\pdfobj{% <<% /Fields[\HyField@afields]% - \ifx\HyField@cofields\ltx@empty + \ifx\HyField@cofields\@empty \else /CO[\romannumeral-`\Q\HyField@cofields]% \fi @@ -971,16 +971,16 @@ \fbox{\textcolor{yellow}{\textsf{SubmitP}}}% }{SubmitP}% } -\let\@endForm\ltx@empty -\let\HyAnn@AbsPageLabel\ltx@empty -\let\Fld@pageobjref\ltx@empty -\ltx@IfUndefined{pdfpageref}{% +\let\@endForm\@empty +\let\HyAnn@AbsPageLabel\@empty +\let\Fld@pageobjref\@empty +\@ifundefined{pdfpageref}{% }{% - \ltx@ifpackageloaded{zref-abspage}{% + \@ifpackageloaded{zref-abspage}{% \newcount\HyAnn@Count - \HyAnn@Count=\ltx@zero + \HyAnn@Count=\z@ \def\HyAnn@AbsPageLabel{% - \global\advance\HyAnn@Count by\ltx@one + \global\advance\HyAnn@Count by\@ne \zref@labelbyprops{HyAnn@\the\HyAnn@Count}{abspage}% \zref@refused{HyAnn@\the\HyAnn@Count}% }% @@ -1000,7 +1000,7 @@ } \def\@TextField[#1]#2{% parameters, label \def\Fld@name{#2}% - \let\Fld@default\ltx@empty + \let\Fld@default\@empty \let\Fld@value\@empty \def\Fld@width{\DefaultWidthofText}% \def\Fld@height{% @@ -1320,7 +1320,7 @@ \else \expandafter \Hy@pstringdef\csname Hy@esc@\string#2\endcsname{#2}% - \ltx@ReturnAfterFi{% + \Hy@ReturnAfterFi{% \Hy@@escapeform#3\@nil }% \fi @@ -1753,9 +1753,9 @@ \def\HyPsd@SanitizeOut@BraceLeft#1(#2\@nil{% #1% \ifx\\#2\\% - \expandafter\ltx@gobble + \expandafter\@gobble \else - \expandafter\ltx@firstofone + \expandafter\@firstofone \fi {% \string\173% @@ -1765,9 +1765,9 @@ \def\HyPsd@SanitizeOut@BraceRight#1)#2\@nil{% #1% \ifx\\#2\\% - \expandafter\ltx@gobble + \expandafter\@gobble \else - \expandafter\ltx@firstofone + \expandafter\@firstofone \fi {% \string\175% @@ -1916,7 +1916,7 @@ \endgroup \H@old@schapter{#1}% } -\ltx@IfUndefined{@chapter}{}{% +\@ifundefined{@chapter}{}{% \let\Hy@org@chapter\@chapter \def\@chapter{% \def\Hy@next{% @@ -1926,7 +1926,7 @@ }% }% \ifnum\c@secnumdepth>\m@ne - \ltx@IfUndefined{if@mainmatter}% + \@ifundefined{if@mainmatter}% \iftrue{\csname if@mainmatter\endcsname}% \let\Hy@next\relax \fi diff --git a/Master/texmf-dist/tex/latex/hyperref/hpdftex.def b/Master/texmf-dist/tex/latex/hyperref/hpdftex.def index 6e6b235f895..403e0f77f9d 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hpdftex.def +++ b/Master/texmf-dist/tex/latex/hyperref/hpdftex.def @@ -33,11 +33,11 @@ %% %% File: hyperref.dtx \ProvidesFile{hpdftex.def} - [2023-11-09 v7.01f % + [2023-11-26 v7.01g % Hyperref driver for pdfTeX] \Hy@VersionCheck{hpdftex.def} \pdf@ifdraftmode{% - \let\Hy@PutCatalog\ltx@gobble + \let\Hy@PutCatalog\@gobble }{% \let\Hy@PutCatalog\pdfcatalog } @@ -76,7 +76,7 @@ |ifx|\#2|\%% |else \\% - |ltx@ReturnAfterFi{% + |Hy@ReturnAfterFi{% |Hy@ExchangeBackslash#2|@nil }% |fi @@ -87,7 +87,7 @@ \ifx\\#2\\% \else \@backslashchar(% - \ltx@ReturnAfterFi{% + \Hy@ReturnAfterFi{% \Hy@ExchangeLeftParenthesis#2\@nil }% \fi @@ -97,7 +97,7 @@ \ifx\\#2\\% \else \@backslashchar)% - \ltx@ReturnAfterFi{% + \Hy@ReturnAfterFi{% \Hy@ExchangeRightParenthesis#2\@nil }% \fi @@ -125,7 +125,7 @@ \fi \ifHy@setpdfversion \ifnum\Hy@pdf@majorminor@version<105 % - \ltx@IfUndefined{pdfobjcompresslevel}{% + \@ifundefined{pdfobjcompresslevel}{% }{% \ifHy@verbose \Hy@InfoNoLine{% @@ -135,19 +135,19 @@ \Hy@pdf@majorversion.\Hy@pdf@minorversion }% \fi - \pdfobjcompresslevel=\ltx@zero + \pdfobjcompresslevel=\z@ }% \fi \ifnum\Hy@pdfmajorminor@version=\Hy@pdf@majorminor@version\relax \else - \let\Hy@temp\ltx@empty + \let\Hy@temp\@empty \def\Hy@temp@A#1#2{% - \ifnum#1>\ltx@zero + \ifnum#1>\z@ \edef\Hy@temp{% \Hy@temp \space\space \the#1\space #2% - \ifnum#1=\ltx@one\else s\fi + \ifnum#1=\@ne\else s\fi \MessageBreak }% \fi @@ -156,15 +156,15 @@ \Hy@temp@A\pdflastxform{form XObject}% \Hy@temp@A\pdflastximage{image XObject}% \Hy@temp@A\pdflastannot{annotation}% - \ltx@IfUndefined{pdflastlink}{% + \@ifundefined{pdflastlink}{% }{% \Hy@temp@A\pdflastlink{link}% }% - \ifx\Hy@temp\ltx@empty + \ifx\Hy@temp\@empty \Hy@pdfmajorversion=\Hy@pdf@majorversion\relax \Hy@pdfminorversion=\Hy@pdf@minorversion\relax \else - \let\Hy@temp@A\ltx@empty + \let\Hy@temp@A\@empty \ifnum\Hy@pdf@majorminor@version=104 % \IfFileExists{pdf14.sty}{% \def\Hy@temp@A{% @@ -187,7 +187,7 @@ \expandafter\string\Hy@pdfminorversion=\Hy@pdf@minorversion \string\relax \ifnum\Hy@pdf@majorminor@version<105 % - \ltx@ifundefined{pdfobjcompresslevel}{% + \@ifundefined{pdfobjcompresslevel}{% }{% \MessageBreak \space\space @@ -386,7 +386,7 @@ } \def\hyper@linkstart#1#2{% \Hy@VerboseLinkStart{#1}{#2}% - \ltx@IfUndefined{@#1bordercolor}{% + \@ifundefined{@#1bordercolor}{% \let\CurrentBorderColor\relax }{% \edef\CurrentBorderColor{\csname @#1bordercolor\endcsname}% @@ -396,7 +396,7 @@ \def\hyper@linkend{\close@pdflink} \def\hyper@link#1#2#3{% \Hy@VerboseLinkStart{#1}{#2}% - \ltx@IfUndefined{@#1bordercolor}{% + \@ifundefined{@#1bordercolor}{% \let\CurrentBorderColor\relax }{% \edef\CurrentBorderColor{\csname @#1bordercolor\endcsname}% @@ -765,8 +765,8 @@ \the\pdflastxform\space 0 R% }% }% -\let\HyField@afields\ltx@empty -\let\HyField@cofields\ltx@empty +\let\HyField@afields\@empty +\let\HyField@cofields\@empty \@ifundefined{pdflastlink} {% \let\HyField@AddToFields\relax @@ -778,37 +778,37 @@ but other PDF viewers might complain% }}% {% - \let\HyField@AuxAddToFields\ltx@gobble - \let\HyField@AuxAddToCoFields\ltx@gobbletwo + \let\HyField@AuxAddToFields\@gobble + \let\HyField@AuxAddToCoFields\@gobbletwo \def\HyField@AfterAuxOpen{\Hy@AtBeginDocument}% \def\HyField@ABD@AuxAddToCoFields#1#2{% \begingroup \Hy@safe@activestrue - \let\ltx@secondoftwo\relax - \ifx\HyField@cofields\ltx@empty + \let\@secondoftwo\relax + \ifx\HyField@cofields\@empty \xdef\HyField@cofields{% - \ltx@secondoftwo{#1}{ #2 0 R}% + \@secondoftwo{#1}{ #2 0 R}% }% \else - \let\ltx@secondoftwo\relax + \let\@secondoftwo\relax \def\HyField@AddCoField##1##2##3{% - \ifx##1\ltx@empty - \ltx@secondoftwo{#1}{ #2 0 R}% - \expandafter\ltx@gobble + \ifx##1\@empty + \@secondoftwo{#1}{ #2 0 R}% + \expandafter\@gobble \else - \ifnum\pdfstrcmp{##2}{#1}>\ltx@zero - \ltx@secondoftwo{#1}{ #2 0 R}% - \ltx@secondoftwo{##2}{##3}% - \expandafter\expandafter\expandafter\ltx@gobble + \ifnum\pdfstrcmp{##2}{#1}>\z@ + \@secondoftwo{#1}{ #2 0 R}% + \@secondoftwo{##2}{##3}% + \expandafter\expandafter\expandafter\@gobble \else - \ltx@secondoftwo{##2}{##3}% + \@secondoftwo{##2}{##3}% \fi \fi \HyField@AddCoField }% \xdef\HyField@cofields{% \expandafter\HyField@AddCoField - \HyField@cofields\ltx@empty\ltx@empty\ltx@empty + \HyField@cofields\@empty\@empty\@empty }% \fi \endgroup @@ -839,7 +839,7 @@ \expandafter\HyField@@AddToFields\expandafter{% \the\pdflastlink }% - \ifx\Fld@calculate@code\ltx@empty + \ifx\Fld@calculate@code\@empty \else \begingroup \Hy@safe@activestrue @@ -882,7 +882,7 @@ \immediate\pdfobj{% <<% /Fields[\HyField@afields]% - \ifx\HyField@cofields\ltx@empty + \ifx\HyField@cofields\@empty \else /CO[\romannumeral-`\Q\HyField@cofields]% \fi @@ -922,16 +922,16 @@ \fbox{\textcolor{yellow}{\textsf{SubmitP}}}% }{SubmitP}% } -\let\@endForm\ltx@empty -\let\HyAnn@AbsPageLabel\ltx@empty -\let\Fld@pageobjref\ltx@empty -\ltx@IfUndefined{pdfpageref}{% +\let\@endForm\@empty +\let\HyAnn@AbsPageLabel\@empty +\let\Fld@pageobjref\@empty +\@ifundefined{pdfpageref}{% }{% - \ltx@ifpackageloaded{zref-abspage}{% + \@ifpackageloaded{zref-abspage}{% \newcount\HyAnn@Count - \HyAnn@Count=\ltx@zero + \HyAnn@Count=\z@ \def\HyAnn@AbsPageLabel{% - \global\advance\HyAnn@Count by\ltx@one + \global\advance\HyAnn@Count by\@ne \zref@labelbyprops{HyAnn@\the\HyAnn@Count}{abspage}% \zref@refused{HyAnn@\the\HyAnn@Count}% }% @@ -951,7 +951,7 @@ } \def\@TextField[#1]#2{% parameters, label \def\Fld@name{#2}% - \let\Fld@default\ltx@empty + \let\Fld@default\@empty \let\Fld@value\@empty \def\Fld@width{\DefaultWidthofText}% \def\Fld@height{% @@ -1272,7 +1272,7 @@ \else \expandafter \Hy@pstringdef\csname Hy@esc@\string#2\endcsname{#2}% - \ltx@ReturnAfterFi{% + \Hy@ReturnAfterFi{% \Hy@@escapeform#3\@nil }% \fi @@ -1705,9 +1705,9 @@ \def\HyPsd@SanitizeOut@BraceLeft#1(#2\@nil{% #1% \ifx\\#2\\% - \expandafter\ltx@gobble + \expandafter\@gobble \else - \expandafter\ltx@firstofone + \expandafter\@firstofone \fi {% \string\173% @@ -1717,9 +1717,9 @@ \def\HyPsd@SanitizeOut@BraceRight#1)#2\@nil{% #1% \ifx\\#2\\% - \expandafter\ltx@gobble + \expandafter\@gobble \else - \expandafter\ltx@firstofone + \expandafter\@firstofone \fi {% \string\175% @@ -1871,7 +1871,7 @@ \endgroup \H@old@schapter{#1}% } -\ltx@IfUndefined{@chapter}{}{% +\@ifundefined{@chapter}{}{% \let\Hy@org@chapter\@chapter \def\@chapter{% \def\Hy@next{% @@ -1881,7 +1881,7 @@ }% }% \ifnum\c@secnumdepth>\m@ne - \ltx@IfUndefined{if@mainmatter}% + \@ifundefined{if@mainmatter}% \iftrue{\csname if@mainmatter\endcsname}% \let\Hy@next\relax \fi diff --git a/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg b/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg index d5a8394e970..c8c14491020 100644 --- a/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg +++ b/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg @@ -33,7 +33,7 @@ %% %% File: hyperref.dtx \ProvidesFile{htex4ht.cfg} - [2023-11-09 v7.01f % + [2023-11-26 v7.01g % Hyperref configuration file for TeX4ht] \IfFileExists{\jobname.cfg}{\endinput}{} \Preamble{html} diff --git a/Master/texmf-dist/tex/latex/hyperref/htex4ht.def b/Master/texmf-dist/tex/latex/hyperref/htex4ht.def index 3c6415084ae..bd4b715aef0 100644 --- a/Master/texmf-dist/tex/latex/hyperref/htex4ht.def +++ b/Master/texmf-dist/tex/latex/hyperref/htex4ht.def @@ -33,18 +33,18 @@ %% %% File: hyperref.dtx \ProvidesFile{htex4ht.def} - [2023-11-09 v7.01f % + [2023-11-26 v7.01g % Hyperref driver for TeX4ht] \Hy@VersionCheck{htex4ht.def} \providecommand*{\XR@ext}{html} -\let\Hy@raisedlink\ltx@empty +\let\Hy@raisedlink\@empty \@ifpackageloaded{tex4ht}{% \Hy@InfoNoLine{tex4ht is already loaded}% }{% \RequirePackage[htex4ht]{tex4ht}% } \hyperlinkfileprefix{} -\let\PDF@FinishDoc\ltx@empty +\let\PDF@FinishDoc\@empty \def\PDF@SetupDoc{% \ifx\@baseurl\@empty \else @@ -151,7 +151,7 @@ \ifx \rEfLiNK \UnDef \def\rEfLiNK #1#2{#2}% \fi -\let\backref\ltx@gobble +\let\backref\@gobble \AtBeginDocument{% \expandafter \let\expandafter\Hy@OrgMakeLabel\csname Make:Label\endcsname @@ -180,7 +180,7 @@ \def\@TextField[#1]#2{% parameters, label \let\Hy@reserved@a\@empty \def\Fld@name{#2}% - \let\Fld@default\ltx@empty + \let\Fld@default\@empty \bgroup \Field@toks={ }% \kvsetkeys{Field}{#1}% @@ -227,7 +227,7 @@ } \def\@ChoiceMenu[#1]#2#3{% parameters, label, choices \def\Fld@name{#2}% - \let\Fld@default\ltx@empty + \let\Fld@default\@empty \let\Hy@reserved@a\relax \begingroup \expandafter\Fld@findlength#3\\% diff --git a/Master/texmf-dist/tex/latex/hyperref/htexture.def b/Master/texmf-dist/tex/latex/hyperref/htexture.def index afb5fe48aa2..0537e315a1d 100644 --- a/Master/texmf-dist/tex/latex/hyperref/htexture.def +++ b/Master/texmf-dist/tex/latex/hyperref/htexture.def @@ -33,7 +33,7 @@ %% %% File: hyperref.dtx \ProvidesFile{htexture.def} - [2023-11-09 v7.01f % + [2023-11-26 v7.01g % Hyperref driver for Textures] \Hy@VersionCheck{htexture.def} \providecommand*{\XR@ext}{pdf} diff --git a/Master/texmf-dist/tex/latex/hyperref/hvtex.def b/Master/texmf-dist/tex/latex/hyperref/hvtex.def index b19c3aa35e1..ccb97c3c1b9 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hvtex.def +++ b/Master/texmf-dist/tex/latex/hyperref/hvtex.def @@ -33,7 +33,7 @@ %% %% File: hyperref.dtx \ProvidesFile{hvtex.def} - [2023-11-09 v7.01f % + [2023-11-26 v7.01g % Hyperref driver for VTeX in PDF/PS mode] \Hy@VersionCheck{hvtex.def} \providecommand*{\XR@ext}{pdf} @@ -102,7 +102,7 @@ |ifx|\#2|\%% |else \\% - |ltx@ReturnAfterFi{% + |Hy@ReturnAfterFi{% |Hy@ExchangeBackslash#2|@nil }% |fi @@ -113,7 +113,7 @@ \ifx\\#2\\% \else \@backslashchar(% - \ltx@ReturnAfterFi{% + \Hy@ReturnAfterFi{% \Hy@ExchangeLeftParenthesis#2\@nil }% \fi @@ -123,7 +123,7 @@ \ifx\\#2\\% \else \@backslashchar)% - \ltx@ReturnAfterFi{% + \Hy@ReturnAfterFi{% \Hy@ExchangeRightParenthesis#2\@nil }% \fi @@ -205,7 +205,7 @@ \Hy@VerboseLinkStart{#1}{#2}% \Hy@pstringdef\Hy@pstringURI{#2}% \expandafter\Hy@colorlink\csname @#1color\endcsname - \ltx@IfUndefined{@#1bordercolor}{% + \@ifundefined{@#1bordercolor}{% \let\CurrentBorderColor\relax }{% \edef\CurrentBorderColor{% @@ -308,7 +308,7 @@ } \def\hyper@link#1#2#3{% \Hy@VerboseLinkStart{#1}{#2}% - \ltx@IfUndefined{@#1bordercolor}{% + \@ifundefined{@#1bordercolor}{% \let\CurrentBorderColor\relax }{% \edef\CurrentBorderColor{\csname @#1bordercolor\endcsname}% @@ -743,9 +743,9 @@ \def\HyPsd@SanitizeOut@BraceLeft#1(#2\@nil{% #1% \ifx\\#2\\% - \expandafter\ltx@gobble + \expandafter\@gobble \else - \expandafter\ltx@firstofone + \expandafter\@firstofone \fi {% \string\173% @@ -755,9 +755,9 @@ \def\HyPsd@SanitizeOut@BraceRight#1)#2\@nil{% #1% \ifx\\#2\\% - \expandafter\ltx@gobble + \expandafter\@gobble \else - \expandafter\ltx@firstofone + \expandafter\@firstofone \fi {% \string\175% @@ -941,7 +941,7 @@ \endgroup \H@old@schapter{#1}% } -\ltx@IfUndefined{@chapter}{}{% +\@ifundefined{@chapter}{}{% \let\Hy@org@chapter\@chapter \def\@chapter{% \def\Hy@next{% @@ -951,7 +951,7 @@ }% }% \ifnum\c@secnumdepth>\m@ne - \ltx@IfUndefined{if@mainmatter}% + \@ifundefined{if@mainmatter}% \iftrue{\csname if@mainmatter\endcsname}% \let\Hy@next\relax \fi diff --git a/Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def b/Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def index ba0459d8226..18fbb365c75 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def +++ b/Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def @@ -33,13 +33,13 @@ %% %% File: hyperref.dtx \ProvidesFile{hvtexhtml.def} - [2023-11-09 v7.01f % + [2023-11-26 v7.01g % Hyperref driver for VTeX in HTML mode] \Hy@VersionCheck{hvtexhtm.def} \providecommand*{\XR@ext}{htm} \RequirePackage{vtexhtml} \newif\if@Localurl -\let\PDF@FinishDoc\ltx@empty +\let\PDF@FinishDoc\@empty \def\PDF@SetupDoc{% \ifx\@baseurl\@empty \else @@ -126,7 +126,7 @@ \def\@Form[#1]{% \Hy@Message{Sorry, TeXpider does not yet support FORMs}% } -\let\@endForm\ltx@empty +\let\@endForm\@empty \def\@Gauge[#1]#2#3#4{% parameters, label, minimum, maximum \Hy@Message{Sorry, TeXpider does not yet support FORM gauges}% } diff --git a/Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def b/Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def index b2c6667fc01..465c179460d 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def +++ b/Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def @@ -33,11 +33,11 @@ %% %% File: hyperref.dtx \ProvidesFile{hvtexmrk.def} - [2023-11-09 v7.01f % + [2023-11-26 v7.01g % Hyperref driver for VTeX in PDF/PS mode (pdfmark specials)] \Hy@VersionCheck{hvtexmrk.def} \providecommand*{\XR@ext}{pdf} -\let\Hy@raisedlink\ltx@empty +\let\Hy@raisedlink\@empty \def\literalps@out#1{\special{pS:#1}}% \def\headerps@out#1{\immediate\special{pS:#1}}% \input{pdfmark.def}% diff --git a/Master/texmf-dist/tex/latex/hyperref/hxetex.def b/Master/texmf-dist/tex/latex/hyperref/hxetex.def index de7af8dba2b..4177ac1f1f1 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hxetex.def +++ b/Master/texmf-dist/tex/latex/hyperref/hxetex.def @@ -33,7 +33,7 @@ %% %% File: hyperref.dtx \ProvidesFile{hxetex.def} - [2023-11-09 v7.01f % + [2023-11-26 v7.01g % Hyperref driver for XeTeX] \Hy@VersionCheck{hxetex.def} \HyPsd@LoadUnicode @@ -132,7 +132,7 @@ |ifx|\#2|\%% |else \\% - |ltx@ReturnAfterFi{% + |Hy@ReturnAfterFi{% |Hy@ExchangeBackslash#2|@nil }% |fi @@ -143,7 +143,7 @@ \ifx\\#2\\% \else \@backslashchar(% - \ltx@ReturnAfterFi{% + \Hy@ReturnAfterFi{% \Hy@ExchangeLeftParenthesis#2\@nil }% \fi @@ -153,7 +153,7 @@ \ifx\\#2\\% \else \@backslashchar)% - \ltx@ReturnAfterFi{% + \Hy@ReturnAfterFi{% \Hy@ExchangeRightParenthesis#2\@nil }% \fi @@ -755,7 +755,7 @@ }% \@pdfm@mark{put @catalog <>}% } -\let\@endForm\ltx@empty +\let\@endForm\@empty \def\dvipdfm@setdim{% height \the\ht\pdfm@box\space width \the\wd\pdfm@box\space @@ -772,14 +772,14 @@ \def\Fld@pageobjref{/P @thispage}% \def\HyField@AddToFields#1{% \@pdfm@mark{put @afields @#1\HyField@TheAnnotCount}% - \ifx\Fld@calculate@code\ltx@empty + \ifx\Fld@calculate@code\@empty \else \@pdfm@mark{put @corder @#1\HyField@TheAnnotCount}% \fi } \def\@TextField[#1]#2{% parameters, label \def\Fld@name{#2}% - \let\Fld@default\ltx@empty + \let\Fld@default\@empty \let\Fld@value\@empty \def\Fld@width{\DefaultWidthofText}% \def\Fld@height{% @@ -1130,7 +1130,7 @@ \else \expandafter \Hy@pstringdef\csname Hy@esc@\string#2\endcsname{#2}% - \ltx@ReturnAfterFi{% + \Hy@ReturnAfterFi{% \Hy@@escapeform#3\@nil }% \fi @@ -1563,9 +1563,9 @@ \def\HyPsd@SanitizeOut@BraceLeft#1(#2\@nil{% #1% \ifx\\#2\\% - \expandafter\ltx@gobble + \expandafter\@gobble \else - \expandafter\ltx@firstofone + \expandafter\@firstofone \fi {% \string\173% @@ -1575,9 +1575,9 @@ \def\HyPsd@SanitizeOut@BraceRight#1)#2\@nil{% #1% \ifx\\#2\\% - \expandafter\ltx@gobble + \expandafter\@gobble \else - \expandafter\ltx@firstofone + \expandafter\@firstofone \fi {% \string\175% @@ -1738,7 +1738,7 @@ \endgroup \H@old@schapter{#1}% } -\ltx@IfUndefined{@chapter}{}{% +\@ifundefined{@chapter}{}{% \let\Hy@org@chapter\@chapter \def\@chapter{% \def\Hy@next{% @@ -1748,7 +1748,7 @@ }% }% \ifnum\c@secnumdepth>\m@ne - \ltx@IfUndefined{if@mainmatter}% + \@ifundefined{if@mainmatter}% \iftrue{\csname if@mainmatter\endcsname}% \let\Hy@next\relax \fi diff --git a/Master/texmf-dist/tex/latex/hyperref/hyperref.sty b/Master/texmf-dist/tex/latex/hyperref/hyperref.sty index 80d5a01310a..7afeca65b6b 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hyperref.sty +++ b/Master/texmf-dist/tex/latex/hyperref/hyperref.sty @@ -36,7 +36,7 @@ %% File: hyperref.dtx \NeedsTeXFormat{LaTeX2e}[2020/10/01] \ProvidesPackage{hyperref} - [2023-11-09 v7.01f % + [2023-11-26 v7.01g % Hypertext links for LaTeX] \begingroup \@makeother\`% @@ -105,10 +105,7 @@ }% \endgroup \Hy@SetCatcodes -\ifx\ExplSyntaxOn\undefined \RequirePackage{expl3}\fi -\RequirePackage{ltxcmds}[2010/11/12] \RequirePackage{iftex}[2019/10/24] -\RequirePackage{pdftexcmds}[2018/09/10] \RequirePackage{infwarerr}[2010/04/08] \RequirePackage{keyval}[1997/11/10] \RequirePackage{kvsetkeys}[2007/09/29] @@ -119,28 +116,28 @@ \RequirePackage{auxhook}[2009/12/14] \RequirePackage{nameref}[2012/07/28] \RequirePackage{etoolbox} -\def\Hy@Error{\@PackageError{hyperref}} -\def\Hy@Warning{\@PackageWarning{hyperref}} -\def\Hy@WarningNoLine{\@PackageWarningNoLine{hyperref}} -\def\Hy@Info{\@PackageInfo{hyperref}} -\def\Hy@InfoNoLine{\@PackageInfoNoLine{hyperref}} +\def\Hy@Error{\PackageError{hyperref}} +\def\Hy@Warning{\PackageWarning{hyperref}} +\def\Hy@WarningNoLine{\PackageWarningNoLine{hyperref}} +\def\Hy@Info{\PackageInfo{hyperref}} +\def\Hy@InfoNoLine#1{\PackageInfo{hyperref}{#1\@gobble}} \def\Hy@Message#1{% \GenericWarning{% (hyperref)\@spaces\@spaces\@spaces\@spaces }{% - Package hyperref Message: #1\ltx@gobble + Package hyperref Message: #1\@gobble }% } \chardef\Hy@VersionChecked=0 % \def\Hy@VersionCheck#1{% \begingroup - \ltx@IfUndefined{ver@hyperref.sty}{% + \@ifundefined{ver@hyperref.sty}{% \Hy@Error{% This should not happen!\MessageBreak Missing hyperref version% }\@ehd }{% - \ltx@IfUndefined{ver@#1}{% + \@ifundefined{ver@#1}{% \Hy@Error{% This should not happen!\MessageBreak Missing version of `#1'% @@ -179,31 +176,33 @@ \def\Hy@@VersionCheck #1#2 #3 #4\@nil{% \def#1{#2 #3}% } -\ltx@IfUndefined{pdfmatch}{% +\edef\Hy@leftbracechar{\string{} +\edef\Hy@rightbracechar{\string}} +\@ifundefined{pdfmatch}{% \def\Hy@Match#1#2#3#4#5{}% }{% \def\Hy@Match#1#2#3{% \begingroup - \edef\^{\ltx@backslashchar\string^}% - \edef\.{\ltx@backslashchar.}% - \edef\[{\ltx@backslashchar[}% ]] - \edef\${\ltx@backslashchar$}% - \edef\({\ltx@backslashchar(}% - \edef\){\ltx@backslashchar)}% - \edef\|{\ltx@backslashchar|}% - \edef\*{\ltx@backslashchar*}% - \edef\+{\ltx@backslashchar+}% - \edef\?{\ltx@backslashchar?}% - \edef\{{\ltx@backslashchar\ltx@leftbracechar}% - \edef\}{\ltx@rightbracechar}% - \edef\\{\ltx@backslashchar\ltx@backslashchar}% - \let\ \ltx@space + \edef\^{\@backslashchar\string^}% + \edef\.{\@backslashchar.}% + \edef\[{\@backslashchar[}% ]] + \edef\${\@backslashchar$}% + \edef\({\@backslashchar(}% + \edef\){\@backslashchar)}% + \edef\|{\@backslashchar|}% + \edef\*{\@backslashchar*}% + \edef\+{\@backslashchar+}% + \edef\?{\@backslashchar?}% + \edef\{{\@backslashchar\Hy@leftbracechar}% + \edef\}{\Hy@rightbracechar}% + \edef\\{\@backslashchar\@backslashchar}% + \let\ \Hy@space \ifcase\pdfmatch#2{#3}{#1} % \endgroup - \expandafter\ltx@secondoftwo + \expandafter\@secondoftwo \or \endgroup - \expandafter\ltx@firstoftwo + \expandafter\@firstoftwo \else \Hy@Warning{% Internal error: Wrong pattern!\MessageBreak @@ -211,21 +210,26 @@ Pattern check ignored% }% \endgroup - \expandafter\ltx@firstoftwo + \expandafter\@firstoftwo \fi }% } \@ifundefined{AfterBeginDocument}{% \def\AfterBeginDocument{\AtBeginDocument}% }{}% +\ExplSyntaxOn +\let\Hy@LocalAppendToMacro\tl_put_right:Nn +\let\Hy@GlobalAppendToMacro\tl_gput_right:Nn +\let\Hy@ifempty\tl_if_empty:nTF +\ExplSyntaxOff \def\Hy@AtBeginDocument{% - \ltx@LocalAppendToMacro\Hy@AtBeginDocumentHook + \Hy@LocalAppendToMacro\Hy@AtBeginDocumentHook } \def\Hy@AtEndOfPackage{% - \ltx@LocalAppendToMacro\Hy@AtEndOfPackageHook + \Hy@LocalAppendToMacro\Hy@AtEndOfPackageHook } -\let\Hy@AtBeginDocumentHook\ltx@empty -\let\Hy@AtEndOfPackageHook\ltx@empty +\let\Hy@AtBeginDocumentHook\@empty +\let\Hy@AtEndOfPackageHook\@empty \AtEndOfPackage{% \Hy@AtEndOfPackageHook \let\Hy@AtEndOfPackageHook\@undefined @@ -331,13 +335,16 @@ \def\Hy@StepCount#1{\advance#1 by 1 }% \def\Hy@GlobalStepCount#1{\global\advance#1 by 1 }% \newdimen\@linkdim -\let\Hy@driver\ltx@empty +\let\Hy@driver\@empty \let\MaybeStopEarly\relax \newcount\Hy@linkcounter \newcount\Hy@pagecounter \Hy@linkcounter0 \Hy@pagecounter0 +\def\Hy@space{ } \let\Hy@ReturnEnd\@empty +\long\def\Hy@ReturnAfterFi#1\fi{\fi#1} +\long\def\Hy@ReturnAfterElseFi#1\else#2\fi{\fi#1} \long\def\Hy@ReturnAfterFiFiEnd#1\fi#2\Hy@ReturnEnd{\fi\fi#1} \long\def\Hy@ReturnAfterElseFiFiEnd#1\else#2\Hy@ReturnEnd{\fi\fi#1} \def\Hy@safe@activestrue{\csname @safe@activestrue\endcsname} @@ -397,7 +404,7 @@ \let\P\textparagraph \let\ldots\textellipsis \let\dots\textellipsis - \ltx@IfUndefined{textEncodingNoboundary}% + \@ifundefined{textEncodingNoboundary}% {}{\let\noboundary\textEncodingNoboundary}% \def\\{\pdfstringdefWarn\\}% \def\newline{\pdfstringdefWarn\newline}% @@ -474,7 +481,7 @@ \fi \let\foreignlanguage\@secondoftwo \let\textlatin\@firstofone - \ltx@IfUndefined{language@group}{}{% + \@ifundefined{language@group}{}{% \let\bbl@info\@gobble \csname HyPsd@babel@\language@group\endcsname }% @@ -514,7 +521,7 @@ \HyPsd@LetUnexpandableSpace\ % \HyPsd@LetUnexpandableSpace~% \HyPsd@LetUnexpandableSpace\nobreakspace - \ltx@IfUndefined{@xspace}{% + \@ifundefined{@xspace}{% \let\xspace\HyPsd@ITALCORR }{% \let\xspace\HyPsd@XSPACE @@ -590,7 +597,7 @@ \HyPsd@StringSubst{\051}{\HyPsd@empty\string\)}#1% \fi \expandafter\HyPsd@Subst\expandafter{\/}\HyPsd@empty#1% - \ltx@IfUndefined{@xspace}{% + \@ifundefined{@xspace}{% }{% \let\HyPsd@xspace\relax \expandafter\HyPsd@Subst\expandafter @@ -623,7 +630,7 @@ \ifHy@unicode \HyPsd@ConvertToUnicode#1% \ifx\HyPsd@pdfencoding\HyPsd@pdfencoding@auto - \ltx@IfUndefined{StringEncodingConvertTest}{% + \@ifundefined{StringEncodingConvertTest}{% }{% \EdefUnescapeString\HyPsd@temp#1% \iftutex @@ -667,9 +674,9 @@ }% \Hy@AtEndOfPackage{% \pdfstringdefDisableCommands{% - \ltx@IfUndefined{oldb}{}{\let\b\oldb}% - \ltx@IfUndefined{oldc}{}{\let\c\oldc}% - \ltx@IfUndefined{oldd}{}{\let\d\oldd}% + \@ifundefined{oldb}{}{\let\b\oldb}% + \@ifundefined{oldc}{}{\let\c\oldc}% + \@ifundefined{oldd}{}{\let\d\oldd}% }% }% }{% @@ -745,9 +752,12 @@ \HyPsd@LoadExtra \let\HyPsd@LoadUnicode\relax } +\def\Hy@iffileloaded#1{% + \@ifundefined{ver@#1}\@secondoftwo\@firstoftwo +} \def\HyPsd@LoadExtra{% \ifHy@psdextra - \ltx@iffileloaded{puenc.def}{% + \Hy@iffileloaded{puenc.def}{% \Hy@SaveCatcodeSettings{psdextra}% \input{psdextra.def}% \Hy@RestoreCatcodeSettings{psdextra}% @@ -774,7 +784,7 @@ \HyPsd@DisableCommands } \long\def\HyPsd@DisableCommands#1{% - \ltx@GlobalAppendToMacro\pdfstringdefPreHook{#1}% + \Hy@GlobalAppendToMacro\pdfstringdefPreHook{#1}% \endgroup } \def\pdfstringdefWarn#1{% @@ -792,7 +802,7 @@ \newif\ifHy@next \RequirePackage{intcalc}[2007/09/27] \def\HyPsd@CJKhook{% - \ltx@ifpackageloaded{CJK}{% + \@ifpackageloaded{CJK}{% \let\CJK@kern\relax \let\CJKkern\relax \let\CJK@CJK\relax @@ -1162,7 +1172,7 @@ \fi } \def\HyPsd@hspacetest#1{\ifdim\dimexpr#1\relax>\z@\space\fi} -\ltx@IfUndefined{tocsection}{% +\@ifundefined{tocsection}{% \let\HyPsd@AMSclassfix\relax }{% \def\HyPsd@AMSclassfix{% @@ -1257,8 +1267,8 @@ \fi } \def\HyPsd@@autorefname#1.#2\@nil{% - \ltx@IfUndefined{#1autorefname}{% - \ltx@IfUndefined{#1name}{% + \@ifundefined{#1autorefname}{% + \@ifundefined{#1name}{% }{% \csname#1name\endcsname\space }% @@ -1313,7 +1323,7 @@ } \def\HyPsd@Warning#1{% \begingroup - \let\space\ltx@space + \let\space\Hy@space \Hy@Warning{#1}% \endgroup } @@ -1382,13 +1392,13 @@ \def\HyPsd@@AppendItalcorr#1#2{% \expandafter\def\expandafter#2\expandafter{#2#1}% } -\ltx@IfUndefined{directlua}{% +\@ifundefined{directlua}{% }{% \expandafter\ifx\csname\endcsname\relax\fi } \begingroup \catcode`\Q=\active - \let Q\ltx@empty + \let Q\@empty \gdef\HyPsd@CheckCatcodes#1#2\HyPsd@End{% \global\let\HyPsd@Rest\relax \ifcat\relax\noexpand#1\relax @@ -1556,7 +1566,7 @@ }% \ifx\\#2\\% \else - \ltx@ReturnAfterFi{% + \Hy@ReturnAfterFi{% \HyPsd@GlyphProcessWarning#2\@empty }% \fi @@ -1612,12 +1622,12 @@ \lccode`\|=`\\% \lccode`\(=`\{% \lccode`\)=`\}% - \lccode`0=\ltx@zero - \lccode`1=\ltx@zero - \lccode`3=\ltx@zero - \lccode`4=\ltx@zero - \lccode`5=\ltx@zero - \lccode`7=\ltx@zero + \lccode`0=\z@ + \lccode`1=\z@ + \lccode`3=\z@ + \lccode`4=\z@ + \lccode`5=\z@ + \lccode`7=\z@ \lowercase{\endgroup \def\HyPsd@EscapeTeX#1{% \HyPsd@Subst!{|045}#1% @@ -1667,7 +1677,7 @@ |gdef|HyPsd@DoConvert#1{% |ifx#1|@empty |else - |ltx@ReturnAfterFi{% + |Hy@ReturnAfterFi{% |ifx#1\%% \%% |expandafter|HyPsd@DoEscape @@ -1682,7 +1692,7 @@ |ifx#19% |expandafter|HyPsd@GetTwoBytes |else - |ltx@ReturnAfterFi{% + |Hy@ReturnAfterFi{% |ifx#18% 00% |expandafter|HyPsd@GetTwoBytes @@ -1754,20 +1764,20 @@ }% \fi \ifcsname UTFviii@loop\endcsname - \def\HyPsd@expand@utfvii{% + \def\HyPsd@expand@utfviii {% \count@"C2 \@tempcnta"F5 \def\UTFviii@tmp{\expandafter\def\expandafter~\expandafter{~}}% \UTFviii@loop } \else - \def\HyPsd@expand@utfvii{} + \def\HyPsd@expand@utfviii {} \fi \begingroup \lccode`\~=`^^f4\relax \lowercase{\endgroup \def\HyPsd@UTFviii{% - \HyPsd@expand@utfvii + \HyPsd@expand@utfviii \let\UTFviii@two@octets\HyPsd@UTFviii@two \let\UTFviii@three@octets\HyPsd@UTFviii@three \let\UTFviii@four@octets\HyPsd@UTFviii@four @@ -1928,9 +1938,9 @@ } \def\HyPsd@DieFaceLarge#1!{% \ifnum#1>6 % - \expandafter\ltx@firstoftwo + \expandafter\@firstoftwo \else - \expandafter\ltx@secondoftwo + \expandafter\@secondoftwo \fi {% \9046\205% @@ -1981,7 +1991,7 @@ \fi } \def\HyPsd@@ding#1!{% - \ltx@ifundefined{HyPsd@ding@#1}{% + \@ifundefined{HyPsd@ding@#1}{% \ifnum#1<127 % \9047% \HyPsd@DecimalToOctalSecond{\IntCalcSub#1!32!}% @@ -2021,7 +2031,7 @@ \@namedef{HyPsd@ding@215}{\textupdownarrow}% \@namedef{HyPsd@ding@240}{\HyPsd@UnicodeReplacementCharacter} \@ifpackageloaded{subfigure}{% - \ltx@IfUndefined{sub@label}{% + \@ifundefined{sub@label}{% \Hy@hypertexnamesfalse }{% \renewcommand*{\sub@label}[1]{% @@ -2169,19 +2179,19 @@ }{} \ExplSyntaxOff \def\IfHyperBooleanExists#1{% - \ltx@ifundefined{Hy@#1false}\ltx@secondoftwo{% - \ltx@ifundefined{KV@Hyp@#1@default}\ltx@secondoftwo\ltx@firstoftwo + \@ifundefined{Hy@#1false}\@secondoftwo{% + \@ifundefined{KV@Hyp@#1@default}\@secondoftwo\@firstoftwo }% } \@namedef{KV@Hyp@stoppedearly@default}{} \def\IfHyperBoolean#1{% \IfHyperBooleanExists{#1}{% \csname ifHy@#1\endcsname - \expandafter\ltx@firstoftwo + \expandafter\@firstoftwo \else - \expandafter\ltx@secondoftwo + \expandafter\@secondoftwo \fi - }\ltx@secondoftwo + }\@secondoftwo } \def\Hy@boolkey#1#2{% \edef\Hy@tempa{#2}% @@ -2213,7 +2223,7 @@ }% } \def\Hy@DisableOption#1{% - \ltx@ifundefined{KV@Hyp@#1@default}{% + \@ifundefined{KV@Hyp@#1@default}{% \define@key{Hyp}{#1}% }{% \define@key{Hyp}{#1}[]% @@ -2507,7 +2517,7 @@ \def\Hy@pdfmajorversion{\pdfmajorversion} \fi \newif\ifHy@DviMode -\let\Hy@DviErrMsg\ltx@empty +\let\Hy@DviErrMsg\@empty \ifpdf \def\Hy@DviErrMsg{pdfTeX or LuaTeX is running in PDF mode}% \else @@ -2527,13 +2537,13 @@ \fi \def\HyOpt@CheckDvi#1{% \ifHy@DviMode - \expandafter\ltx@firstofone + \expandafter\@firstofone \else \Hy@Error{% Wrong DVI mode driver option `#1',\MessageBreak because \Hy@DviErrMsg }\@ehc - \expandafter\ltx@gobble + \expandafter\@gobble \fi } \DeclareVoidOption{tex4ht}{% @@ -2719,7 +2729,7 @@ \PassOptionsToPackage{dvips}{color}% }% } -\let\HyOpt@DriverFallback\ltx@empty +\let\HyOpt@DriverFallback\@empty \define@key{Hyp}{driverfallback}{% \ifHy@DviMode \def\HyOpt@DriverFallback{#1}% @@ -2731,11 +2741,11 @@ Invalid driver `#1' for option\MessageBreak `driverfallback'% }% - \let\HyOpt@DriverFallback\ltx@empty + \let\HyOpt@DriverFallback\@empty }% \fi } -\let\HyOpt@CustomDriver\ltx@empty +\let\HyOpt@CustomDriver\@empty \define@key{Hyp}{customdriver}{% \IfFileExists{#1.def}{% \def\HyOpt@CustomDriver{#1}% @@ -3208,7 +3218,7 @@ \def\Hy@colorlink##1{\begingroup}% \def\Hy@endcolorlink{\endgroup}% \def\@pdfborder{0 0 0}% - \let\@pdfborderstyle\ltx@empty + \let\@pdfborderstyle\@empty } \define@key{Hyp}{ocgcolorlinks}[true]{% \Hy@boolkey{ocgcolorlinks}{#1}% @@ -3344,7 +3354,7 @@ of option `pdfpageduration'\MessageBreak is replaced by an empty value% }% - \let\@pdfpageduration\ltx@empty + \let\@pdfpageduration\@empty }% } \def\Hy@ColorList{cite,file,link,menu,run,url} @@ -3720,7 +3730,7 @@ \x \fi } -\global\let\HyInfo@AddonList\ltx@empty +\global\let\HyInfo@AddonList\@empty \define@key{Hyp}{pdfview}{\calculate@pdfview#1 \\} \define@key{Hyp}{pdflinkmargin}{\setpdflinkmargin{#1}} \let\setpdflinkmargin\@gobble @@ -3737,14 +3747,14 @@ }% \define@key{Hyp}{pdfstartpage}{% \ifx\\#1\\% - \let\@pdfstartpage\ltx@empty + \let\@pdfstartpage\@empty \else \edef\@pdfstartpage{\Hy@number{#1}}% \fi }% \define@key{Hyp}{pdfstartview}{% \ifx\\#1\\% - \let\@pdfstartview\ltx@empty + \let\@pdfstartview\@empty \else \def\@pdfstartview{/#1}% \fi @@ -3846,7 +3856,7 @@ \fi \ifx\@pdflang\relax \else - \ifx\@pdflang\ltx@empty + \ifx\@pdflang\@empty \else \Hy@Match\@pdflang{icase}{% ^% @@ -3900,7 +3910,7 @@ }% }{}% \Hy@Match\Hy@temp{icase}{% - (-[a-wyz0-9]-).*\ltx@backslashchar1% + (-[a-wyz0-9]-).*\@backslashchar1% }{% \Hy@Warning{% Invalid language identifier `#1'\MessageBreak @@ -3965,20 +3975,20 @@ \def\@runbordercolor{0 .7 .7} \def\@citebordercolor{0 1 0} \def\@pdfhighlight{/I} -\let\@pdftitle\ltx@empty -\let\@pdfauthor\ltx@empty +\let\@pdftitle\@empty +\let\@pdfauthor\@empty \let\@pdfproducer\relax \def\@pdfcreator{LaTeX with hyperref} -\let\@pdfcreationdate\ltx@empty -\let\@pdfmoddate\ltx@empty -\let\@pdfsubject\ltx@empty -\let\@pdfkeywords\ltx@empty -\let\@pdftrapped\ltx@empty -\let\@pdfpagescrop\ltx@empty +\let\@pdfcreationdate\@empty +\let\@pdfmoddate\@empty +\let\@pdfsubject\@empty +\let\@pdfkeywords\@empty +\let\@pdftrapped\@empty +\let\@pdfpagescrop\@empty \def\@pdfstartview{/Fit} \def\@pdfremotestartview{/Fit} \def\@pdfstartpage{1} -\let\@pdfprintpagerange\ltx@empty +\let\@pdfprintpagerange\@empty \let\@pdflang\relax \let\PDF@SetupDoc\@empty \let\PDF@FinishDoc\@empty @@ -4024,21 +4034,21 @@ \@ifpackageloaded{tex4ht}{% \PassOptionsToPackage{tex4ht}{hyperref}% }{% - \ltx@IfUndefined{HCode}{% + \@ifundefined{HCode}{% }{% \begingroup \def\Hy@pkg{tex4ht}% \def\Hy@temp@A#1\RequirePackage[#2]#3#4\Hy@NIL{% \def\Hy@param{#2#3}% - \ifx\Hy@param\ltx@empty - \expandafter\ltx@gobble + \ifx\Hy@param\@empty + \expandafter\@gobble \else \def\Hy@param{#3}% \ifx\Hy@param\Hy@pkg \PassOptionsToPackage{#2}{tex4ht}% \expandafter\expandafter\expandafter\@gobble \else - \expandafter\expandafter\expandafter\ltx@firstofone + \expandafter\expandafter\expandafter\@firstofone \fi \fi {\Hy@temp@A#4\Hy@NIL}% @@ -4053,12 +4063,12 @@ \let\ReadBookmarks\relax \ProcessKeyvalOptions{Hyp} \def\Hy@xspace@end{} -\ltx@IfUndefined{xspaceaddexceptions}{% +\@ifundefined{xspaceaddexceptions}{% \Hy@AtBeginDocument{% - \ltx@IfUndefined{xspaceaddexceptions}{% + \@ifundefined{xspaceaddexceptions}{% }{% \def\Hy@xspace@end{% - \ltx@gobble{end for xspace}% + \@gobble{end for xspace}% }% \xspaceaddexceptions{% \Hy@xspace@end,\hyper@linkend,\hyper@anchorend @@ -4067,7 +4077,7 @@ }% }{% \def\Hy@xspace@end{% - \ltx@gobble{end for xspace}% + \@gobble{end for xspace}% }% \xspaceaddexceptions{\Hy@xspace@end,\hyper@linkend,\hyper@anchorend}% } @@ -4308,8 +4318,8 @@ \fi \fi \fi - \let\HyOpt@DriverType\ltx@empty - \ifx\HyOpt@CustomDriver\ltx@empty + \let\HyOpt@DriverType\@empty + \ifx\HyOpt@CustomDriver\@empty \ifx\Hy@driver\@empty \def\HyOpt@DriverType{ (autodetected)}% \providecommand*{\Hy@defaultdriver}{hdvips}% @@ -4343,7 +4353,7 @@ \ifnum\ifvtex\OpMode\else\m@ne\fi=\tw@ \def\Hy@driver{hvtex}% \else - \ifx\HyOpt@DriverFallback\ltx@empty + \ifx\HyOpt@DriverFallback\@empty \let\Hy@driver\Hy@defaultdriver \def\HyOpt@DriverType{ (default)}% \else @@ -4353,7 +4363,7 @@ \noexpand\kvsetkeys{Hyp}{\the\toks@}% }% \x - \ifx\Hy@driver\ltx@empty + \ifx\Hy@driver\@empty \let\Hy@driver\Hy@defaultdriver \def\HyOpt@DriverType{ (default)}% \else @@ -4440,7 +4450,7 @@ \def\@pdfpagemode{UseOutlines}% \fi \else - \let\@bookmarkopenstatus\ltx@gobble + \let\@bookmarkopenstatus\@gobble \Hy@Info{Bookmarks OFF}% \Hy@AtEndOfPackage{% \global\let\ReadBookmarks\relax @@ -4452,7 +4462,7 @@ \fi \Hy@DisableOption{bookmarks} \def\Hy@CatcodeWrapper#1{% - \let\Hy@EndWrap\ltx@empty + \let\Hy@EndWrap\@empty \def\TMP@EnsureCode##1##2{% \edef\Hy@EndWrap{% \Hy@EndWrap @@ -4607,11 +4617,11 @@ \gdef\hyper@n@rmalise#1#2{^^A \def\Hy@tempa{#2}^^A \ifx\Hy@tempa\Hy@ActiveCarriageReturn - \ltx@ReturnAfterElseFi{^^A + \Hy@ReturnAfterElseFi{^^A \hyper@@normalise{#1}^^A }^^A \else - \ltx@ReturnAfterFi{^^A + \Hy@ReturnAfterFi{^^A \hyper@@normalise{#1}{#2}^^A }^^A \fi @@ -4627,7 +4637,7 @@ #1^^A \ifx\limits#2\limits \else - \ltx@ReturnAfterFi{^^A + \Hy@ReturnAfterFi{^^A \Hy@RemovePercentCr #2\@nil }^^A \fi @@ -4737,7 +4747,7 @@ \let\KV@href@pdfnewwindow@default\KV@Hyp@pdfnewwindow@default \newif\ifHy@href@ismap \define@key{href}{ismap}[true]{% - \ltx@IfUndefined{Hy@href@ismap#1}{% + \@ifundefined{Hy@href@ismap#1}{% \Hy@Error{% Invalid value (#1) for key `ismap'.\MessageBreak Permitted values are `true' or `false'.\MessageBreak @@ -4948,18 +4958,18 @@ \@ifnextchar[{\hyper@link@}{\hyper@link@[link]}% } \def\hyper@link@[#1]#2#3#4{% - \ltx@ifempty{#4}{% link text + \Hy@ifempty{#4}{% link text \Hy@Warning{Suppressing empty link}% }{% \begingroup \protected@edef\Hy@tempa{#2}% \edef\Hy@tempb{#3}% - \ifx\Hy@tempa\ltx@empty - \ifx\Hy@tempb\ltx@empty + \ifx\Hy@tempa\@empty + \ifx\Hy@tempb\@empty \Hy@Warning{Suppressing link with empty target}% \toks@{% \endgroup - \ltx@secondoftwo + \@secondoftwo }% \else \toks@{% @@ -5063,9 +5073,9 @@ \expandafter\def\expandafter\z\expandafter##\expandafter1\y##2\@nil{% \endgroup \ifx\relax##2\relax - \expandafter\ltx@secondoftwo + \expandafter\@secondoftwo \else - \expandafter\ltx@firstoftwo + \expandafter\@firstoftwo \fi }% \expandafter\expandafter\expandafter\z\expandafter\x\y\@nil @@ -5123,7 +5133,7 @@ \fi \let\anchor@spot\@empty } -\let\anchor@spot\ltx@empty +\let\anchor@spot\@empty \ifHy@destlabel \def\hyper@newdestlabel#1#2{% \begingroup @@ -5135,7 +5145,7 @@ }% \providecommand*{\hyper@destlabel@hook}{}% \newcommand*{\Hy@DestRename}[2]{% - \ltx@IfUndefined{HyDL!#1}{% + \@ifundefined{HyDL!#1}{% \begingroup \Hy@safe@activestrue \edef\dest@name{#1}% @@ -5144,7 +5154,7 @@ \Hy@IsNotEmpty{dest@name}{% \Hy@IsNotEmpty{label@name}{% \global\expandafter - \let\csname HyDL!#1\endcsname\ltx@empty + \let\csname HyDL!#1\endcsname\@empty \if@filesw \protected@write\@auxout{}{% \string\hyper@newdestlabel @@ -5166,19 +5176,19 @@ \let\HyperDestRename\Hy@DestRename }% \def\Hy@IsNotEmpty#1{% - \ltx@IfUndefined{#1}\ltx@gobble{% - \expandafter\ifx\csname#1\endcsname\ltx@empty - \expandafter\ltx@gobble + \@ifundefined{#1}\@gobble{% + \expandafter\ifx\csname#1\endcsname\@empty + \expandafter\@gobble \else - \expandafter\ltx@firstofone + \expandafter\@firstofone \fi }% }% - \ltx@GlobalAppendToMacro\label@hook{% + \Hy@GlobalAppendToMacro\label@hook{% \HyperDestRename\@currentHref\label@name }% \def\HyperDestLabelReplace#1{% - \ltx@ifundefined{HyDL@#1}{% + \@ifundefined{HyDL@#1}{% #1% }{% \csname HyDL@#1\endcsname @@ -5186,9 +5196,9 @@ }% \let\HyperDestNameFilter\HyperDestLabelReplace \else - \let\hyper@newdestlabel\ltx@gobbletwo - \let\HyperDestLabelReplace\ltx@firstofone - \let\HyperDestRename\ltx@gobbletwo + \let\hyper@newdestlabel\@gobbletwo + \let\HyperDestLabelReplace\@firstofone + \let\HyperDestRename\@gobbletwo \fi \Hy@DisableOption{destlabel} \AddToHook{include/before} @@ -5394,7 +5404,7 @@ \fi \HyField@PrintFlags{Submit}{submit button field}% \bitsetIsEmpty{HyField@Submit}{% - \let\Fld@submitflags\ltx@empty + \let\Fld@submitflags\@empty }{% \edef\Fld@submitflags{/Flags \bitsetGetDec{HyField@Submit}}% }% @@ -5412,7 +5422,7 @@ \HyField@UseFlag{F}{LockedContents}% \HyField@PrintFlags{F}{#1}% \bitsetIsEmpty{HyField@F}{% - \let\Fld@annotflags\ltx@empty + \let\Fld@annotflags\@empty }{% \edef\Fld@annotflags{/F \bitsetGetDec{HyField@F}}% }% @@ -5426,7 +5436,7 @@ \HyField@SetFlag{Ff}{Pushbutton}% \HyField@PrintFlags{Ff}{push button field}% \bitsetIsEmpty{HyField@Ff}{% - \let\Fld@flags\ltx@empty + \let\Fld@flags\@empty }{% \edef\Fld@flags{/Ff \bitsetGetDec{HyField@Ff}}% }% @@ -5439,7 +5449,7 @@ \HyField@UseFlag{Ff}{NoExport}% \HyField@PrintFlags{Ff}{check box field}% \bitsetIsEmpty{HyField@Ff}{% - \let\Fld@flags\ltx@empty + \let\Fld@flags\@empty }{% \edef\Fld@flags{/Ff \bitsetGetDec{HyField@Ff}}% }% @@ -5455,7 +5465,7 @@ \HyField@UseFlag{Ff}{RadiosInUnison}% \HyField@PrintFlags{Ff}{radio button field}% \bitsetIsEmpty{HyField@Ff}{% - \let\Fld@flags\ltx@empty + \let\Fld@flags\@empty }{% \edef\Fld@flags{/Ff \bitsetGetDec{HyField@Ff}}% }% @@ -5487,7 +5497,7 @@ \HyField@UseFlag{Ff}{RichText}% \HyField@PrintFlags{Ff}{text field}% \bitsetIsEmpty{HyField@Ff}{% - \let\Fld@flags\ltx@empty + \let\Fld@flags\@empty }{% \edef\Fld@flags{/Ff \bitsetGetDec{HyField@Ff}}% }% @@ -5512,15 +5522,15 @@ \HyField@UseFlag{Ff}{CommitOnSelChange}% \HyField@PrintFlags{Ff}{choice field}% \bitsetIsEmpty{HyField@Ff}{% - \let\Fld@flags\ltx@empty + \let\Fld@flags\@empty }{% \edef\Fld@flags{/Ff \bitsetGetDec{HyField@Ff}}% }% } \def\HyField@PDFChoices#1{% \begingroup - \global\let\Fld@choices\ltx@empty - \let\HyTmp@optlist\ltx@empty + \global\let\Fld@choices\@empty + \let\HyTmp@optlist\@empty \let\HyTmp@optitem\relax \count@=0 % \kv@parse{#1}{% @@ -5845,7 +5855,7 @@ \Fld@DingDef\Fld@radiosymbol{#1}% } \def\Fld@DingDef#1#2{% - \let\Fld@temp\ltx@empty + \let\Fld@temp\@empty \Fld@@DingDef#2\ding{}\@nil \let#1\Fld@temp } @@ -5883,17 +5893,17 @@ \define@key{Field}{color}{% \HyColor@FieldColor{#1}\Fld@color{hyperref}{color}% } -\let\Fld@onclick@code\ltx@empty -\let\Fld@format@code\ltx@empty -\let\Fld@validate@code\ltx@empty -\let\Fld@calculate@code\ltx@empty -\let\Fld@keystroke@code\ltx@empty -\let\Fld@onfocus@code\ltx@empty -\let\Fld@onblur@code\ltx@empty -\let\Fld@onmousedown@code\ltx@empty -\let\Fld@onmouseup@code\ltx@empty -\let\Fld@onenter@code\ltx@empty -\let\Fld@onexit@code\ltx@empty +\let\Fld@onclick@code\@empty +\let\Fld@format@code\@empty +\let\Fld@validate@code\@empty +\let\Fld@calculate@code\@empty +\let\Fld@keystroke@code\@empty +\let\Fld@onfocus@code\@empty +\let\Fld@onblur@code\@empty +\let\Fld@onmousedown@code\@empty +\let\Fld@onmouseup@code\@empty +\let\Fld@onenter@code\@empty +\let\Fld@onexit@code\@empty \def\Hy@temp#1{% \expandafter\Hy@@temp\csname Fld@#1@code\endcsname{#1}% } @@ -5918,7 +5928,7 @@ \Hy@temp{onblur} \Hy@temp{onenter} \Hy@temp{onexit} -\let\Fld@calculate@sortkey\ltx@empty +\let\Fld@calculate@sortkey\@empty \define@key{Field}{calculatesortkey}[1]{% \def\Fld@calculate@sortkey{#1}% } @@ -6126,10 +6136,10 @@ \def\hyper@@anchor##1##2{##2\Hy@xspace@end}% \global\let\hyper@livelink\hyper@link \gdef\hyper@link##1##2##3{##3\Hy@xspace@end}% - \let\hyper@anchor\ltx@gobble - \let\hyper@anchorstart\ltx@gobble + \let\hyper@anchor\@gobble + \let\hyper@anchorstart\@gobble \def\hyper@anchorend{\Hy@xspace@end}% - \let\hyper@linkstart\ltx@gobbletwo + \let\hyper@linkstart\@gobbletwo \def\hyper@linkend{\Hy@xspace@end}% \def\hyper@linkurl##1##2{##1\Hy@xspace@end}% \def\hyper@linkfile##1##2##3{##1\Hy@xspace@end}% @@ -6138,12 +6148,12 @@ \def\stop@hyper{% \def\hyper@link@[##1]##2##3##4{##4\Hy@xspace@end}% \let\Hy@backout\@gobble - \let\hyper@@anchor\ltx@gobble + \let\hyper@@anchor\@gobble \def\hyper@link##1##2##3{##3\Hy@xspace@end}% - \let\hyper@anchor\ltx@gobble - \let\hyper@anchorstart\ltx@gobble + \let\hyper@anchor\@gobble + \let\hyper@anchorstart\@gobble \def\hyper@anchorend{\Hy@xspace@end}% - \let\hyper@linkstart\ltx@gobbletwo + \let\hyper@linkstart\@gobbletwo \def\hyper@linkend{\Hy@xspace@end}% \def\hyper@linkurl##1##2{##1\Hy@xspace@end}% \def\hyper@linkfile##1##2##3{##1\Hy@xspace@end}% @@ -6177,7 +6187,7 @@ \string\gdef\string\HyperFirstAtBeginDocument\string#1{\string#1}% }% \fi - \let\HyperFirstAtBeginDocument\ltx@firstofone + \let\HyperFirstAtBeginDocument\@firstofone \ifx\hyper@last\@undefined \def\newlabel#1#2{\@newl@bel r{#1}{#2{}{}{}{}}}% \fi @@ -6223,7 +6233,7 @@ \fi \Hy@DisableOption{pdfusetitle} \def\Hy@UseMaketitleString#1{% - \ltx@IfUndefined{Hy@#1}{}{% + \@ifundefined{Hy@#1}{}{% \begingroup \let\Hy@saved@hook\pdfstringdefPreHook \pdfstringdefDisableCommands{% @@ -6248,12 +6258,12 @@ \Hy@UseMaketitleString{author}% } \RequirePackage{atbegshi}[2007/09/09] -\let\Hy@EveryPageHook\ltx@empty -\let\Hy@EveryPageBoxHook\ltx@empty -\let\Hy@FirstPageHook\ltx@empty +\let\Hy@EveryPageHook\@empty +\let\Hy@EveryPageBoxHook\@empty +\let\Hy@FirstPageHook\@empty \AtBeginShipout{% \Hy@EveryPageHook - \ifx\Hy@EveryPageBoxHook\ltx@empty + \ifx\Hy@EveryPageBoxHook\@empty \else \setbox\AtBeginShipoutBox=\vbox{% \offinterlineskip @@ -6262,10 +6272,10 @@ }% \fi } -\ltx@iffileloaded{hpdftex.def}{% +\Hy@iffileloaded{hpdftex.def}{% \AtBeginShipout{% \Hy@FirstPageHook - \global\let\Hy@FirstPageHook\ltx@empty + \global\let\Hy@FirstPageHook\@empty }% }{% \AtBeginShipoutFirst{% @@ -6274,7 +6284,7 @@ } \g@addto@macro\Hy@FirstPageHook{% \PDF@FinishDoc - \global\let\PDF@FinishDoc\ltx@empty + \global\let\PDF@FinishDoc\@empty } \ifHy@pdfpagelabels \begingroup\expandafter\expandafter\expandafter\endgroup @@ -6291,29 +6301,29 @@ \gdef\HyPL@thisLabel{#1}% }% \global\let\HyPL@thisLabel\relax - \let\HyPL@Labels\ltx@empty + \let\HyPL@Labels\@empty \newcount\Hy@abspage \Hy@abspage=0 % \def\HyPL@LastType{init}% \def\HyPL@LastNumber{0}% - \let\HyPL@LastPrefix\ltx@empty + \let\HyPL@LastPrefix\@empty \def\HyPL@arabic{D}% \def\HyPL@Roman{R}% \def\HyPL@roman{r}% \def\HyPL@Alph{A}% \def\HyPL@alph{a}% - \let\HyPL@SlidesSetPage\ltx@empty - \ltx@ifclassloaded{slides}{% + \let\HyPL@SlidesSetPage\@empty + \@ifclassloaded{slides}{% \def\HyPL@SlidesSetPage{% - \advance\c@page\ltx@one - \ifnum\value{page}>\ltx@one + \advance\c@page\@ne + \ifnum\value{page}>\@ne \protected@edef\HyPL@SlidesOptionalPage{% \Hy@SlidesFormatOptionalPage{\thepage}% }% \else - \let\HyPL@SlidesOptionalPage\ltx@empty + \let\HyPL@SlidesOptionalPage\@empty \fi - \advance\c@page-\ltx@one + \advance\c@page-\@ne \def\HyPL@page{% \csname the\Hy@SlidesPage\endcsname \HyPL@SlidesOptionalPage @@ -6331,7 +6341,7 @@ \fi \let\HyPL@Type\relax \ifnum\c@page>0 % - \ifx\HyPL@SlidesSetPage\ltx@empty + \ifx\HyPL@SlidesSetPage\@empty \expandafter\HyPL@CheckThePage\HyPL@page\@nil \fi \fi @@ -6455,7 +6465,7 @@ \cs_new_protected:Npn \__hyp_target_raise:n #1 { \mode_if_vertical:TF - { \UseSocket{hyp/raisedlink}{#1} } + { #1 } { \Hy@SaveSpaceFactor \penalty\@M @@ -6587,7 +6597,7 @@ \Hy@CounterExists{part}{% \providecommand\theHpart{\arabic{part}}% } -\ltx@IfUndefined{thechapter}{% +\@ifundefined{thechapter}{% \providecommand\theHsection {\arabic{section}}% \providecommand\theHfigure {\arabic{figure}}% \providecommand\theHtable {\arabic{table}}% @@ -6668,7 +6678,7 @@ \@ifundefined{theH#1}{% \expandafter\def\csname theH#1\endcsname{}% \def\Hy@temp{\@elt{#1}}% - \ltx@onelevel@sanitize\Hy@temp + \@onelevel@sanitize\Hy@temp \let\HyOrg@elt\@elt \edef\@elt{% \noexpand\HyCnt@LookForParentCounter @@ -6677,7 +6687,7 @@ \cl@@ckpt \let\@elt\HyOrg@elt \expandafter - \ltx@LocalAppendToMacro\csname theH#1\expandafter\endcsname + \Hy@LocalAppendToMacro\csname theH#1\expandafter\endcsname \expandafter{% \expandafter\@arabic\csname c@#1\endcsname }% @@ -6685,20 +6695,20 @@ } \def\HyCnt@LookForParentCounter#1#2{% \expandafter\let\expandafter\Hy@temp@A\csname cl@#2\endcsname - \ltx@IfUndefined{cl@#2}{% + \@ifundefined{cl@#2}{% }{% - \ltx@onelevel@sanitize\Hy@temp@A + \@onelevel@sanitize\Hy@temp@A \edef\Hy@temp@A{% \noexpand\in@{\Hy@temp}{\Hy@temp@A}% }\Hy@temp@A \ifin@ - \ltx@IfUndefined{theH#2}{% - \expandafter\ltx@LocalAppendToMacro\expandafter#1% + \@ifundefined{theH#2}{% + \expandafter\Hy@LocalAppendToMacro\expandafter#1% \expandafter{% \expandafter\@arabic\csname c@#2\endcsname.% }% }{% - \expandafter\ltx@LocalAppendToMacro\expandafter#1% + \expandafter\Hy@LocalAppendToMacro\expandafter#1% \expandafter{% \csname theH#2\endcsname.% }% @@ -6714,7 +6724,7 @@ \fi \def\Hy@appendixstring{appendix} \def\Hy@chapapp{\Hy@chapterstring} -\ltx@IfUndefined{appendix}{% +\@ifundefined{appendix}{% }{% \let\HyOrg@appendix\appendix \def\Hy@AlphNoErr#1{% @@ -6729,7 +6739,7 @@ \fi }% \def\appendix{% - \ltx@IfUndefined{chapter}{% + \@ifundefined{chapter}{% \gdef\theHsection{\Hy@AlphNoErr{section}}% }{% \gdef\theHchapter{\Hy@AlphNoErr{chapter}}% @@ -6915,7 +6925,7 @@ \let\refstepcounter\new@refstepcounter }% \def\endequation{% - \ifx\Hy@raisedlink\ltx@empty + \ifx\Hy@raisedlink\@empty \hyper@anchorend \else \mathclose{\Hy@raisedlink{\hyper@anchorend}}% @@ -6956,7 +6966,7 @@ \@namedef{endeqnarray*}{% \nonumber\endeqnarray\@eqnstarfalse } -\ltx@IfUndefined{subeqnarray}{}{% +\@ifundefined{subeqnarray}{}{% \let\H@subeqnarray\subeqnarray \let\H@endsubeqnarray\endsubeqnarray \def\subeqnarray{% @@ -7069,9 +7079,9 @@ \long\def\@mpfootnotetext#1{% \H@@mpfootnotetext{% \ifHy@nesting - \expandafter\ltx@firstoftwo + \expandafter\@firstoftwo \else - \expandafter\ltx@secondoftwo + \expandafter\@secondoftwo \fi {% \expandafter\hyper@@anchor\expandafter{% @@ -7089,9 +7099,9 @@ \long\def\@footnotetext#1{% \H@@footnotetext{% \ifHy@nesting - \expandafter\ltx@firstoftwo + \expandafter\@firstoftwo \else - \expandafter\ltx@secondoftwo + \expandafter\@secondoftwo \fi {% \expandafter\hyper@@anchor\expandafter{% @@ -7358,7 +7368,7 @@ \def\hyper@natanchorend{\hyper@anchorend} \@ifundefined{hyper@nopatch@bib} {% - \ltx@IfUndefined{NAT@parse}{% + \@ifundefined{NAT@parse}{% \providecommand*\@extra@binfo{}% \providecommand*\@extra@b@citeb{}% \def\bibcite#1#2{% @@ -7521,12 +7531,12 @@ }% }{} \def\@currentHpage{Doc-Start} -\ltx@ifclassloaded{slides}{% +\@ifclassloaded{slides}{% \def\Hy@SlidesFormatOptionalPage#1{(#1)}% \def\Hy@PageAnchorSlidesPlain{% - \advance\c@page\ltx@one + \advance\c@page\@ne \xdef\@currentHpage{page.\the\c@slide.\the\c@overlay.\the\c@note% - \ifnum\c@page=\ltx@one + \ifnum\c@page=\@ne \else .\the\c@page \fi}% @@ -7535,12 +7545,12 @@ \@currentHpage }% }% - \advance\c@page-\ltx@one + \advance\c@page-\@ne }% \def\Hy@PageAnchorSlide{% - \advance\c@page\ltx@one - \ifnum\c@page>\ltx@one - \ltx@IfUndefined{theHpage}{% + \advance\c@page\@ne + \ifnum\c@page>\@ne + \@ifundefined{theHpage}{% \protected@edef\Hy@TheSlideOptionalPage{% \Hy@SlidesFormatOptionalPage{\thepage}% }% @@ -7552,16 +7562,16 @@ \else \def\Hy@TheSlideOptionalPage{}% \fi - \advance\c@page-\ltx@one + \advance\c@page-\@ne \pdfstringdef\@the@H@page{% \csname the% - \ltx@ifundefined{theH\Hy@SlidesPage}{}{H}% + \@ifundefined{theH\Hy@SlidesPage}{}{H}% \Hy@SlidesPage \endcsname \Hy@TheSlideOptionalPage }% - \ltx@gobblethree + \@gobblethree }% \def\Hy@SlidesPage{slide}% \g@addto@macro\slide{% @@ -7688,7 +7698,7 @@ \edef\x{\endgroup \def\noexpand\Hy@tocdestname{#4}% }\x - \ifx\Hy@tocdestname\ltx@empty + \ifx\Hy@tocdestname\@empty \csname l@#1\endcsname{#2}{#3}% \else \ifcase\Hy@linktoc % none @@ -7699,7 +7709,7 @@ }{#3}% \or % page \def\Hy@temp{#3}% - \ifx\Hy@temp\ltx@empty + \ifx\Hy@temp\@empty \csname l@#1\endcsname{#2}{#3}% \else \csname l@#1\endcsname{{#2}}{% @@ -7708,7 +7718,7 @@ \fi \else % all \def\Hy@temp{#3}% - \ifx\Hy@temp\ltx@empty + \ifx\Hy@temp\@empty \csname l@#1\endcsname{% \Hy@toclinkstart{#2}\Hy@toclinkend }{}% @@ -7884,8 +7894,8 @@ \ifx\\#3\\% \ifx\Hy@temp@A\HyInd@ParenRight \HyInd@DefKey{#1}% - \ltx@IfUndefined{HyInd@(\HyInd@key)}{% - \let\Hy@temp\ltx@empty + \@ifundefined{HyInd@(\HyInd@key)}{% + \let\Hy@temp\@empty }{% \expandafter\let\expandafter\Hy@temp \csname HyInd@(\HyInd@key)\endcsname @@ -7923,7 +7933,7 @@ \begingroup \let\protect\@unexpandable@protect \edef\Hy@temp{#1}% - \ltx@onelevel@sanitize\Hy@temp + \@onelevel@sanitize\Hy@temp \global\let\HyInd@key\Hy@temp \endgroup }% @@ -7942,7 +7952,7 @@ \def\Hy@temp{#3}% \ifx\Hy@temp\@empty \else - \ltx@ReturnAfterFi{% + \Hy@ReturnAfterFi{% \HyInd@hyperpage#3\@nil }% \fi @@ -7978,7 +7988,7 @@ \hyperlink{page.\the\toks@}{\the\toks@}% \fi \else - \ltx@ReturnAfterFi{% + \Hy@ReturnAfterFi{% \HyInd@removespaces#2\@nil }% \fi @@ -8105,8 +8115,8 @@ \hyperref[{#1}]{\HyRef@autopagerefname\pageref*{#1}}% } \def\HyRef@autopagerefname{% - \ltx@IfUndefined{pageautorefname}{% - \ltx@IfUndefined{pagename}{% + \@ifundefined{pageautorefname}{% + \@ifundefined{pagename}{% \Hy@Warning{No autoref name for `page'}% }{% \pagename\nobreakspace @@ -8150,11 +8160,11 @@ \fi } \def\HyRef@testreftype#1.#2\\{% - \ltx@IfUndefined{#1autorefname}{% - \ltx@IfUndefined{#1name}{% + \@ifundefined{#1autorefname}{% + \@ifundefined{#1name}{% \HyRef@StripStar#1\\*\\\@nil{#1}% - \ltx@IfUndefined{\HyRef@name autorefname}{% - \ltx@IfUndefined{\HyRef@name name}{% + \@ifundefined{\HyRef@name autorefname}{% + \@ifundefined{\HyRef@name name}{% \def\HyRef@currentHtag{}% \Hy@Warning{No autoref name for `#1'}% }{% diff --git a/Master/texmf-dist/tex/latex/hyperref/hypertex.def b/Master/texmf-dist/tex/latex/hyperref/hypertex.def index e018d9b8d7b..5ed58a7a1fb 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hypertex.def +++ b/Master/texmf-dist/tex/latex/hyperref/hypertex.def @@ -33,11 +33,11 @@ %% %% File: hyperref.dtx \ProvidesFile{hypertex.def} - [2023-11-09 v7.01f % + [2023-11-26 v7.01g % Hyperref driver for HyperTeX specials] \Hy@VersionCheck{hypertex.def} \providecommand*{\XR@ext}{dvi} -\let\PDF@FinishDoc\ltx@empty +\let\PDF@FinishDoc\@empty \def\PDF@SetupDoc{% \ifx\@baseurl\@empty \else @@ -140,7 +140,7 @@ \def\@Form[#1]{% \Hy@Message{Sorry, HyperTeX does not support FORMs}% } -\let\@endForm\ltx@empty +\let\@endForm\@empty \def\@Gauge[#1]#2#3#4{% parameters, label, minimum, maximum \Hy@Message{Sorry, HyperTeX does not support FORM gauges}% } @@ -206,7 +206,7 @@ \endgroup \H@old@schapter{#1}% } -\ltx@IfUndefined{@chapter}{}{% +\@ifundefined{@chapter}{}{% \let\Hy@org@chapter\@chapter \def\@chapter{% \def\Hy@next{% @@ -216,7 +216,7 @@ }% }% \ifnum\c@secnumdepth>\m@ne - \ltx@IfUndefined{if@mainmatter}% + \@ifundefined{if@mainmatter}% \iftrue{\csname if@mainmatter\endcsname}% \let\Hy@next\relax \fi diff --git a/Master/texmf-dist/tex/latex/hyperref/nameref.sty b/Master/texmf-dist/tex/latex/hyperref/nameref.sty index e27935509d9..22ea0e98a61 100644 --- a/Master/texmf-dist/tex/latex/hyperref/nameref.sty +++ b/Master/texmf-dist/tex/latex/hyperref/nameref.sty @@ -58,17 +58,21 @@ %% given in the file `manifest.txt'. \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{nameref} - [2023-11-09 v2.55 Cross-referencing by name of section]% + [2023-11-26 v2.56 Cross-referencing by name of section]% \RequirePackage{refcount}[2006/02/12] \RequirePackage{gettitlestring}[2009/12/18] -\RequirePackage{ltxcmds}[2009/12/12] -\def\NR@strip@period#1.\ltx@empty#2\@nil{#1} + +\ExplSyntaxOn +\let\NR@GlobalAppendToMacro\tl_gput_right:Nn +\ExplSyntaxOff + +\def\NR@strip@period#1.\@empty#2\@nil{#1} \def\strip@period#1.\relax#2\@@@{#1} \def\NR@sanitize@labelname{% \@onelevel@sanitize\@currentlabelname \edef\@currentlabelname{% \expandafter\NR@strip@period\@currentlabelname - \ltx@empty.\ltx@empty\@nil + \@empty.\@empty\@nil }% } \newif\ifNR@showkeys @@ -82,7 +86,7 @@ \endgroup }{} \providecommand*{\label@hook}{} -\ltx@GlobalAppendToMacro{\label@hook}{% +\NR@GlobalAppendToMacro{\label@hook}{% \NR@sanitize@labelname } \@ifl@t@r\fmtversion{2023-06-01} @@ -247,7 +251,7 @@ }% }{}% }{}% - \ltx@IfUndefined{descriptionlabel}{% + \@ifundefined{descriptionlabel}{% }{% \@ifundefined{NR@nopatch@lists} {\let\NRorg@descriptionlabel\descriptionlabel @@ -259,7 +263,7 @@ }% } \@ifundefined{NR@nopatch@theorem}{% - \ltx@IfUndefined{@opargbegintheorem}{}{% + \@ifundefined{@opargbegintheorem}{}{% \let\NRorg@opargbegintheorem\@opargbegintheorem \def\@opargbegintheorem#1#2#3{% \NR@gettitle{#3}% diff --git a/Master/texmf-dist/tex/latex/hyperref/nohyperref.sty b/Master/texmf-dist/tex/latex/hyperref/nohyperref.sty index f8538fd99d9..e36f0355407 100644 --- a/Master/texmf-dist/tex/latex/hyperref/nohyperref.sty +++ b/Master/texmf-dist/tex/latex/hyperref/nohyperref.sty @@ -34,7 +34,7 @@ %% File: hyperref.dtx \NeedsTeXFormat{LaTeX2e}[2020/10/01] \ProvidesPackage{nohyperref} - [2023-11-09 v7.01f % + [2023-11-26 v7.01g % Dummy hyperref (SR)] \RequirePackage{letltxmacro}[2008/06/13] \let\hyper@@anchor\@gobble diff --git a/Master/texmf-dist/tex/latex/hyperref/pd1enc.def b/Master/texmf-dist/tex/latex/hyperref/pd1enc.def index e9aa97d83a7..020d0b2f3c1 100644 --- a/Master/texmf-dist/tex/latex/hyperref/pd1enc.def +++ b/Master/texmf-dist/tex/latex/hyperref/pd1enc.def @@ -33,7 +33,7 @@ %% %% File: hyperref.dtx \ProvidesFile{pd1enc.def} - [2023-11-09 v7.01f % + [2023-11-26 v7.01g % Hyperref: PDFDocEncoding definition (HO)] \DeclareFontEncoding{PD1}{}{} \DeclareTextAccent{\`}{PD1}{\textasciigrave} diff --git a/Master/texmf-dist/tex/latex/hyperref/pdfmark.def b/Master/texmf-dist/tex/latex/hyperref/pdfmark.def index 38c3300c187..18aa64228aa 100644 --- a/Master/texmf-dist/tex/latex/hyperref/pdfmark.def +++ b/Master/texmf-dist/tex/latex/hyperref/pdfmark.def @@ -33,7 +33,7 @@ %% %% File: hyperref.dtx \ProvidesFile{pdfmark.def} - [2023-11-09 v7.01f % + [2023-11-26 v7.01g % Hyperref definitions for pdfmark specials] \Hy@VersionCheck{pdfmark.def} \begingroup @@ -110,7 +110,7 @@ |ifx|\#2|\%% |else \\% - |ltx@ReturnAfterFi{% + |Hy@ReturnAfterFi{% |Hy@ExchangeBackslash#2|@nil }% |fi @@ -121,7 +121,7 @@ \ifx\\#2\\% \else \@backslashchar(% - \ltx@ReturnAfterFi{% + \Hy@ReturnAfterFi{% \Hy@ExchangeLeftParenthesis#2\@nil }% \fi @@ -131,7 +131,7 @@ \ifx\\#2\\% \else \@backslashchar)% - \ltx@ReturnAfterFi{% + \Hy@ReturnAfterFi{% \Hy@ExchangeRightParenthesis#2\@nil }% \fi @@ -193,7 +193,7 @@ \endgroup \Hy@RestoreLastskip } -\ltx@IfUndefined{hyper@anchorstart}{}{\endinput} +\@ifundefined{hyper@anchorstart}{}{\endinput} \Hy@WrapperDef\hyper@anchorstart#1{% \Hy@SaveLastskip \Hy@VerboseAnchor{#1}% @@ -221,7 +221,7 @@ \ifmmode \def\Hy@LinkMath{$}% \else - \let\Hy@LinkMath\ltx@empty + \let\Hy@LinkMath\@empty \fi \Hy@SaveSpaceFactor \hbox\bgroup @@ -236,7 +236,7 @@ } \def\hyper@linkend{% \literalps@out{\strip@pt@and@otherjunk\baselineskip\space H.L}% - \ltx@IfUndefined{@\hyper@currentlinktype bordercolor}{% + \@ifundefined{@\hyper@currentlinktype bordercolor}{% \let\Hy@tempcolor\relax }{% \edef\Hy@tempcolor{% @@ -315,7 +315,7 @@ \def\Hy@undefinedname{UNDEFINED} \def\hyper@link#1#2#3{% \Hy@VerboseLinkStart{#1}{#2}% - \ltx@IfUndefined{@#1bordercolor}{% + \@ifundefined{@#1bordercolor}{% \let\Hy@tempcolor\relax }{% \edef\Hy@tempcolor{\csname @#1bordercolor\endcsname}% @@ -477,7 +477,7 @@ \edef\@processme{\noexpand\pdf@toks={\the\pdf@defaulttoks}}% \@processme \let\pdf@type\relax - \let\pdf@objdef\ltx@empty + \let\pdf@objdef\@empty \kvsetkeys{PDF}{#2}% \ifHy@pdfmarkerror \else @@ -491,14 +491,14 @@ \ifx\\#1\\% \literalps@out{% [% - \ifx\pdf@objdef\ltx@empty + \ifx\pdf@objdef\@empty \else /_objdef\string{\pdf@objdef\string}% \fi \the\pdf@toks\space\pdf@type\space pdfmark% }% \else - \ltx@IfUndefined{@\pdf@linktype color}{% + \@ifundefined{@\pdf@linktype color}{% \Hy@colorlink\@linkcolor }{% \expandafter\Hy@colorlink @@ -507,7 +507,7 @@ \pdf@rect{#1}% \literalps@out{% [% - \ifx\pdf@objdef\ltx@empty + \ifx\pdf@objdef\@empty \else /_objdef\string{\pdf@objdef\string}% \fi @@ -526,7 +526,7 @@ \begingroup \chardef\x=1 % \def\Hy@temp{#1}% - \ifx\Hy@temp\ltx@empty + \ifx\Hy@temp\@empty \chardef\x=0 % \else \def\y{\anchor@spot}% @@ -547,7 +547,7 @@ \ifmmode \def\Hy@LinkMath{$}% \else - \let\Hy@LinkMath\ltx@empty + \let\Hy@LinkMath\@empty \fi \ifHy@breaklinks \Hy@setouterhbox\pdf@box{% @@ -611,7 +611,7 @@ \define@key{PDF}{linktype}{\def\pdf@linktype{#1}} \def\pdf@linktype{link} \define@key{PDF}{objdef}{\edef\pdf@objdef{#1}} -\let\pdf@objdef\ltx@empty +\let\pdf@objdef\@empty \define@key{PDF}{Raw}{\pdf@addtoksx{#1}} \define@key{PDF}{Action}{\pdf@addtoks{#1}{Action}} \define@key{PDF}{Border}{% @@ -1026,7 +1026,7 @@ }}% \kvsetkeys{Form}{#1}% } -\let\@endForm\ltx@empty +\let\@endForm\@empty \def\@Gauge[#1]#2#3#4{% parameters, label, minimum, maximum \Hy@Message{Sorry, pdfmark drivers do not support FORM gauges}% } @@ -1047,7 +1047,7 @@ \string{#1\HyField@TheAnnotCount\string}% }% }% - \ifx\Fld@calculate@code\ltx@empty + \ifx\Fld@calculate@code\@empty \else \pdfmark{% pdfmark=/APPEND,% @@ -1060,7 +1060,7 @@ } \def\@TextField[#1]#2{% parameters, label \def\Fld@name{#2}% - \let\Fld@default\ltx@empty + \let\Fld@default\@empty \let\Fld@value\@empty \def\Fld@width{\DefaultWidthofText}% \def\Fld@height{% @@ -1324,7 +1324,7 @@ \else \expandafter \Hy@pstringdef\csname Hy@esc@\string#2\endcsname{#2}% - \ltx@ReturnAfterFi{% + \Hy@ReturnAfterFi{% \Hy@@escapeform#3\@nil }% \fi @@ -1757,9 +1757,9 @@ \def\HyPsd@SanitizeOut@BraceLeft#1(#2\@nil{% #1% \ifx\\#2\\% - \expandafter\ltx@gobble + \expandafter\@gobble \else - \expandafter\ltx@firstofone + \expandafter\@firstofone \fi {% \string\173% @@ -1769,9 +1769,9 @@ \def\HyPsd@SanitizeOut@BraceRight#1)#2\@nil{% #1% \ifx\\#2\\% - \expandafter\ltx@gobble + \expandafter\@gobble \else - \expandafter\ltx@firstofone + \expandafter\@firstofone \fi {% \string\175% @@ -1920,7 +1920,7 @@ \endgroup \H@old@schapter{#1}% } -\ltx@IfUndefined{@chapter}{}{% +\@ifundefined{@chapter}{}{% \let\Hy@org@chapter\@chapter \def\@chapter{% \def\Hy@next{% @@ -1930,7 +1930,7 @@ }% }% \ifnum\c@secnumdepth>\m@ne - \ltx@IfUndefined{if@mainmatter}% + \@ifundefined{if@mainmatter}% \iftrue{\csname if@mainmatter\endcsname}% \let\Hy@next\relax \fi diff --git a/Master/texmf-dist/tex/latex/hyperref/psdextra.def b/Master/texmf-dist/tex/latex/hyperref/psdextra.def index 6e27604f523..947559f337d 100644 --- a/Master/texmf-dist/tex/latex/hyperref/psdextra.def +++ b/Master/texmf-dist/tex/latex/hyperref/psdextra.def @@ -33,7 +33,7 @@ %% %% File: hyperref.dtx \ProvidesFile{psdextra.def} - [2023-11-09 v7.01f % + [2023-11-26 v7.01g % Hyperref: Additions to PDF string support] \Hy@VersionCheck{psdextra.def} \DeclareTextCommand{\textGamma}{PU}{\83\223}%* U+0393 diff --git a/Master/texmf-dist/tex/latex/hyperref/puarenc.def b/Master/texmf-dist/tex/latex/hyperref/puarenc.def index d8d9f934730..c60fd0edd8d 100644 --- a/Master/texmf-dist/tex/latex/hyperref/puarenc.def +++ b/Master/texmf-dist/tex/latex/hyperref/puarenc.def @@ -33,7 +33,7 @@ %% %% File: hyperref.dtx \ProvidesFile{puarenc.def} - [2023-11-09 v7.01f % + [2023-11-26 v7.01g % Hyperref: Additions to puenc.def for Arabi] \DeclareTextCommand{\hamza}{PU}{\86\041}% U+0621 \DeclareTextCommand{\alefmadda}{PU}{\86\042}% U+0622 diff --git a/Master/texmf-dist/tex/latex/hyperref/puenc-extra.def b/Master/texmf-dist/tex/latex/hyperref/puenc-extra.def index 26075ea21a7..9b0a40ada63 100644 --- a/Master/texmf-dist/tex/latex/hyperref/puenc-extra.def +++ b/Master/texmf-dist/tex/latex/hyperref/puenc-extra.def @@ -33,7 +33,7 @@ %% %% File: hyperref.dtx \ProvidesFile{puenc-extra.def} - [2023-11-09 v7.01f % + [2023-11-26 v7.01g % Hyperref: PDF Unicode extra definition (HO)] \DeclareTextCommand{\G}{PU}[1]{#1\83\017}% U+030F \DeclareTextCompositeCommand{\G}{PU}{\@empty}{\textdoublegrave}% diff --git a/Master/texmf-dist/tex/latex/hyperref/puenc.def b/Master/texmf-dist/tex/latex/hyperref/puenc.def index c4ae9f70911..8a332ba7a9a 100644 --- a/Master/texmf-dist/tex/latex/hyperref/puenc.def +++ b/Master/texmf-dist/tex/latex/hyperref/puenc.def @@ -33,7 +33,7 @@ %% %% File: hyperref.dtx \ProvidesFile{puenc.def} - [2023-11-09 v7.01f % + [2023-11-26 v7.01g % Hyperref: PDF Unicode definition (HO)] \DeclareFontEncoding{PU}{}{} \DeclareTextCommand{\`}{PU}[1]{#1\83\000}% U+0300 @@ -786,7 +786,7 @@ \DeclareTextCommand{\CYRABHHA}{PU}{\84\250}% U+04A8 \DeclareTextCommand{\cyrabhha}{PU}{\84\251}% U+04A9 \DeclareTextCommand{\CYRSDSC}{PU}{\84\252}% U+04AA -\DeclareTextCompositeCommand{\CYRSDSC}{PU}{\CYRS}{\84\252}% U+04AA +\DeclareTextCompositeCommand{\k}{PU}{\CYRS}{\84\252}% U+04AA \DeclareTextCommand{\cyrsdsc}{PU}{\84\253}% U+04AB \DeclareTextCompositeCommand{\k}{PU}{\cyrs}{\84\253}% U+04AB \DeclareTextCommand{\CYRTDSC}{PU}{\84\254}% U+04AC diff --git a/Master/texmf-dist/tex/latex/hyperref/puvnenc.def b/Master/texmf-dist/tex/latex/hyperref/puvnenc.def index 8badaa617b5..acd3e400cdf 100644 --- a/Master/texmf-dist/tex/latex/hyperref/puvnenc.def +++ b/Master/texmf-dist/tex/latex/hyperref/puvnenc.def @@ -33,7 +33,7 @@ %% %% File: hyperref.dtx \ProvidesFile{puvnenc.def} - [2023-11-09 v7.01f % + [2023-11-26 v7.01g % Hyperref: Additions to puenc.def for VnTeX] \DeclareTextCommand{\abreve}{PU}{\81\003}% U+0103 \DeclareTextCommand{\acircumflex}{PU}{\80\342}% U+00E2 diff --git a/Master/texmf-dist/tex/latex/hyperref/xr-hyper.sty b/Master/texmf-dist/tex/latex/hyperref/xr-hyper.sty index 84c9611732b..d1f931a9bca 100644 --- a/Master/texmf-dist/tex/latex/hyperref/xr-hyper.sty +++ b/Master/texmf-dist/tex/latex/hyperref/xr-hyper.sty @@ -50,14 +50,15 @@ %% %% In the case of \ref, if the external document has not used %% hyperref, this package will work like xr and produce the correct -%% text, but can not produce a well formed link as the target document -%% is not set up. In this case you may prefer to use \ref* rather than +%% text, but it can only produce a file link and +%% not target the exact location as the target document has no destinations +%% In this case you may prefer to use \ref* rather than %% \ref to avoid generating a hyperlink. %% %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{xr-hyper} - [2023-11-09 v7.01f eXternal References (DPC)] + [2023-11-26 v7.01g eXternal References (DPC)] \def\externaldocument{\@testopt\XR@cite{}} \let\externalcitedocument\externaldocument @@ -73,7 +74,6 @@ \else \let\XR@bibcite\bibcite \fi - \def\XR@useURL{}% \def\XR@URL{#4}% \filename@parse{#3}% \XR@next#3.aux\relax\\}} @@ -94,12 +94,7 @@ % XR@addURL: \def\XR@addURL#1{\XR@@dURL#1{}{}{}{}\\} \def\XR@@dURL#1#2#3#4#5\\{% - {#1}{#2}% - \if!#4!% - {#3}{#4}{}% new perhaps this could use \XR@URL too? - \else - {#3}{#4}{\XR@useURL}% - \fi + {#1}{#2}{#3}{#4}{\XR@URL}% }% \def\XR@explist{\expandafter\XR@next\XR@list\\} @@ -118,11 +113,6 @@ % 2019 update to match xr \long\def\XR@test#1#2#3#4\XR@{% \let\XR@tempa\@gobblethree -% we set the file name only if the target has actually destinations. -% for this we test if hyperref has been used. - \ifx#1\HyperFirstAtBeginDocument - \let\XR@useURL\XR@URL - \fi \ifx#1\newlabel \let\XR@tempa\@firstofthree \else\ifx#1\XR@bibcite @@ -168,3 +158,9 @@ %% unified and simplified the brace handling: all defined references have now %% five brace groups. Together with the planed change in LaTeX 2023-06-01 this %% will improve the combination of hyperref/non-hyperref documents. +%% +%% 2023-11-26 +%% +%% Always store the URL/file name of the external document to allow file links +%% even if it has no destinations. +%% -- cgit v1.2.3