diff options
author | Karl Berry <karl@freefriends.org> | 2008-04-19 17:08:57 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2008-04-19 17:08:57 +0000 |
commit | e01d0e61ce7553ae7d91e31196d754100e418bfc (patch) | |
tree | e5f559860bd3378e2d1e36db609b4ae256b0515f /Master/texmf-dist/tex/latex/hyperref/pdfmark.def | |
parent | 3ebb5d696023c7c1dd3c42045057c647fbe5cd2f (diff) |
hyperref update (18apr08)
git-svn-id: svn://tug.org/texlive/trunk@7520 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 | 200 |
1 files changed, 123 insertions, 77 deletions
diff --git a/Master/texmf-dist/tex/latex/hyperref/pdfmark.def b/Master/texmf-dist/tex/latex/hyperref/pdfmark.def index b1892ecb34e..acdefa9d555 100644 --- a/Master/texmf-dist/tex/latex/hyperref/pdfmark.def +++ b/Master/texmf-dist/tex/latex/hyperref/pdfmark.def @@ -24,7 +24,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{pdfmark.def} - [2008/04/12 v6.77m + [2008/04/17 v6.77q Hyperref definitions for pdfmark specials] \def\Hy@PutCatalog#1{% \pdfmark{pdfmark=/PUT,Raw={\string{Catalog\string} << #1 >>}}% @@ -202,6 +202,7 @@ pdfmark=/ANN,% linktype=link,% Subtype=/Link,% + PDFAFlags=4,% Dest=\hyper@currentanchor,% AcroHighlight=\@pdfhighlight,% Border=\@pdfborder,% @@ -295,6 +296,7 @@ BorderStyle=\@pdfborderstyle,% pdfmark=/ANN,% Subtype=/Link,% + PDFAFlags=4,% Dest=\Hy@testname }% \endgroup @@ -550,6 +552,11 @@ \define@key{PDF}{Dir}{\pdf@addtoks{(#1)}{Dir}} \define@key{PDF}{File}{\pdf@addtoks{(#1)}{File}} \define@key{PDF}{Flags}{\pdf@addtoks{#1}{Flags}} +\define@key{PDF}{PDFAFlags}{% + \ifHy@pdfa + \pdf@addtoks{#1}{F}% + \fi +} \define@key{PDF}{AcroHighlight}{% \begingroup \edef\x{#1}% @@ -585,14 +592,17 @@ \define@key{PDF}{Base}{\pdf@addtoks{(#1)}{Base}} \define@key{PDF}{URI}{\pdf@addtoks{#1}{URI}} \def\Acrobatmenu#1#2{% - \pdfmark[{#2}]{% - linktype=menu,% - pdfmark=/ANN,% - AcroHighlight=\@pdfhighlight,% - Border=\@pdfborder,% - BorderStyle=\@pdfborderstyle,% - Action={<< /Subtype /Named /N /#1 >>},% - Subtype=/Link% + \Hy@Acrobatmenu{#1}{#2}{% + \pdfmark[{#2}]{% + linktype=menu,% + pdfmark=/ANN,% + AcroHighlight=\@pdfhighlight,% + Border=\@pdfborder,% + BorderStyle=\@pdfborderstyle,% + Action={<< /Subtype /Named /N /#1 >>},% + Subtype=/Link,% + PDFAFlags=4% + }% }% } \def\PDFNextPage{\@ifnextchar[{\PDFNextPage@}{\PDFNextPage@[]}} @@ -604,6 +614,7 @@ Color=.2 .1 .5,% pdfmark=/ANN,% Subtype=/Link,% + PDFAFlags=4,% Page=/Next% }% } @@ -618,6 +629,7 @@ Color=.4 .4 .1,% pdfmark=/ANN,% Subtype=/Link,% + PDFAFlags=4,% Page=/Prev% }% } @@ -637,7 +649,8 @@ BorderStyle=\@pdfborderstyle,% Color=\@urlbordercolor,% Action={<< /Subtype /URI /URI (\Hy@pstringURI) >>},% - Subtype=/Link% + Subtype=/Link,% + PDFAFlags=4% }% \endgroup } @@ -649,6 +662,7 @@ \pdfmark[{#1}]{% pdfmark=/ANN,% Subtype=/Link,% + PDFAFlags=4,% AcroHighlight=\@pdfhighlight,% Border=\@pdfborder,% BorderStyle=\@pdfborderstyle,% @@ -673,6 +687,7 @@ \pdfmark[{#2}]{% pdfmark=/ANN,% Subtype=/Link,% + PDFAFlags=4,% AcroHighlight=\@pdfhighlight,% Border=\@pdfborder,% BorderStyle=\@pdfborderstyle,% @@ -854,7 +869,10 @@ >>% /DA(/Helv 10 Tf 0 g)% /CO{corder}% - /NeedAppearances true% + \ifHy@pdfa + \else + /NeedAppearances true% + \fi >>% /PUT pdfmark% [% @@ -999,14 +1017,25 @@ \expandafter\HyField@SetKeys\expandafter{% \DefaultOptionsofPushButton,#1% }% - \HyField@FlagsPushButton - \ifFld@hidden\def\Fld@width{1sp}\fi - \LayoutPushButtonField{% - \Hy@escapeform\PDFForm@Push - \pdfmark[\MakeButtonField{#2}]{% - pdfmark=/ANN,Raw={\PDFForm@Push}% + \ifHy@pdfa + \PackageError{hyperref}{% + PDF/A: Push button with JavaScript is prohibited% + }\@ehc + \LayoutPushButtonField{% + \leavevmode + \MakeButtonField{#2}% }% - }% + \else + \HyField@FlagsPushButton + \ifFld@hidden\def\Fld@width{1sp}\fi + \LayoutPushButtonField{% + \leavevmode + \Hy@escapeform\PDFForm@Push + \pdfmark[\MakeButtonField{#2}]{% + pdfmark=/ANN,Raw={\PDFForm@Push}% + }% + }% + \fi \endgroup } \def\@Submit[#1]#2{% @@ -1035,14 +1064,22 @@ \expandafter\HyField@SetKeys\expandafter{% \DefaultOptionsofReset,#1% }% - \HyField@FlagsPushButton - \ifFld@hidden\def\Fld@width{1sp}\fi - \Hy@escapeform\PDFForm@Reset - \pdfmark[\MakeButtonField{#2}]{% - pdfmark=/ANN,Raw={\PDFForm@Reset}% - }% + \leavevmode + \ifHy@pdfa + \PackageError{hyperref}{% + PDF/A: Reset action is prohibited% + }\@ehc + \MakeButtonField{#2}% + \else + \HyField@FlagsPushButton + \ifFld@hidden\def\Fld@width{1sp}\fi + \Hy@escapeform\PDFForm@Reset + \pdfmark[\MakeButtonField{#2}]{% + pdfmark=/ANN,Raw={\PDFForm@Reset}% + }% + \fi \endgroup -} +}% \def\@CheckBox[#1]#2{% parameters, label \def\Fld@name{#2}% \def\Fld@default{0}% @@ -1143,31 +1180,34 @@ /H/P% \ifFld@checked /V/Yes\else /V/Off\fi } -\def\PDFForm@Push{% - /Subtype/Widget% - \Fld@annotflags - /T(\Fld@name)% - /FT/Btn% - \Fld@flags - /H/P% - /BS<</W \Fld@borderwidth/S/\Fld@borderstyle>>% - \ifcase0\ifnum\Fld@rotation=\z@ \else 1\fi - \ifx\Fld@bordercolor\relax\else 1\fi - \space - \else - /MK<<% - \ifnum\Fld@rotation=\z@ - \else - /R \Fld@rotation - \fi - \ifx\Fld@bordercolor\relax - \else - /BC[\Fld@bordercolor]% - \fi - >>% - \fi - /A<</S/JavaScript/JS(\Hy@escapestring{\Fld@onclick})>>% -} +\ifHy@pdfa +\else + \def\PDFForm@Push{% + /Subtype/Widget% + \Fld@annotflags + /T(\Fld@name)% + /FT/Btn% + \Fld@flags + /H/P% + /BS<</W \Fld@borderwidth/S/\Fld@borderstyle>>% + \ifcase0\ifnum\Fld@rotation=\z@ \else 1\fi + \ifx\Fld@bordercolor\relax\else 1\fi + \space + \else + /MK<<% + \ifnum\Fld@rotation=\z@ + \else + /R \Fld@rotation + \fi + \ifx\Fld@bordercolor\relax + \else + /BC[\Fld@bordercolor]% + \fi + >>% + \fi + /A<</S/JavaScript/JS(\Hy@escapestring{\Fld@onclick})>>% + }% +\fi \def\Fld@@additionalactions{% \ifx\Fld@keystroke@code\@empty \else @@ -1213,7 +1253,10 @@ \def\Fld@additionalactions{% \if-\Fld@@additionalactions-% \else - /AA<<\Fld@@additionalactions>>% + \ifHy@pdfa + \else + /AA<<\Fld@@additionalactions>>% + \fi \fi } \def\PDFForm@List{% @@ -1348,32 +1391,35 @@ \Fld@submitflags >>% } -\def\PDFForm@Reset{% - /Subtype/Widget% - \Fld@annotflags - /T(\Fld@name)% - /FT/Btn% - \Fld@flags - /H/P% - /DA(/Helv \strip@pt\Fld@charsize\space Tf 0 0 1 rg)% - \ifcase0\ifnum\Fld@rotation=\z@ \else 1\fi - \ifx\Fld@bordercolor\relax\else 1\fi - \space - \else - /MK<<% - \ifnum\Fld@rotation=\z@ - \else - /R \Fld@rotation - \fi - \ifx\Fld@bordercolor\relax - \else - /BC[\Fld@bordercolor]% - \fi - >>% - \fi - /BS<</W \Fld@borderwidth/S/\Fld@borderstyle>>% - /A<</S/ResetForm>>% -} +\ifHy@pdfa +\else + \def\PDFForm@Reset{% + /Subtype/Widget% + \Fld@annotflags + /T(\Fld@name)% + /FT/Btn% + \Fld@flags + /H/P% + /DA(/Helv \strip@pt\Fld@charsize\space Tf 0 0 1 rg)% + \ifcase0\ifnum\Fld@rotation=\z@ \else 1\fi + \ifx\Fld@bordercolor\relax\else 1\fi + \space + \else + /MK<<% + \ifnum\Fld@rotation=\z@ + \else + /R \Fld@rotation + \fi + \ifx\Fld@bordercolor\relax + \else + /BC[\Fld@bordercolor]% + \fi + >>% + \fi + /BS<</W \Fld@borderwidth/S/\Fld@borderstyle>>% + /A<</S/ResetForm>>% + }% +\fi \def\Hy@writebookmark#1#2#3#4#5{% % section number, text, label, level, file \ifx\WriteBookmarks\relax% |