From e310a370e47dad34bf66385af346c7ba08fc1f27 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 28 Nov 2009 00:32:45 +0000 Subject: hyperref update (27nov09) git-svn-id: svn://tug.org/texlive/trunk@16209 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/hyperref/hyperref.sty | 54 ++++++++++++++++------- 1 file changed, 39 insertions(+), 15 deletions(-) (limited to 'Master/texmf-dist/tex/latex/hyperref/hyperref.sty') diff --git a/Master/texmf-dist/tex/latex/hyperref/hyperref.sty b/Master/texmf-dist/tex/latex/hyperref/hyperref.sty index f36901c07bb..0b87e72c753 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hyperref.sty +++ b/Master/texmf-dist/tex/latex/hyperref/hyperref.sty @@ -25,7 +25,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{hyperref} - [2009/11/25 v6.79h + [2009/11/26 v6.79i Hypertext links for LaTeX] \begingroup \@makeother\`% @@ -3505,10 +3505,15 @@ } \def\hyperdef{\@ifnextchar[{\label@hyperdef}{\@hyperdef}} \def\@hyperdef#1#2#3{%, category, name, text + \ifx\\#1\\% + \def\Hy@AnchorName{#2}% + \else + \def\Hy@AnchorName{#1.#2}% + \fi \ifHy@nesting - \hyper@@anchor{#1.#2}{#3}% + \expandafter\hyper@@anchor\expandafter{\Hy@AnchorName}{#3}% \else - \hyper@@anchor{#1.#2}{\relax}#3% + \expandafter\hyper@@anchor\expandafter{\Hy@AnchorName}{\relax}#3% \fi } \def\label@hyperref[#1]{% @@ -3529,15 +3534,21 @@ \def\label@hyperdef[#1]#2#3#4{% label name, category, name, % anchor text \@bsphack + \ifx\\#2\\% + \def\Hy@AnchorName{#3}% + \else + \def\Hy@AnchorName{#2.#3}% + \fi \if@filesw - \protected@write\@auxout{}% - {\string\newlabel{#1}{{}{}{}\##2.#3}}% + \protected@write\@auxout{}{% + \string\newlabel{#1}{{}{}{}{\Hy@AnchorName}{}}% + }% \fi \@esphack \ifHy@nesting - \hyper@@anchor{#2.#3}{#4}% + \expandafter\hyper@@anchor\expandafter{\Hy@AnchorName}{#4}% \else - \hyper@@anchor{#2.#3}{\relax}#4% + \expandafter\hyper@@anchor\expandafter{\Hy@AnchorName}{\relax}#4% \fi } \def\hyper@@link{\let\Hy@reserved@a\relax @@ -4489,6 +4500,16 @@ \ifHy@texht\else\hyper@anchorstart{Doc-Start}\hyper@anchorend\fi \Hy@pdfstringfalse } + +\let\NoHy@OrgRef\ref +\def\ref{% + \@ifstar\NoHy@OrgRef\NoHy@OrgRef +} +\let\NoHy@OrgPageRef\pageref +\def\pageref{% + \@ifstar\NoHy@OrgPageRef\NoHy@OrgPageRef +} + \def\NoHyper{% \def\hyper@link@[##1]##2##3##4{##4}% \def\hyper@@anchor##1{}% @@ -5280,10 +5301,10 @@ \long\def\@mpfootnotetext#1{% \H@@mpfootnotetext{% \ifHy@nesting - \hyper@@anchor{\Hy@footnote@currentHref}{#1}% + \expandafter\hyper@@anchor\expandafter{\Hy@footnote@currentHref}{#1}% \else \Hy@raisedlink{% - \hyper@@anchor{\Hy@footnote@currentHref}{\relax}% + \expandafter\hyper@@anchor\expandafter{\Hy@footnote@currentHref}{\relax}% }#1% \fi }% @@ -5291,10 +5312,10 @@ \long\def\@footnotetext#1{% \H@@footnotetext{% \ifHy@nesting - \hyper@@anchor{\Hy@footnote@currentHref}{#1}% + \expandafter\hyper@@anchor\expandafter{\Hy@footnote@currentHref}{#1}% \else \Hy@raisedlink{% - \hyper@@anchor{\Hy@footnote@currentHref}{\relax}% + \expandafter\hyper@@anchor\expandafter{\Hy@footnote@currentHref}{\relax}% }% \let\@currentHlabel\Hy@footnote@currentHlabel \let\@currentHref\Hy@footnote@currentHref @@ -5382,7 +5403,7 @@ \bgroup \aftergroup\V@@@footnotetext \Hy@raisedlink{% - \hyper@@anchor{\Hy@footnote@currentHref}{\relax}% + \expandafter\hyper@@anchor\expandafter{\Hy@footnote@currentHref}{\relax}% }% \let\@currentHlabel\Hy@footnote@currentHlabel \let\@currentHref\Hy@footnote@currentHref @@ -5465,9 +5486,12 @@ \@makecaption{\csname fnum@#1\endcsname}{% \ignorespaces \ifHy@nesting - \hyper@@anchor{\@currentHref}{#3}% + \expandafter\hyper@@anchor\expandafter{\@currentHref}{#3}% \else - \Hy@raisedlink{\hyper@@anchor{\@currentHref}{\relax}}#3% + \Hy@raisedlink{% + \expandafter\hyper@@anchor\expandafter{\@currentHref}{\relax}% + }% + #3% \fi }% \fi @@ -5491,7 +5515,7 @@ #1\relax \ifx\Hy@float@currentHref\@undefined \else - \hyper@@anchor{\Hy@float@currentHref}{\relax}% + \expandafter\hyper@@anchor\expandafter{\Hy@float@currentHref}{\relax}% \global\let\Hy@float@currentHref\@undefined \fi }% -- cgit v1.2.3