diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/hyperref/hyperref.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/hyperref/hyperref.sty | 84 |
1 files changed, 53 insertions, 31 deletions
diff --git a/Master/texmf-dist/tex/latex/hyperref/hyperref.sty b/Master/texmf-dist/tex/latex/hyperref/hyperref.sty index 736d5cbceb2..245ba22d0a0 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hyperref.sty +++ b/Master/texmf-dist/tex/latex/hyperref/hyperref.sty @@ -23,7 +23,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{hyperref} - [2007/02/07 v6.75r + [2007/02/27 v6.75t Hypertext links for LaTeX] \begingroup \@makeother\`% @@ -320,26 +320,7 @@ \let\href\@secondoftwo \let\ref\HyPsd@ref \let\pageref\HyPsd@pageref - \def\HyPsd@ar@get##1.##2\@nil{##1}% - \def\HyPsd@ar@tmp##1{% - \expandafter\expandafter\expandafter\HyPsd@ar@get - \expandafter\@fourthoffive##1\@empt\@empty.\@nil - }% - \def\auto@setref##1##2##3{% - \ifx##1\relax - \else - \csname\HyPsd@ar@tmp{##1}% - \expandafter\ifx\csname\HyPsd@ar@tmp{##1}autorefname\endcsname - \relax - \else - autoref% - \fi - name% - \endcsname - \space - \expandafter##2##1\@empty\@empty - \fi - }% + \let\autoref\HyPsd@autoref \let\leavevmode\@empty \let\mbox\@empty \def\halign{\pdfstringdefWarn\halign\@gobble}% @@ -760,6 +741,39 @@ \csname r@#1\endcsname\@nil \fi } +\def\HyPsd@autoref#1{\HyPsd@@autoref#1*\END} +\def\HyPsd@@autoref#1*#2\END{% + \ifx\\#2\\% + \HyPsd@@@autoref{#1}% + \else + \expandafter\HyPsd@@@autoref + \fi +} +\def\HyPsd@@@autoref#1{% + \expandafter\ifx\csname r@#1\endcsname\relax + ??% + \else + \expandafter\expandafter\expandafter\HyPsd@autorefname + \csname r@#1\endcsname{}{}{}{}\@nil + \expandafter\expandafter\expandafter\@car\csname r@#1\endcsname\@nil + \fi +} +\def\HyPsd@autorefname#1#2#3#4#5\@nil{% + \ifx\\#4\\% + \else + \HyPsd@@autorefname#4.\@nil + \fi +} +\def\HyPsd@@autorefname#1.#2\@nil{% + \@ifundefined{#1autorefname}{% + \@ifundefined{#1name}{% + }{% + \csname#1name\endcsname\space + }% + }{% + \csname#1autorefname\endcsname\space + }% +} \begingroup \def\x#1#2{% \endgroup @@ -2677,9 +2691,14 @@ \else \toks0{\expandafter\hyper@readexternallink#2\\{#1}}% \fi - \toks1{{#4}}% + \toks2{#4}% + \edef\Hy@tempa{\the\toks2}% \edef\x{\endgroup - \the\toks0 {\x}\the\toks1 % + \ifx\Hy@tempa\@empty + \noexpand\Hy@Warning{Suppressing empty link}% + \else + \the\toks0 {\x}{\the\toks2}%% + \fi }% \x } @@ -3487,17 +3506,20 @@ \@hyper@itemfalse \@skiphyperreffalse \def\refstepcounter#1{% - \H@refstepcounter{#1}% - \edef\This@name{#1}% - \ifx\This@name\name@of@slide + \ifHy@pdfstring \else - \if@skiphyperref + \H@refstepcounter{#1}% + \edef\This@name{#1}% + \ifx\This@name\name@of@slide \else - \if@hyper@item - \stepcounter{Item}% - \hyper@refstepcounter{Item}% + \if@skiphyperref \else - \hyper@refstepcounter{#1}% + \if@hyper@item + \stepcounter{Item}% + \hyper@refstepcounter{Item}% + \else + \hyper@refstepcounter{#1}% + \fi \fi \fi \fi |