summaryrefslogtreecommitdiff
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
parent3cfc580006114b09315b3babb1d923fb03691aad (diff)
hyperref update (19mar10)
git-svn-id: svn://tug.org/texlive/trunk@17505 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/hyperref/ChangeLog14
-rw-r--r--Master/texmf-dist/doc/latex/hyperref/ChangeLog.pdfbin338756 -> 339662 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hyperref/backref.pdf4
-rw-r--r--Master/texmf-dist/doc/latex/hyperref/hyperref.pdfbin4061222 -> 4071002 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hyperref/nameref.pdf6
-rw-r--r--Master/texmf-dist/source/latex/hyperref/hyperref.dtx163
-rw-r--r--Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def6
-rw-r--r--Master/texmf-dist/tex/latex/hyperref/hdvips.def2
-rw-r--r--Master/texmf-dist/tex/latex/hyperref/hdvipson.def2
-rw-r--r--Master/texmf-dist/tex/latex/hyperref/hdviwind.def4
-rw-r--r--Master/texmf-dist/tex/latex/hyperref/hpdftex.def13
-rw-r--r--Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg2
-rw-r--r--Master/texmf-dist/tex/latex/hyperref/htex4ht.def2
-rw-r--r--Master/texmf-dist/tex/latex/hyperref/htexture.def2
-rw-r--r--Master/texmf-dist/tex/latex/hyperref/hvtex.def12
-rw-r--r--Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def2
-rw-r--r--Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def2
-rw-r--r--Master/texmf-dist/tex/latex/hyperref/hxetex.def8
-rw-r--r--Master/texmf-dist/tex/latex/hyperref/hyperref.sty132
-rw-r--r--Master/texmf-dist/tex/latex/hyperref/hypertex.def6
-rw-r--r--Master/texmf-dist/tex/latex/hyperref/nohyperref.sty2
-rw-r--r--Master/texmf-dist/tex/latex/hyperref/pd1enc.def2
-rw-r--r--Master/texmf-dist/tex/latex/hyperref/pdfmark.def14
-rw-r--r--Master/texmf-dist/tex/latex/hyperref/puarenc.def2
-rw-r--r--Master/texmf-dist/tex/latex/hyperref/puenc.def2
-rw-r--r--Master/texmf-dist/tex/latex/hyperref/puvnenc.def2
26 files changed, 246 insertions, 160 deletions
diff --git a/Master/texmf-dist/doc/latex/hyperref/ChangeLog b/Master/texmf-dist/doc/latex/hyperref/ChangeLog
index d8a4cbcb0e3..c6e88e6de58 100644
--- a/Master/texmf-dist/doc/latex/hyperref/ChangeLog
+++ b/Master/texmf-dist/doc/latex/hyperref/ChangeLog
@@ -1,3 +1,17 @@
+2010-03-19 6.80r Heiko Oberdiek
+ * 6.80r
+ * Experimental boolean option `localanchorname' added.
+ * Warning text corrected for empty anchor.
+ * Some \@ifundefined replaced by \ltx@IfUndefined
+ (avoids definition of macros like \thechapter as \relax).
+
+2010-03-18 6.80q Heiko Oberdiek
+ * 6.80q
+ * hpdftex.def, option `verbose': end of links are
+ recorded in the .log file at shipout time.
+ This helps to find the link in case of the pdfTeX error
+ `\pdfendlink ended up in different nesting level ...'
+
2010-03-16 6.80p Heiko Oberdiek
* 6.80p
* Bookmark output for \CJKnumber fixed.
diff --git a/Master/texmf-dist/doc/latex/hyperref/ChangeLog.pdf b/Master/texmf-dist/doc/latex/hyperref/ChangeLog.pdf
index 003afb98a80..07c21a42ff4 100644
--- a/Master/texmf-dist/doc/latex/hyperref/ChangeLog.pdf
+++ b/Master/texmf-dist/doc/latex/hyperref/ChangeLog.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hyperref/backref.pdf b/Master/texmf-dist/doc/latex/hyperref/backref.pdf
index b12ea6dd9bb..05c93833f72 100644
--- a/Master/texmf-dist/doc/latex/hyperref/backref.pdf
+++ b/Master/texmf-dist/doc/latex/hyperref/backref.pdf
@@ -10,7 +10,7 @@ endobj
endobj
5 0 obj<</D[13 0 R/FitBH 752.95145]/S/GoTo>>
endobj
-6 0 obj<</ModDate(D:20100316183641+01'00')/Subject(Bibliographical back referencing)/Creator(LaTeX with hyperref package)/Author(David Carlisle and Sebastian Rahtz)/Trapped/False/Producer(pdfTeX-1.40.10)/CreationDate(D:20100316183641+01'00')/PTEX.Fullbanner(This is pdfTeX, Version 3.1415926-1.40.10-2.2 (TeX Live 2009) kpathsea version 5.0.0)/Title(Back referencing from bibliographical citations)>>
+6 0 obj<</ModDate(D:20100318232750+01'00')/Subject(Bibliographical back referencing)/Creator(LaTeX with hyperref package)/Author(David Carlisle and Sebastian Rahtz)/Trapped/False/Producer(pdfTeX-1.40.10)/CreationDate(D:20100318232750+01'00')/PTEX.Fullbanner(This is pdfTeX, Version 3.1415926-1.40.10-2.2 (TeX Live 2009) kpathsea version 5.0.0)/Title(Back referencing from bibliographical citations)>>
endobj
7 0 obj<</Type/Pages/Kids[13 0 R 14 0 R 15 0 R 16 0 R 17 0 R 18 0 R]/Parent 2 0 R/Count 6>>
endobj
@@ -5384,7 +5384,7 @@ xref
0000385083 00000 n
0000385122 00000 n
trailer
-<</Root 1 0 R/ID[(eÌ#=;o)(K' * %3:G9=<)]/Compress<</SpecO/1.4/LengthO 435517>>/Info 6 0 R/Size 1478>>
+<</Root 1 0 R/ID[(,3 _p=c7)(FK"w@ݖ)]/Compress<</SpecO/1.4/LengthO 435517>>/Info 6 0 R/Size 1478>>
startxref
385161
%%EOF
diff --git a/Master/texmf-dist/doc/latex/hyperref/hyperref.pdf b/Master/texmf-dist/doc/latex/hyperref/hyperref.pdf
index 8ef61f1b561..300d394a414 100644
--- a/Master/texmf-dist/doc/latex/hyperref/hyperref.pdf
+++ b/Master/texmf-dist/doc/latex/hyperref/hyperref.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hyperref/nameref.pdf b/Master/texmf-dist/doc/latex/hyperref/nameref.pdf
index 7786cd77d15..fa39e1c3dd9 100644
--- a/Master/texmf-dist/doc/latex/hyperref/nameref.pdf
+++ b/Master/texmf-dist/doc/latex/hyperref/nameref.pdf
@@ -10,7 +10,7 @@ endobj
endobj
5 0 obj<</D[12 0 R/FitBH 752.95145]/S/GoTo>>
endobj
-6 0 obj<</ModDate(D:20100316183659+01'00')/Subject(Cross-referencing by name of section)/Creator(LaTeX with hyperref package)/Author(Sebastian Rahtz)/Trapped/False/Producer(pdfTeX-1.40.10)/CreationDate(D:20100316183659+01'00')/PTEX.Fullbanner(This is pdfTeX, Version 3.1415926-1.40.10-2.2 (TeX Live 2009) kpathsea version 5.0.0)/Title(Section name references in LaTeX)>>
+6 0 obj<</ModDate(D:20100318232805+01'00')/Subject(Cross-referencing by name of section)/Creator(LaTeX with hyperref package)/Author(Sebastian Rahtz)/Trapped/False/Producer(pdfTeX-1.40.10)/CreationDate(D:20100318232805+01'00')/PTEX.Fullbanner(This is pdfTeX, Version 3.1415926-1.40.10-2.2 (TeX Live 2009) kpathsea version 5.0.0)/Title(Section name references in LaTeX)>>
endobj
7 0 obj<</Type/Pages/Kids[12 0 R 13 0 R 14 0 R 15 0 R 16 0 R 17 0 R]/Parent 2 0 R/Count 6>>
endobj
@@ -4539,7 +4539,9 @@ xref
0000348616 00000 n
0000348655 00000 n
trailer
-<</Root 1 0 R/ID[(VJm
+<</Root 1 0 R/ID[(?g
+DQ
+|8)(]II,s)]/Compress<</SpecO/1.4/LengthO 388932>>/Info 6 0 R/Size 1202>>
startxref
348694
%%EOF
diff --git a/Master/texmf-dist/source/latex/hyperref/hyperref.dtx b/Master/texmf-dist/source/latex/hyperref/hyperref.dtx
index f9095185175..3142fccba5e 100644
--- a/Master/texmf-dist/source/latex/hyperref/hyperref.dtx
+++ b/Master/texmf-dist/source/latex/hyperref/hyperref.dtx
@@ -44,7 +44,7 @@
%<puenc>\ProvidesFile{puenc.def}
%<puvnenc>\ProvidesFile{puvnenc.def}
%<puarenc>\ProvidesFile{puarenc.def}
-%<!none> [2010/03/16 v6.80p
+%<!none> [2010/03/19 v6.80r
%<package> Hypertext links for LaTeX]
%<nohyperref> Dummy hyperref (SR)]
%<driver> Hyperref documentation driver file]
@@ -126,7 +126,7 @@
\end{document}
%</driver>
% \fi
-% \CheckSum{26760}
+% \CheckSum{26810}
%
% \MakeShortVerb{|}
% \StopEventually{}
@@ -565,6 +565,7 @@
% setup internal code changed at that point. It'll probably break
% with the later releases!
% \begin{macrocode}
+\RequirePackage{ltxcmds}[2010/03/09]
\RequirePackage{keyval}[1997/11/10]
\RequirePackage{kvsetkeys}[2007/09/29]
\RequirePackage{pdfescape}[2007/11/11]
@@ -622,6 +623,7 @@
\newif\ifHy@hypertexnames
\newif\ifHy@implicit
\newif\ifHy@linktocpage
+\newif\ifHy@localanchorname
\newif\ifHy@menubar
\newif\ifHy@naturalnames
\newif\ifHy@nesting
@@ -663,6 +665,7 @@
\Hy@hypertexnamestrue
\Hy@implicittrue
\Hy@linktocpagefalse
+\Hy@localanchornamefalse
\Hy@menubartrue
\Hy@naturalnamesfalse
\Hy@nestingfalse
@@ -1108,7 +1111,7 @@
% (Email: \Email{Felix.Neubauer@gmx.net}).
% \begin{macrocode}
\let\textlatin\@firstofone
- \@ifundefined{language@group}{}{%
+ \ltx@IfUndefined{language@group}{}{%
\csname HyPsd@babel@\language@group\endcsname
}%
\HyPsd@GreekPatch
@@ -1241,7 +1244,7 @@
%
% \paragraph{Package xspace.}
% \begin{macrocode}
- \@ifundefined{@xspace}{%
+ \ltx@IfUndefined{@xspace}{%
\let\xspace\HyPsd@ITALCORR
}{%
\let\xspace\HyPsd@XSPACE
@@ -1543,7 +1546,7 @@
% the string gets an additional \cs{HyPsd@empty}.
% \begin{macrocode}
\expandafter\HyPsd@Subst\expandafter{\/}\HyPsd@empty#1%
- \@ifundefined{@xspace}{%
+ \ltx@IfUndefined{@xspace}{%
}{%
\let\HyPsd@xspace\relax
\expandafter\HyPsd@Subst\expandafter
@@ -1635,7 +1638,7 @@
%
% \begin{macrocode}
\ifx\HyPsd@pdfencoding\HyPsd@pdfencoding@auto
- \@ifundefined{StringEncodingConvertTest}{%
+ \ltx@IfUndefined{StringEncodingConvertTest}{%
}{%
\EdefUnescapeString\HyPsd@temp#1%
\ifxetex
@@ -1775,9 +1778,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}%
}%
}%
}{%
@@ -2027,59 +2030,59 @@
%
% Nothing to do for english.
% \begin{macrocode}
-\@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}{"|}{}%
}%
@@ -2087,7 +2090,7 @@
% \end{macrocode}
% Nested quoting environments are not supported (|<<|, |>>|).
% \begin{macrocode}
-\@ifundefined{spanish@sh@>@sel}{}{%
+\ltx@IfUndefined{spanish@sh@>@sel}{}{%
\def\HyPsd@babel@spanish{%
\declare@shorthand{spanish}{<<}{\guillemotleft}%
\declare@shorthand{spanish}{>>}{\guillemotright}%
@@ -2097,19 +2100,19 @@
\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}{"|}{}%
@@ -2117,7 +2120,7 @@
}
% \end{macrocode}
% \begin{macrocode}
-\@ifundefined{greek@sh@\string~@sel}{%
+\ltx@IfUndefined{greek@sh@\string~@sel}{%
\let\HyPsd@GreekPatch\@empty
}{%
\def\HyPsd@GreekPatch{%
@@ -2270,7 +2273,6 @@
%
% \begin{macrocode}
\RequirePackage{intcalc}[2007/09/27]
-\RequirePackage{ltxcmds}[2010/03/09]
% \end{macrocode}
%
% \begin{macro}{\HyPsd@CJKhook}
@@ -2818,7 +2820,7 @@
% \subsubsection{Fix for AMS classes}
%
% \begin{macrocode}
-\@ifundefined{tocsection}{%
+\ltx@IfUndefined{tocsection}{%
\let\HyPsd@AMSclassfix\relax
}{%
\def\HyPsd@AMSclassfix{%
@@ -2990,8 +2992,8 @@
% \begin{macro}{\HyPsd@@autorefname}
% \begin{macrocode}
\def\HyPsd@@autorefname#1.#2\@nil{%
- \@ifundefined{#1autorefname}{%
- \@ifundefined{#1name}{%
+ \ltx@IfUndefined{#1autorefname}{%
+ \ltx@IfUndefined{#1name}{%
}{%
\csname#1name\endcsname\space
}%
@@ -4052,7 +4054,7 @@
% Added fix for version 2.1. Here \cmd{\sub@label} is defined.
% \begin{macrocode}
\@ifpackageloaded{subfigure}{%
- \@ifundefined{sub@label}{%
+ \ltx@IfUndefined{sub@label}{%
\Hy@hypertexnamesfalse
}{%
\renewcommand*{\sub@label}[1]{%
@@ -4092,7 +4094,7 @@
% \verb|xr-hyper|. Therefore we test for the macro itself and not
% for the package name:
% \begin{macrocode}
-\@ifundefined{XR@addURL}{%
+\ltx@IfUndefined{XR@addURL}{%
}{%
% \end{macrocode}
% If reading external aux files check whether they have a non zero
@@ -4470,6 +4472,11 @@
\let\Hy@setbreaklinks\@gobble
}
% \end{macrocode}
+% \begin{macrocode}
+\define@key{Hyp}{localanchorname}[true]{%
+ \Hy@boolkey{localanchorname}{#1}%
+}
+% \end{macrocode}
% Determines whether an automatic anchor is put on each page
% \begin{macrocode}
\define@key{Hyp}{pageanchor}[true]{%
@@ -6075,9 +6082,9 @@
% in babel manner.
% \begin{macrocode}
\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
@@ -6588,8 +6595,30 @@
\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
+}
+% \end{macrocode}
+% \begin{macrocode}
+\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
}
% \end{macrocode}
@@ -6913,7 +6942,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
@@ -8279,7 +8308,7 @@
%
% \begin{macrocode}
\def\Hy@UseMaketitleString#1{%
- \@ifundefined{Hy@#1}{}{%
+ \ltx@IfUndefined{Hy@#1}{}{%
\begingroup
\let\Hy@saved@hook\pdfstringdefPreHook
\pdfstringdefDisableCommands{%
@@ -8873,7 +8902,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}}%
@@ -9004,7 +9033,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}%
@@ -9036,9 +9065,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
@@ -9046,14 +9075,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
}
% \end{macrocode}
% \end{macro}
@@ -9372,7 +9408,7 @@
% Then again, we have the \emph{subeqnarray}
% package. Tanmoy provided some code for this:
% \begin{macrocode}
-\@ifundefined{subeqnarray}{}{%
+\ltx@IfUndefined{subeqnarray}{}{%
\let\H@subeqnarray\subeqnarray
\let\H@endsubeqnarray\endsubeqnarray
\def\subeqnarray{%
@@ -9938,7 +9974,7 @@
% not expanded immediately, we use \cs{@extra@b@citeb}, so cites in a
% chapter will link to the bibliography in that chapter.
% \begin{macrocode}
-\@ifundefined{NAT@parse}{%
+\ltx@IfUndefined{NAT@parse}{%
\providecommand*\@extra@binfo{}%
\providecommand*\@extra@b@citeb{}%
\def\bibcite#1#2{%
@@ -11108,8 +11144,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
@@ -11153,11 +11189,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'}%
}{%
@@ -11572,6 +11608,7 @@
}
\def\close@pdflink{%
\Hy@endcolorlink
+ \Hy@VerboseLinkStop
\pdfendlink
}
\def\hyper@anchor#1{%
@@ -11587,7 +11624,7 @@
}
\def\hyper@linkstart#1#2{%
\Hy@VerboseLinkStart{#1}{#2}%
- \@ifundefined{@#1bordercolor}{%
+ \ltx@IfUndefined{@#1bordercolor}{%
\let\CurrentBorderColor\relax
}{%
\edef\CurrentBorderColor{\csname @#1bordercolor\endcsname}%
@@ -11597,7 +11634,7 @@
\def\hyper@linkend{\close@pdflink}
\def\hyper@link#1#2#3{%
\Hy@VerboseLinkStart{#1}{#2}%
- \@ifundefined{@#1bordercolor}{%
+ \ltx@IfUndefined{@#1bordercolor}{%
\let\CurrentBorderColor\relax
}{%
\edef\CurrentBorderColor{\csname @#1bordercolor\endcsname}%
@@ -12076,7 +12113,7 @@
\fi
\fi
}{%
- \@ifundefined{stockwidth}{%
+ \ltx@IfUndefined{stockwidth}{%
\ifdim\paperwidth>\z@
\setlength{\pdfpagewidth}{\paperwidth}%
\fi
@@ -13167,7 +13204,7 @@
\else
\ifHy@setpagesize
\providecommand*{\VTeXInitMediaSize}{%
- \@ifundefined{stockwidth}{%
+ \ltx@IfUndefined{stockwidth}{%
\ifdim\paperheight>0pt %
\setlength\mediaheight\paperheight
\fi
@@ -13227,7 +13264,7 @@
\Hy@VerboseLinkStart{#1}{#2}%
\Hy@pstringdef\Hy@pstringURI{#2}%
\expandafter\Hy@colorlink\csname @#1color\endcsname
- \@ifundefined{@#1bordercolor}{%
+ \ltx@IfUndefined{@#1bordercolor}{%
\let\CurrentBorderColor\relax
}{%
\edef\CurrentBorderColor{%
@@ -13314,7 +13351,7 @@
}
\def\hyper@link#1#2#3{%
\Hy@VerboseLinkStart{#1}{#2}%
- \@ifundefined{@#1bordercolor}{%
+ \ltx@IfUndefined{@#1bordercolor}{%
\let\CurrentBorderColor\relax
}{%
\edef\CurrentBorderColor{\csname @#1bordercolor\endcsname}%
@@ -13874,7 +13911,7 @@
\endgroup
\Hy@RestoreLastskip
}
-\@ifundefined{hyper@anchorstart}{}{\endinput}
+\ltx@IfUndefined{hyper@anchorstart}{}{\endinput}
\def\hyper@anchorstart#1{%
\Hy@SaveLastskip
\Hy@VerboseAnchor{#1}%
@@ -13908,7 +13945,7 @@
}
\def\hyper@linkend{%
\literalps@out{\strip@pt@and@otherjunk\baselineskip\space H.L}%
- \@ifundefined{@\hyper@currentlinktype bordercolor}{%
+ \ltx@IfUndefined{@\hyper@currentlinktype bordercolor}{%
\let\Hy@tempcolor\relax
}{%
\edef\Hy@tempcolor{%
@@ -14020,7 +14057,7 @@
\def\Hy@undefinedname{UNDEFINED}
\def\hyper@link#1#2#3{%
\Hy@VerboseLinkStart{#1}{#2}%
- \@ifundefined{@#1bordercolor}{%
+ \ltx@IfUndefined{@#1bordercolor}{%
\let\Hy@tempcolor\relax
}{%
\edef\Hy@tempcolor{\csname @#1bordercolor\endcsname}%
@@ -14208,7 +14245,7 @@
[\the\pdf@toks\space\pdf@type\space pdfmark%
}%
\else
- \@ifundefined{@\pdf@linktype color}{%
+ \ltx@IfUndefined{@\pdf@linktype color}{%
\Hy@colorlink\@linkcolor
}{%
\expandafter\Hy@colorlink
@@ -17700,7 +17737,7 @@
% executed, so there will be no destination for \cmd{addcontentsline}.
% So \cmd{\@chapter} is overloaded to avoid this:
% \begin{macrocode}
-\@ifundefined{@chapter}{}{%
+\ltx@IfUndefined{@chapter}{}{%
\let\Hy@org@chapter\@chapter
\def\@chapter{%
\def\Hy@next{%
@@ -17711,7 +17748,7 @@
}%
}%
\ifnum\c@secnumdepth>\m@ne
- \@ifundefined{if@mainmatter}%
+ \ltx@IfUndefined{if@mainmatter}%
\iftrue{\csname if@mainmatter\endcsname}%
\let\Hy@next\relax
\fi
diff --git a/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def b/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def
index 83d208f2e42..96969e16a00 100644
--- a/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def
+++ b/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def
@@ -29,7 +29,7 @@
%% given in the file `manifest.txt'.
%%
\ProvidesFile{hdvipdfm.def}
- [2010/03/16 v6.80p
+ [2010/03/19 v6.80r
Hyperref driver for dvipdfm]
\def\Hy@PutCatalog#1{\@pdfm@mark{docview << #1 >>}}
\ifHy@pagelabels
@@ -1473,7 +1473,7 @@
\endgroup
\H@old@schapter{#1}%
}
-\@ifundefined{@chapter}{}{%
+\ltx@IfUndefined{@chapter}{}{%
\let\Hy@org@chapter\@chapter
\def\@chapter{%
\def\Hy@next{%
@@ -1484,7 +1484,7 @@
}%
}%
\ifnum\c@secnumdepth>\m@ne
- \@ifundefined{if@mainmatter}%
+ \ltx@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 70d6d8d2546..aa99757151c 100644
--- a/Master/texmf-dist/tex/latex/hyperref/hdvips.def
+++ b/Master/texmf-dist/tex/latex/hyperref/hdvips.def
@@ -29,7 +29,7 @@
%% given in the file `manifest.txt'.
%%
\ProvidesFile{hdvips.def}
- [2010/03/16 v6.80p
+ [2010/03/19 v6.80r
Hyperref driver for dvips]
\providecommand*{\XR@ext}{pdf}
\def\Hy@raisedlink{}
diff --git a/Master/texmf-dist/tex/latex/hyperref/hdvipson.def b/Master/texmf-dist/tex/latex/hyperref/hdvipson.def
index 55a7a9c8b17..18d52033c55 100644
--- a/Master/texmf-dist/tex/latex/hyperref/hdvipson.def
+++ b/Master/texmf-dist/tex/latex/hyperref/hdvipson.def
@@ -29,7 +29,7 @@
%% given in the file `manifest.txt'.
%%
\ProvidesFile{hdvipson.def}
- [2010/03/16 v6.80p
+ [2010/03/19 v6.80r
Hyperref driver for dvipsone]
\providecommand*{\XR@ext}{pdf}
\def\Hy@raisedlink{}
diff --git a/Master/texmf-dist/tex/latex/hyperref/hdviwind.def b/Master/texmf-dist/tex/latex/hyperref/hdviwind.def
index d02b4ba6a1b..9544d639f13 100644
--- a/Master/texmf-dist/tex/latex/hyperref/hdviwind.def
+++ b/Master/texmf-dist/tex/latex/hyperref/hdviwind.def
@@ -29,7 +29,7 @@
%% given in the file `manifest.txt'.
%%
\ProvidesFile{hdviwind.def}
- [2010/03/16 v6.80p
+ [2010/03/19 v6.80r
Hyperref driver for dviwindo]
\begingroup
\@ifundefined{headerps@out}{}{%
@@ -429,7 +429,7 @@
[\the\pdf@toks\space\pdf@type\space pdfmark%
}%
\else
- \@ifundefined{@\pdf@linktype color}{%
+ \ltx@IfUndefined{@\pdf@linktype color}{%
\Hy@colorlink\@linkcolor
}{%
\expandafter\Hy@colorlink
diff --git a/Master/texmf-dist/tex/latex/hyperref/hpdftex.def b/Master/texmf-dist/tex/latex/hyperref/hpdftex.def
index 325466135ff..a08fd9ee76d 100644
--- a/Master/texmf-dist/tex/latex/hyperref/hpdftex.def
+++ b/Master/texmf-dist/tex/latex/hyperref/hpdftex.def
@@ -29,7 +29,7 @@
%% given in the file `manifest.txt'.
%%
\ProvidesFile{hpdftex.def}
- [2010/03/16 v6.80p
+ [2010/03/19 v6.80r
Hyperref driver for pdfTeX]
\let\Hy@PutCatalog\pdfcatalog
\ifHy@pagelabels
@@ -299,6 +299,7 @@
}
\def\close@pdflink{%
\Hy@endcolorlink
+ \Hy@VerboseLinkStop
\pdfendlink
}
\def\hyper@anchor#1{%
@@ -314,7 +315,7 @@
}
\def\hyper@linkstart#1#2{%
\Hy@VerboseLinkStart{#1}{#2}%
- \@ifundefined{@#1bordercolor}{%
+ \ltx@IfUndefined{@#1bordercolor}{%
\let\CurrentBorderColor\relax
}{%
\edef\CurrentBorderColor{\csname @#1bordercolor\endcsname}%
@@ -324,7 +325,7 @@
\def\hyper@linkend{\close@pdflink}
\def\hyper@link#1#2#3{%
\Hy@VerboseLinkStart{#1}{#2}%
- \@ifundefined{@#1bordercolor}{%
+ \ltx@IfUndefined{@#1bordercolor}{%
\let\CurrentBorderColor\relax
}{%
\edef\CurrentBorderColor{\csname @#1bordercolor\endcsname}%
@@ -705,7 +706,7 @@
\fi
\fi
}{%
- \@ifundefined{stockwidth}{%
+ \ltx@IfUndefined{stockwidth}{%
\ifdim\paperwidth>\z@
\setlength{\pdfpagewidth}{\paperwidth}%
\fi
@@ -1680,7 +1681,7 @@
\endgroup
\H@old@schapter{#1}%
}
-\@ifundefined{@chapter}{}{%
+\ltx@IfUndefined{@chapter}{}{%
\let\Hy@org@chapter\@chapter
\def\@chapter{%
\def\Hy@next{%
@@ -1691,7 +1692,7 @@
}%
}%
\ifnum\c@secnumdepth>\m@ne
- \@ifundefined{if@mainmatter}%
+ \ltx@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 140fe952c03..3adbdc452c9 100644
--- a/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg
+++ b/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg
@@ -29,7 +29,7 @@
%% given in the file `manifest.txt'.
%%
\ProvidesFile{htex4ht.cfg}
- [2010/03/16 v6.80p
+ [2010/03/19 v6.80r
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 566e1c14aaa..6cc2fd797e4 100644
--- a/Master/texmf-dist/tex/latex/hyperref/htex4ht.def
+++ b/Master/texmf-dist/tex/latex/hyperref/htex4ht.def
@@ -29,7 +29,7 @@
%% given in the file `manifest.txt'.
%%
\ProvidesFile{htex4ht.def}
- [2010/03/16 v6.80p
+ [2010/03/19 v6.80r
Hyperref driver for TeX4ht]
\providecommand*{\XR@ext}{html}
\def\Hy@raisedlink{}
diff --git a/Master/texmf-dist/tex/latex/hyperref/htexture.def b/Master/texmf-dist/tex/latex/hyperref/htexture.def
index 95caf024fa8..047c20809d0 100644
--- a/Master/texmf-dist/tex/latex/hyperref/htexture.def
+++ b/Master/texmf-dist/tex/latex/hyperref/htexture.def
@@ -29,7 +29,7 @@
%% given in the file `manifest.txt'.
%%
\ProvidesFile{htexture.def}
- [2010/03/16 v6.80p
+ [2010/03/19 v6.80r
Hyperref driver for Textures]
\providecommand*{\XR@ext}{pdf}
\begingroup
diff --git a/Master/texmf-dist/tex/latex/hyperref/hvtex.def b/Master/texmf-dist/tex/latex/hyperref/hvtex.def
index 543ff7fe881..071adb323ea 100644
--- a/Master/texmf-dist/tex/latex/hyperref/hvtex.def
+++ b/Master/texmf-dist/tex/latex/hyperref/hvtex.def
@@ -29,7 +29,7 @@
%% given in the file `manifest.txt'.
%%
\ProvidesFile{hvtex.def}
- [2010/03/16 v6.80p
+ [2010/03/19 v6.80r
Hyperref driver for VTeX in PDF/PS mode]
\providecommand*{\XR@ext}{pdf}
\edef\Hy@VTeXversion{%
@@ -139,7 +139,7 @@
\else
\ifHy@setpagesize
\providecommand*{\VTeXInitMediaSize}{%
- \@ifundefined{stockwidth}{%
+ \ltx@IfUndefined{stockwidth}{%
\ifdim\paperheight>0pt %
\setlength\mediaheight\paperheight
\fi
@@ -196,7 +196,7 @@
\Hy@VerboseLinkStart{#1}{#2}%
\Hy@pstringdef\Hy@pstringURI{#2}%
\expandafter\Hy@colorlink\csname @#1color\endcsname
- \@ifundefined{@#1bordercolor}{%
+ \ltx@IfUndefined{@#1bordercolor}{%
\let\CurrentBorderColor\relax
}{%
\edef\CurrentBorderColor{%
@@ -283,7 +283,7 @@
}
\def\hyper@link#1#2#3{%
\Hy@VerboseLinkStart{#1}{#2}%
- \@ifundefined{@#1bordercolor}{%
+ \ltx@IfUndefined{@#1bordercolor}{%
\let\CurrentBorderColor\relax
}{%
\edef\CurrentBorderColor{\csname @#1bordercolor\endcsname}%
@@ -846,7 +846,7 @@
\endgroup
\H@old@schapter{#1}%
}
-\@ifundefined{@chapter}{}{%
+\ltx@IfUndefined{@chapter}{}{%
\let\Hy@org@chapter\@chapter
\def\@chapter{%
\def\Hy@next{%
@@ -857,7 +857,7 @@
}%
}%
\ifnum\c@secnumdepth>\m@ne
- \@ifundefined{if@mainmatter}%
+ \ltx@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 0116422e7b1..d35eac7487f 100644
--- a/Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def
+++ b/Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def
@@ -29,7 +29,7 @@
%% given in the file `manifest.txt'.
%%
\ProvidesFile{hvtexhtml.def}
- [2010/03/16 v6.80p
+ [2010/03/19 v6.80r
Hyperref driver for VTeX in HTML mode]
\providecommand*{\XR@ext}{htm}
\RequirePackage{vtexhtml}
diff --git a/Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def b/Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def
index 19fcd71e4a6..300c148c2a0 100644
--- a/Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def
+++ b/Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def
@@ -29,7 +29,7 @@
%% given in the file `manifest.txt'.
%%
\ProvidesFile{hvtexmrk.def}
- [2010/03/16 v6.80p
+ [2010/03/19 v6.80r
Hyperref driver for VTeX in PDF/PS mode (pdfmark specials)]
\providecommand*{\XR@ext}{pdf}
\def\Hy@raisedlink{}
diff --git a/Master/texmf-dist/tex/latex/hyperref/hxetex.def b/Master/texmf-dist/tex/latex/hyperref/hxetex.def
index 509ce01fdb0..496aaf12074 100644
--- a/Master/texmf-dist/tex/latex/hyperref/hxetex.def
+++ b/Master/texmf-dist/tex/latex/hyperref/hxetex.def
@@ -29,7 +29,7 @@
%% given in the file `manifest.txt'.
%%
\ProvidesFile{hxetex.def}
- [2010/03/16 v6.80p
+ [2010/03/19 v6.80r
Hyperref driver for XeTeX]
\HyPsd@LoadUnicode
\Hy@unicodetrue
@@ -184,7 +184,7 @@
\fi
\fi
}{%
- \@ifundefined{stockwidth}{%
+ \ltx@IfUndefined{stockwidth}{%
\ifdim\paperwidth>\z@
\setlength{\pdfpagewidth}{\paperwidth}%
\fi
@@ -1535,7 +1535,7 @@
\endgroup
\H@old@schapter{#1}%
}
-\@ifundefined{@chapter}{}{%
+\ltx@IfUndefined{@chapter}{}{%
\let\Hy@org@chapter\@chapter
\def\@chapter{%
\def\Hy@next{%
@@ -1546,7 +1546,7 @@
}%
}%
\ifnum\c@secnumdepth>\m@ne
- \@ifundefined{if@mainmatter}%
+ \ltx@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 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'}%
}{%
diff --git a/Master/texmf-dist/tex/latex/hyperref/hypertex.def b/Master/texmf-dist/tex/latex/hyperref/hypertex.def
index ce749e9a85d..c1511c35686 100644
--- a/Master/texmf-dist/tex/latex/hyperref/hypertex.def
+++ b/Master/texmf-dist/tex/latex/hyperref/hypertex.def
@@ -29,7 +29,7 @@
%% given in the file `manifest.txt'.
%%
\ProvidesFile{hypertex.def}
- [2010/03/16 v6.80p
+ [2010/03/19 v6.80r
Hyperref driver for HyperTeX specials]
\providecommand*{\XR@ext}{dvi}
\def\PDF@FinishDoc{}
@@ -187,7 +187,7 @@
\endgroup
\H@old@schapter{#1}%
}
-\@ifundefined{@chapter}{}{%
+\ltx@IfUndefined{@chapter}{}{%
\let\Hy@org@chapter\@chapter
\def\@chapter{%
\def\Hy@next{%
@@ -198,7 +198,7 @@
}%
}%
\ifnum\c@secnumdepth>\m@ne
- \@ifundefined{if@mainmatter}%
+ \ltx@IfUndefined{if@mainmatter}%
\iftrue{\csname if@mainmatter\endcsname}%
\let\Hy@next\relax
\fi
diff --git a/Master/texmf-dist/tex/latex/hyperref/nohyperref.sty b/Master/texmf-dist/tex/latex/hyperref/nohyperref.sty
index b66721c0761..dfca430f5a9 100644
--- a/Master/texmf-dist/tex/latex/hyperref/nohyperref.sty
+++ b/Master/texmf-dist/tex/latex/hyperref/nohyperref.sty
@@ -30,7 +30,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{nohyperref}
- [2010/03/16 v6.80p
+ [2010/03/19 v6.80r
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 ece8fa28e50..4a8e39edb54 100644
--- a/Master/texmf-dist/tex/latex/hyperref/pd1enc.def
+++ b/Master/texmf-dist/tex/latex/hyperref/pd1enc.def
@@ -29,7 +29,7 @@
%% given in the file `manifest.txt'.
%%
\ProvidesFile{pd1enc.def}
- [2010/03/16 v6.80p
+ [2010/03/19 v6.80r
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 a5523697460..6fa1a06d1e9 100644
--- a/Master/texmf-dist/tex/latex/hyperref/pdfmark.def
+++ b/Master/texmf-dist/tex/latex/hyperref/pdfmark.def
@@ -29,7 +29,7 @@
%% given in the file `manifest.txt'.
%%
\ProvidesFile{pdfmark.def}
- [2010/03/16 v6.80p
+ [2010/03/19 v6.80r
Hyperref definitions for pdfmark specials]
\begingroup
\@ifundefined{headerps@out}{}{%
@@ -186,7 +186,7 @@
\endgroup
\Hy@RestoreLastskip
}
-\@ifundefined{hyper@anchorstart}{}{\endinput}
+\ltx@IfUndefined{hyper@anchorstart}{}{\endinput}
\def\hyper@anchorstart#1{%
\Hy@SaveLastskip
\Hy@VerboseAnchor{#1}%
@@ -220,7 +220,7 @@
}
\def\hyper@linkend{%
\literalps@out{\strip@pt@and@otherjunk\baselineskip\space H.L}%
- \@ifundefined{@\hyper@currentlinktype bordercolor}{%
+ \ltx@IfUndefined{@\hyper@currentlinktype bordercolor}{%
\let\Hy@tempcolor\relax
}{%
\edef\Hy@tempcolor{%
@@ -308,7 +308,7 @@
\def\Hy@undefinedname{UNDEFINED}
\def\hyper@link#1#2#3{%
\Hy@VerboseLinkStart{#1}{#2}%
- \@ifundefined{@#1bordercolor}{%
+ \ltx@IfUndefined{@#1bordercolor}{%
\let\Hy@tempcolor\relax
}{%
\edef\Hy@tempcolor{\csname @#1bordercolor\endcsname}%
@@ -483,7 +483,7 @@
[\the\pdf@toks\space\pdf@type\space pdfmark%
}%
\else
- \@ifundefined{@\pdf@linktype color}{%
+ \ltx@IfUndefined{@\pdf@linktype color}{%
\Hy@colorlink\@linkcolor
}{%
\expandafter\Hy@colorlink
@@ -1682,7 +1682,7 @@
\endgroup
\H@old@schapter{#1}%
}
-\@ifundefined{@chapter}{}{%
+\ltx@IfUndefined{@chapter}{}{%
\let\Hy@org@chapter\@chapter
\def\@chapter{%
\def\Hy@next{%
@@ -1693,7 +1693,7 @@
}%
}%
\ifnum\c@secnumdepth>\m@ne
- \@ifundefined{if@mainmatter}%
+ \ltx@IfUndefined{if@mainmatter}%
\iftrue{\csname if@mainmatter\endcsname}%
\let\Hy@next\relax
\fi
diff --git a/Master/texmf-dist/tex/latex/hyperref/puarenc.def b/Master/texmf-dist/tex/latex/hyperref/puarenc.def
index d5f91b50e88..15caad3bdbf 100644
--- a/Master/texmf-dist/tex/latex/hyperref/puarenc.def
+++ b/Master/texmf-dist/tex/latex/hyperref/puarenc.def
@@ -29,7 +29,7 @@
%% given in the file `manifest.txt'.
%%
\ProvidesFile{puarenc.def}
- [2010/03/16 v6.80p
+ [2010/03/19 v6.80r
Hyperref: Additions to puenc.def for Arabi]
\DeclareTextCommand{\hamza}{PU}{\86\041}% 0621;afii57409;ARABIC LETTER HAMZA
\DeclareTextCommand{\alefmadda}{PU}{\86\042}% 0622;afii57410;ARABIC LETTER ALEF WITH MADDA ABOVE
diff --git a/Master/texmf-dist/tex/latex/hyperref/puenc.def b/Master/texmf-dist/tex/latex/hyperref/puenc.def
index 69b1b61dc9f..75a2808729c 100644
--- a/Master/texmf-dist/tex/latex/hyperref/puenc.def
+++ b/Master/texmf-dist/tex/latex/hyperref/puenc.def
@@ -29,7 +29,7 @@
%% given in the file `manifest.txt'.
%%
\ProvidesFile{puenc.def}
- [2010/03/16 v6.80p
+ [2010/03/19 v6.80r
Hyperref: PDF Unicode definition (HO)]
\DeclareFontEncoding{PU}{}{}
\DeclareTextCommand{\`}{PU}[1]{#1\83\000}% U+0300
diff --git a/Master/texmf-dist/tex/latex/hyperref/puvnenc.def b/Master/texmf-dist/tex/latex/hyperref/puvnenc.def
index 9a571e35288..7c5ab70909c 100644
--- a/Master/texmf-dist/tex/latex/hyperref/puvnenc.def
+++ b/Master/texmf-dist/tex/latex/hyperref/puvnenc.def
@@ -29,7 +29,7 @@
%% given in the file `manifest.txt'.
%%
\ProvidesFile{puvnenc.def}
- [2010/03/16 v6.80p
+ [2010/03/19 v6.80r
Hyperref: Additions to puenc.def for VnTeX]
\DeclareTextCommand{\abreve}{PU}{\81\003}
\DeclareTextCommand{\acircumflex}{PU}{\80\342}