From 2879f4c79a28689be64c43518e2d54d1158015c3 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 26 Feb 2010 00:40:18 +0000 Subject: hyperref update (24feb10) git-svn-id: svn://tug.org/texlive/trunk@17207 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/hyperref/ChangeLog | 9 +- Master/texmf-dist/doc/latex/hyperref/ChangeLog.pdf | Bin 333703 -> 334928 bytes Master/texmf-dist/doc/latex/hyperref/README | 17 ++- Master/texmf-dist/doc/latex/hyperref/README.pdf | Bin 297913 -> 297742 bytes Master/texmf-dist/doc/latex/hyperref/backref.pdf | 4 +- Master/texmf-dist/doc/latex/hyperref/hyperref.pdf | Bin 3961657 -> 3980766 bytes Master/texmf-dist/doc/latex/hyperref/nameref.pdf | 5 +- .../texmf-dist/source/latex/hyperref/hyperref.dtx | 125 ++++++++++++++++++--- Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def | 4 +- Master/texmf-dist/tex/latex/hyperref/hdvips.def | 2 +- Master/texmf-dist/tex/latex/hyperref/hdvipson.def | 2 +- Master/texmf-dist/tex/latex/hyperref/hdviwind.def | 6 +- Master/texmf-dist/tex/latex/hyperref/hpdftex.def | 27 +++-- Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg | 2 +- Master/texmf-dist/tex/latex/hyperref/htex4ht.def | 6 +- Master/texmf-dist/tex/latex/hyperref/htexture.def | 6 +- Master/texmf-dist/tex/latex/hyperref/hvtex.def | 6 +- Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def | 6 +- Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def | 2 +- Master/texmf-dist/tex/latex/hyperref/hxetex.def | 4 +- Master/texmf-dist/tex/latex/hyperref/hyperref.sty | 57 ++++++++-- Master/texmf-dist/tex/latex/hyperref/hypertex.def | 6 +- .../texmf-dist/tex/latex/hyperref/nohyperref.sty | 2 +- Master/texmf-dist/tex/latex/hyperref/pd1enc.def | 2 +- Master/texmf-dist/tex/latex/hyperref/pdfmark.def | 6 +- Master/texmf-dist/tex/latex/hyperref/puarenc.def | 2 +- Master/texmf-dist/tex/latex/hyperref/puenc.def | 2 +- Master/texmf-dist/tex/latex/hyperref/puvnenc.def | 2 +- 28 files changed, 251 insertions(+), 61 deletions(-) diff --git a/Master/texmf-dist/doc/latex/hyperref/ChangeLog b/Master/texmf-dist/doc/latex/hyperref/ChangeLog index f83af51a7ec..4fd3932f125 100644 --- a/Master/texmf-dist/doc/latex/hyperref/ChangeLog +++ b/Master/texmf-dist/doc/latex/hyperref/ChangeLog @@ -1,4 +1,11 @@ -2010-02-08 6.80f Heiko Oberdiek +2010-02-25 6.80h Heiko Oberdiek + * Compatibility for KOMA-Script's \footref. + +2010-02-24 6.80g Heiko Oberdiek + * Option `verbose': anchors and internal links are recorded in + the .log file for all drivers. + +2010-02-21 6.80f Heiko Oberdiek * Unicode support is loaded only if unicode is set to true. Previously the option regardless of setting triggered the loading of unicode support (or an error, if after diff --git a/Master/texmf-dist/doc/latex/hyperref/ChangeLog.pdf b/Master/texmf-dist/doc/latex/hyperref/ChangeLog.pdf index 66afc737fc9..d1cafbc8640 100644 Binary files a/Master/texmf-dist/doc/latex/hyperref/ChangeLog.pdf and b/Master/texmf-dist/doc/latex/hyperref/ChangeLog.pdf differ diff --git a/Master/texmf-dist/doc/latex/hyperref/README b/Master/texmf-dist/doc/latex/hyperref/README index 32b32365e79..27a87c6c794 100644 --- a/Master/texmf-dist/doc/latex/hyperref/README +++ b/Master/texmf-dist/doc/latex/hyperref/README @@ -1,4 +1,4 @@ -README for hyperref bundle, 2010/02/10 +README for hyperref bundle, 2010/02/24 TABLE OF CONTENTS @@ -1323,7 +1323,20 @@ Footnotes to use \footnotemark and \footnotetext out of order or reusing \footnotemark. Here you can either disable hyperref's footnote support by "hyperfootnotes=false" or fiddle with internal macros, - nasty example: + nasty examples: + +\documentclass{article} +\usepackage{hyperref} +\begin{document} +Hello% +\footnote{The first footnote} +World% +\addtocounter{footnote}{-1}% +\addtocounter{Hfootnote}{-1}% +\footnotemark. +\end{document} + + or \documentclass{article} diff --git a/Master/texmf-dist/doc/latex/hyperref/README.pdf b/Master/texmf-dist/doc/latex/hyperref/README.pdf index c4376371fc8..a21a2e396a3 100644 Binary files a/Master/texmf-dist/doc/latex/hyperref/README.pdf and b/Master/texmf-dist/doc/latex/hyperref/README.pdf differ diff --git a/Master/texmf-dist/doc/latex/hyperref/backref.pdf b/Master/texmf-dist/doc/latex/hyperref/backref.pdf index 657fcb39c3e..e6b74638e92 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<> endobj -6 0 obj<> +6 0 obj<> endobj 7 0 obj<> endobj @@ -5406,7 +5406,7 @@ xref 0000385761 00000 n 0000385800 00000 n trailer -<>/Info 6 0 R/Size 1481>> +<>/Info 6 0 R/Size 1481>> startxref 385839 %%EOF diff --git a/Master/texmf-dist/doc/latex/hyperref/hyperref.pdf b/Master/texmf-dist/doc/latex/hyperref/hyperref.pdf index 36f6bac4b5e..47276d717b9 100644 Binary files a/Master/texmf-dist/doc/latex/hyperref/hyperref.pdf and b/Master/texmf-dist/doc/latex/hyperref/hyperref.pdf differ diff --git a/Master/texmf-dist/doc/latex/hyperref/nameref.pdf b/Master/texmf-dist/doc/latex/hyperref/nameref.pdf index b3f6dff4a7f..814b211b463 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<> endobj -6 0 obj<> +6 0 obj<> endobj 7 0 obj<> endobj @@ -4539,7 +4539,8 @@ xref 0000348616 00000 n 0000348655 00000 n trailer -<>/Info 6 0 R/Size 1202>> +< #k)]/Compress<>/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 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 @@ %\ProvidesFile{puenc.def} %\ProvidesFile{puvnenc.def} %\ProvidesFile{puarenc.def} -% [2010/02/21 v6.80f +% [2010/02/25 v6.80h % Hypertext links for LaTeX] % Dummy hyperref (SR)] % Hyperref documentation driver file] @@ -124,7 +124,7 @@ \end{document} % % \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:}% @@ -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 }% @@ -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:}% @@ -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{% diff --git a/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def b/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def index 77afbf4a131..7880fab279b 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/02/21 v6.80f + [2010/02/25 v6.80h Hyperref driver for dvipdfm] \def\Hy@PutCatalog#1{\@pdfm@mark{docview << #1 >>}} \ifHy@pagelabels @@ -127,6 +127,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}% @@ -318,6 +319,7 @@ } \def\Hy@undefinedname{UNDEFINED} \def\hyper@linkstart#1#2{% + \Hy@VerboseLinkStart{#1}{#2}% \Hy@BeginAnnot{% \protected@edef\Hy@testname{#2}% \ifx\Hy@testname\@empty diff --git a/Master/texmf-dist/tex/latex/hyperref/hdvips.def b/Master/texmf-dist/tex/latex/hyperref/hdvips.def index 4e61e7c356e..5d212aec480 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/02/21 v6.80f + [2010/02/25 v6.80h 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 c7b8b1865d6..bc51129cdaf 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/02/21 v6.80f + [2010/02/25 v6.80h 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 2ca95c68ca3..00a9d15436e 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/02/21 v6.80f + [2010/02/25 v6.80h Hyperref driver for dviwindo] \begingroup \@ifundefined{headerps@out}{}{% @@ -145,6 +145,7 @@ \providecommand*\wwwbrowser{c:\string\netscape\string\netscape} \def\hyper@anchor#1{% \Hy@SaveLastskip + \Hy@VerboseAnchor{#1}% \begingroup \let\protect=\string \special{mark: #1}% @@ -156,6 +157,7 @@ } \def\hyper@anchorstart#1{% \Hy@SaveLastskip + \Hy@VerboseAnchor{#1}% \special{mark: #1}% \Hy@activeanchortrue } @@ -164,6 +166,7 @@ \Hy@RestoreLastskip } \def\hyper@linkstart#1#2{% + \Hy@VerboseLinkStart{#1}{#2}% \expandafter\Hy@colorlink\csname @#1color\endcsname \special{button: % 10000000 % @@ -175,6 +178,7 @@ \Hy@endcolorlink } \def\hyper@link#1#2#3{% + \Hy@VerboseLinkStart{#1}{#2}% \setbox\@tempboxa=\color@hbox #3\color@endbox \leavevmode \ifHy@raiselinks diff --git a/Master/texmf-dist/tex/latex/hyperref/hpdftex.def b/Master/texmf-dist/tex/latex/hyperref/hpdftex.def index 180ccc82b13..a23e6589f01 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/02/21 v6.80f + [2010/02/25 v6.80h Hyperref driver for pdfTeX] \let\Hy@PutCatalog\pdfcatalog \ifHy@pagelabels @@ -253,10 +253,8 @@ \fi \providecommand*\@pdfview{XYZ} \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 @@ -299,11 +297,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 }{% @@ -313,6 +323,7 @@ } \def\hyper@linkend{\close@pdflink} \def\hyper@link#1#2#3{% + \Hy@VerboseLinkStart{#1}{#2}% \@ifundefined{@#1bordercolor}{% \let\CurrentBorderColor\relax }{% diff --git a/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg b/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg index 8bfe41d6169..a2537eefb33 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/02/21 v6.80f + [2010/02/25 v6.80h 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 0460501675f..012c3d20a56 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/02/21 v6.80f + [2010/02/25 v6.80h Hyperref driver for TeX4ht] \providecommand*{\XR@ext}{html} \def\Hy@raisedlink{} @@ -48,6 +48,7 @@ } \def\hyper@anchor#1{% \Hy@SaveLastskip + \Hy@VerboseAnchor{#1}% \begingroup \let\protect=\string \special{t4ht=}% @@ -74,6 +76,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 @@ -120,6 +123,7 @@ \fi } \def\hyper@link#1#2#3{% + \Hy@VerboseLinkStart{#1}{#2}% \hyper@linkurl{#3}{\#\HyperDestNameFilter{#2}}% } \def\hyper@image#1#2{% diff --git a/Master/texmf-dist/tex/latex/hyperref/htexture.def b/Master/texmf-dist/tex/latex/hyperref/htexture.def index 547f1a2f0c9..3a7ab19ea6c 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/02/21 v6.80f + [2010/02/25 v6.80h Hyperref driver for Textures] \providecommand*{\XR@ext}{pdf} \begingroup @@ -126,6 +126,7 @@ } \def\hyper@anchor#1{% \Hy@SaveLastskip + \Hy@VerboseAnchor{#1}% \begingroup \let\protect=\string \special{html:}% @@ -65,6 +66,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 }% @@ -85,6 +87,7 @@ } \def\hyper@anchorstart#1{% \Hy@SaveLastskip + \Hy@VerboseAnchor{#1}% \begingroup \hyper@chars \special{!aname #1}% @@ -100,6 +103,7 @@ } \def\hyper@anchor#1{% \Hy@SaveLastskip + \Hy@VerboseAnchor{#1}% \begingroup \let\protect=\string \hyper@chars diff --git a/Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def b/Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def index ec4ce533d47..5dee5227dd7 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/02/21 v6.80f + [2010/02/25 v6.80h 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 8e1567a4d56..e44b65d85d5 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/02/21 v6.80f + [2010/02/25 v6.80h Hyperref driver for XeTeX] \HyPsd@LoadUnicode \Hy@unicodetrue @@ -209,6 +209,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}% @@ -400,6 +401,7 @@ } \def\Hy@undefinedname{UNDEFINED} \def\hyper@linkstart#1#2{% + \Hy@VerboseLinkStart{#1}{#2}% \Hy@BeginAnnot{% \protected@edef\Hy@testname{#2}% \ifx\Hy@testname\@empty diff --git a/Master/texmf-dist/tex/latex/hyperref/hyperref.sty b/Master/texmf-dist/tex/latex/hyperref/hyperref.sty index 8f73a9471e1..8c401b3ce1d 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/02/21 v6.80f + [2010/02/25 v6.80h Hypertext links for LaTeX] \begingroup \@makeother\`% @@ -3727,6 +3727,22 @@ \def\hyperlink#1#2{% \hyper@@link{}{#1}{#2}% } +\def\Hy@VerboseLinkStart#1#2{% + \ifHy@verbose + \begingroup + \Hy@safe@activestrue + \Hy@Info{Reference (#1) to `#2'}% + \endgroup + \fi +} +\def\Hy@VerboseAnchor#1{% + \ifHy@verbose + \begingroup + \Hy@safe@activestrue + \Hy@Info{Anchor `\HyperDestNameFilter{#1}'}% + \endgroup + \fi +} \DeclareRobustCommand*{\href}{% \@ifnextchar\bgroup\Hy@href{\hyper@normalise\href@}% } @@ -4787,6 +4803,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{}% @@ -4801,6 +4818,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{}% @@ -5708,6 +5726,20 @@ \ignorespaces }% }{}% + \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 \let\HyOrg@maketitle\maketitle \def\maketitle{% \let\Hy@saved@footnotemark\@footnotemark @@ -6134,15 +6166,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}% diff --git a/Master/texmf-dist/tex/latex/hyperref/hypertex.def b/Master/texmf-dist/tex/latex/hyperref/hypertex.def index b8c1cccccf8..4b209ccad31 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/02/21 v6.80f + [2010/02/25 v6.80h Hyperref driver for HyperTeX specials] \providecommand*{\XR@ext}{dvi} \def\PDF@FinishDoc{} @@ -41,6 +41,7 @@ } \def\hyper@anchor#1{% \Hy@SaveLastskip + \Hy@VerboseAnchor{#1}% \begingroup \let\protect=\string \hyper@chars @@ -55,6 +56,7 @@ } \def\hyper@anchorstart#1{% \Hy@SaveLastskip + \Hy@VerboseAnchor{#1}% \begingroup \hyper@chars \special{html: