diff options
Diffstat (limited to 'Master/texmf-dist/tex')
21 files changed, 744 insertions, 336 deletions
diff --git a/Master/texmf-dist/tex/latex/hyperref/backref.sty b/Master/texmf-dist/tex/latex/hyperref/backref.sty index 4e4e35ee4e8..c553bfba9a3 100644 --- a/Master/texmf-dist/tex/latex/hyperref/backref.sty +++ b/Master/texmf-dist/tex/latex/hyperref/backref.sty @@ -29,7 +29,7 @@ %% given in the file `manifest.txt'. \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{backref} - [2010/03/11 v1.35 Bibliographical back referencing]% + [2010/08/30 v1.36 Bibliographical back referencing]% \newif\ifBR@verbose \@ifundefined{ifHy@verbose}{% \BR@verbosefalse @@ -427,7 +427,7 @@ \immediate\closeout\tf@brf }% }{% - Rerun to get bibliographicsl references right% + Rerun to get bibliographical references right% }% } \endinput diff --git a/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def b/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def index 9683f9293fa..f45ea7ed2c6 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def +++ b/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def @@ -29,7 +29,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hdvipdfm.def} - [2010/06/18 v6.81g + [2010/09/11 v6.81m Hyperref driver for dvipdfm] \def\Hy@PutCatalog#1{\@pdfm@mark{docview << #1 >>}} \ifHy@pagelabels @@ -123,6 +123,9 @@ \fi \providecommand*{\XR@ext}{pdf} \Hy@setbreaklinks{true} +\def\HyPat@ObjRef{% + @[^ ]+% +} \newsavebox{\pdfm@box} \def\@pdfm@mark#1{\special{pdf:#1}} \def\@pdfm@dest#1{% @@ -279,14 +282,14 @@ \begingroup \ifHy@ocgcolorlinks \def\Hy@ocgcolor{#1}% - \setbox0=\color@hbox + \setbox0=\hbox\bgroup\color@begingroup \else \HyColor@UseColor#1% \fi }% \def\Hy@endcolorlink{% \ifHy@ocgcolorlinks - \color@endbox + \color@endgroup\egroup \mbox{% \@pdfm@mark{content /OC/OCPrint BDC}% \rlap{\copy0}% @@ -348,6 +351,7 @@ /A<<% /S/GoTo% /D(\Hy@testname)% + \Hy@href@nextactionraw >>% >>% }% @@ -361,8 +365,11 @@ \def\hyper@linkfile#1#2#3{% \leavevmode \Hy@BeginAnnot{% - \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 \@pdfm@mark{% bann<<% /Type/Annot% @@ -376,8 +383,14 @@ /A<<% /S/GoToR% /F(\Hy@pstringF)% - /D\ifx\\#3\\[0 \@pdfstartview]\else(\Hy@pstringD)\fi + /D% + \ifx\\#3\\% + [\Hy@href@page\@pdfremotestartview]% + \else + (\Hy@pstringD)% + \fi \Hy@SetNewWindow + \Hy@href@nextactionraw >>% >>% }% @@ -403,6 +416,10 @@ /A<<% /S/URI% /URI(\Hy@pstringURI)% + \ifHy@href@ismap + /IsMap true% + \fi + \Hy@href@nextactionraw >>% >>% }% @@ -422,6 +439,7 @@ /A<<% /S/Named% /N/#1% + \Hy@href@nextactionraw >>% \Hy@setpdfborder \ifx\@menubordercolor\relax @@ -619,7 +637,6 @@ \fi }% \begingroup - \Field@toks={ }% \expandafter\HyField@SetKeys\expandafter{% \DefaultOptionsofText,#1% }% @@ -659,7 +676,6 @@ \ifdim\@tempdimb>\@tempdima\@tempdima\@tempdimb\fi }% \advance\@tempdima by 15\p@ - \Field@toks={ }% \begingroup \HyField@SetKeys{#1}% \edef\x{\endgroup @@ -767,7 +783,6 @@ \def\@PushButton[#1]#2{% parameters, label \def\Fld@name{#2}% \begingroup - \Field@toks={ }% \expandafter\HyField@SetKeys\expandafter{% \DefaultOptionsofPushButton,#1% }% @@ -800,7 +815,6 @@ \endgroup } \def\@Submit[#1]#2{% - \Field@toks={ }% \def\Fld@width{\DefaultWidthofSubmit}% \def\Fld@height{\DefaultHeightofSubmit}% \begingroup @@ -824,7 +838,6 @@ \endgroup } \def\@Reset[#1]#2{% - \Field@toks={ }% \def\Fld@width{\DefaultWidthofReset}% \def\Fld@height{\DefaultHeightofReset}% \begingroup @@ -859,7 +872,6 @@ \begingroup \def\Fld@width{\DefaultWidthofCheckBox}% \def\Fld@height{\DefaultHeightofCheckBox}% - \Field@toks={ }% \expandafter\HyField@SetKeys\expandafter{% \DefaultOptionsofCheckBox,#1% }% @@ -988,6 +1000,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 @@ -1015,6 +1078,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 @@ -1042,59 +1106,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 @@ -1226,6 +1240,7 @@ >>% \Fld@submitflags >>% + \Fld@additionalactions } \ifHy@pdfa \else @@ -1254,6 +1269,7 @@ \fi /BS<</W \Fld@borderwidth/S/\Fld@borderstyle>>% /A<</S/ResetForm>>% + \Fld@additionalactions }% \fi \def\Hy@writebookmark#1#2#3#4#5{% diff --git a/Master/texmf-dist/tex/latex/hyperref/hdvips.def b/Master/texmf-dist/tex/latex/hyperref/hdvips.def index fd48afc6b17..6cda6f66845 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hdvips.def +++ b/Master/texmf-dist/tex/latex/hyperref/hdvips.def @@ -29,7 +29,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hdvips.def} - [2010/06/18 v6.81g + [2010/09/11 v6.81m Hyperref driver for dvips] \providecommand*{\XR@ext}{pdf} \def\Hy@raisedlink{} diff --git a/Master/texmf-dist/tex/latex/hyperref/hdvipson.def b/Master/texmf-dist/tex/latex/hyperref/hdvipson.def index 45f7013ccc0..a27928fe904 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hdvipson.def +++ b/Master/texmf-dist/tex/latex/hyperref/hdvipson.def @@ -29,7 +29,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hdvipson.def} - [2010/06/18 v6.81g + [2010/09/11 v6.81m Hyperref driver for dvipsone] \providecommand*{\XR@ext}{pdf} \def\Hy@raisedlink{} diff --git a/Master/texmf-dist/tex/latex/hyperref/hdviwind.def b/Master/texmf-dist/tex/latex/hyperref/hdviwind.def index 899b9c77bea..30d960f878f 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hdviwind.def +++ b/Master/texmf-dist/tex/latex/hyperref/hdviwind.def @@ -29,7 +29,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hdviwind.def} - [2010/06/18 v6.81g + [2010/09/11 v6.81m Hyperref driver for dviwindo] \begingroup \@ifundefined{headerps@out}{}{% @@ -179,9 +179,12 @@ } \def\hyper@link#1#2#3{% \Hy@VerboseLinkStart{#1}{#2}% - \setbox\@tempboxa=\color@hbox #3\color@endbox \leavevmode \ifHy@raiselinks + \Hy@SaveSpaceFactor + \Hy@SaveSavedSpaceFactor + \sbox\@tempboxa{\Hy@RestoreSpaceFactor#3}% + \Hy@RestoreSavedSpaceFactor \@linkdim\dp\@tempboxa \lower\@linkdim\hbox{% \special{button: % @@ -189,19 +192,24 @@ \number\ht\@tempboxa\space #2% }% - \expandafter\Hy@colorlink\csname @#1color\endcsname#3% + \expandafter\Hy@colorlink\csname @#1color\endcsname + \Hy@RestoreSpaceFactor + #3% + \Hy@SaveSpaceFactor \Hy@endcolorlink }% \@linkdim\ht\@tempboxa \advance\@linkdim by -6.5\p@ \raise\@linkdim\hbox{}% + \Hy@RestoreSpaceFactor \else \special{button: % \number\wd\@tempboxa\space \number\ht\@tempboxa\space #2% }% - \expandafter\Hy@colorlink\csname @#1color\endcsname#3% + \expandafter\Hy@colorlink\csname @#1color\endcsname + #3% \Hy@endcolorlink \fi } @@ -209,8 +217,11 @@ \begingroup \hyper@chars \leavevmode - \setbox\@tempboxa=\color@hbox #1\color@endbox \ifHy@raiselinks + \Hy@SaveSpaceFactor + \Hy@SaveSavedSpaceFactor + \sbox\@tempboxa{\Hy@RestoreSpaceFactor#1}% + \Hy@RestoreSavedSpaceFactor \@linkdim\dp\@tempboxa \lower\@linkdim\hbox{% \special{button: % @@ -219,11 +230,16 @@ launch: \wwwbrowser\space #2% }% - \Hy@colorlink\@urlcolor#1\Hy@endcolorlink + \Hy@colorlink\@urlcolor + \Hy@RestoreSpaceFactor + #1% + \Hy@SaveSpaceFactor + \Hy@endcolorlink }% \@linkdim\ht\@tempboxa \advance\@linkdim by -6.5\p@ \raise\@linkdim\hbox{}% + \Hy@RestoreSpaceFactor \else \special{button: % \number\wd\@tempboxa\space @@ -239,8 +255,11 @@ \begingroup \hyper@chars \leavevmode - \setbox\@tempboxa=\color@hbox #1\color@endbox \ifHy@raiselinks + \Hy@SaveSpaceFactor + \Hy@SaveSavedSpaceFactor + \sbox\@tempboxa{\Hy@RestoreSpaceFactor#1}% + \Hy@RestoreSavedSpaceFactor \@linkdim\dp\@tempboxa \lower\@linkdim\hbox{% \special{button: % @@ -249,11 +268,16 @@ #3,% file: #2% }% - \Hy@colorlink\@filecolor#1\Hy@endcolorlink + \Hy@colorlink\@filecolor + \Hy@RestoreSpaceFactor + #1% + \Hy@SaveSpaceFactor + \Hy@endcolorlink }% \@linkdim\ht\@tempboxa \advance\@linkdim by -6.5\p@ \raise\@linkdim\hbox{}% + \Hy@RestoreSpaceFactor \else \special{button: % \number\wd\@tempboxa\space @@ -469,10 +493,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@ @@ -491,6 +524,7 @@ \else \raise\dimen@\hbox{\literalps@out{H.R}}% \fi + \Hy@RestoreSpaceFactor \fi \ifx\pdf@type\Hy@DEST \else diff --git a/Master/texmf-dist/tex/latex/hyperref/hpdftex.def b/Master/texmf-dist/tex/latex/hyperref/hpdftex.def index 40c42faa8de..a6a93bab7df 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hpdftex.def +++ b/Master/texmf-dist/tex/latex/hyperref/hpdftex.def @@ -29,7 +29,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hpdftex.def} - [2010/06/18 v6.81g + [2010/09/11 v6.81m Hyperref driver for pdfTeX] \let\Hy@PutCatalog\pdfcatalog \ifHy@pagelabels @@ -105,6 +105,9 @@ \fi \providecommand*{\XR@ext}{pdf} \Hy@setbreaklinks{true} +\def\HyPat@ObjRef{% + [0-9]*[1-9][0-9]* 0 R% +} \let\Hy@pdfminorversion\relax \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname pdfminorversion\endcsname\relax @@ -216,14 +219,14 @@ \begingroup \ifHy@ocgcolorlinks \def\Hy@ocgcolor{#1}% - \setbox0=\color@hbox + \setbox0=\hbox\bgroup\color@begingroup \else \HyColor@UseColor#1% \fi }% \def\Hy@endcolorlink{% \ifHy@ocgcolorlinks - \color@endbox + \color@endgroup\egroup \mbox{% \pdfliteral page{/OC/OCPrint BDC}% \rlap{\copy0}% @@ -253,11 +256,17 @@ \fi \providecommand*\@pdfview{XYZ} \def\new@pdflink#1{% + \ifhmode + \@savsf\spacefactor + \fi \Hy@SaveLastskip \Hy@VerboseAnchor{#1}% \Hy@pstringdef\Hy@pstringDest{\HyperDestNameFilter{#1}}% \Hy@DestName\Hy@pstringDest\@pdfview \Hy@RestoreLastskip + \ifhmode + \spacefactor\@savsf + \fi } \let\pdf@endanchor\@empty \def\Hy@DestName#1#2{% @@ -358,6 +367,10 @@ /Type/Action% /S/URI% /URI(\Hy@pstringURI)% + \ifHy@href@ismap + /IsMap true% + \fi + \Hy@href@nextactionraw >>% }% \relax @@ -367,8 +380,11 @@ } \def\hyper@linkfile#1#2#3{% anchor text, filename, linkname \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 \pdfstartlink attr{% @@ -390,10 +406,11 @@ /S/GoToR% \Hy@SetNewWindow \ifx\\#3\\% - /D[0 \@pdfstartview]% + /D[\Hy@href@page\@pdfremotestartview]% \else /D(\Hy@pstringD)% \fi + \Hy@href@nextactionraw >>% }% \relax @@ -429,6 +446,7 @@ \else /Win<</P(\Hy@pstringP)/F(\Hy@pstringF)>>% \fi + \Hy@href@nextactionraw >>% }% \relax @@ -743,7 +761,9 @@ /Subtype/Link% \ifHy@pdfa /F 4\fi /A<<% - /S/Named/N/#1% + /S/Named% + /N/#1% + \Hy@href@nextactionraw >>% }% \relax @@ -875,7 +895,6 @@ \fi }% \begingroup - \Field@toks={ }% \expandafter\HyField@SetKeys\expandafter{% \DefaultOptionsofText,#1% }% @@ -907,7 +926,6 @@ \ifdim\@tempdimb>\@tempdima\@tempdima\@tempdimb\fi }% \advance\@tempdima by 15\p@ - \Field@toks={ }% \begingroup \HyField@SetKeys{#1}% \edef\x{\endgroup @@ -998,7 +1016,6 @@ \def\@PushButton[#1]#2{% parameters, label \def\Fld@name{#2}% \begingroup - \Field@toks={ }% \expandafter\HyField@SetKeys\expandafter{% \DefaultOptionsofPushButton,#1% }% @@ -1026,7 +1043,6 @@ \endgroup } \def\@Submit[#1]#2{% - \Field@toks={ }% \def\Fld@width{\DefaultWidthofSubmit}% \def\Fld@height{\DefaultHeightofSubmit}% \begingroup @@ -1049,7 +1065,6 @@ \endgroup } \def\@Reset[#1]#2{% - \Field@toks={ }% \def\Fld@width{\DefaultWidthofReset}% \def\Fld@height{\DefaultHeightofReset}% \begingroup @@ -1079,7 +1094,6 @@ \begingroup \def\Fld@width{\DefaultWidthofCheckBox}% \def\Fld@height{\DefaultHeightofCheckBox}% - \Field@toks={ }% \expandafter\HyField@SetKeys\expandafter{% \DefaultOptionsofCheckBox,#1% }% @@ -1205,6 +1219,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 @@ -1232,6 +1297,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 @@ -1259,59 +1325,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 @@ -1443,6 +1459,7 @@ >>% \Fld@submitflags >>% + \Fld@additionalactions } \ifHy@pdfa \else @@ -1471,6 +1488,7 @@ \fi /BS<</W \Fld@borderwidth/S/\Fld@borderstyle>>% /A<</S/ResetForm>>% + \Fld@additionalactions }% \fi \def\Hy@writebookmark#1#2#3#4#5{% diff --git a/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg b/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg index 1f54cb91452..580ff7cee7d 100644 --- a/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg +++ b/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg @@ -29,7 +29,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{htex4ht.cfg} - [2010/06/18 v6.81g + [2010/09/11 v6.81m 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 ec044058cfc..dd6a0058c35 100644 --- a/Master/texmf-dist/tex/latex/hyperref/htex4ht.def +++ b/Master/texmf-dist/tex/latex/hyperref/htex4ht.def @@ -29,7 +29,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{htex4ht.def} - [2010/06/18 v6.81g + [2010/09/11 v6.81m Hyperref driver for TeX4ht] \providecommand*{\XR@ext}{html} \def\Hy@raisedlink{} @@ -99,7 +99,10 @@ \def\hyper@linkurl#1#2{% \leavevmode \ifHy@raiselinks - \setbox\@tempboxa=\color@hbox #1\color@endbox + \Hy@SaveSpaceFactor + \Hy@SaveSavedSpaceFactor + \sbox\@tempboxa{\Hy@RestoreSpaceFactor#1}% + \Hy@RestoreSavedSpaceFactor \@linkdim\dp\@tempboxa \lower\@linkdim\hbox{% \begingroup @@ -109,10 +112,15 @@ }% \endgroup }% - \Hy@colorlink\@urlcolor#1\Hy@endcolorlink + \Hy@colorlink\@urlcolor + \Hy@RestoreSpaceFactor + #1% + \Hy@SaveSpaceFactor + \Hy@endcolorlink \@linkdim\ht\@tempboxa \advance\@linkdim by -6.5\p@ \raise\@linkdim\hbox{\special{t4ht=</a>}}% + \Hy@RestoreSpaceFactor \else \begingroup \hyper@chars @@ -137,6 +145,22 @@ \def\rEfLiNK #1#2{#2}% \fi \def\backref#1{} +\AtBeginDocument{% + \expandafter\let\expandafter\Hy@OrgMakeLabel\csname Make:Label\endcsname + \expandafter\def\csname Make:Label\endcsname#1#2{% + \ifhmode + \Hy@SaveSpaceFactor + \else + \global\Hy@SavedSpaceFactor=1000 % + \fi + \Hy@OrgMakeLabel{#1}{% + \Hy@RestoreSpaceFactor + #2% + \Hy@SaveSpaceFactor + }% + \Hy@RestoreSpaceFactor + }% +} \def\@Form[#1]{% \kvsetkeys{Form}{#1}% \HCode{<form action="\Form@action" method="\Form@method">}% diff --git a/Master/texmf-dist/tex/latex/hyperref/htexture.def b/Master/texmf-dist/tex/latex/hyperref/htexture.def index b8d48f62d04..396cec13baa 100644 --- a/Master/texmf-dist/tex/latex/hyperref/htexture.def +++ b/Master/texmf-dist/tex/latex/hyperref/htexture.def @@ -29,7 +29,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{htexture.def} - [2010/06/18 v6.81g + [2010/09/11 v6.81m Hyperref driver for Textures] \providecommand*{\XR@ext}{pdf} \begingroup @@ -182,17 +182,24 @@ \def\hyper@linkurl#1#2{% \leavevmode \ifHy@raiselinks - \setbox\@tempboxa=\color@hbox #1\color@endbox + \Hy@SaveSpaceFactor + \Hy@SaveSavedSpaceFactor + \sbox\@tempboxa{\Hy@RestoreSpaceFactor#1}% + \Hy@RestoreSavedSpaceFactor \@linkdim\dp\@tempboxa \lower\@linkdim\hbox{% \hyper@chars \special{html:<a href=\hyper@quote#2\hyper@quote>}% }% - \Hy@colorlink\@urlcolor#1% - \@linkdim\ht\@tempboxa - \advance\@linkdim by -6.5\p@ - \raise\@linkdim\hbox{\special{html:</a>}}% + \Hy@colorlink\@urlcolor + \Hy@RestoreSpaceFactor + #1% + \Hy@SaveSpaceFactor + \@linkdim\ht\@tempboxa + \advance\@linkdim by -6.5\p@ + \raise\@linkdim\hbox{\special{html:</a>}}% \Hy@endcolorlink + \Hy@RestoreSpaceFactor \else \begingroup \hyper@chars diff --git a/Master/texmf-dist/tex/latex/hyperref/hvtex.def b/Master/texmf-dist/tex/latex/hyperref/hvtex.def index 70d948c0d6a..a436643199e 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hvtex.def +++ b/Master/texmf-dist/tex/latex/hyperref/hvtex.def @@ -29,7 +29,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hvtex.def} - [2010/06/18 v6.81g + [2010/09/11 v6.81m Hyperref driver for VTeX in PDF/PS mode] \providecommand*{\XR@ext}{pdf} \edef\Hy@VTeXversion{% @@ -206,7 +206,12 @@ \def\Hy@tempa{#1}% \ifx\Hy@tempa\@urltype \special{!% - aref <u=/Type /Action /S /URI /URI (\Hy@pstringURI)>;% + aref <u=/Type/Action/S/URI/URI(\Hy@pstringURI)% + \ifHy@href@ismap + /IsMap true% + \fi + \Hy@href@nextactionraw + >;% a=<% \ifHy@pdfa /F 4\fi \Hy@setpdfborder @@ -245,10 +250,12 @@ } \def\hyper@linkfile#1#2#3{% \leavevmode + \def\Hy@pstringF{#2}% + \Hy@CleanupFile\Hy@pstringF \special{!% aref <% \ifnum\Hy@VTeXversion>753 \ifHy@newwindow n\fi\fi - f=#2>#3;% + f=\Hy@pstringF>#3;% a=<% \ifHy@pdfa /F 4\fi \Hy@setpdfborder @@ -267,7 +274,12 @@ \hyper@chars \leavevmode \special{!% - aref <u=/Type /Action /S /URI /URI (\Hy@pstringURI)>;% + aref <u=/Type/Action/S/URI/URI(\Hy@pstringURI)% + \ifHy@href@ismap + /IsMap true% + \fi + \Hy@href@nextactionraw + >;% a=<% \ifHy@pdfa /F 4\fi \Hy@setpdfborder @@ -329,7 +341,8 @@ \ifx\\#3\\% \else /Win<</F(\Hy@pstringF)/P(\Hy@pstringP)>>% - \fi% + \fi + \Hy@href@nextactionraw >;% a=<% \ifHy@pdfa /F 4\fi diff --git a/Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def b/Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def index c231807ba17..b21b4f9bdcd 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def +++ b/Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def @@ -29,7 +29,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hvtexhtml.def} - [2010/06/18 v6.81g + [2010/09/11 v6.81m Hyperref driver for VTeX in HTML mode] \providecommand*{\XR@ext}{htm} \RequirePackage{vtexhtml} diff --git a/Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def b/Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def index ab4d7e7c87b..f52225cfd92 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def +++ b/Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def @@ -29,7 +29,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hvtexmrk.def} - [2010/06/18 v6.81g + [2010/09/11 v6.81m Hyperref driver for VTeX in PDF/PS mode (pdfmark specials)] \providecommand*{\XR@ext}{pdf} \def\Hy@raisedlink{} diff --git a/Master/texmf-dist/tex/latex/hyperref/hxetex.def b/Master/texmf-dist/tex/latex/hyperref/hxetex.def index a4b82dd6c4f..a02683aca73 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hxetex.def +++ b/Master/texmf-dist/tex/latex/hyperref/hxetex.def @@ -29,7 +29,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hxetex.def} - [2010/06/18 v6.81g + [2010/09/11 v6.81m Hyperref driver for XeTeX] \HyPsd@LoadUnicode \Hy@unicodetrue @@ -205,6 +205,9 @@ } \providecommand*{\XR@ext}{pdf} \Hy@setbreaklinks{true} +\def\HyPat@ObjRef{% + @[^ ]+% +} \newsavebox{\pdfm@box} \def\@pdfm@mark#1{\special{pdf:#1}} \def\@pdfm@dest#1{% @@ -361,14 +364,14 @@ \begingroup \ifHy@ocgcolorlinks \def\Hy@ocgcolor{#1}% - \setbox0=\color@hbox + \setbox0=\hbox\bgroup\color@begingroup \else \HyColor@UseColor#1% \fi }% \def\Hy@endcolorlink{% \ifHy@ocgcolorlinks - \color@endbox + \color@endgroup\egroup \mbox{% \@pdfm@mark{content /OC/OCPrint BDC}% \rlap{\copy0}% @@ -430,6 +433,7 @@ /A<<% /S/GoTo% /D(\Hy@testname)% + \Hy@href@nextactionraw >>% >>% }% @@ -443,8 +447,11 @@ \def\hyper@linkfile#1#2#3{% \leavevmode \Hy@BeginAnnot{% - \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 \@pdfm@mark{% bann<<% /Type/Annot% @@ -458,8 +465,14 @@ /A<<% /S/GoToR% /F(\Hy@pstringF)% - /D\ifx\\#3\\[0 \@pdfstartview]\else(\Hy@pstringD)\fi + /D% + \ifx\\#3\\% + [\Hy@href@page\@pdfremotestartview]% + \else + (\Hy@pstringD)% + \fi \Hy@SetNewWindow + \Hy@href@nextactionraw >>% >>% }% @@ -485,6 +498,10 @@ /A<<% /S/URI% /URI(\Hy@pstringURI)% + \ifHy@href@ismap + /IsMap true% + \fi + \Hy@href@nextactionraw >>% >>% }% @@ -504,6 +521,7 @@ /A<<% /S/Named% /N/#1% + \Hy@href@nextactionraw >>% \Hy@setpdfborder \ifx\@menubordercolor\relax @@ -681,7 +699,6 @@ \fi }% \begingroup - \Field@toks={ }% \expandafter\HyField@SetKeys\expandafter{% \DefaultOptionsofText,#1% }% @@ -721,7 +738,6 @@ \ifdim\@tempdimb>\@tempdima\@tempdima\@tempdimb\fi }% \advance\@tempdima by 15\p@ - \Field@toks={ }% \begingroup \HyField@SetKeys{#1}% \edef\x{\endgroup @@ -829,7 +845,6 @@ \def\@PushButton[#1]#2{% parameters, label \def\Fld@name{#2}% \begingroup - \Field@toks={ }% \expandafter\HyField@SetKeys\expandafter{% \DefaultOptionsofPushButton,#1% }% @@ -862,7 +877,6 @@ \endgroup } \def\@Submit[#1]#2{% - \Field@toks={ }% \def\Fld@width{\DefaultWidthofSubmit}% \def\Fld@height{\DefaultHeightofSubmit}% \begingroup @@ -886,7 +900,6 @@ \endgroup } \def\@Reset[#1]#2{% - \Field@toks={ }% \def\Fld@width{\DefaultWidthofReset}% \def\Fld@height{\DefaultHeightofReset}% \begingroup @@ -921,7 +934,6 @@ \begingroup \def\Fld@width{\DefaultWidthofCheckBox}% \def\Fld@height{\DefaultHeightofCheckBox}% - \Field@toks={ }% \expandafter\HyField@SetKeys\expandafter{% \DefaultOptionsofCheckBox,#1% }% @@ -1050,6 +1062,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 @@ -1077,6 +1140,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 @@ -1104,59 +1168,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 @@ -1288,6 +1302,7 @@ >>% \Fld@submitflags >>% + \Fld@additionalactions } \ifHy@pdfa \else @@ -1316,6 +1331,7 @@ \fi /BS<</W \Fld@borderwidth/S/\Fld@borderstyle>>% /A<</S/ResetForm>>% + \Fld@additionalactions }% \fi \def\Hy@writebookmark#1#2#3#4#5{% diff --git a/Master/texmf-dist/tex/latex/hyperref/hyperref.sty b/Master/texmf-dist/tex/latex/hyperref/hyperref.sty index 4e42f4f12b8..d7c55490684 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hyperref.sty +++ b/Master/texmf-dist/tex/latex/hyperref/hyperref.sty @@ -30,7 +30,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{hyperref} - [2010/06/18 v6.81g + [2010/09/11 v6.81m Hypertext links for LaTeX] \begingroup \@makeother\`% @@ -111,6 +111,45 @@ \def\Hy@Warning#1{\PackageWarning{hyperref}{#1}} \def\Hy@WarningNoLine#1{\PackageWarningNoLine{hyperref}{#1}} \def\Hy@Info#1{\PackageInfo{hyperref}{#1}} +\ltx@IfUndefined{pdfmatch}{% + \def\Hy@Match#1#2#3#4{}% +}{% + \def\Hy@Match#1#2{% + \begingroup + \edef\^{\ltx@backslashchar\string^}% + \edef\.{\ltx@backslashchar.}% + \edef\[{\ltx@backslashchar[}% ]] + \edef\${\ltx@backslashchar$}% + \edef\({\ltx@backslashchar(}% + \edef\){\ltx@backslashchar)}% + \edef\|{\ltx@backslashchar|}% + \edef\*{\ltx@backslashchar*}% + \edef\+{\ltx@backslashchar+}% + \edef\?{\ltx@backslashchar?}% + \edef\{{\ltx@backslashchar\ltx@leftbracechar}% + \edef\}{\ltx@rightbracechar}% + \edef\\{\ltx@backslashchar\ltx@backslashchar}% + \ifnum\pdfmatch{#2}{#1}=\ltx@one + \endgroup + \expandafter\ltx@firstoftwo + \else + \endgroup + \expandafter\ltx@secondoftwo + \fi + }% +} +\ltx@ifpackagelater{ltxcmds}{2010/09/11}{}{% + \begingroup + \lccode`0=`\{\relax + \lowercase{\endgroup + \def\ltx@leftbracechar{0}% + }% + \begingroup + \lccode`0=`\}\relax + \lowercase{\endgroup + \def\ltx@rightbracechar{0}% + }% +} \@ifundefined{AfterBeginDocument}{% \def\AfterBeginDocument{\AtBeginDocument}% }{}% @@ -391,7 +430,7 @@ \let\label\@gobble \let\index\@gobble \let\glossary\@gobble - \let\href\@secondoftwo + \let\href\HyPsd@href \let\@mkboth\@gobbletwo \let\ref\HyPsd@ref \let\pageref\HyPsd@pageref @@ -1365,6 +1404,7 @@ #3% }% } +\def\HyPsd@href#1#{\@secondoftwo} \def\HyPsd@ref#1{\HyPsd@@ref#1*\END}% \def\HyPsd@@ref#1*#2\END{% \ifx\\#2\\% @@ -2156,10 +2196,28 @@ \def\Hy@writebookmark#1#2#3#4#5{}% \let\HyperRaiseLinkHook\@empty \def\HyperRaiseLinkDefault{\baselineskip} +\newcount\Hy@SavedSpaceFactor +\def\Hy@SaveSpaceFactor{% + \global\Hy@SavedSpaceFactor=\ifhmode\spacefactor\else\z@\fi +} +\def\Hy@RestoreSpaceFactor{% + \relax + \ifhmode + \ifnum\Hy@SavedSpaceFactor>\z@ + \spacefactor=\Hy@SavedSpaceFactor + \fi + \fi +} +\def\Hy@SaveSavedSpaceFactor{% + \edef\Hy@RestoreSavedSpaceFactor{% + \global\Hy@SavedSpaceFactor=\the\Hy@SavedSpaceFactor\relax + }% +} \def\Hy@raisedlink#1{% \ifvmode #1% \else + \Hy@SaveSpaceFactor \penalty\@M \smash{% \begingroup @@ -2167,8 +2225,13 @@ \setlength\HyperRaiseLinkLength\HyperRaiseLinkDefault \HyperRaiseLinkHook \expandafter\endgroup - \expandafter\raise\the\HyperRaiseLinkLength\hbox{#1}% + \expandafter\raise\the\HyperRaiseLinkLength\hbox{% + \Hy@RestoreSpaceFactor + #1% + \Hy@SaveSpaceFactor + }% }% + \Hy@RestoreSpaceFactor \fi } \def\Hy@SaveLastskip{% @@ -3455,7 +3518,40 @@ \ifx\\#1\\% \def\@pdfstartview{}% \else - \hypercalcbpdef\@pdfstartview{ /#1 }% + \hypercalcbpdef\@pdfstartview{/#1}% + \fi +} +\def\HyPat@NonNegativeReal/{% + ([0-9]+\.?[0-9]*|[0-9]*\.?[0-9]+)% +} +\define@key{Hyp}{pdfremotestartview}{% + \ifx\\#1\\% + \def\@pdfremotestartview{/Fit}% + \else + \hypercalcbpdef\@pdfremotestartview{#1}% + \edef\@pdfremotestartview{\@pdfremotestartview}% + \Hy@Match\@pdfremotestartview{% + ^(XYZ -?(null|\HyPat@NonNegativeReal/) % + -?(null|\HyPat@NonNegativeReal/) % + (null|\HyPat@NonNegativeReal/)|% + Fit(|B|% + (H|V|BH|BV) (null|\HyPat@NonNegativeReal/)|% + R \HyPat@NonNegativeReal/ \HyPat@NonNegativeReal/ % + \HyPat@NonNegativeReal/ \HyPat@NonNegativeReal/% + ))$% + }{}{% + \Hy@Warning{% + Invalid value `\@pdfremotestartview'\MessageBreak + of `pdfremotestartview'\MessageBreak + is replaced by `Fit'% + }% + \let\@pdfremotestartview\@empty + }% + \ifx\@pdfremotestartview\@empty + \def\@pdfremotestartview{/Fit}% + \else + \edef\@pdfremotestartview{/\@pdfremotestartview}% + \fi \fi } \define@key{Hyp}{pdfpagescrop}{\edef\@pdfpagescrop{#1}} @@ -3529,7 +3625,8 @@ \def\@pdfkeywords{} \def\@pdftrapped{} \def\@pdfpagescrop{} -\def\@pdfstartview{ /Fit } +\def\@pdfstartview{/Fit} +\def\@pdfremotestartview{/Fit} \def\@pdfstartpage{1} \def\@pdfprintpagerange{} \def\@pdflang{} @@ -3593,7 +3690,7 @@ \let\@secondoffive\@secondoftwo \let\ReadBookmarks\relax \let\WriteBookmarks\relax - \Hy@WarningNoLine{ draft mode on}% + \Hy@WarningNoLine{Draft mode on}% \fi \Hy@DisableOption{draft}% \Hy@DisableOption{nolinks}% @@ -4137,7 +4234,9 @@ \hskip\z@skip \fi } -\DeclareRobustCommand*{\href}{% +\DeclareRobustCommand*{\href}[1][]{% + \begingroup + \setkeys{href}{#1}% \@ifnextchar\bgroup\Hy@href{\hyper@normalise\href@}% } \def\Hy@href#{% @@ -4147,10 +4246,78 @@ \catcode`\$=6 % \catcode`\#=12 % \gdef\href@$1{\expandafter\href@split$1##\\}% - \gdef\href@split$1#$2#$3\\{% - \hyper@@link{$1}{$2}% + \gdef\href@split$1#$2#$3\\$4{% + \hyper@@link{$1}{$2}{$4}% + \endgroup }% \endgroup +\define@key{href}{page}{% + \def\Hy@href@page{#1}% +} +\let\Hy@href@page\@empty +\newcount\c@Hy@tempcnt +\def\theHy@tempcnt{\the\c@Hy@tempcnt} +\def\Hy@MakeRemoteAction{% + \ifx\Hy@href@page\@empty + \def\Hy@href@page{0}% + \else + \setcounter{Hy@tempcnt}{\Hy@href@page}% + \ifnum\c@Hy@tempcnt<\@ne + \Hy@Warning{% + Invalid page number (\theHy@tempcnt)\MessageBreak + for remote PDF file.\MessageBreak + Using page 1% + }% + \def\Hy@href@page{0}% + \else + \global\advance\c@Hy@tempcnt\m@ne + \edef\Hy@href@page{\theHy@tempcnt}% + \fi + \fi + \ifx\Hy@href@nextactionraw\@empty + \else + \Hy@newwindowsettrue + \Hy@newwindowtrue + \fi +} +\define@key{href}{pdfremotestartview}{% + \setkeys{Hyp}{pdfremotestartview={#1}}% +} +\let\KV@href@pdfnewwindow\KV@Hyp@pdfnewwindow +\let\KV@href@pdfnewwindow@default\KV@Hyp@pdfnewwindow@default +\newif\ifHy@href@ismap +\define@key{href}{ismap}[true]{% + \ltx@IfUndefined{Hy@href@ismap#1}{% + \PackageError{hyperref}{% + Invalid value (#1) for key `ismap'.\MessageBreak + Permitted values are `true' or `false'.\MessageBreak + Ignoring `ismap'% + }\@ehc + }{% + \csname Hy@href@ismap#1\endcsname + }% +} +\let\Hy@href@nextactionraw\@empty +\define@key{href}{nextactionraw}{% + \edef\Hy@href@nextactionraw{#1}% + \ifx\Hy@href@nextactionraw\@empty + \else + \Hy@Match\Hy@href@nextactionraw{% + ^(\HyPat@ObjRef/|<<.*/S[ /].+>>|% + \[( ?\HyPat@ObjRef/|<<.*/S[ /].+>>)+ ?])$% + }{}{% + \Hy@Warning{Invalid value for `nextactionraw':\MessageBreak + \Hy@href@nextactionraw\MessageBreak + The action is discarded% + }% + }% + \ifx\Hy@href@nextactionraw\@empty + \else + \edef\Hy@href@nextactionraw{/Next \Hy@href@nextactionraw}% + \fi + \fi +} +\def\HyPat@ObjRef/{.+} \RequirePackage{url} \let\HyOrg@url\url \def\Hurl{\begingroup \Url} @@ -4263,20 +4430,26 @@ \x } \def\hyper@readexternallink#1\\#2#3#4{% - \expandafter\@hyper@readexternallink{#2}{#3}{#4}#1::\\{#1}% + \begingroup + \let\\\relax + \expandafter\endgroup + \expandafter\@@hyper@@readexternallink#1\\{#2}{#3}{#4}% +} +\def\@@hyper@@readexternallink#1\\#2#3#4{% + \@hyper@readexternallink{#2}{#3}{#4}#1::\\{#1}% } \def\@pdftempwordfile{file}% \def\@pdftempwordrun{run}% \def\@hyper@readexternallink#1#2#3#4:#5:#6\\#7{% \ifx\\#6\\% - \expandafter\@hyper@linkfile file:#7\\{#3}{#2}% + \@hyper@linkfile file:#7\\{#3}{#2}{#7}% \else \ifx\\#4\\% - \expandafter\@hyper@linkfile file:#7\\{#3}{#2}% + \@hyper@linkfile file:#7\\{#3}{#2}{#7}% \else \def\@pdftempa{#4}% \ifx\@pdftempa\@pdftempwordfile - \expandafter\@hyper@linkfile#7\\{#3}{#2}% + \@hyper@linkfile#7\\{#3}{#2}{#7}% \else \ifx\@pdftempa\@pdftempwordrun \ifHy@pdfa @@ -4288,7 +4461,7 @@ #2% \endgroup \else - \expandafter\@hyper@launch#7\\{#3}{#2}% + \@hyper@launch#7\\{#3}{#2}% \fi \else \hyper@linkurl{#3}{#7\ifx\\#2\\\else\hyper@hash#2\fi}% @@ -4308,8 +4481,8 @@ \fi }% } -\def\@hyper@linkfile file:#1\\#2#3{% - %file url,link string, name +\def\@hyper@linkfile file:#1\\#2#3#4{% + %file url,link string, name, original uri \filename@parse{#1}% \ifx\filename@ext\relax \edef\filename@ext{\XR@ext}% @@ -4320,7 +4493,7 @@ }{% \ifx\@baseurl\@empty \hyper@linkurl{#2}{% - \Hy@linkfileprefix\use@file\ifx\\#3\\\else\hyper@hash#3\fi + #4\ifx\\#3\\\else\hyper@hash#3\fi }% \else \hyper@linkurl{#2}{\use@file\ifx\\#3\\\else\hyper@hash#3\fi}% @@ -4345,6 +4518,29 @@ }% \expandafter\expandafter\expandafter\z\expandafter\x\y\@nil } +\def\Hy@StringLocalhost{localhost} +\@onelevel@sanitize\Hy@StringLocalhost +\def\Hy@CleanupFile#1{% + \edef#1{#1}% + \expandafter\Hy@@CleanupFile#1\hbox///\hbox\@nil{#1}% +} +\def\Hy@@CleanupFile#1//#2/#3\hbox#4\@nil#5{% + \begingroup + \toks@{\endgroup}% + \def\x{#1}% + \ifx\x\@empty + \def\x{#2}% + \ifx\x\@empty + \toks@{\endgroup\def#5{/#3}}% + \else + \@onelevel@sanitize\x + \ifx\x\Hy@StringLocalhost + \toks@{\endgroup\def#5{/#3}}% + \fi + \fi + \fi + \the\toks@ +} \long\def\hyper@@anchor#1#2{\@hyper@@anchor#1\relax#2\relax} \long\def\@hyper@@anchor#1\relax#2#3\relax{% \ifx\\#1\\% @@ -4375,6 +4571,7 @@ \fi \let\anchor@spot\@empty } +\def\anchor@spot{} \let\htmladdimg\hyperimage \def\htmladdnormallink#1#2{\href{#2}{#1}} \def\htmladdnormallinkfoot#1#2{\href{#2}{#1}\footnote{#2}} @@ -4886,12 +5083,21 @@ \def\Field@boolkey#1#2{% \csname Fld@#2\ifx\relax#1\relax true\else#1\fi\endcsname } -\newtoks\Field@toks -\Field@toks={ }% -\def\Field@addtoks#1#2{% - \edef\@processme{\Field@toks{\the\Field@toks\space #1="#2"}}% - \@processme -} +\ifHy@texht + \newtoks\Field@toks + \Field@toks={ }% + \def\Field@addtoks#1#2{% + \edef\@processme{\Field@toks{\the\Field@toks\space #1="#2"}}% + \@processme + }% +\else + \def\Hy@WarnHTMLFieldOption#1{% + \Hy@Warning{% + HTML field option `#1'\MessageBreak + is ignored% + }% + }% +\fi \def\Fld@checkequals#1=#2=#3\\{% \def\@currDisplay{#1}% \ifx\\#2\\% @@ -4909,12 +5115,21 @@ \define@key{Field}{disabled}[true]{% \lowercase{\Field@boolkey{#1}}{disabled}% } -\define@key{Field}{accesskey}{% - \Field@addtoks{accesskey}{#1}% -} -\define@key{Field}{tabkey}{% - \Field@addtoks{tabkey}{#1}% -} +\ifHy@texht + \define@key{Field}{accesskey}{% + \Field@addtoks{accesskey}{#1}% + }% + \define@key{Field}{tabkey}{% + \Field@addtoks{tabkey}{#1}% + }% +\else + \define@key{Field}{accesskey}{% + \Hy@WarnHTMLFieldOption{accesskey}% + }% + \define@key{Field}{tabkey}{% + \Hy@WarnHTMLFieldOption{tabkey}% + }% +\fi \define@key{Field}{name}{% \def\Fld@name{#1}% } @@ -5032,33 +5247,46 @@ \Hy@temp{onblur} \Hy@temp{onenter} \Hy@temp{onexit} -\def\Hy@temp#1{% - \define@key{Field}{#1}{% - \Field@addtoks{#1}{##1}% +\ifHy@texht + \def\Hy@temp#1{% + \define@key{Field}{#1}{% + \Field@addtoks{#1}{##1}% + }% }% -} -\Hy@temp{onselect} -\Hy@temp{onchange} +\else + \def\Hy@temp#1{% + \define@key{Field}{#1}{% + \Hy@WarnHTMLFieldOption{#1}% + }% + }% +\fi \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} -\ifHy@pdfa - \define@key{Field}{onclick}{% - \PackageError{hyperref}{% - PDF/A: Action `onclick' is prohibited% - }\@ehc - }% -\else +\Hy@temp{onselect} +\Hy@temp{onchange} +\Hy@temp{onkeypress} +\ifHy@texht \define@key{Field}{onclick}{% - \def\Fld@onclick@code{#1}% \Field@addtoks{onclick}{#1}% }% +\else + \ifHy@pdfa + \define@key{Field}{onclick}{% + \PackageError{hyperref}{% + PDF/A: Action `onclick' is prohibited% + }\@ehc + }% + \else + \define@key{Field}{onclick}{% + \def\Fld@onclick@code{#1}% + }% + \fi \fi \DeclareRobustCommand\TextField{% \@ifnextchar[{\@TextField}{\@TextField[]}% @@ -5610,6 +5838,7 @@ \fi \fi } +\let\Hy@saved@refstepcounter\refstepcounter \@ifpackageloaded{amsmath}{}{\newif\ifmeasuring@\measuring@false} \def\hyper@refstepcounter#1{% \edef\This@name{#1}% @@ -5832,6 +6061,18 @@ \edef#1{\getpagerefnumber{#2}}% }% }{} +\def\Hy@varioref@refstepcounter#1{% + \stepcounter{#1}% + \protected@edef\@currentlabel{% + \csname p@#1\expandafter\endcsname\csname the#1\endcsname + }% +} +\AtBeginDocument{% + \ifx\refstepcounter\Hy@varioref@refstepcounter + \let\H@refstepcounter\refstepcounter + \let\refstepcounter\Hy@saved@refstepcounter + \fi +} \@ifpackageloaded{longtable}{% \begingroup \def\y{\LT@array}% @@ -6581,7 +6822,7 @@ \evensidemargin \fi \kern-1bp\relax - \Hy@TempPageAnchor + \Hy@TempPageAnchor\relax \hss }% \vss diff --git a/Master/texmf-dist/tex/latex/hyperref/hypertex.def b/Master/texmf-dist/tex/latex/hyperref/hypertex.def index dd4cd0ea113..e5f03a5338c 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hypertex.def +++ b/Master/texmf-dist/tex/latex/hyperref/hypertex.def @@ -29,7 +29,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hypertex.def} - [2010/06/18 v6.81g + [2010/09/11 v6.81m Hyperref driver for HyperTeX specials] \providecommand*{\XR@ext}{dvi} \def\PDF@FinishDoc{} @@ -94,17 +94,24 @@ \def\hyper@linkurl#1#2{% \leavevmode \ifHy@raiselinks - \setbox\@tempboxa=\color@hbox #1\color@endbox + \Hy@SaveSpaceFactor + \Hy@SaveSavedSpaceFactor + \sbox\@tempboxa{\Hy@RestoreSpaceFactor#1}% + \Hy@RestoreSavedSpaceFactor \@linkdim\dp\@tempboxa \lower\@linkdim\hbox{% \hyper@chars \special{html:<a href=\hyper@quote#2\hyper@quote>}% }% - \Hy@colorlink\@urlcolor#1% + \Hy@colorlink\@urlcolor + \Hy@RestoreSpaceFactor + #1% + \Hy@SaveSpaceFactor \@linkdim\ht\@tempboxa \advance\@linkdim by -6.5\p@ \raise\@linkdim\hbox{\special{html:</a>}}% \Hy@endcolorlink + \Hy@RestoreSpaceFactor \else \begingroup \hyper@chars diff --git a/Master/texmf-dist/tex/latex/hyperref/nohyperref.sty b/Master/texmf-dist/tex/latex/hyperref/nohyperref.sty index 5bc5acf4fdc..327ba2cb427 100644 --- a/Master/texmf-dist/tex/latex/hyperref/nohyperref.sty +++ b/Master/texmf-dist/tex/latex/hyperref/nohyperref.sty @@ -30,7 +30,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{nohyperref} - [2010/06/18 v6.81g + [2010/09/11 v6.81m Dummy hyperref (SR)] \RequirePackage{letltxmacro}[2008/06/13] \let\hyper@@anchor\@gobble @@ -53,7 +53,7 @@ \let\phantomsection\@empty \let\hypersetup\@gobble \let\hyperbaseurl\@gobble -\let\href\@gobble +\newcommand*{\href}[3][]{#3} \let\hyperdef\@gobbletwo \let\hyperlink\@gobble \let\hypertarget\@gobble diff --git a/Master/texmf-dist/tex/latex/hyperref/pd1enc.def b/Master/texmf-dist/tex/latex/hyperref/pd1enc.def index 97f3d2b8451..a3665096d49 100644 --- a/Master/texmf-dist/tex/latex/hyperref/pd1enc.def +++ b/Master/texmf-dist/tex/latex/hyperref/pd1enc.def @@ -29,7 +29,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{pd1enc.def} - [2010/06/18 v6.81g + [2010/09/11 v6.81m Hyperref: PDFDocEncoding definition (HO)] \DeclareFontEncoding{PD1}{}{} \DeclareTextAccent{\`}{PD1}{\textasciigrave} 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{% diff --git a/Master/texmf-dist/tex/latex/hyperref/puarenc.def b/Master/texmf-dist/tex/latex/hyperref/puarenc.def index 87d225407a1..00279107b34 100644 --- a/Master/texmf-dist/tex/latex/hyperref/puarenc.def +++ b/Master/texmf-dist/tex/latex/hyperref/puarenc.def @@ -29,7 +29,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{puarenc.def} - [2010/06/18 v6.81g + [2010/09/11 v6.81m 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 83ad4a22306..d976e048a98 100644 --- a/Master/texmf-dist/tex/latex/hyperref/puenc.def +++ b/Master/texmf-dist/tex/latex/hyperref/puenc.def @@ -29,7 +29,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{puenc.def} - [2010/06/18 v6.81g + [2010/09/11 v6.81m Hyperref: PDF Unicode definition (HO)] \DeclareFontEncoding{PU}{}{} \DeclareTextCommand{\`}{PU}[1]{#1\83\000}% U+0300 diff --git a/Master/texmf-dist/tex/latex/hyperref/puvnenc.def b/Master/texmf-dist/tex/latex/hyperref/puvnenc.def index c8ff698e21e..b698f9c8c2c 100644 --- a/Master/texmf-dist/tex/latex/hyperref/puvnenc.def +++ b/Master/texmf-dist/tex/latex/hyperref/puvnenc.def @@ -29,7 +29,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{puvnenc.def} - [2010/06/18 v6.81g + [2010/09/11 v6.81m Hyperref: Additions to puenc.def for VnTeX] \DeclareTextCommand{\abreve}{PU}{\81\003} \DeclareTextCommand{\acircumflex}{PU}{\80\342} |