summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/hyperref/hyperref.sty
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2010-03-19 22:46:31 +0000
committerKarl Berry <karl@freefriends.org>2010-03-19 22:46:31 +0000
commit56aa84a36d8b3bce954f6b22351af3d111d550c7 (patch)
tree9e796a3844cd9dc384851b749f62d6d105011765 /Master/texmf-dist/tex/latex/hyperref/hyperref.sty
parent3cfc580006114b09315b3babb1d923fb03691aad (diff)
hyperref update (19mar10)
git-svn-id: svn://tug.org/texlive/trunk@17505 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/hyperref/hyperref.sty')
-rw-r--r--Master/texmf-dist/tex/latex/hyperref/hyperref.sty132
1 files changed, 82 insertions, 50 deletions
diff --git a/Master/texmf-dist/tex/latex/hyperref/hyperref.sty b/Master/texmf-dist/tex/latex/hyperref/hyperref.sty
index 13f830f7067..eac583ba1c2 100644
--- a/Master/texmf-dist/tex/latex/hyperref/hyperref.sty
+++ b/Master/texmf-dist/tex/latex/hyperref/hyperref.sty
@@ -30,7 +30,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{hyperref}
- [2010/03/16 v6.80p
+ [2010/03/19 v6.80r
Hypertext links for LaTeX]
\begingroup
\@makeother\`%
@@ -99,6 +99,7 @@
}%
\endgroup
\Hy@SetCatcodes
+\RequirePackage{ltxcmds}[2010/03/09]
\RequirePackage{keyval}[1997/11/10]
\RequirePackage{kvsetkeys}[2007/09/29]
\RequirePackage{pdfescape}[2007/11/11]
@@ -135,6 +136,7 @@
\newif\ifHy@hypertexnames
\newif\ifHy@implicit
\newif\ifHy@linktocpage
+\newif\ifHy@localanchorname
\newif\ifHy@menubar
\newif\ifHy@naturalnames
\newif\ifHy@nesting
@@ -173,6 +175,7 @@
\Hy@hypertexnamestrue
\Hy@implicittrue
\Hy@linktocpagefalse
+\Hy@localanchornamefalse
\Hy@menubartrue
\Hy@naturalnamesfalse
\Hy@nestingfalse
@@ -340,7 +343,7 @@
\def\MakeUppercase{\MakeUppercaseUnsupportedInPdfStrings}%
\def\MakeLowercase{\MakeLowercaseUnsupportedInPdfStrings}%
\let\textlatin\@firstofone
- \@ifundefined{language@group}{}{%
+ \ltx@IfUndefined{language@group}{}{%
\csname HyPsd@babel@\language@group\endcsname
}%
\HyPsd@GreekPatch
@@ -382,7 +385,7 @@
\HyPsd@LetUnexpandableSpace\ %
\HyPsd@LetUnexpandableSpace~%
\HyPsd@LetUnexpandableSpace\nobreakspace
- \@ifundefined{@xspace}{%
+ \ltx@IfUndefined{@xspace}{%
\let\xspace\HyPsd@ITALCORR
}{%
\let\xspace\HyPsd@XSPACE
@@ -457,7 +460,7 @@
\HyPsd@StringSubst{\051}{\HyPsd@empty\string\)}#1%
\fi
\expandafter\HyPsd@Subst\expandafter{\/}\HyPsd@empty#1%
- \@ifundefined{@xspace}{%
+ \ltx@IfUndefined{@xspace}{%
}{%
\let\HyPsd@xspace\relax
\expandafter\HyPsd@Subst\expandafter
@@ -490,7 +493,7 @@
\ifHy@unicode
\HyPsd@ConvertToUnicode#1%
\ifx\HyPsd@pdfencoding\HyPsd@pdfencoding@auto
- \@ifundefined{StringEncodingConvertTest}{%
+ \ltx@IfUndefined{StringEncodingConvertTest}{%
}{%
\EdefUnescapeString\HyPsd@temp#1%
\ifxetex
@@ -606,9 +609,9 @@
}%
\AtEndOfPackage{%
\pdfstringdefDisableCommands{%
- \@ifundefined{oldb}{}{\let\b\oldb}%
- \@ifundefined{oldc}{}{\let\c\oldc}%
- \@ifundefined{oldd}{}{\let\d\oldd}%
+ \ltx@IfUndefined{oldb}{}{\let\b\oldb}%
+ \ltx@IfUndefined{oldc}{}{\let\c\oldc}%
+ \ltx@IfUndefined{oldd}{}{\let\d\oldd}%
}%
}%
}{%
@@ -712,64 +715,64 @@
\Hy@temp
\expandafter\AtBeginDocument\expandafter{\Hy@temp}
\newif\ifHy@next
-\@ifundefined{danish@sh@"@sel}{}{%
+\ltx@IfUndefined{danish@sh@"@sel}{}{%
\def\HyPsd@babel@danish{%
\declare@shorthand{danish}{"|}{}%
\declare@shorthand{danish}{"~}{-}%
}%
}
-\@ifundefined{dutch@sh@"@sel}{}{%
+\ltx@IfUndefined{dutch@sh@"@sel}{}{%
\def\HyPsd@babel@dutch{%
\declare@shorthand{dutch}{"|}{}%
\declare@shorthand{dutch}{"~}{-}%
}%
}
-\@ifundefined{finnish@sh@"@sel}{}{%
+\ltx@IfUndefined{finnish@sh@"@sel}{}{%
\def\HyPsd@babel@finnish{%
\declare@shorthand{finnish}{"|}{}%
}%
}
-\@ifundefined{french@sh@:@sel}{}{%
+\ltx@IfUndefined{french@sh@:@sel}{}{%
\def\HyPsd@babel@frenchb{%
\def\guill@spacing{ }%
}%
}
-\@ifundefined{german@sh@"@sel}{}{%
+\ltx@IfUndefined{german@sh@"@sel}{}{%
\def\HyPsd@babel@german{%
\declare@shorthand{german}{"f}{f}%
\declare@shorthand{german}{"|}{}%
\declare@shorthand{german}{"~}{-}%
}%
}
-\@ifundefined{macedonian@sh@"@sel}{}{%
+\ltx@IfUndefined{macedonian@sh@"@sel}{}{%
\def\HyPsd@babel@macedonian{%
\declare@shorthand{macedonian}{"|}{}%
\declare@shorthand{macedonian}{"~}{-}%
}%
}{}
-\@ifundefined{ngerman@sh@"@sel}{}{%
+\ltx@IfUndefined{ngerman@sh@"@sel}{}{%
\def\HyPsd@babel@ngerman{%
\declare@shorthand{ngerman}{"|}{}%
\declare@shorthand{ngerman}{"~}{-}%
}%
}
-\@ifundefined{portuges@sh@"@sel}{}{%
+\ltx@IfUndefined{portuges@sh@"@sel}{}{%
\def\HyPsd@babel@portuges{%
\declare@shorthand{portuges}{"|}{}%
}%
}
-\@ifundefined{russian@sh@"@sel}{}{%
+\ltx@IfUndefined{russian@sh@"@sel}{}{%
\def\HyPsd@babel@russian{%
\declare@shorthand{russian}{"|}{}%
\declare@shorthand{russian}{"~}{-}%
}%
}
-\@ifundefined{slovene@sh@"@sel}{}{%
+\ltx@IfUndefined{slovene@sh@"@sel}{}{%
\def\HyPsd@babel@slovene{%
\declare@shorthand{slovene}{"|}{}%
}%
}
-\@ifundefined{spanish@sh@>@sel}{}{%
+\ltx@IfUndefined{spanish@sh@>@sel}{}{%
\def\HyPsd@babel@spanish{%
\declare@shorthand{spanish}{<<}{\guillemotleft}%
\declare@shorthand{spanish}{>>}{\guillemotright}%
@@ -779,25 +782,25 @@
\declare@shorthand{spanish}{"?}{\textquestiondown}%
}%
}
-\@ifundefined{swedish@sh@"@sel}{}{%
+\ltx@IfUndefined{swedish@sh@"@sel}{}{%
\def\HyPsd@babel@swedish{%
\declare@shorthand{swedish}{"|}{}%
\declare@shorthand{swedish}{"~}{-}%
}%
}
-\@ifundefined{ukrainian@sh@"@sel}{}{%
+\ltx@IfUndefined{ukrainian@sh@"@sel}{}{%
\def\HyPsd@babel@ukrainian{%
\declare@shorthand{ukrainian}{"|}{}%
\declare@shorthand{ukrainian}{"~}{-}%
}%
}
-\@ifundefined{usorbian@sh@"@sel}{}{%
+\ltx@IfUndefined{usorbian@sh@"@sel}{}{%
\def\HyPsd@babel@usorbian{%
\declare@shorthand{usorbian}{"f}{f}%
\declare@shorthand{usorbian}{"|}{}%
}%
}
-\@ifundefined{greek@sh@\string~@sel}{%
+\ltx@IfUndefined{greek@sh@\string~@sel}{%
\let\HyPsd@GreekPatch\@empty
}{%
\def\HyPsd@GreekPatch{%
@@ -943,7 +946,6 @@
\fi
}
\RequirePackage{intcalc}[2007/09/27]
-\RequirePackage{ltxcmds}[2010/03/09]
\def\HyPsd@CJKhook{%
\ltx@ifpackageloaded{CJK}{%
\let\CJK@kern\relax
@@ -1315,7 +1317,7 @@
\fi
}
\def\HyPsd@hspacetest#1{\ifdim#1>\z@\space\fi}
-\@ifundefined{tocsection}{%
+\ltx@IfUndefined{tocsection}{%
\let\HyPsd@AMSclassfix\relax
}{%
\def\HyPsd@AMSclassfix{%
@@ -1409,8 +1411,8 @@
\fi
}
\def\HyPsd@@autorefname#1.#2\@nil{%
- \@ifundefined{#1autorefname}{%
- \@ifundefined{#1name}{%
+ \ltx@IfUndefined{#1autorefname}{%
+ \ltx@IfUndefined{#1name}{%
}{%
\csname#1name\endcsname\space
}%
@@ -2045,7 +2047,7 @@
\AtEndOfPackage{\RequirePackage{memhfixc}}%
}{}
\@ifpackageloaded{subfigure}{%
- \@ifundefined{sub@label}{%
+ \ltx@IfUndefined{sub@label}{%
\Hy@hypertexnamesfalse
}{%
\renewcommand*{\sub@label}[1]{%
@@ -2078,7 +2080,7 @@
}%
}%
}{}
-\@ifundefined{XR@addURL}{%
+\ltx@IfUndefined{XR@addURL}{%
}{%
\def\XR@addURL#1{\XR@@dURL#1{}{}{}{}\\}%
\def\XR@@dURL#1#2#3#4#5\\{%
@@ -2337,6 +2339,9 @@
\Hy@boolkey{breaklinks}{#1}%
\let\Hy@setbreaklinks\@gobble
}
+\define@key{Hyp}{localanchorname}[true]{%
+ \Hy@boolkey{localanchorname}{#1}%
+}
\define@key{Hyp}{pageanchor}[true]{%
\Hy@boolkey{pageanchor}{#1}%
}
@@ -3570,9 +3575,9 @@
\def\Hy@Acrobatmenu#1#2{\leavevmode}%
\fi
\Hy@nextfalse
-\@ifundefined{spanish@sh@"@sel}{}{\Hy@nexttrue}
-\@ifundefined{galician@sh@"@sel}{}{\Hy@nexttrue}
-\@ifundefined{estonian@sh@"@sel}{}{\Hy@nexttrue}
+\ltx@IfUndefined{spanish@sh@"@sel}{}{\Hy@nexttrue}
+\ltx@IfUndefined{galician@sh@"@sel}{}{\Hy@nexttrue}
+\ltx@IfUndefined{estonian@sh@"@sel}{}{\Hy@nexttrue}
\ifHy@next
\let\texttilde\~%
\fi
@@ -4017,8 +4022,28 @@
\ifHy@verbose
\begingroup
\Hy@safe@activestrue
- \Hy@Info{Reference (#1) to `#2'}%
+ \xdef\Hy@VerboseGlobalTemp{(#1) `#2'}%
+ \Hy@Info{Reference \Hy@VerboseGlobalTemp}%
+ \xdef\Hy@VerboseGlobalTemp{%
+ \Hy@VerboseGlobalTemp, %
+ line \the\inputlineno
+ }%
\endgroup
+ \let\Hy@VerboseLinkInfo\Hy@VerboseGlobalTemp
+ \@onelevel@sanitize\Hy@VerboseLinkInfo
+ \fi
+}
+\def\Hy@VerboseLinkInfo{<VerboseLinkInfo>}
+\def\Hy@VerboseLinkStop{%
+ \ifHy@verbose
+ \begingroup
+ \edef\x{\endgroup
+ \write\m@ne{%
+ Package `hyperref' Info: %
+ End of reference \Hy@VerboseLinkInfo.%
+ }%
+ }%
+ \x
\fi
}
\def\Hy@VerboseAnchor#1{%
@@ -4229,7 +4254,7 @@
\long\def\hyper@@anchor#1#2{\@hyper@@anchor#1\relax#2\relax}
\long\def\@hyper@@anchor#1\relax#2#3\relax{%
\ifx\\#1\\%
- #2\Hy@WarningNoLine{empty link? #1: #2#3}%
+ #2\Hy@Warning{Ignoring empty anchor}%
\else
\def\anchor@spot{#2#3}%
\let\put@me@back\@empty
@@ -5210,7 +5235,7 @@
\fi
\Hy@DisableOption{pdfusetitle}
\def\Hy@UseMaketitleString#1{%
- \@ifundefined{Hy@#1}{}{%
+ \ltx@IfUndefined{Hy@#1}{}{%
\begingroup
\let\Hy@saved@hook\pdfstringdefPreHook
\pdfstringdefDisableCommands{%
@@ -5424,7 +5449,7 @@
\Hy@CounterExists{part}{%
\newcommand\theHpart{\arabic{part}}%
}
-\@ifundefined{thechapter}{%
+\ltx@IfUndefined{thechapter}{%
\newcommand\theHsection {\arabic{section}}%
\newcommand\theHfigure {\arabic{figure}}%
\newcommand\theHtable {\arabic{table}}%
@@ -5512,7 +5537,7 @@
\def\Hy@chapapp{\Hy@chapterstring}
\let\HyOrg@appendix\appendix
\def\appendix{%
- \@ifundefined{chapter}%
+ \ltx@IfUndefined{chapter}%
{\gdef\theHsection{\Alph{section}}}%
{\gdef\theHchapter{\Alph{chapter}}}%
\xdef\Hy@chapapp{\Hy@appendixstring}%
@@ -5539,9 +5564,9 @@
\fi
\ifHy@naturalnames
\let\textlatin\@firstofone
- \xdef\@currentHlabel{\csname the#1\endcsname}%
+ \xdef\Hy@GlobalTempHlabel{\csname the#1\endcsname}%
\else
- \xdef\@currentHlabel{%
+ \xdef\Hy@GlobalTempHlabel{%
\csname
the%
\expandafter\ifx\csname theH#1\endcsname\relax\else H\fi
@@ -5549,14 +5574,21 @@
\endcsname
}%
\fi
- \xdef\@currentHref{%
- \Hy@param.\expandafter\strip@prefix\meaning\@currentHlabel
+ \xdef\Hy@GlobalTempHref{%
+ \Hy@param.\expandafter\strip@prefix\meaning\Hy@GlobalTempHlabel
}%
\else
\Hy@GlobalStepCount\Hy@linkcounter
- \xdef\@currentHref{\Hy@param.\the\Hy@linkcounter}%
+ \xdef\Hy@GlobalTempHref{\Hy@param.\the\Hy@linkcounter}%
\fi
\endgroup
+ \ifHy@localanchorname
+ \let\@currentHlabel\Hy@GlobalTempHlabel
+ \let\@currentHref\Hy@GlobalTempHref
+ \else
+ \global\let\@currentHlabel\Hy@GlobalTempHlabel
+ \global\let\@currentHref\Hy@GlobalTempHref
+ \fi
}
\@ifpackageloaded{fancyvrb}{%
\@ifpackagelater{fancyvrb}{1998/05/20}{}{%
@@ -5764,7 +5796,7 @@
\@namedef{endeqnarray*}{%
\nonumber\endeqnarray\@eqnstarfalse
}
-\@ifundefined{subeqnarray}{}{%
+\ltx@IfUndefined{subeqnarray}{}{%
\let\H@subeqnarray\subeqnarray
\let\H@endsubeqnarray\endsubeqnarray
\def\subeqnarray{%
@@ -6166,7 +6198,7 @@
\Hy@raisedlink{\hyper@anchorstart{cite.#1}}%
}
\def\hyper@natanchorend{\hyper@anchorend}
-\@ifundefined{NAT@parse}{%
+\ltx@IfUndefined{NAT@parse}{%
\providecommand*\@extra@binfo{}%
\providecommand*\@extra@b@citeb{}%
\def\bibcite#1#2{%
@@ -7036,8 +7068,8 @@
\hyperref[{#1}]{\HyRef@autopagerefname\pageref*{#1}}%
}
\def\HyRef@autopagerefname{%
- \@ifundefined{pageautorefname}{%
- \@ifundefined{pagename}{%
+ \ltx@IfUndefined{pageautorefname}{%
+ \ltx@IfUndefined{pagename}{%
\Hy@Warning{No autoref name for `page'}%
}{%
\pagename\nobreakspace
@@ -7081,11 +7113,11 @@
\fi
}
\def\HyRef@testreftype#1.#2\\{%
- \@ifundefined{#1autorefname}{%
- \@ifundefined{#1name}{%
+ \ltx@IfUndefined{#1autorefname}{%
+ \ltx@IfUndefined{#1name}{%
\HyRef@StripStar#1\\*\\\@nil{#1}%
- \@ifundefined{\HyRef@name autorefname}{%
- \@ifundefined{\HyRef@name name}{%
+ \ltx@IfUndefined{\HyRef@name autorefname}{%
+ \ltx@IfUndefined{\HyRef@name name}{%
\def\HyRef@currentHtag{}%
\Hy@Warning{No autoref name for `#1'}%
}{%