summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2010-02-26 00:40:18 +0000
committerKarl Berry <karl@freefriends.org>2010-02-26 00:40:18 +0000
commit2879f4c79a28689be64c43518e2d54d1158015c3 (patch)
tree340e3ecbc7b24e4e7430080ccde14fadaa945149 /Master/texmf-dist/source
parent0288945faa2fa7ad7b023fe54b2eefac37ba88f6 (diff)
hyperref update (24feb10)
git-svn-id: svn://tug.org/texlive/trunk@17207 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source')
-rw-r--r--Master/texmf-dist/source/latex/hyperref/hyperref.dtx125
1 files changed, 107 insertions, 18 deletions
diff --git a/Master/texmf-dist/source/latex/hyperref/hyperref.dtx b/Master/texmf-dist/source/latex/hyperref/hyperref.dtx
index 294a61471af..6f9d4109cc5 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/02/21 v6.80f
+%<!none> [2010/02/25 v6.80h
%<package> Hypertext links for LaTeX]
%<nohyperref> Dummy hyperref (SR)]
%<driver> Hyperref documentation driver file]
@@ -124,7 +124,7 @@
\end{document}
%</driver>
% \fi
-% \CheckSum{25476}
+% \CheckSum{25557}
%
% \MakeShortVerb{|}
% \StopEventually{}
@@ -6270,6 +6270,27 @@
% \end{macrocode}
%
% \begin{macrocode}
+\def\Hy@VerboseLinkStart#1#2{%
+ \ifHy@verbose
+ \begingroup
+ \Hy@safe@activestrue
+ \Hy@Info{Reference (#1) to `#2'}%
+ \endgroup
+ \fi
+}
+% \end{macrocode}
+% \begin{macrocode}
+\def\Hy@VerboseAnchor#1{%
+ \ifHy@verbose
+ \begingroup
+ \Hy@safe@activestrue
+ \Hy@Info{Anchor `\HyperDestNameFilter{#1}'}%
+ \endgroup
+ \fi
+}
+% \end{macrocode}
+%
+% \begin{macrocode}
\DeclareRobustCommand*{\href}{%
\@ifnextchar\bgroup\Hy@href{\hyper@normalise\href@}%
}
@@ -7682,6 +7703,7 @@
\def\hyper@@anchor##1{}%
\global\let\hyper@livelink\hyper@link
\gdef\hyper@link##1##2##3{##3}%
+ \def\hyper@anchor##1{}%
\def\hyper@anchorstart##1{}%
\let\hyper@anchorend\@empty
\def\hyper@linkstart##1##2{}%
@@ -7696,6 +7718,7 @@
\let\Hy@backout\@gobble
\def\hyper@@anchor##1{}%
\def\hyper@link##1##2##3{##3}%
+ \def\hyper@anchor##1{}%
\def\hyper@anchorstart##1{}%
\let\hyper@anchorend\@empty
\def\hyper@linkstart##1##2{}%
@@ -9326,6 +9349,26 @@
}{}%
% \end{macrocode}
%
+% KOMA-Script defines \cs{footref} that uses both
+% \cs{ref} and \cs{@footnotemark} resulting in two links,
+% one of them wrong.
+% \begin{macrocode}
+ \def\Hy@temp#1{%
+ \begingroup
+ \unrestored@protected@xdef\@thefnmark{\ref{#1}}%
+ \endgroup
+ \@footnotemark
+ }%
+ \ifx\Hy@temp\footref
+ \def\footref#1{%
+ \begingroup
+ \unrestored@protected@xdef\@thefnmark{\ref{#1}}%
+ \endgroup
+ \H@@footnotemark
+ }%
+ \fi
+% \end{macrocode}
+%
% But the special footnotes
% in |\maketitle| are much too hard to deal with
% properly. Let them revert to plain behaviour.
@@ -9995,15 +10038,20 @@
{\Hy@toclevel}%
{#1}%
\ifHy@verbose
- \def\Hy@tempa{#3}%
- \@onelevel@sanitize\Hy@tempa
- \typeout{pdftex: bookmark at \the\inputlineno: %
- {\csname the#2\endcsname}%
- {\Hy@tempa}%
- {\@currentHref}%
- {\Hy@toclevel}%
- {#1}%
- }%
+ \begingroup
+ \def\Hy@tempa{#3}%
+ \@onelevel@sanitize\Hy@tempa
+ \let\temp@online\on@line
+ \let\on@line\@empty
+ \Hy@Info{%
+ bookmark\temp@online:\MessageBreak
+ thecounter {\csname the#2\endcsname}\MessageBreak
+ text {\Hy@tempa}\MessageBreak
+ reference {\@currentHref}\MessageBreak
+ toclevel {\Hy@toclevel}\MessageBreak
+ type {#1}%
+ }%
+ \endgroup
\fi
\addtocontents{#1}{%
\protect\contentsline{#2}{#3}{\thepage}{\@currentHref}%
@@ -11140,10 +11188,8 @@
% First define the anchors:
% \begin{macrocode}
\def\new@pdflink#1{%
- \ifHy@verbose
- \typeout{pdftex: define anchor at line \the\inputlineno: #1}%
- \fi
\Hy@SaveLastskip
+ \Hy@VerboseAnchor{#1}%
\Hy@pstringdef\Hy@pstringDest{\HyperDestNameFilter{#1}}%
\Hy@DestName\Hy@pstringDest\@pdfview
\Hy@RestoreLastskip
@@ -11200,11 +11246,23 @@
\def\Hy@StartlinkName#1#2{%
\pdfstartlink attr{#1}goto name{#2}\relax
}
-\def\close@pdflink{\Hy@endcolorlink\pdfendlink}
-\def\hyper@anchor#1{\new@pdflink{#1}\anchor@spot\pdf@endanchor}
-\def\hyper@anchorstart#1{\new@pdflink{#1}\Hy@activeanchortrue}
-\def\hyper@anchorend{\pdf@endanchor\Hy@activeanchorfalse}
+\def\close@pdflink{%
+ \Hy@endcolorlink
+ \pdfendlink
+}
+\def\hyper@anchor#1{%
+ \new@pdflink{#1}\anchor@spot\pdf@endanchor
+}
+\def\hyper@anchorstart#1{%
+ \new@pdflink{#1}%
+ \Hy@activeanchortrue
+}
+\def\hyper@anchorend{%
+ \pdf@endanchor
+ \Hy@activeanchorfalse
+}
\def\hyper@linkstart#1#2{%
+ \Hy@VerboseLinkStart{#1}{#2}%
\@ifundefined{@#1bordercolor}{%
\let\CurrentBorderColor\relax
}{%
@@ -11214,6 +11272,7 @@
}
\def\hyper@linkend{\close@pdflink}
\def\hyper@link#1#2#3{%
+ \Hy@VerboseLinkStart{#1}{#2}%
\@ifundefined{@#1bordercolor}{%
\let\CurrentBorderColor\relax
}{%
@@ -11822,6 +11881,7 @@
}
\def\hyper@anchor#1{%
\Hy@SaveLastskip
+ \Hy@VerboseAnchor{#1}%
\begingroup
\let\protect=\string
\hyper@chars
@@ -11836,6 +11896,7 @@
}
\def\hyper@anchorstart#1{%
\Hy@SaveLastskip
+ \Hy@VerboseAnchor{#1}%
\begingroup
\hyper@chars
\special{html:<a name=%
@@ -11850,6 +11911,7 @@
}
\def\@urltype{url}
\def\hyper@linkstart#1#2{%
+ \Hy@VerboseLinkStart{#1}{#2}%
\expandafter\Hy@colorlink\csname @#1color\endcsname
\def\Hy@tempa{#1}%
\ifx\Hy@tempa\@urltype
@@ -11908,6 +11970,7 @@
% Very poor implementation of \cs{hyper@link} without considering |#1|.
% \begin{macrocode}
\def\hyper@link#1#2#3{%
+ \Hy@VerboseLinkStart{#1}{#2}%
\hyper@linkurl{#3}{\#\HyperDestNameFilter{#2}}%
}
% \end{macrocode}
@@ -11944,6 +12007,7 @@
\providecommand*\wwwbrowser{c:\string\netscape\string\netscape}
\def\hyper@anchor#1{%
\Hy@SaveLastskip
+ \Hy@VerboseAnchor{#1}%
\begingroup
\let\protect=\string
\special{mark: #1}%
@@ -11955,6 +12019,7 @@
}
\def\hyper@anchorstart#1{%
\Hy@SaveLastskip
+ \Hy@VerboseAnchor{#1}%
\special{mark: #1}%
\Hy@activeanchortrue
}
@@ -11963,6 +12028,7 @@
\Hy@RestoreLastskip
}
\def\hyper@linkstart#1#2{%
+ \Hy@VerboseLinkStart{#1}{#2}%
\expandafter\Hy@colorlink\csname @#1color\endcsname
\special{button: %
10000000 %
@@ -11974,6 +12040,7 @@
\Hy@endcolorlink
}
\def\hyper@link#1#2#3{%
+ \Hy@VerboseLinkStart{#1}{#2}%
\setbox\@tempboxa=\color@hbox #3\color@endbox
\leavevmode
\ifHy@raiselinks
@@ -12182,6 +12249,7 @@
\def\@pdfm@mark#1{\special{pdf:#1}}
\def\@pdfm@dest#1{%
\Hy@SaveLastskip
+ \Hy@VerboseAnchor{#1}%
\begingroup
\Hy@pstringdef\Hy@pstringDest{\HyperDestNameFilter{#1}}%
\def\x{XYZ}%
@@ -12381,6 +12449,7 @@
% \begin{macrocode}
\def\Hy@undefinedname{UNDEFINED}
\def\hyper@linkstart#1#2{%
+ \Hy@VerboseLinkStart{#1}{#2}%
\Hy@BeginAnnot{%
\protected@edef\Hy@testname{#2}%
\ifx\Hy@testname\@empty
@@ -12658,6 +12727,7 @@
}
\def\@urltype{url}
\def\hyper@link#1#2#3{%
+ \Hy@VerboseLinkStart{#1}{#2}%
\leavevmode
\special{!direct <a href=%
\hyper@quote\hyper@hash\HyperDestNameFilter{#2}\hyper@quote>}%
@@ -12680,6 +12750,7 @@
\hyper@linkurl{#1}{\Hy@linkfileprefix#2\ifx\\#3\\\else\##3\fi}%
}
\def\hyper@linkstart#1#2{%
+ \Hy@VerboseLinkStart{#1}{#2}%
\def\Hy@tempa{#1}\ifx\Hy@tempa\@urltype
\@Localurltrue
\special{!direct <a href=\hyper@quote#2\hyper@quote>}%
@@ -12700,6 +12771,7 @@
}
\def\hyper@anchorstart#1{%
\Hy@SaveLastskip
+ \Hy@VerboseAnchor{#1}%
\begingroup
\hyper@chars
\special{!aname #1}%
@@ -12715,6 +12787,7 @@
}
\def\hyper@anchor#1{%
\Hy@SaveLastskip
+ \Hy@VerboseAnchor{#1}%
\begingroup
\let\protect=\string
\hyper@chars
@@ -12800,6 +12873,7 @@
\let\CurrentBorderColor\@linkbordercolor
\def\hyper@anchor#1{%
\Hy@SaveLastskip
+ \Hy@VerboseAnchor{#1}%
\begingroup
\let\protect=\string
\hyper@chars
@@ -12812,6 +12886,7 @@
}
\def\hyper@anchorstart#1{%
\Hy@SaveLastskip
+ \Hy@VerboseAnchor{#1}%
\begingroup
\hyper@chars
\special{!aname \HyperDestNameFilter{#1};\@pdfview}%
@@ -12825,6 +12900,7 @@
\def\@urltype{url}
\def\Hy@undefinedname{UNDEFINED}
\def\hyper@linkstart#1#2{%
+ \Hy@VerboseLinkStart{#1}{#2}%
\Hy@pstringdef\Hy@pstringURI{#2}%
\expandafter\Hy@colorlink\csname @#1color\endcsname
\@ifundefined{@#1bordercolor}{%
@@ -12913,6 +12989,7 @@
\endgroup
}
\def\hyper@link#1#2#3{%
+ \Hy@VerboseLinkStart{#1}{#2}%
\@ifundefined{@#1bordercolor}{%
\let\CurrentBorderColor\relax
}{%
@@ -13462,6 +13539,7 @@
\Hy@breaklinks@unsupported
\def\hyper@anchor#1{%
\Hy@SaveLastskip
+ \Hy@VerboseAnchor{#1}%
\begingroup
\pdfmark[\anchor@spot]{%
pdfmark=/DEST,%
@@ -13475,6 +13553,7 @@
\@ifundefined{hyper@anchorstart}{}{\endinput}
\def\hyper@anchorstart#1{%
\Hy@SaveLastskip
+ \Hy@VerboseAnchor{#1}%
\literalps@out{H.S}%
\xdef\hyper@currentanchor{#1}%
\Hy@activeanchortrue
@@ -13491,6 +13570,7 @@
\Hy@RestoreLastskip
}
\def\hyper@linkstart#1#2{%
+ \Hy@VerboseLinkStart{#1}{#2}%
\ifHy@breaklinks
\else
\leavevmode\hbox\bgroup
@@ -13613,6 +13693,7 @@
}
\def\Hy@undefinedname{UNDEFINED}
\def\hyper@link#1#2#3{%
+ \Hy@VerboseLinkStart{#1}{#2}%
\@ifundefined{@#1bordercolor}{%
\let\Hy@tempcolor\relax
}{%
@@ -14580,6 +14661,7 @@
}
\def\hyper@anchor#1{%
\Hy@SaveLastskip
+ \Hy@VerboseAnchor{#1}%
\begingroup
\let\protect=\string
\special{html:<a name=%
@@ -14593,6 +14675,7 @@
}
\def\hyper@anchorstart#1{%
\Hy@SaveLastskip
+ \Hy@VerboseAnchor{#1}%
\begingroup
\hyper@chars
\special{html:<a name=%
@@ -14607,6 +14690,7 @@
}
\def\@urltype{url}
\def\hyper@linkstart#1#2{%
+ \Hy@VerboseLinkStart{#1}{#2}%
\expandafter\Hy@colorlink\csname @#1color\endcsname
\def\Hy@tempa{#1}%
\ifx\Hy@tempa\@urltype
@@ -14658,6 +14742,7 @@
% Very poor implementation of \cs{hyper@link} without considering |#1|.
% \begin{macrocode}
\def\hyper@link#1#2#3{%
+ \Hy@VerboseLinkStart{#1}{#2}%
\hyper@linkurl{#3}{\#\HyperDestNameFilter{#2}}%
}
\def\hyper@image#1#2{%
@@ -14880,6 +14965,7 @@
}
\def\hyper@anchor#1{%
\Hy@SaveLastskip
+ \Hy@VerboseAnchor{#1}%
\begingroup
\let\protect=\string
\special{t4ht=<a name=%
@@ -14893,6 +14979,7 @@
}
\def\hyper@anchorstart#1{%
\Hy@SaveLastskip
+ \Hy@VerboseAnchor{#1}%
\begingroup
\hyper@chars\special{t4ht=<a name=%
\hyper@quote\HyperDestNameFilter{#1}\hyper@quote>}%
@@ -14906,6 +14993,7 @@
}
\def\@urltype{url}
\def\hyper@linkstart#1#2{%
+ \Hy@VerboseLinkStart{#1}{#2}%
\expandafter\Hy@colorlink\csname @#1color\endcsname
\def\Hy@tempa{#1}%
\ifx\Hy@tempa\@urltype
@@ -14955,6 +15043,7 @@
% Poor implementation of \cs{hyper@link} without considering |#1|.
% \begin{macrocode}
\def\hyper@link#1#2#3{%
+ \Hy@VerboseLinkStart{#1}{#2}%
\hyper@linkurl{#3}{\#\HyperDestNameFilter{#2}}%
}
\def\hyper@image#1#2{%