diff options
author | Karl Berry <karl@freefriends.org> | 2010-09-11 22:56:04 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2010-09-11 22:56:04 +0000 |
commit | eb1e0a22fee869ae52e26bf9cd370da5a15358f3 (patch) | |
tree | 87cb97ca719386815056c272aecf23a871e54773 /Master/texmf-dist/tex/latex/hyperref/pdfmark.def | |
parent | 1c41710dabbde19fb39689af8b04bc5cb0ab4007 (diff) |
hyperref update (11sep10)
git-svn-id: svn://tug.org/texlive/trunk@19658 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/hyperref/pdfmark.def')
-rw-r--r-- | Master/texmf-dist/tex/latex/hyperref/pdfmark.def | 160 |
1 files changed, 96 insertions, 64 deletions
diff --git a/Master/texmf-dist/tex/latex/hyperref/pdfmark.def b/Master/texmf-dist/tex/latex/hyperref/pdfmark.def index 34d6b323562..c3256fa429d 100644 --- a/Master/texmf-dist/tex/latex/hyperref/pdfmark.def +++ b/Master/texmf-dist/tex/latex/hyperref/pdfmark.def @@ -29,7 +29,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{pdfmark.def} - [2010/06/18 v6.81g + [2010/09/11 v6.81m Hyperref definitions for pdfmark specials] \begingroup \@ifundefined{headerps@out}{}{% @@ -173,6 +173,9 @@ \endgroup } \Hy@breaklinks@unsupported +\def\HyPat@ObjRef{% + \{[^{}]+\}% +} \def\hyper@anchor#1{% \Hy@SaveLastskip \Hy@VerboseAnchor{#1}% @@ -210,7 +213,10 @@ \Hy@VerboseLinkStart{#1}{#2}% \ifHy@breaklinks \else - \leavevmode\hbox\bgroup + \leavevmode + \Hy@SaveSpaceFactor + \hbox\bgroup + \Hy@RestoreSpaceFactor \fi \expandafter\Hy@colorlink\csname @#1color\endcsname \literalps@out{H.S}% @@ -242,7 +248,9 @@ \Hy@endcolorlink \ifHy@breaklinks \else + \Hy@SaveSpaceFactor \egroup + \Hy@RestoreSpaceFactor \fi } \begingroup @@ -523,10 +531,19 @@ \literalps@out{H.R}% \else \leavevmode + \Hy@SaveSpaceFactor \ifHy@breaklinks - \Hy@setouterhbox\pdf@box{\Hy@AllowHyphens#1}% + \Hy@setouterhbox\pdf@box{% + \Hy@RestoreSpaceFactor + \Hy@AllowHyphens#1% + \Hy@SaveSpaceFactor + }% \else - \sbox\pdf@box{#1}% + \sbox\pdf@box{% + \Hy@RestoreSpaceFactor + #1% + \Hy@SaveSpaceFactor + }% \fi \dimen@\ht\pdf@box \ifdim\dp\pdf@box=\z@ @@ -545,6 +562,7 @@ \else \raise\dimen@\hbox{\literalps@out{H.R}}% \fi + \Hy@RestoreSpaceFactor \fi \ifx\pdf@type\Hy@DEST \else @@ -721,7 +739,13 @@ Border=\@pdfborder,% BorderStyle=\@pdfborderstyle,% Color=\@urlbordercolor,% - Action={<< /Subtype /URI /URI (\Hy@pstringURI) >>},% + Action={<<% + /Subtype/URI% + /URI(\Hy@pstringURI)% + \ifHy@href@ismap + /IsMap true% + \fi + >>},% Subtype=/Link,% PDFAFlags=4% }% @@ -729,8 +753,11 @@ } \def\hyper@linkfile#1#2#3{% \begingroup - \Hy@pstringdef\Hy@pstringF{#2}% + \def\Hy@pstringF{#2}% + \Hy@CleanupFile\Hy@pstringF + \Hy@pstringdef\Hy@pstringF\Hy@pstringF \Hy@pstringdef\Hy@pstringD{#3}% + \Hy@MakeRemoteAction \leavevmode \pdfmark[{#1}]{% pdfmark=/ANN,% @@ -746,7 +773,13 @@ /S/GoToR% \Hy@SetNewWindow /F(\Hy@pstringF)% - /D\ifx\\#3\\[0 \@pdfstartview]\else(\Hy@pstringD)cvn\fi + /D% + \ifx\\#3\\% + [\Hy@href@page\@pdfremotestartview]% + \else + (\Hy@pstringD)cvn% + \fi + \Hy@href@nextactionraw >>% }% }% @@ -775,6 +808,7 @@ \else /Win<</P(\Hy@pstringP)/F(\Hy@pstringF)>>% \fi + \Hy@href@nextactionraw >>% }% }% @@ -978,7 +1012,6 @@ \fi }% \begingroup - \Field@toks={ }% \expandafter\HyField@SetKeys\expandafter{% \DefaultOptionsofText,#1% }% @@ -1009,7 +1042,6 @@ \ifdim\@tempdimb>\@tempdima\@tempdima\@tempdimb\fi }% \advance\@tempdima by 15\p@ - \Field@toks={ }% \begingroup \HyField@SetKeys{#1}% \edef\x{\endgroup @@ -1088,7 +1120,6 @@ \def\@PushButton[#1]#2{% parameters, label \def\Fld@name{#2}% \begingroup - \Field@toks={ }% \expandafter\HyField@SetKeys\expandafter{% \DefaultOptionsofPushButton,#1% }% @@ -1114,7 +1145,6 @@ \endgroup } \def\@Submit[#1]#2{% - \Field@toks={ }% \def\Fld@width{\DefaultWidthofSubmit}% \def\Fld@height{\DefaultHeightofSubmit}% \begingroup @@ -1132,7 +1162,6 @@ \endgroup } \def\@Reset[#1]#2{% - \Field@toks={ }% \def\Fld@width{\DefaultWidthofReset}% \def\Fld@height{\DefaultHeightofReset}% \begingroup @@ -1161,7 +1190,6 @@ \begingroup \def\Fld@width{\DefaultWidthofCheckBox}% \def\Fld@height{\DefaultHeightofCheckBox}% - \Field@toks={ }% \expandafter\HyField@SetKeys\expandafter{% \DefaultOptionsofCheckBox,#1% }% @@ -1229,6 +1257,57 @@ \endgroup \let\Fld@name\Hy@gtemp } +\def\Fld@@additionalactions{% + \ifx\Fld@keystroke@code\@empty + \else + /K<</S/JavaScript/JS(\Hy@escapestring{\Fld@keystroke@code})>>% + \fi + \ifx\Fld@format@code\@empty + \else + /F<</S/JavaScript/JS(\Hy@escapestring{\Fld@format@code})>>% + \fi + \ifx\Fld@validate@code\@empty + \else + /V<</S/JavaScript/JS(\Hy@escapestring{\Fld@validate@code})>>% + \fi + \ifx\Fld@calculate@code\@empty + \else + /C<</S/JavaScript/JS(\Hy@escapestring{\Fld@calculate@code})>>% + \fi + \ifx\Fld@onfocus@code\@empty + \else + /Fo<</S/JavaScript/JS(\Hy@escapestring{\Fld@onfocus@code})>>% + \fi + \ifx\Fld@onblur@code\@empty + \else + /Bl<</S/JavaScript/JS(\Hy@escapestring{\Fld@onblur@code})>>% + \fi + \ifx\Fld@onmousedown@code\@empty + \else + /D<</S/JavaScript/JS(\Hy@escapestring{\Fld@onmousedown@code})>>% + \fi + \ifx\Fld@onmouseup@code\@empty + \else + /U<</S/JavaScript/JS(\Hy@escapestring{\Fld@onmouseup@code})>>% + \fi + \ifx\Fld@onenter@code\@empty + \else + /E<</S/JavaScript/JS(\Hy@escapestring{\Fld@onenter@code})>>% + \fi + \ifx\Fld@onexit@code\@empty + \else + /X<</S/JavaScript/JS(\Hy@escapestring{\Fld@onexit@code})>>% + \fi +} +\def\Fld@additionalactions{% + \if-\Fld@@additionalactions-% + \else + \ifHy@pdfa + \else + /AA<<\Fld@@additionalactions>>% + \fi + \fi +} \def\PDFForm@Check{% /Subtype/Widget% \Fld@annotflags @@ -1256,6 +1335,7 @@ \ifx\Fld@color\@empty\else\space\Fld@color\fi)% /H/P% \ifFld@checked /V/Yes\else /V/Off\fi + \Fld@additionalactions } \ifHy@pdfa \else @@ -1283,59 +1363,9 @@ >>% \fi /A<</S/JavaScript/JS(\Hy@escapestring{\Fld@onclick@code})>>% + \Fld@additionalactions }% \fi -\def\Fld@@additionalactions{% - \ifx\Fld@keystroke@code\@empty - \else - /K<</S/JavaScript/JS(\Hy@escapestring{\Fld@keystroke@code})>>% - \fi - \ifx\Fld@format@code\@empty - \else - /F<</S/JavaScript/JS(\Hy@escapestring{\Fld@format@code})>>% - \fi - \ifx\Fld@validate@code\@empty - \else - /V<</S/JavaScript/JS(\Hy@escapestring{\Fld@validate@code})>>% - \fi - \ifx\Fld@calculate@code\@empty - \else - /C<</S/JavaScript/JS(\Hy@escapestring{\Fld@calculate@code})>>% - \fi - \ifx\Fld@onfocus@code\@empty - \else - /Fo<</S/JavaScript/JS(\Hy@escapestring{\Fld@onfocus@code})>>% - \fi - \ifx\Fld@onblur@code\@empty - \else - /Bl<</S/JavaScript/JS(\Hy@escapestring{\Fld@onblur@code})>>% - \fi - \ifx\Fld@onmousedown@code\@empty - \else - /D<</S/JavaScript/JS(\Hy@escapestring{\Fld@onmousedown@code})>>% - \fi - \ifx\Fld@onmouseup@code\@empty - \else - /U<</S/JavaScript/JS(\Hy@escapestring{\Fld@onmouseup@code})>>% - \fi - \ifx\Fld@onenter@code\@empty - \else - /E<</S/JavaScript/JS(\Hy@escapestring{\Fld@onenter@code})>>% - \fi - \ifx\Fld@onexit@code\@empty - \else - /X<</S/JavaScript/JS(\Hy@escapestring{\Fld@onexit@code})>>% - \fi -} -\def\Fld@additionalactions{% - \if-\Fld@@additionalactions-% - \else - \ifHy@pdfa - \else - /AA<<\Fld@@additionalactions>>% - \fi - \fi -} \def\PDFForm@List{% /Subtype/Widget% \Fld@annotflags @@ -1467,6 +1497,7 @@ >>% \Fld@submitflags >>% + \Fld@additionalactions } \ifHy@pdfa \else @@ -1495,6 +1526,7 @@ \fi /BS<</W \Fld@borderwidth/S/\Fld@borderstyle>>% /A<</S/ResetForm>>% + \Fld@additionalactions }% \fi \def\Hy@writebookmark#1#2#3#4#5{% |