diff options
author | Karl Berry <karl@freefriends.org> | 2008-07-17 23:06:30 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2008-07-17 23:06:30 +0000 |
commit | 8ba2e4ca526b22810442d35e723f95412d7f6b4c (patch) | |
tree | 7717ffffdccc788b6a0cc78c4b46826a9ce894b0 /Master/texmf-dist/source/latex/hyperref | |
parent | 848dbb11f1b8a5adf31e6af8716456aeb12a7021 (diff) |
hyperref update (17jul08)
git-svn-id: svn://tug.org/texlive/trunk@9645 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/hyperref')
-rw-r--r-- | Master/texmf-dist/source/latex/hyperref/hyperref.dtx | 98 |
1 files changed, 63 insertions, 35 deletions
diff --git a/Master/texmf-dist/source/latex/hyperref/hyperref.dtx b/Master/texmf-dist/source/latex/hyperref/hyperref.dtx index e7125686040..d706e1bbd0e 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> [2008/07/15 v6.78b +%<!none> [2008/07/16 v6.78c %<package> Hypertext links for LaTeX] %<nohyperref> Dummy hyperref (SR)] %<driver> Hyperref documentation driver file] @@ -114,7 +114,7 @@ \end{document} %</driver> % \fi -% \CheckSum{22800} +% \CheckSum{22837} % % \MakeShortVerb{|} % \StopEventually{} @@ -5063,6 +5063,7 @@ \let\PDF@FinishDoc\@empty \let\phantomsection\@empty \let\special@paper\@empty +\def\HyperDestNameFilter#1{#1} \@ifundefined{stockwidth}{% \ifdim\paperwidth>\z@ \ifdim\paperheight>\z@ @@ -10319,7 +10320,7 @@ \typeout{pdftex: define anchor at line \the\inputlineno: #1}% \fi \Hy@SaveLastskip - \Hy@pstringdef\Hy@pstringDest{#1}% + \Hy@pstringdef\Hy@pstringDest{\HyperDestNameFilter{#1}}% \Hy@DestName\Hy@pstringDest\@pdfview \Hy@RestoreLastskip } @@ -10350,7 +10351,9 @@ \ifx\Hy@testname\@empty \let\Hy@testname\Hy@undefinedname \else - \Hy@pstringdef\Hy@testname\Hy@testname + \Hy@pstringdef\Hy@testname{% + \expandafter\HyperDestNameFilter\expandafter{\Hy@testname}% + }% \fi \Hy@StartlinkName{% \ifHy@pdfa /F 4\fi @@ -10952,7 +10955,8 @@ \begingroup \let\protect=\string \hyper@chars - \special{html:<a name=\hyper@quote #1\hyper@quote>}% + \special{html:<a name=% + \hyper@quote\HyperDestNameFilter{#1}\hyper@quote>}% \endgroup \Hy@activeanchortrue \Hy@colorlink\@anchorcolor\anchor@spot\Hy@endcolorlink @@ -10964,7 +10968,8 @@ \Hy@SaveLastskip \begingroup \hyper@chars - \special{html:<a name=\hyper@quote#1\hyper@quote>}% + \special{html:<a name=% + \hyper@quote\HyperDestNameFilter{#1}\hyper@quote>}% \endgroup \Hy@activeanchortrue } @@ -10982,7 +10987,8 @@ \else \begingroup \hyper@chars - \special{html:<a href=\hyper@quote\##2\hyper@quote>}% + \special{html:<a href=% + \hyper@quote\#\HyperDestNameFilter{#2}\hyper@quote>}% \endgroup \fi } @@ -11028,8 +11034,11 @@ \endgroup \fi } +% \end{macrocode} +% Very poor implementation of \cs{hyper@link} without considering |#1|. +% \begin{macrocode} \def\hyper@link#1#2#3{% - \hyper@linkurl{#3}{\##2}% + \hyper@linkurl{#3}{\#\HyperDestNameFilter{#2}}% } % \end{macrocode} % @@ -11300,7 +11309,7 @@ \def\@pdfm@dest#1{% \Hy@SaveLastskip \begingroup - \Hy@pstringdef\Hy@pstringDest{#1}% + \Hy@pstringdef\Hy@pstringDest{\HyperDestNameFilter{#1}}% \def\x{XYZ}% \ifx\x\@pdfview \def\x{XYZ @xpos @ypos null}% @@ -11477,7 +11486,9 @@ \ifx\Hy@testname\@empty \let\Hy@testname\Hy@undefinedname \else - \Hy@pstringdef\Hy@testname\Hy@testname + \Hy@pstringdef\Hy@testname{% + \expandafter\HyperDestNameFilter\expandafter{\Hy@testname}% + }% \fi \@pdfm@mark{% bann<<% @@ -11701,7 +11712,8 @@ \def\@urltype{url} \def\hyper@link#1#2#3{% \leavevmode - \special{!direct <a href=\hyper@quote\hyper@hash#2\hyper@quote>}% + \special{!direct <a href=% + \hyper@quote\hyper@hash\HyperDestNameFilter{#2}\hyper@quote>}% #3% \special{!direct </a>}% } @@ -11710,7 +11722,8 @@ \hyper@chars \leavevmode \MathBSuppress=1\relax - \special{!direct <a href=\hyper@quote#2\hyper@quote>}% + \special{!direct <a href=% + \hyper@quote\HyperDestNameFilter{#2}\hyper@quote>}% #1% \MathBSuppress=0\relax \special{!direct </a>}% @@ -11727,7 +11740,7 @@ \@Localurlfalse \begingroup \hyper@chars - \special{!aref #2}% + \special{!aref \HyperDestNameFilter{#2}}% \endgroup \fi } @@ -11743,7 +11756,8 @@ \begingroup \hyper@chars \special{!aname #1}% - \special{!direct <a name=\hyper@quote#1\hyper@quote>}% + \special{!direct <a name=% + \hyper@quote\HyperDestNameFilter{#1}\hyper@quote>}% \endgroup \Hy@activeanchortrue } @@ -11759,7 +11773,8 @@ \hyper@chars \leavevmode \special{!aname #1}% - \special{!direct <a name=\hyper@quote #1\hyper@quote>}% + \special{!direct <a name=% + \hyper@quote\HyperDestNameFilter{#1}\hyper@quote>}% \endgroup \Hy@activeanchortrue \bgroup\anchor@spot\egroup @@ -11839,7 +11854,7 @@ \begingroup \let\protect=\string \hyper@chars - \special{!aname #1;\@pdfview}% + \special{!aname \HyperDestNameFilter{#1};\@pdfview}% \endgroup \Hy@activeanchortrue \Hy@colorlink\@anchorcolor\anchor@spot\Hy@endcolorlink @@ -11850,7 +11865,7 @@ \Hy@SaveLastskip \begingroup \hyper@chars - \special{!aname #1;\@pdfview}% + \special{!aname \HyperDestNameFilter{#1};\@pdfview}% \endgroup \Hy@activeanchortrue } @@ -11887,7 +11902,8 @@ \let\Hy@testname\Hy@undefinedname \fi \special{!% - aref \Hy@testname;% + aref \expandafter\HyperDestNameFilter + \expandafter{\Hy@testname};% a=<% \ifHy@pdfa /F 4\fi \Hy@setpdfborder @@ -11953,7 +11969,8 @@ \let\Hy@testname\Hy@undefinedname \fi \special{!% - aref \Hy@testname;% + aref \expandafter\HyperDestNameFilter + \expandafter{\Hy@testname};% a=<% \ifHy@pdfa /F 4\fi \Hy@setpdfborder @@ -12946,7 +12963,7 @@ \define@key{PDF}{DataSource}{\pdf@addtoks{(#1)}{DataSource}} % parameter is a destination \define@key{PDF}{Dest}{% - \Hy@pstringdef\Hy@pstringDest{#1}% + \Hy@pstringdef\Hy@pstringDest{\HyperDestNameFilter{#1}}% \ifx\Hy@pstringDest\@empty \Hy@pdfmarkerrortrue \Hy@Warning{Destination with empty name ignored}% @@ -12955,7 +12972,7 @@ \fi } \define@key{PDF}{DestAnchor}{% - \Hy@pstringdef\Hy@pstringDest{#1}% + \Hy@pstringdef\Hy@pstringDest{\HyperDestNameFilter{#1}}% \ifx\Hy@pstringDest\@empty \Hy@pdfmarkerrortrue \Hy@Warning{Destination with empty name ignored}% @@ -13559,7 +13576,8 @@ \Hy@SaveLastskip \begingroup \let\protect=\string - \special{html:<a name=\hyper@quote #1\hyper@quote>}% + \special{html:<a name=% + \hyper@quote\HyperDestNameFilter{#1}\hyper@quote>}% \endgroup \Hy@activeanchortrue \Hy@colorlink\@anchorcolor\anchor@spot\Hy@endcolorlink @@ -13571,7 +13589,8 @@ \Hy@SaveLastskip \begingroup \hyper@chars - \special{html:<a name=\hyper@quote#1\hyper@quote>}% + \special{html:<a name=% + \hyper@quote\HyperDestNameFilter{#1}\hyper@quote>}% \endgroup \Hy@activeanchortrue } @@ -13589,7 +13608,8 @@ \else \begingroup \hyper@chars - \special{html:<a href=\hyper@quote\##2\hyper@quote>}% + \special{html:<a href=% + \hyper@quote\#\HyperDestNameFilter{#2}\hyper@quote>}% \endgroup \fi } @@ -13624,8 +13644,11 @@ \endgroup \fi } +% \end{macrocode} +% Very poor implementation of \cs{hyper@link} without considering |#1|. +% \begin{macrocode} \def\hyper@link#1#2#3{% - \hyper@linkurl{#3}{\##2}% + \hyper@linkurl{#3}{\#\HyperDestNameFilter{#2}}% } \def\hyper@image#1#2{% \begingroup @@ -13845,7 +13868,8 @@ \Hy@SaveLastskip \begingroup \let\protect=\string - \special{t4ht=<a name=\hyper@quote #1\hyper@quote>}% + \special{t4ht=<a name=% + \hyper@quote\HyperDestNameFilter{#1}\hyper@quote>}% \endgroup \Hy@activeanchortrue \Hy@colorlink\@anchorcolor\anchor@spot\Hy@endcolorlink @@ -13856,7 +13880,8 @@ \def\hyper@anchorstart#1{% \Hy@SaveLastskip \begingroup - \hyper@chars\special{t4ht=<a name=\hyper@quote#1\hyper@quote>}% + \hyper@chars\special{t4ht=<a name=% + \hyper@quote\HyperDestNameFilter{#1}\hyper@quote>}% \endgroup \Hy@activeanchortrue } @@ -13874,7 +13899,8 @@ \else \begingroup \hyper@chars - \special{t4ht=<a href=\hyper@quote\##2\hyper@quote>}% + \special{t4ht=<a href=% + \hyper@quote\#\HyperDestNameFilter{#2}\hyper@quote>}% \endgroup \fi } @@ -13908,8 +13934,11 @@ \endgroup \fi } +% \end{macrocode} +% Poor implementation of \cs{hyper@link} without considering |#1|. +% \begin{macrocode} \def\hyper@link#1#2#3{% - \hyper@linkurl{#3}{\##2}% + \hyper@linkurl{#3}{\#\HyperDestNameFilter{#2}}% } \def\hyper@image#1#2{% \begingroup @@ -13934,7 +13963,7 @@ \def\LaTeXe{\LaTeX2e} \def\eTeX{e-\TeX} \def\MF{Metafont} -\def\MP{Metapost} +\def\MP{MetaPost} %</tex4htcfg> % \end{macrocode} % @@ -15922,7 +15951,7 @@ \fi }% \immediate\special{% - !outline #3;p=\@parcount,i=\@mycount,% + !outline \HyperDestNameFilter{#3};p=\@parcount,i=\@mycount,% s=\ifx#2-c\else o\fi,t=#4% }% }% @@ -15976,7 +16005,7 @@ \def\@@BOOKMARK[##1][##2]##3##4##5{% \def\Hy@temp{##4}% %<*pdftex> - \Hy@pstringdef\Hy@pstringName{##3}% + \Hy@pstringdef\Hy@pstringName{\HyperDestNameFilter{##3}}% \Hy@OutlineName{}\Hy@pstringName{% ##2\check@bm@number{##3}% }{% @@ -15984,16 +16013,15 @@ }% %</pdftex> %<*pdfmark> - \Hy@pstringdef\Hy@pstringName{##3}% \pdfmark{% pdfmark=/OUT,% Count={##2\check@bm@number{##3}},% - Dest={\Hy@pstringName},% + Dest={##3},% Title=\expandafter\strip@prefix\meaning\Hy@temp }% %</pdfmark> %<*dvipdfm> - \Hy@pstringdef\Hy@pstringName{##3}% + \Hy@pstringdef\Hy@pstringName{\HyperDestNameFilter{##3}}% \@pdfm@mark{% outline \ifHy@DvipdfmxOutlineOpen [% |