diff options
author | Karl Berry <karl@freefriends.org> | 2009-05-07 14:06:36 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2009-05-07 14:06:36 +0000 |
commit | a4f87700e8526eea8269d63d945f357ad10cc2bb (patch) | |
tree | d8792b6c1d1419eab081bea8dc9119c6ccb20cd7 /Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def | |
parent | cd1a537262711f171841dad07ef552a35e10be89 (diff) |
hyperref update (3may09)
git-svn-id: svn://tug.org/texlive/trunk@12984 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def')
-rw-r--r-- | Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def | 188 |
1 files changed, 105 insertions, 83 deletions
diff --git a/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def b/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def index 40a9b0c2dcb..6d50e2f92a7 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def +++ b/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def @@ -24,7 +24,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hdvipdfm.def} - [2009/04/04 v6.78q + [2009/05/01 v6.78r Hyperref driver for dvipdfm] \def\Hy@PutCatalog#1{\@pdfm@mark{docview << #1 >>}} \ifHy@pagelabels @@ -185,6 +185,7 @@ \def\hyper@anchorend{% \Hy@activeanchorfalse } +\newcounter{Hy@AnnotLevel} \ifHy@ocgcolorlinks \def\OBJ@OCG@view{@OCG@view}% \@pdfm@mark{% @@ -295,112 +296,133 @@ \else \Hy@DisableOption{ocgcolorlinks}% \fi +\def\Hy@BeginAnnot#1{% + \stepcounter{Hy@AnnotLevel}% + \ifnum\value{Hy@AnnotLevel}=\@ne + #1% + \fi +} +\def\Hy@EndAnnot{% + \ifnum\value{Hy@AnnotLevel}=\@ne + \Hy@endcolorlink + \@pdfm@mark{eann}% + \fi + \addtocounter{Hy@AnnotLevel}\m@ne +} \def\Hy@undefinedname{UNDEFINED} \def\hyper@linkstart#1#2{% - \protected@edef\Hy@testname{#2}% - \ifx\Hy@testname\@empty - \Hy@Warning{% - Empty destination name,\MessageBreak - using `\Hy@undefinedname'% - }% - \let\Hy@testname\Hy@undefinedname - \else - \Hy@pstringdef\Hy@testname{% - \expandafter\HyperDestNameFilter\expandafter{\Hy@testname}% - }% - \fi - \@pdfm@mark{% - bann<<% - /Type/Annot% - /Subtype/Link% - \ifHy@pdfa /F 4\fi - \Hy@setpdfborder - \expandafter\ifx\csname @#1bordercolor\endcsname\relax - \else - /C[\csname @#1bordercolor\endcsname]% - \fi - /A<<% - /S/GoTo% - /D(\Hy@testname)% + \Hy@BeginAnnot{% + \protected@edef\Hy@testname{#2}% + \ifx\Hy@testname\@empty + \Hy@Warning{% + Empty destination name,\MessageBreak + using `\Hy@undefinedname'% + }% + \let\Hy@testname\Hy@undefinedname + \else + \Hy@pstringdef\Hy@testname{% + \expandafter\HyperDestNameFilter\expandafter{\Hy@testname}% + }% + \fi + \@pdfm@mark{% + bann<<% + /Type/Annot% + /Subtype/Link% + \ifHy@pdfa /F 4\fi + \Hy@setpdfborder + \expandafter\ifx\csname @#1bordercolor\endcsname\relax + \else + /C[\csname @#1bordercolor\endcsname]% + \fi + /A<<% + /S/GoTo% + /D(\Hy@testname)% + >>% >>% - >>% + }% + \expandafter\Hy@colorlink\csname @#1color\endcsname }% - \expandafter\Hy@colorlink\csname @#1color\endcsname -} -\def\hyper@linkend{% - \Hy@endcolorlink - \@pdfm@mark{eann}% } +\def\hyper@linkend{\Hy@EndAnnot}% \def\hyper@link#1#2#3{% \hyper@linkstart{#1}{#2}#3\hyper@linkend } \def\hyper@linkfile#1#2#3{% - \Hy@pstringdef\Hy@pstringF{#2}% - \Hy@pstringdef\Hy@pstringD{#3}% \leavevmode - \@pdfm@mark{% - bann<<% - /Type/Annot% - /Subtype/Link% - \ifHy@pdfa /F 4\fi - \Hy@setpdfborder - \ifx\@filebordercolor\relax - \else - /C[\@filebordercolor]% - \fi - /A<<% - /S/GoToR% - /F(\Hy@pstringF)% - /D\ifx\\#3\\[0 \@pdfstartview]\else(\Hy@pstringD)\fi - \Hy@SetNewWindow + \Hy@BeginAnnot{% + \Hy@pstringdef\Hy@pstringF{#2}% + \Hy@pstringdef\Hy@pstringD{#3}% + \@pdfm@mark{% + bann<<% + /Type/Annot% + /Subtype/Link% + \ifHy@pdfa /F 4\fi + \Hy@setpdfborder + \ifx\@filebordercolor\relax + \else + /C[\@filebordercolor]% + \fi + /A<<% + /S/GoToR% + /F(\Hy@pstringF)% + /D\ifx\\#3\\[0 \@pdfstartview]\else(\Hy@pstringD)\fi + \Hy@SetNewWindow + >>% >>% - >>% + }% + \Hy@colorlink\@filecolor }% - \Hy@colorlink\@filecolor#1\Hy@endcolorlink - \@pdfm@mark{eann}% + #1% + \Hy@EndAnnot } \def\hyper@linkurl#1#2{% - \Hy@pstringdef\Hy@pstringURI{#2}% \leavevmode - \@pdfm@mark{% - bann<<% - /Type/Annot% - /Subtype/Link% - \ifHy@pdfa /F 4\fi - \Hy@setpdfborder - \ifx\@urlbordercolor\relax - \else - /C[\@urlbordercolor]% - \fi - /A<<% - /S/URI% - /URI(\Hy@pstringURI)% - >>% - >>% - }% - \Hy@colorlink\@urlcolor#1\Hy@endcolorlink - \@pdfm@mark{eann}% -} -\def\Acrobatmenu#1#2{% - \Hy@Acrobatmenu{#1}{#2}{% + \Hy@BeginAnnot{% + \Hy@pstringdef\Hy@pstringURI{#2}% \@pdfm@mark{% bann<<% /Type/Annot% /Subtype/Link% \ifHy@pdfa /F 4\fi - /A<<% - /S/Named% - /N/#1% - >>% \Hy@setpdfborder - \ifx\@menubordercolor\relax - \relax - /C[\@menubordercolor]% + \ifx\@urlbordercolor\relax + \else + /C[\@urlbordercolor]% \fi + /A<<% + /S/URI% + /URI(\Hy@pstringURI)% + >>% >>% }% - \Hy@colorlink\@menucolor#2\Hy@endcolorlink - \@pdfm@mark{eann}% + \Hy@colorlink\@urlcolor + }% + #1% + \Hy@EndAnnot +} +\def\Acrobatmenu#1#2{% + \Hy@Acrobatmenu{#1}{#2}{% + \Hy@BeginAnnot{% + \@pdfm@mark{% + bann<<% + /Type/Annot% + /Subtype/Link% + \ifHy@pdfa /F 4\fi + /A<<% + /S/Named% + /N/#1% + >>% + \Hy@setpdfborder + \ifx\@menubordercolor\relax + \relax + /C[\@menubordercolor]% + \fi + >>% + }% + \Hy@colorlink\@menucolor + }% + #2% + \Hy@EndAnnot }% } \ifx\@pdfproducer\relax |