From 3a682d261809f0d511e3257205004f20ddaa2683 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 10 Nov 2023 21:38:45 +0000 Subject: hyperref (10nov23) git-svn-id: svn://tug.org/texlive/trunk@68800 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/source/latex/hyperref/hluatex.dtx | 4 +- .../source/latex/hyperref/hyperref-linktarget.dtx | 2 +- .../source/latex/hyperref/hyperref-patches.dtx | 2 +- .../texmf-dist/source/latex/hyperref/hyperref.dtx | 45 ++----- .../texmf-dist/source/latex/hyperref/nameref.dtx | 145 +-------------------- 5 files changed, 13 insertions(+), 185 deletions(-) (limited to 'Master/texmf-dist/source/latex') diff --git a/Master/texmf-dist/source/latex/hyperref/hluatex.dtx b/Master/texmf-dist/source/latex/hyperref/hluatex.dtx index d8309b3eb94..96c5ef9610d 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 -% 2023-11-07 v7.01e +% 2023-11-09 v7.01f % % Copyright % 2016-2019 Oberdiek Package Support Group @@ -31,7 +31,7 @@ % % \begin{macrocode} %<*luatex> -%% 2023-11-07 v7.01e +%% 2023-11-09 v7.01f %% 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 d013b89980d..4c138136797 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 2023-11-07 v7.01e} +% \date{Version 2023-11-09 v7.01f} % % \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 2c1209001a7..4a5134a2b2e 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 2023-11-07 v7.01e} +% \date{Version 2023-11-09 v7.01f} % % \maketitle % \begin{documentation} diff --git a/Master/texmf-dist/source/latex/hyperref/hyperref.dtx b/Master/texmf-dist/source/latex/hyperref/hyperref.dtx index c6fccc9cfd1..94d6b909ff4 100644 --- a/Master/texmf-dist/source/latex/hyperref/hyperref.dtx +++ b/Master/texmf-dist/source/latex/hyperref/hyperref.dtx @@ -51,7 +51,7 @@ %\ProvidesFile{puvnenc.def} %\ProvidesFile{puarenc.def} %\ProvidesFile{psdextra.def} -% [2023-11-07 v7.01e % +% [2023-11-09 v7.01f % % Hypertext links for LaTeX] % Dummy hyperref (SR)] % Hyperref documentation driver file] @@ -9420,21 +9420,6 @@ } % \end{macrocode} -% Ignore star from referencing macros: -% This is only needed if LaTeX doesn't define the starred -% variants itself. -% \begin{macrocode} -\@ifundefined{@kernel@ref} - {\LetLtxMacro\NoHy@OrgRef\ref - \DeclareRobustCommand*{\ref}{% - \@ifstar\NoHy@OrgRef\NoHy@OrgRef - } - \LetLtxMacro\NoHy@OrgPageRef\pageref - \DeclareRobustCommand*{\pageref}{% - \@ifstar\NoHy@OrgPageRef\NoHy@OrgPageRef - }}{} -% \end{macrocode} -% % \section{Localized nullifying of package} % Sometimes we just don't want the wretched package interfering % with us. Define an environment we can put in manually, or include @@ -9522,21 +9507,7 @@ \long\def\@gobbleopt[#1]{} \let\hyperpage\@empty % \end{macrocode} -% Ignore star from referencing macros. This is only -% needed in older formats. % \begin{macrocode} -\@ifl@t@r\fmtversion{2022-06-01} - {}% - {% - \LetLtxMacro\NoHy@OrgRef\ref - \DeclareRobustCommand*{\ref}{% - \@ifstar\NoHy@OrgRef\NoHy@OrgRef - } - \LetLtxMacro\NoHy@OrgPageRef\pageref - \DeclareRobustCommand*{\pageref}{% - \@ifstar\NoHy@OrgPageRef\NoHy@OrgPageRef - }% - } % % \end{macrocode} % @@ -10993,8 +10964,8 @@ % The last point is the most complicated. Simply moving at the point \cs{refstepcounter} % is encountered into the next para hook doesn't work, as this can be in a header if there is page % break. The next item hook doesn't work for the same reason, -% also not every theorem environment actually use \cs{item} (e.g. {amsthm} and ams-classes). -% Patching (or using a hook) \cs{@begintheorem} doesn't work either as {ntheorem} +% also not every theorem environment actually use \cs{item} (e.g. \texttt{amsthm} and ams-classes). +% Patching (or using a hook) \cs{@begintheorem} doesn't work either as \texttt{ntheorem} % redefines this on the fly. % % For now we move the target creation into the item hook. This is not perfect, @@ -20085,7 +20056,7 @@ \DeclareTextCommand{\textdagger}{PD1}{\201}% U+2020 % U+2021 DOUBLE DAGGER; daggerdbl; \ddagger (LaTeX) \DeclareTextCommand{\textdaggerdbl}{PD1}{\202}% U+2021 -\DeclareTextCommand{\textddagger}{PD1}{\textddagger} +\DeclareTextCommand{\textddagger}{PD1}{\textdaggerdbl} % U+2026 HORIZONTAL ELLIPSIS; ellipsis \DeclareTextCommand{\textellipsis}{PD1}{\203}% U+2026 % U+2014 EM DASH; emdash @@ -22322,7 +22293,7 @@ % U+04EC CYRILLIC CAPITAL LETTER E WITH DIAERESIS \DeclareTextCompositeCommand{\"}{PU}{\CYREREV}{\84\354}% U+04EC % U+04ED CYRILLIC SMALL LETTER E WITH DIAERESIS -\DeclareTextCompositeCommand{\"}{PU}{\cyreref}{\84\355}% U+04ED +\DeclareTextCompositeCommand{\"}{PU}{\cyrerev}{\84\355}% U+04ED % U+04EE CYRILLIC CAPITAL LETTER U WITH MACRON; Umacroncyrillic \DeclareTextCompositeCommand{\=}{PU}{\CYRU}{\84\356}% U+04EE % U+04EF CYRILLIC SMALL LETTER U WITH MACRON; umacroncyrillic @@ -24591,8 +24562,8 @@ % U+2752 UPPER RIGHT SHADOWED WHITE SQUARE; % \SquareCastShadowTopRight (bbding) \DeclareTextCommand{\textSquareCastShadowTopRight}{PU}{\9047\122}%* U+2752 -% U+2756 BLACK DIAMOND MINUS WHITE X; \OrnamentDiamandSolid (bbding) -\DeclareTextCommand{\textDiamandSolid}{PU}{\9047\126}%* U+2756 +% U+2756 BLACK DIAMOND MINUS WHITE X; \OrnamentDiamondSolid (bbding) +\DeclareTextCommand{\textDiamondSolid}{PU}{\9047\126}%* U+2756 % U+2758 LIGHT VERTICAL BAR; \RectangleThin (bbding) \DeclareTextCommand{\textRectangleThin}{PU}{\9047\130}%* U+2758 % U+2759 MEDIUM VERTICAL BAR; \Rectangle (bbding) @@ -26134,7 +26105,7 @@ \let\SquareTopRight\textSquareTopRight \let\SquareCastShadowBottomRight\textSquareCastShadowBottomRight \let\SquareCastShadowTopRight\textSquareCastShadowTopRight - \let\DiamandSolid\textDiamandSolid + \let\DiamondSolid\textDiamondSolid \let\RectangleThin\textRectangleThin \let\Rectangle\textRectangle \let\RectangleBold\textRectangleBold diff --git a/Master/texmf-dist/source/latex/hyperref/nameref.dtx b/Master/texmf-dist/source/latex/hyperref/nameref.dtx index d282f8dfd57..861af305a0a 100644 --- a/Master/texmf-dist/source/latex/hyperref/nameref.dtx +++ b/Master/texmf-dist/source/latex/hyperref/nameref.dtx @@ -33,7 +33,7 @@ %\ProvidesFile{nameref.drv} % \fi % \ProvidesFile{nameref.dtx} - [2023-10-05 v2.54 Cross-referencing by name of section]% + [2023-11-09 v2.55 Cross-referencing by name of section]% % % % \iffalse @@ -110,8 +110,6 @@ % \item \cs{@ssect}: command to store the title added, % \cs{Sectionformat} is added. % -% \item \cs{M@sect} (memoir class): command to store the title added -% % \item \cs{@part}, \cs{@spart}, \cs{@chapter}, \cs{@schapter}: % command to store the title added % \item \cs{ttl@sect@i} (from the \textsf{titlesec} package): @@ -457,27 +455,6 @@ % \end{macrocode} % \end{macro} % -% Support for class memoir. -% -% \begin{macrocode} -\@ifundefined{NR@nopatch@sectioning} - {\ltx@IfUndefined{ifheadnameref}{% - }{% - \ltx@IfUndefined{M@sect}{% - }{% - \let\NRorg@M@sect\M@sect - \def\M@sect#1#2#3#4#5#6[#7][#8]{% - \ifheadnameref - \NR@gettitle{#8}% - \else - \NR@gettitle{#7}% - \fi - \NRorg@M@sect{#1}{#2}{#3}{#4}{#5}{#6}[{#7}][{#8}]% - }% - }% - }}{} -% \end{macrocode} -% % Parts and chapters are treated differently. sigh. % \cs{@part} and \cs{@spart} are \cs{long} because of class memoir. % @@ -500,32 +477,6 @@ \NR@gettitle{#1}% \NR@chapter[{#1}]{#2}% } - \@ifclassloaded{memoir}{% - \ltx@IfUndefined{ifheadnameref}{% - }{% - \def\@chapter[#1]#2{% - \ltx@IfUndefined{ch@pt@c}{% - \NR@gettitle{#1}% - }{% - \ifx\ch@pt@c\ltx@empty - \NR@gettitle{#2}% - \else - \def\NR@temp{#1}% - \ifx\NR@temp\ltx@empty - \expandafter\NR@gettitle\expandafter{\ch@pt@c}% - \else - \ifheadnameref - \NR@gettitle{#1}% - \else - \expandafter\NR@gettitle\expandafter{\ch@pt@c}% - \fi - \fi - \fi - }% - \NR@chapter[{#1}]{#2}% - }% - }% - }{} \def\@schapter#1{% \NR@gettitle{#1}% \NR@schapter{#1}% @@ -580,71 +531,6 @@ } % \end{macrocode} % -% Compatibility for package titlesec. -% \begin{macrocode} -\AtBeginDocument{% - \@ifpackageloaded{titlesec}{% - \let\NRorg@ttl@sect@i\ttl@sect@i - \@ifundefined{NR@nopatch@titlesec} - {% - \def\ttl@sect@i#1#2[#3]#4{% - \NR@gettitle{#4}% - \NRorg@ttl@sect@i{#1}{#2}[{#3}]{#4}% - }% - }{}% - }{}% -} -% \end{macrocode} -% -% \subsubsection{Class beamer} -% -% \begin{macrocode} -\@ifclassloaded{beamer}{% - \@ifclasslater{beamer}{2022-05-17} - {}%do nothing - {% - \@ifundefined{NR@nopatch@beamer} - {% - \def\NR@PatchBeamer#1{% - \expandafter\let\csname NRorg@beamer@#1\expandafter\endcsname - \csname beamer@#1\endcsname - \begingroup - \edef\x{\endgroup - \long\def\expandafter\noexpand\csname beamer@#1\endcsname - [####1]{% hash-ok - \noexpand\NR@gettitle{####1}% - \expandafter\noexpand\csname NRorg@beamer@#1\endcsname - [{####1}]% - }% - }% - \x - }% - \AddToHook{class/beamer/after}{% - \NR@PatchBeamer{section}% - \NR@PatchBeamer{subsection}% - \NR@PatchBeamer{subsubsection}% -% \end{macrocode} -% -% Theorem names. -% \begin{macrocode} - \addtobeamertemplate{theorem begin}{% - \expandafter\NR@gettitle\expandafter{\inserttheoremaddition}% - }{}% -% \end{macrocode} -% \begin{macrocode} - \@ifdefinable{\NRorg@beamer@descriptionitem}{% - \let\NRorg@beamer@descriptionitem\beamer@descriptionitem - \renewcommand{\beamer@descriptionitem}[1]{% - \NR@gettitle{#1}% - \NRorg@beamer@descriptionitem{#1}% - }% - }% - }%Hook - }{}%@ifundefined - }%class later - }{} -% \end{macrocode} -% % \subsubsection{Theorems} % % \begin{macrocode} @@ -914,35 +800,6 @@ % \end{macrocode} % \end{macro} % -% \subsection{Package ifthen support} -% -% Package ifthen's \cmd{\isodd} does not work with -% \cmd{\pageref} because of the extra link and the -% star form. Therefore we need an expandable variant. -% -% Unfortunately there is no hook in \cmd{\ifthenelse} in order -% to provide expandable versions without link of \cmd{\ref} -% and \cmd{\pageref}. As possible target I could only find -% \cmd{\begingroup}: -% Changed/disabled 2022-04-13: ifthen takes care itself to -% change \cmd{\pageref} to an expandable version. -% \begin{macrocode} -\@ifundefined{@kernel@pageref@exp} - {\@ifpackageloaded{ifthen}{% - \let\NROrg@ifthenelse\ifthenelse - \def\ifthenelse{% - \let\begingroup\NR@TE@begingroup - \NROrg@ifthenelse - }% - \let\NROrg@begingroup\begingroup - \def\NR@TE@begingroup{% - \let\begingroup\NROrg@begingroup - \begingroup - \def\ref##1{\getrefbykeydefault{##1}{}{??}}% - \def\pageref##1{\getrefbykeydefault{##1}{page}{0}}% - }% - }{}}{} -% \end{macrocode} % % \subsection{Compatibility with varioref} % -- cgit v1.2.3