summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2009-11-28 00:32:45 +0000
committerKarl Berry <karl@freefriends.org>2009-11-28 00:32:45 +0000
commite310a370e47dad34bf66385af346c7ba08fc1f27 (patch)
tree57ea984d861ef1f9af034bd4fa85e72c62f806e3 /Master/texmf-dist/source/latex
parentb9fd6f4c3a2131191f55e213f94aaa3d6b0a8cb9 (diff)
hyperref update (27nov09)
git-svn-id: svn://tug.org/texlive/trunk@16209 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex')
-rw-r--r--Master/texmf-dist/source/latex/hyperref/hyperref.dtx60
1 files changed, 44 insertions, 16 deletions
diff --git a/Master/texmf-dist/source/latex/hyperref/hyperref.dtx b/Master/texmf-dist/source/latex/hyperref/hyperref.dtx
index 92064b5d20f..5274277e038 100644
--- a/Master/texmf-dist/source/latex/hyperref/hyperref.dtx
+++ b/Master/texmf-dist/source/latex/hyperref/hyperref.dtx
@@ -38,7 +38,7 @@
%<puenc>\ProvidesFile{puenc.def}
%<puvnenc>\ProvidesFile{puvnenc.def}
%<puarenc>\ProvidesFile{puarenc.def}
-%<!none> [2009/11/25 v6.79h
+%<!none> [2009/11/26 v6.79i
%<package> Hypertext links for LaTeX]
%<nohyperref> Dummy hyperref (SR)]
%<driver> Hyperref documentation driver file]
@@ -115,7 +115,7 @@
\end{document}
%</driver>
% \fi
-% \CheckSum{24927}
+% \CheckSum{24995}
%
% \MakeShortVerb{|}
% \StopEventually{}
@@ -6036,10 +6036,15 @@
% \begin{macrocode}
\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
}
% \end{macrocode}
@@ -6064,15 +6069,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
}
% \end{macrocode}
@@ -7339,6 +7350,20 @@
\Hy@pdfstringfalse
}
% \end{macrocode}
+
+% Ignore star from referencing macros:
+% \begin{macrocode}
+\let\NoHy@OrgRef\ref
+\def\ref{%
+ \@ifstar\NoHy@OrgRef\NoHy@OrgRef
+}
+\let\NoHy@OrgPageRef\pageref
+\def\pageref{%
+ \@ifstar\NoHy@OrgPageRef\NoHy@OrgPageRef
+}
+
+
+
%
% \section{Localized nullifying of package}
% Sometimes we just don't want the wretched package interfering
@@ -8793,10 +8818,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
}%
@@ -8804,10 +8829,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
@@ -8916,7 +8941,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
@@ -9052,9 +9077,12 @@
% If we cannot have nesting, the anchor is empty.
% \begin{macrocode}
\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
@@ -9084,7 +9112,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
}%