From e01d0e61ce7553ae7d91e31196d754100e418bfc Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 19 Apr 2008 17:08:57 +0000 Subject: hyperref update (18apr08) git-svn-id: svn://tug.org/texlive/trunk@7520 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def | 253 +++++++++-------- 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 | 7 +- Master/texmf-dist/tex/latex/hyperref/hpdftex.def | 219 +++++++++------ Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg | 2 +- Master/texmf-dist/tex/latex/hyperref/htex4ht.def | 2 +- Master/texmf-dist/tex/latex/hyperref/htexture.def | 2 +- Master/texmf-dist/tex/latex/hyperref/hvtex.def | 34 ++- Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def | 2 +- Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def | 2 +- Master/texmf-dist/tex/latex/hyperref/hyperref.sty | 311 +++++++++++++++------ Master/texmf-dist/tex/latex/hyperref/hypertex.def | 2 +- .../texmf-dist/tex/latex/hyperref/nohyperref.sty | 4 +- Master/texmf-dist/tex/latex/hyperref/pd1enc.def | 2 +- Master/texmf-dist/tex/latex/hyperref/pdfmark.def | 200 ++++++++----- 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 +- 19 files changed, 651 insertions(+), 401 deletions(-) (limited to 'Master/texmf-dist/tex') diff --git a/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def b/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def index 6021aeb9ddc..22b791a45a4 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} - [2008/04/12 v6.77m + [2008/04/17 v6.77q Hyperref driver for dvipdfm] \def\Hy@PutCatalog#1{\@pdfm@mark{docview << #1 >>}} \ifHy@pagelabels @@ -195,6 +195,7 @@ bann<<% /Type/Annot% /Subtype/Link% + \ifHy@pdfa /F 4\fi \Hy@setpdfborder \expandafter\ifx\csname @#1bordercolor\endcsname\relax \else @@ -223,6 +224,7 @@ bann<<% /Type/Annot% /Subtype/Link% + \ifHy@pdfa /F 4\fi \Hy@setpdfborder \ifx\@filebordercolor\relax \else @@ -239,33 +241,6 @@ \Hy@colorlink\@filecolor#1\Hy@endcolorlink \@pdfm@mark{eann}% } -\def\@hyper@launch run:#1\\#2#3{% filename, anchor text linkname - \Hy@pstringdef\Hy@pstringF{#1}% - \Hy@pstringdef\Hy@pstringP{#3}% - \leavevmode - \@pdfm@mark{% - bann<<% - /Type/Annot% - /Subtype/Link% - \Hy@setpdfborder - \ifx\@runbordercolor\relax - \else - /C[\@runbordercolor]% - \fi - /A<<% - /S/Launch% - /F(\Hy@pstringF)% - \Hy@SetNewWindow - \ifx\\#3\\% - \else - /Win<>% - \fi - >>% - >>% - }% - \Hy@colorlink\@runcolor#2\Hy@endcolorlink - \@pdfm@mark{eann}% -} \def\hyper@linkurl#1#2{% \Hy@pstringdef\Hy@pstringURI{#2}% \leavevmode @@ -273,6 +248,7 @@ bann<<% /Type/Annot% /Subtype/Link% + \ifHy@pdfa /F 4\fi \Hy@setpdfborder \ifx\@urlbordercolor\relax \else @@ -288,24 +264,26 @@ \@pdfm@mark{eann}% } \def\Acrobatmenu#1#2{% - \leavevmode - \@pdfm@mark{% - bann<<% - /Type/Annot% - /Subtype/Link% - /A<<% - /S/Named% - /N/#1% + \Hy@Acrobatmenu{#1}{#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]% + \fi >>% - \Hy@setpdfborder - \ifx\@menubordercolor\relax - \relax - /C[\@menubordercolor]% - \fi - >>% + }% + \Hy@colorlink\@menucolor#2\Hy@endcolorlink + \@pdfm@mark{eann}% }% - \Hy@colorlink\@menucolor#2\Hy@endcolorlink - \@pdfm@mark{eann}% } \ifx\@pdfproducer\relax \def\@pdfproducer{dvipdfm}% @@ -426,7 +404,10 @@ >>% /DA(/Helv 10 Tf 0 g)% /CO @corder% - /NeedAppearances true% + \ifHy@pdfa + \else + /NeedAppearances true% + \fi >>% }% \@pdfm@mark{put @catalog <>}% @@ -601,21 +582,31 @@ \DefaultOptionsofPushButton,#1% }% \PDFForm@Name - \HyField@FlagsPushButton - \ifFld@hidden\def\Fld@width{1sp}\fi - \setbox\pdfm@box=\hbox{\MakeButtonField{#2}}% - \HyField@AdvanceAnnotCount - \LayoutPushButtonField{% - \leavevmode - \Hy@escapeform\PDFForm@Push - \@pdfm@mark{% - ann @push\HyField@TheAnnotCount\space - \dvipdfm@setdim - <<\PDFForm@Push>>% + \ifHy@pdfa + \PackageError{hyperref}{% + PDF/A: Push button with JavaScript is prohibited% + }\@ehc + \LayoutPushButtonField{% + \leavevmode + \MakeButtonField{#2}% }% - }% - \unhbox\pdfm@box - \@pdfm@mark{put @afields @push\HyField@TheAnnotCount}% + \else + \setbox\pdfm@box=\hbox{\MakeButtonField{#2}}% + \HyField@FlagsPushButton + \ifFld@hidden\def\Fld@width{1sp}\fi + \HyField@AdvanceAnnotCount + \LayoutPushButtonField{% + \leavevmode + \Hy@escapeform\PDFForm@Push + \@pdfm@mark{% + ann @push\HyField@TheAnnotCount\space + \dvipdfm@setdim + <<\PDFForm@Push>>% + }% + }% + \unhbox\pdfm@box + \@pdfm@mark{put @afields @push\HyField@TheAnnotCount}% + \fi \endgroup } \def\@Submit[#1]#2{% @@ -650,19 +641,26 @@ \expandafter\HyField@SetKeys\expandafter{% \DefaultOptionsofReset,#1% }% - \HyField@FlagsPushButton - \ifFld@hidden\def\Fld@width{1sp}\fi - \setbox\pdfm@box=\hbox{\MakeButtonField{#2}}% \leavevmode - \Hy@escapeform\PDFForm@Reset - \HyField@AdvanceAnnotCount - \@pdfm@mark{% - ann @reset\HyField@TheAnnotCount\space - \dvipdfm@setdim - <<\PDFForm@Reset>>% - }% - \unhbox\pdfm@box - \@pdfm@mark{put @afields @reset\HyField@TheAnnotCount}% + \ifHy@pdfa + \PackageError{hyperref}{% + PDF/A: Reset action is prohibited% + }\@ehc + \MakeButtonField{#2}% + \else + \HyField@FlagsPushButton + \ifFld@hidden\def\Fld@width{1sp}\fi + \setbox\pdfm@box=\hbox{\MakeButtonField{#2}}% + \Hy@escapeform\PDFForm@Reset + \HyField@AdvanceAnnotCount + \@pdfm@mark{% + ann @reset\HyField@TheAnnotCount\space + \dvipdfm@setdim + <<\PDFForm@Reset>>% + }% + \unhbox\pdfm@box + \@pdfm@mark{put @afields @reset\HyField@TheAnnotCount}% + \fi \endgroup } \def\@CheckBox[#1]#2{% parameters, label @@ -821,31 +819,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<>% - \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<>% -} +\ifHy@pdfa +\else + \def\PDFForm@Push{% + /Subtype/Widget% + \Fld@annotflags + /T(\Fld@name)% + /FT/Btn% + \Fld@flags + /H/P% + /BS<>% + \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<>% + }% +\fi \def\Fld@@additionalactions{% \ifx\Fld@keystroke@code\@empty \else @@ -891,7 +892,10 @@ \def\Fld@additionalactions{% \if-\Fld@@additionalactions-% \else - /AA<<\Fld@@additionalactions>>% + \ifHy@pdfa + \else + /AA<<\Fld@@additionalactions>>% + \fi \fi } \def\PDFForm@List{% @@ -1026,32 +1030,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<>% - /A<>% -} +\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<>% + /A<>% + }% +\fi \def\Hy@writebookmark#1#2#3#4#5{% % section number, text, label, level, file \ifx\WriteBookmarks\relax% diff --git a/Master/texmf-dist/tex/latex/hyperref/hdvips.def b/Master/texmf-dist/tex/latex/hyperref/hdvips.def index 495bf388297..971eb187bf0 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hdvips.def +++ b/Master/texmf-dist/tex/latex/hyperref/hdvips.def @@ -24,7 +24,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hdvips.def} - [2008/04/12 v6.77m + [2008/04/17 v6.77q Hyperref driver for dvips] \input{pdfmark.def}% \ifx\@pdfproducer\relax diff --git a/Master/texmf-dist/tex/latex/hyperref/hdvipson.def b/Master/texmf-dist/tex/latex/hyperref/hdvipson.def index fac61e54b69..4d6675957ce 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hdvipson.def +++ b/Master/texmf-dist/tex/latex/hyperref/hdvipson.def @@ -24,7 +24,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hdvipson.def} - [2008/04/12 v6.77m + [2008/04/17 v6.77q Hyperref driver for dvipsone] \providecommand*\@pdfborder{0 0 1} \providecommand*\@pdfborderstyle{} diff --git a/Master/texmf-dist/tex/latex/hyperref/hdviwind.def b/Master/texmf-dist/tex/latex/hyperref/hdviwind.def index 61d90bac0a2..7fa6400b0c7 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hdviwind.def +++ b/Master/texmf-dist/tex/latex/hyperref/hdviwind.def @@ -24,7 +24,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hdviwind.def} - [2008/04/12 v6.77m + [2008/04/17 v6.77q Hyperref driver for dviwindo] \def\Hy@PutCatalog#1{% \pdfmark{pdfmark=/PUT,Raw={\string{Catalog\string} << #1 >>}}% @@ -511,6 +511,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}% diff --git a/Master/texmf-dist/tex/latex/hyperref/hpdftex.def b/Master/texmf-dist/tex/latex/hyperref/hpdftex.def index 188e211ed61..4ac6e978500 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hpdftex.def +++ b/Master/texmf-dist/tex/latex/hyperref/hpdftex.def @@ -24,7 +24,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hpdftex.def} - [2008/04/12 v6.77m + [2008/04/17 v6.77q Hyperref driver for pdfTeX] \let\Hy@PutCatalog\pdfcatalog \ifHy@pagelabels @@ -164,6 +164,7 @@ \Hy@pstringdef\Hy@testname\Hy@testname \fi \Hy@StartlinkName{% + \ifHy@pdfa /F 4\fi \Hy@setpdfborder \ifx\@pdfhighlight\@empty \else @@ -220,6 +221,7 @@ }% user{% /Subtype/Link% + \ifHy@pdfa /F 4\fi /A<<% /Type/Action% /S/URI% @@ -233,8 +235,8 @@ } \def\hyper@linkfile#1#2#3{% anchor text, filename, linkname \begingroup - \Hy@pstringdef\Hy@pstringF{#2}% - \Hy@pstringdef\Hy@pstringD{#3}% + \Hy@pstringdef\Hy@pstringF{#2}% + \Hy@pstringdef\Hy@pstringD{#3}% \leavevmode \pdfstartlink attr{% @@ -250,6 +252,7 @@ }% user {% /Subtype/Link% + \ifHy@pdfa /F 4\fi /A<<% /F(\Hy@pstringF)% /S/GoToR% @@ -285,6 +288,7 @@ }% user {% /Subtype/Link% + \ifHy@pdfa /F 4\fi /A<<% /F(\Hy@pstringF)% /S/Launch% @@ -586,27 +590,29 @@ \Hy@DisableOption{setpagesize}% } \def\Acrobatmenu#1#2{% - \leavevmode - \pdfstartlink - attr{% - \Hy@setpdfborder - \ifx\@pdfhighlight\@empty - \else - /H\@pdfhighlight - \fi - \ifx\@menubordercolor\relax - \else - /C[\@menubordercolor]% - \fi - }% - user{% - /Subtype/Link% - /A<<% - /S/Named/N/#1% - >>% - }% - \relax - \Hy@colorlink\@menucolor#2\close@pdflink + \Hy@Acrobatmenu{#1}{#2}{% + \pdfstartlink + attr{% + \Hy@setpdfborder + \ifx\@pdfhighlight\@empty + \else + /H\@pdfhighlight + \fi + \ifx\@menubordercolor\relax + \else + /C[\@menubordercolor]% + \fi + }% + user{% + /Subtype/Link% + \ifHy@pdfa /F 4\fi + /A<<% + /S/Named/N/#1% + >>% + }% + \relax + \Hy@colorlink\@menucolor#2\close@pdflink + }% } \def\@Gauge[#1]#2#3#4{% parameters, label, minimum, maximum \typeout{Sorry, pdftex does not support FORM gauges}% @@ -781,15 +787,25 @@ \DefaultOptionsofPushButton,#1% }% \PDFForm@Name - \HyField@FlagsPushButton - \ifFld@hidden\def\Fld@width{1sp}\fi - \LayoutPushButtonField{% - \leavevmode - \Hy@escapeform\PDFForm@Push - \pdfstartlink user {\PDFForm@Push}\relax - \MakeButtonField{#2}% - \pdfendlink - }% + \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 + \pdfstartlink user {\PDFForm@Push}\relax + \MakeButtonField{#2}% + \pdfendlink + }% + \fi \endgroup } \def\@Submit[#1]#2{% @@ -822,13 +838,20 @@ \expandafter\HyField@SetKeys\expandafter{% \DefaultOptionsofReset,#1% }% - \HyField@FlagsPushButton - \ifFld@hidden\def\Fld@width{1sp}\fi \leavevmode - \Hy@escapeform\PDFForm@Reset - \pdfstartlink user {\PDFForm@Reset}\relax - \MakeButtonField{#2}% - \pdfendlink + \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 + \pdfstartlink user {\PDFForm@Reset}\relax + \MakeButtonField{#2}% + \pdfendlink + \fi \endgroup } \def\@CheckBox[#1]#2{% parameters, label @@ -915,7 +938,10 @@ >>% >>% /DA(/Helv 10 Tf 0 g)% - /NeedAppearances true% + \ifHy@pdfa + \else + /NeedAppearances true% + \fi >>% } \edef\OBJ@acroform{\the\pdflastobj} @@ -999,31 +1025,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<>% - \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<>% -} +\ifHy@pdfa +\else + \def\PDFForm@Push{% + /Subtype/Widget% + \Fld@annotflags + /T(\Fld@name)% + /FT/Btn% + \Fld@flags + /H/P% + /BS<>% + \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<>% + }% +\fi \def\Fld@@additionalactions{% \ifx\Fld@keystroke@code\@empty \else @@ -1069,7 +1098,10 @@ \def\Fld@additionalactions{% \if-\Fld@@additionalactions-% \else - /AA<<\Fld@@additionalactions>>% + \ifHy@pdfa + \else + /AA<<\Fld@@additionalactions>>% + \fi \fi } \def\PDFForm@List{% @@ -1204,32 +1236,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<>% - /A<>% -} +\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<>% + /A<>% + }% +\fi \def\Hy@writebookmark#1#2#3#4#5{% % section number, text, label, level, file \ifx\WriteBookmarks\relax% diff --git a/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg b/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg index cf95acdbc7e..d3544cfc16b 100644 --- a/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg +++ b/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg @@ -24,7 +24,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{htex4ht.cfg} - [2008/04/12 v6.77m + [2008/04/17 v6.77q 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 49aa471139a..0cb48dabdfb 100644 --- a/Master/texmf-dist/tex/latex/hyperref/htex4ht.def +++ b/Master/texmf-dist/tex/latex/hyperref/htex4ht.def @@ -24,7 +24,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{htex4ht.def} - [2008/04/12 v6.77m + [2008/04/17 v6.77q Hyperref driver for TeX4ht] \@ifpackageloaded{tex4ht}{% \typeout{hyperref tex4ht: tex4ht already loaded}% diff --git a/Master/texmf-dist/tex/latex/hyperref/htexture.def b/Master/texmf-dist/tex/latex/hyperref/htexture.def index 129561aa2de..5efd1d77bcb 100644 --- a/Master/texmf-dist/tex/latex/hyperref/htexture.def +++ b/Master/texmf-dist/tex/latex/hyperref/htexture.def @@ -24,7 +24,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{htexture.def} - [2008/04/12 v6.77m + [2008/04/17 v6.77q Hyperref driver for Textures] \begingroup \obeylines % diff --git a/Master/texmf-dist/tex/latex/hyperref/hvtex.def b/Master/texmf-dist/tex/latex/hyperref/hvtex.def index 81c4d61a8f4..5745045fa45 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hvtex.def +++ b/Master/texmf-dist/tex/latex/hyperref/hvtex.def @@ -24,7 +24,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hvtex.def} - [2008/04/12 v6.77m + [2008/04/17 v6.77q Hyperref driver for VTeX in PDF/PS mode] \edef\Hy@VTeXversion{% \ifx\VTeXversion\@undefined @@ -198,6 +198,7 @@ \special{!% aref ;% a=<% + \ifHy@pdfa /F 4\fi \Hy@setpdfborder \ifx\CurrentBorderColor\relax \else @@ -213,6 +214,7 @@ \special{!% aref \Hy@testname;% a=<% + \ifHy@pdfa /F 4\fi \Hy@setpdfborder \ifx\CurrentBorderColor\relax \else @@ -233,6 +235,7 @@ \ifnum\Hy@VTeXversion>753 \ifHy@newwindow n\fi\fi f=#2>#3;% a=<% + \ifHy@pdfa /F 4\fi \Hy@setpdfborder \ifx\@filebordercolor\relax \else @@ -251,6 +254,7 @@ \special{!% aref ;% a=<% + \ifHy@pdfa /F 4\fi \Hy@setpdfborder \ifx\@urlbordercolor\relax \else @@ -276,6 +280,7 @@ \special{!% aref \Hy@testname;% a=<% + \ifHy@pdfa /F 4\fi \Hy@setpdfborder \ifx\CurrentBorderColor\relax \else @@ -302,6 +307,7 @@ \ifx\\#3\\\else /Win<>\fi% >;% a=<% + \ifHy@pdfa /F 4\fi \Hy@setpdfborder \ifx\@runbordercolor\relax \else @@ -313,19 +319,21 @@ \special{!endaref}% } \def\Acrobatmenu#1#2{% - \leavevmode - \special{!% - aref ;% - a=<% - \Hy@setpdfborder - \ifx\@menubordercolor\relax - \else - /C[\@menubordercolor]% - \fi - >% + \Hy@Acrobatmenu{#1}{#2}{% + \special{!% + aref ;% + a=<% + \ifHy@pdfa /F 4\fi + \Hy@setpdfborder + \ifx\@menubordercolor\relax + \else + /C[\@menubordercolor]% + \fi + >% + }% + \Hy@colorlink\@menucolor#2\Hy@endcolorlink + \special{!endaref}% }% - \Hy@colorlink\@menucolor#2\Hy@endcolorlink - \special{!endaref}% } \ifnum\Hy@VTeXversion<702 % \else diff --git a/Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def b/Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def index 0e05b03d9e4..f2ed5054ba8 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def +++ b/Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def @@ -24,7 +24,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hvtexhtml.def} - [2008/04/12 v6.77m + [2008/04/17 v6.77q Hyperref driver for VTeX in HTML mode] \RequirePackage{vtexhtml} \newif\if@Localurl diff --git a/Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def b/Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def index fef6b7bd923..89bfade9877 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def +++ b/Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def @@ -24,7 +24,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hvtexmrk.def} - [2008/04/12 v6.77m + [2008/04/17 v6.77q Hyperref driver for VTeX in PDF/PS mode (pdfmark specials)] \input{pdfmark.def}% \ifx\@pdfproducer\relax diff --git a/Master/texmf-dist/tex/latex/hyperref/hyperref.sty b/Master/texmf-dist/tex/latex/hyperref/hyperref.sty index 71cf12df18c..777459a5046 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hyperref.sty +++ b/Master/texmf-dist/tex/latex/hyperref/hyperref.sty @@ -25,7 +25,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{hyperref} - [2008/04/12 v6.77m + [2008/04/17 v6.77q Hypertext links for LaTeX] \begingroup \@makeother\`% @@ -145,6 +145,7 @@ \newif\ifHy@verbose \newif\ifHy@windowui \newif\ifHy@displaydoctitle +\newif\ifHy@pdfa \Hy@backreffalse \Hy@bookmarksnumberedfalse \Hy@bookmarksopenfalse @@ -180,6 +181,7 @@ \Hy@verbosefalse \Hy@windowuitrue \Hy@displaydoctitlefalse +\Hy@pdfafalse \def\Hy@StepCount#1{\advance#1 by 1 }% \def\Hy@GlobalStepCount#1{\global\advance#1 by 1 }% \newdimen\@linkdim @@ -1364,7 +1366,9 @@ }% }% \def\HyPsd@UTFviii@ccxliv@undef{\@inpenc@undefined@{utf8}}% - \edef\HyPsd@UTFviii@ccxliv@def{\noexpand\UTFviii@four@octets\string^^f4}% + \edef\HyPsd@UTFviii@ccxliv@def{% + \noexpand\UTFviii@four@octets\string ^^f4% + }% \def\HyPsd@UTFviii@two#1#2{% \expandafter\HyPsd@UTFviii@@two \number\dimexpr.25\dimexpr`#1sp\expandafter\relax\expandafter|% @@ -1538,7 +1542,7 @@ \def\Hy@false{false} \let\literalps@out\@gobble \newcommand\pdfbookmark[3][]{} -\let\Acrobatmenu\@gobble +\def\Acrobatmenu#1#2{\leavevmode#2} \def\Hy@writebookmark#1#2#3#4#5{}% \let\HyperRaiseLinkHook\@empty \def\HyperRaiseLinkDefault{\baselineskip} @@ -1730,6 +1734,32 @@ } \define@key{Hyp}{linktocpage}[true]{% \Hy@boolkey{linktocpage}{#1}% + \ifHy@linktocpage + \let\Hy@linktoc\Hy@linktoc@page + \else + \let\Hy@linktoc\Hy@linktoc@section + \fi +} +\chardef\Hy@linktoc@none=0 % +\chardef\Hy@linktoc@section=1 % +\chardef\Hy@linktoc@page=2 % +\chardef\Hy@linktoc@all=3 % +\ifHy@linktocpage + \let\Hy@linktoc\Hy@linktoc@page +\else + \let\Hy@linktoc\Hy@linktoc@section +\fi +\define@key{Hyp}{linktoc}{% + \@ifundefined{Hy@linktoc@#1}{% + \Hy@Warning{% + Unexpected value `#1' of\MessageBreak + option `linktoc' instead of `none',\MessageBreak + `section', `page' or `all'% + }% + }{% + \expandafter\let\expandafter\Hy@linktoc + \csname Hy@linktoc@#1\endcsname + }% } \define@key{Hyp}{extension}{\def\XR@ext{#1}} \def\XR@ext{dvi} @@ -2610,6 +2640,9 @@ \define@key{Hyp}{pdfdisplaydoctitle}[true]{% \Hy@boolkey[pdfdisplaydoctitle]{displaydoctitle}{#1}% } +\define@key{Hyp}{pdfa}[true]{% + \Hy@boolkey{pdfa}{#1}% +} \define@key{Hyp}{pdfnewwindow}[true]{% \def\Hy@temp{#1}% \ifx\Hy@temp\@empty @@ -2722,7 +2755,7 @@ \def\hyper@linkurl#1#2{#1}% \def\hyper@linkfile#1#2#3{#1}% \def\hyper@link@[#1]#2#3{}% - \def\Acrobatmenu#1#2{#2}% + \def\Acrobatmenu#1#2{\leavevmode#2}% \let\PDF@SetupDoc\@empty \let\PDF@FinishDoc\@empty \let\@fifthoffive\@secondoftwo @@ -2736,6 +2769,51 @@ \Hy@DisableOption{final}% } \Hy@DisableOption{pdfversion}% +\Hy@DisableOption{pdfa} +\ifHy@pdfa + \def\Hy@Acrobatmenu#1#2{% + \leavevmode + \begingroup + \edef\x{#1}% + \@onelevel@sanitize\x + \ifx\x\Hy@NextPage + \let\y=Y% + \else + \ifx\x\Hy@PrevPage + \let\y=Y% + \else + \ifx\x\Hy@FirstPage + \let\y=Y% + \else + \ifx\x\Hy@LastPage + \let\y=Y% + \else + \let\y=N% + \fi + \fi + \fi + \fi + \expandafter\endgroup + \ifx\y Y% + \else + \PackageError{hyperref}{% + PDF/A: Named action `#1' is not permitted% + }\@ehc + {#2}% + \expandafter\@gobble + \fi + }% + \def\Hy@temp#1{% + \expandafter\def\csname Hy@#1\endcsname{#1}% + \expandafter\@onelevel@sanitize\csname Hy@#1\endcsname + }% + \Hy@temp{NextPage}% + \Hy@temp{PrevPage}% + \Hy@temp{FirstPage}% + \Hy@temp{LastPage}% +\else + \def\Hy@Acrobatmenu#1#2{\leavevmode}% +\fi \Hy@nextfalse \@ifundefined{spanish@sh@"@sel}{}{\Hy@nexttrue} \@ifundefined{galician@sh@"@sel}{}{\Hy@nexttrue} @@ -2743,6 +2821,36 @@ \ifHy@next \let\texttilde\~% \fi +\@ifpackageloaded{babel}{% + \@ifpackagelater{babel}{2008/03/16}{% + \def\Hy@PatchLanguageShorthands#1{% + \begingroup + \edef\x{#1}% + \@onelevel@sanitize\x + \def\y{system}% + \@onelevel@sanitize\y + \expandafter\endgroup + \ifx\x\y + \else + \HyOrg@languageshorthands{#1}% + \fi + }% + \AtBeginDocument{% + \begingroup + \toks0=\expandafter{\pdfstringdefPreHook}% + \xdef\pdfstringdefPreHook{% + \let\noexpand\HyOrg@languageshorthands + \noexpand\languageshorthands + \let\noexpand\languageshorthands + \noexpand\Hy@PatchLanguageShorthands + \the\toks0 % + \let\noexpand\languageshorthands + \noexpand\HyOrg@languageshorthands + }% + \endgroup + }% + }{}% +}{} \ifHy@figures \Hy@Info{Hyper figures ON}% \else @@ -3201,7 +3309,17 @@ \expandafter\@hyper@linkfile#7\\{#3}{#2}% \else \ifx\@pdftempa\@pdftempwordrun - \expandafter\@hyper@launch#7\\{#3}{#2}% + \ifHy@pdfa + \PackageError{hyperref}{% + PDF/A: Launch action is prohibited% + }\@ehc + \begingroup + \leavevmode + #2% + \endgroup + \else + \expandafter\@hyper@launch#7\\{#3}{#2}% + \fi \else \hyper@linkurl{#3}{#7\ifx\\#2\\\else\hyper@hash#2\fi}% \fi @@ -3393,6 +3511,38 @@ \HyField@NewFlag{F}{Locked}{8}% PDF 1.4 \HyField@NewFlag{F}{ToggleNoView}{9}% PDF 1.5 \HyField@NewFlag{F}{LockedContents}{10}% PDF 1.7 +\ifHy@pdfa + \def\HyField@PDFAFlagWarning#1#2{% + \Hy@Warning{% + PDF/A: Annotation flag `#1' must\MessageBreak + be set to `#2'% + }% + }% + \Fld@invisiblefalse + \def\Fld@invisibletrue{% + \HyField@PDFAFlagWarning{invisible}{false}% + }% + \Fld@hiddenfalse + \def\Fld@hiddentrue{% + \HyField@PDFAFlagWarning{hidden}{false}% + }% + \Fld@printtrue + \def\Fld@printfalse{% + \HyField@PDFAFlagWarning{print}{true}% + }% + \Fld@nozoomtrue + \def\Fld@nozoomfalse{% + \HyField@PDFAFlagWarning{nozoom}{true}% + }% + \Fld@norotatetrue + \def\Fld@norotatefalse{% + \HyField@PDFAFlagWarning{norotate}{true}% + }% + \Fld@noviewfalse + \def\Fld@noviewtrue{% + \HyField@PDFAFlagWarning{noview}{false}% + }% +\fi \HyField@NewFlag{Submit}{IncludeNoValueFields}{2} \HyField@NewFlagOnly{Submit}{ExportFormat}{3} \HyField@NewFlag{Submit}{GetMethod}{4} @@ -3838,67 +3988,42 @@ \def\Fld@onmouseup@code{} \def\Fld@onenter@code{} \def\Fld@onexit@code{} -\define@key{Field}{keystroke}{% - \def\Fld@keystroke@code{#1}% -} -\define@key{Field}{format}{% - \def\Fld@format@code{#1}% -} -\define@key{Field}{validate}{% - \def\Fld@validate@code{#1}% -} -\define@key{Field}{calculate}{% - \def\Fld@calculate@code{#1}% -} -\define@key{Field}{onfocus}{% - \def\Fld@onfocus@code{#1}% -} -\define@key{Field}{onblur}{% - \def\Fld@onblur@code{#1}% -} -\define@key{Field}{onenter}{% - \def\Fld@onenter@code{#1}% -} -\define@key{Field}{onexit}{% - \def\Fld@onexit@code{#1}% -} -\define@key{Field}{onselect}{% - \Field@addtoks{onselect}{#1}% -} -\define@key{Field}{onchange}{% - \Field@addtoks{onchange}{#1}% -} -\define@key{Field}{onclick}{% - \def\Fld@onclick{#1}% - \Field@addtoks{onclick}{#1}% -} -\define@key{Field}{ondblclick}{% - \Field@addtoks{ondblclick}{#1}% -} -\define@key{Field}{onmousedown}{% - \Field@addtoks{onmousedown}{#1}% -} -\define@key{Field}{onmouseup}{% - \Field@addtoks{onmouseup}{#1}% -} -\define@key{Field}{onmouseover}{% - \Field@addtoks{onmouseover}{#1}% -} -\define@key{Field}{onmousemove}{% - \Field@addtoks{onmousemove}{#1}% -} -\define@key{Field}{onmouseout}{% - \Field@addtoks{onmouseout}{#1}% -} -\define@key{Field}{onkeypress}{% - \Field@addtoks{onkeypress}{#1}% -} -\define@key{Field}{onkeydown}{% - \Field@addtoks{onkeydown}{#1}% +\def\Hy@temp#1{% + \expandafter\Hy@@temp\csname Fld@#1@code\endcsname{#1}% } -\define@key{Field}{onkeyup}{% - \Field@addtoks{onkeyup}{#1}% +\def\Hy@@temp#1#2{% + \ifHy@pdfa + \define@key{Field}{#2}{% + \PackageError{hyperref}{% + PDF/A: Additional action #2 is prohibited% + }\@ehc + }% + \else + \define@key{Field}{#2}{% + \def#1{##1}% + }% + \fi } +\Hy@temp{keystroke} +\Hy@temp{format} +\Hy@temp{validate} +\Hy@temp{calculate} +\Hy@temp{onfocus} +\Hy@temp{onblur} +\Hy@temp{onenter} +\Hy@temp{onexit} +\Hy@temp{onselect} +\Hy@temp{onchange} +\Hy@temp{onclick} +\Hy@temp{ondblclick} +\Hy@temp{onmousedown} +\Hy@temp{onmouseup} +\Hy@temp{onmouseover} +\Hy@temp{onmousemove} +\Hy@temp{onmouseout} +\Hy@temp{onkeypress} +\Hy@temp{onkeydown} +\Hy@temp{onkeyup} \DeclareRobustCommand\TextField{% \@ifnextchar[{\@TextField}{\@TextField[]}% } @@ -4469,6 +4594,12 @@ \def\@Alph{Alph\@arabic}% \fi }% + \ifx\@Alph\@Alph@bul + \def\@Alph{Alph\@arabic}% + \fi + \ifx\@alph\@alph@bul + \def\@alph{alph\@arabic}% + \fi \ifHy@naturalnames \let\textlatin\@firstofone \xdef\@currentHlabel{\csname the#1\endcsname}% @@ -5316,14 +5447,22 @@ \ifx\\#4\\% \csname l@#1\endcsname{#2}{#3}% \else - \ifHy@linktocpage + \ifcase\Hy@linktoc % none + \csname l@#1\endcsname{#2}{#3}% + \or % section + \csname l@#1\endcsname{% + \hyper@linkstart{link}{#4}{#2}\hyper@linkend + }{#3}% + \or % page \csname l@#1\endcsname{{#2}}{% \hyper@linkstart{link}{#4}{#3}\hyper@linkend }% - \else + \else % all \csname l@#1\endcsname{% \hyper@linkstart{link}{#4}{#2}\hyper@linkend - }{#3}% + }{% + \hyper@linkstart{link}{#4}{#3}\hyper@linkend + }% \fi \fi } @@ -5339,20 +5478,30 @@ \csname the\@ifundefined{theH#2}{}{H}#2\endcsname.\arabic{#1}% }% } -\let\Hmake@df@tag@@\make@df@tag@@ -\def\make@df@tag@@#1{% - \Hmake@df@tag@@{#1}% - \Hy@GlobalStepCount\Hy@linkcounter - \xdef\@currentHref{AMS.\the\Hy@linkcounter}% - \Hy@raisedlink{\hyper@anchorstart{\@currentHref}\hyper@anchorend}% -} -\let\Hmake@df@tag@@@\make@df@tag@@@ -\def\make@df@tag@@@#1{% - \Hmake@df@tag@@@{#1}% - \Hy@GlobalStepCount\Hy@linkcounter - \xdef\@currentHref{AMS.\the\Hy@linkcounter}% - \Hy@raisedlink{\hyper@anchorstart{\@currentHref}\hyper@anchorend}% -} +\@ifpackageloaded{amsmath}{% + \def\Hy@make@anchor{% + \Hy@GlobalStepCount\Hy@linkcounter + \xdef\@currentHref{AMS.\the\Hy@linkcounter}% + \Hy@raisedlink{\hyper@anchorstart{\@currentHref}\hyper@anchorend}% + }% + \def\Hy@make@df@tag@@#1{% + \gdef\df@tag{% + \maketag@@@{\Hy@make@anchor#1}% + \def\@currentlabel{#1}% + }% + }% + \def\Hy@make@df@tag@@@#1{% + \gdef\df@tag{% + \tagform@{\Hy@make@anchor#1}% + \toks@\@xp{\p@equation{#1}}% + \edef\@currentlabel{\the\toks@}% + }% + }% + \let\HyOrg@make@df@tag@@\make@df@tag@@ + \let\HyOrg@make@df@tag@@@\make@df@tag@@@ + \let\make@df@tag@@\Hy@make@df@tag@@ + \let\make@df@tag@@@\Hy@make@df@tag@@@ +}{} \@ifpackagewith{hyperref}{pdftex}{% \let\H@seteqlabel\@seteqlabel \def\@seteqlabel#1{% diff --git a/Master/texmf-dist/tex/latex/hyperref/hypertex.def b/Master/texmf-dist/tex/latex/hyperref/hypertex.def index 705c4a96b57..2bd830644c2 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hypertex.def +++ b/Master/texmf-dist/tex/latex/hyperref/hypertex.def @@ -24,7 +24,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hypertex.def} - [2008/04/12 v6.77m + [2008/04/17 v6.77q Hyperref driver for HyperTeX specials] \def\PDF@FinishDoc{} \def\PDF@SetupDoc{% diff --git a/Master/texmf-dist/tex/latex/hyperref/nohyperref.sty b/Master/texmf-dist/tex/latex/hyperref/nohyperref.sty index b81466819d3..efadc65c000 100644 --- a/Master/texmf-dist/tex/latex/hyperref/nohyperref.sty +++ b/Master/texmf-dist/tex/latex/hyperref/nohyperref.sty @@ -25,7 +25,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{nohyperref} - [2008/04/12 v6.77m + [2008/04/17 v6.77q Dummy hyperref (SR)] \let\hyper@@anchor\@gobble \def\hyper@link#1#2#3{#3}% @@ -38,7 +38,7 @@ \def\hyper@link@[#1]#2#3{}% \let\PDF@SetupDoc\@empty \let\PDF@FinishDoc\@empty -\let\Acrobatmenu\@gobble +\def\Acrobatmenu#1#2{\leavevmode#2} \let\pdfstringdefDisableCommands\@gobbletwo \let\texorpdfstring\@firstoftwo \let\pdfbookmark\@undefined diff --git a/Master/texmf-dist/tex/latex/hyperref/pd1enc.def b/Master/texmf-dist/tex/latex/hyperref/pd1enc.def index 9fa7423bba0..f7602eb7624 100644 --- a/Master/texmf-dist/tex/latex/hyperref/pd1enc.def +++ b/Master/texmf-dist/tex/latex/hyperref/pd1enc.def @@ -24,7 +24,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{pd1enc.def} - [2008/04/12 v6.77m + [2008/04/17 v6.77q Hyperref: PDFDocEncoding definition (HO)] \DeclareFontEncoding{PD1}{}{} \DeclareTextCommand{\textLF}{PD1}{\012} % line feed 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<>% - \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<>% -} +\ifHy@pdfa +\else + \def\PDFForm@Push{% + /Subtype/Widget% + \Fld@annotflags + /T(\Fld@name)% + /FT/Btn% + \Fld@flags + /H/P% + /BS<>% + \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<>% + }% +\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<>% - /A<>% -} +\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<>% + /A<>% + }% +\fi \def\Hy@writebookmark#1#2#3#4#5{% % section number, text, label, level, file \ifx\WriteBookmarks\relax% diff --git a/Master/texmf-dist/tex/latex/hyperref/puarenc.def b/Master/texmf-dist/tex/latex/hyperref/puarenc.def index 1a1cc2a8c6c..8e301a2a2ef 100644 --- a/Master/texmf-dist/tex/latex/hyperref/puarenc.def +++ b/Master/texmf-dist/tex/latex/hyperref/puarenc.def @@ -24,7 +24,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{puarenc.def} - [2008/04/12 v6.77m + [2008/04/17 v6.77q Hyperref: Additions to puenc.def for Arabi] \DeclareTextCommand{\hamza}{PU}{\86\041}% 0621;afii57409;ARABIC LETTER HAMZA \DeclareTextCommand{\alefmadda}{PU}{\86\042}% 0622;afii57410;ARABIC LETTER ALEF WITH MADDA ABOVE diff --git a/Master/texmf-dist/tex/latex/hyperref/puenc.def b/Master/texmf-dist/tex/latex/hyperref/puenc.def index 8594f6a06b0..f123239ab7c 100644 --- a/Master/texmf-dist/tex/latex/hyperref/puenc.def +++ b/Master/texmf-dist/tex/latex/hyperref/puenc.def @@ -24,7 +24,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{puenc.def} - [2008/04/12 v6.77m + [2008/04/17 v6.77q Hyperref: PDF Unicode definition (HO)] \DeclareFontEncoding{PU}{}{} \DeclareTextCommand{\textLF}{PU}{\80\012} % line feed diff --git a/Master/texmf-dist/tex/latex/hyperref/puvnenc.def b/Master/texmf-dist/tex/latex/hyperref/puvnenc.def index cddefabebf3..bf8235be5c8 100644 --- a/Master/texmf-dist/tex/latex/hyperref/puvnenc.def +++ b/Master/texmf-dist/tex/latex/hyperref/puvnenc.def @@ -24,7 +24,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{puvnenc.def} - [2008/04/12 v6.77m + [2008/04/17 v6.77q Hyperref: Additions to puenc.def for VnTeX] \DeclareTextCommand{\abreve}{PU}{\81\003} \DeclareTextCommand{\acircumflex}{PU}{\80\342} -- cgit v1.2.3