From 179388974fc2854ba702d7cfa609872ad0def9cc Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 24 Oct 2010 23:39:55 +0000 Subject: hyperref (20oct10) git-svn-id: svn://tug.org/texlive/trunk@20177 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/hyperref/ChangeLog | 9 + Master/texmf-dist/doc/latex/hyperref/ChangeLog.pdf | Bin 321944 -> 323058 bytes Master/texmf-dist/doc/latex/hyperref/backref.pdf | 4 +- Master/texmf-dist/doc/latex/hyperref/hyperref.pdf | Bin 3670736 -> 3691345 bytes Master/texmf-dist/doc/latex/hyperref/manual.html | 469 ++++++++++++--------- Master/texmf-dist/doc/latex/hyperref/manual.pdf | Bin 569043 -> 568890 bytes Master/texmf-dist/doc/latex/hyperref/manual2.html | 2 +- Master/texmf-dist/doc/latex/hyperref/manual3.html | 2 +- Master/texmf-dist/doc/latex/hyperref/nameref.pdf | 4 +- .../source/latex/hyperref/doc/manual.tex | 10 +- .../texmf-dist/source/latex/hyperref/hyperref.dtx | 195 +++++++-- Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def | 43 +- Master/texmf-dist/tex/latex/hyperref/hdvips.def | 3 +- Master/texmf-dist/tex/latex/hyperref/hdvipson.def | 3 +- Master/texmf-dist/tex/latex/hyperref/hdviwind.def | 3 +- Master/texmf-dist/tex/latex/hyperref/hpdftex.def | 43 +- Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg | 2 +- Master/texmf-dist/tex/latex/hyperref/htex4ht.def | 3 +- Master/texmf-dist/tex/latex/hyperref/htexture.def | 3 +- Master/texmf-dist/tex/latex/hyperref/hvtex.def | 3 +- Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def | 3 +- Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def | 3 +- Master/texmf-dist/tex/latex/hyperref/hxetex.def | 47 ++- Master/texmf-dist/tex/latex/hyperref/hyperref.sty | 113 ++++- Master/texmf-dist/tex/latex/hyperref/hypertex.def | 3 +- .../texmf-dist/tex/latex/hyperref/nohyperref.sty | 2 +- Master/texmf-dist/tex/latex/hyperref/pd1enc.def | 2 +- Master/texmf-dist/tex/latex/hyperref/pdfmark.def | 43 +- 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 +- 31 files changed, 704 insertions(+), 319 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/doc/latex/hyperref/ChangeLog b/Master/texmf-dist/doc/latex/hyperref/ChangeLog index d437534e0a3..0ba8529edd2 100644 --- a/Master/texmf-dist/doc/latex/hyperref/ChangeLog +++ b/Master/texmf-dist/doc/latex/hyperref/ChangeLog @@ -1,3 +1,12 @@ +2010-10-19 6.81s Heiko Oberdiek + * 6.81s + * Version check added for driver files. + * Field options `altname' and `mappingname' added. + +2010-09-25 6.81r Heiko Oberdiek + * 6.81r + * \SpecialDvipdfmxOutlineOpen is set in case of XeTeX. + 2010-09-17 6.81q Heiko Oberdiek * 6.81q * Broken error messages because of broken \Hy@Error fixed. diff --git a/Master/texmf-dist/doc/latex/hyperref/ChangeLog.pdf b/Master/texmf-dist/doc/latex/hyperref/ChangeLog.pdf index 7ec6d6c8b2f..8a77f65bd75 100644 Binary files a/Master/texmf-dist/doc/latex/hyperref/ChangeLog.pdf and b/Master/texmf-dist/doc/latex/hyperref/ChangeLog.pdf differ diff --git a/Master/texmf-dist/doc/latex/hyperref/backref.pdf b/Master/texmf-dist/doc/latex/hyperref/backref.pdf index f578167db7c..0801db355b9 100644 --- a/Master/texmf-dist/doc/latex/hyperref/backref.pdf +++ b/Master/texmf-dist/doc/latex/hyperref/backref.pdf @@ -10,7 +10,7 @@ endobj endobj 5 0 obj<> endobj -6 0 obj<> +6 0 obj<> endobj 7 0 obj<> endobj @@ -3899,7 +3899,7 @@ endobj endobj 1477 0 obj<> endobj -1478 0 obj<!a`l)]/Compress<>/Info 6 0 R/DecodeParms<>/Size 1479/Length 1078>>stream +1478 0 obj<>/Info 6 0 R/DecodeParms<>/Size 1479/Length 1078>>stream xڽXMlMAGņ і&TIKh J{>I %(j"% ?D$vb#;j#!!T|͹j;s̙3g~1 C0^4 &J-QA;"X9B>;_hv - + @@ -23,7 +23,7 @@ class="E">EX: a manual for hyperref class="ec-lmr-12">Sebastian Rahtz
Heiko Oberdiek
September 2010
+class="ec-lmr-12">October 2010

Contents

@@ -4261,421 +4261,468 @@ class="td11"> number 0 alignment within text field; 0 is left-aligned, + 1 is centered, 2 is right-aligned. +class="td11"> backgroundcolor color of box +class="td11"> 1 is centered, 2 is right-aligned. bordercolor altname name color of border +class="td11"> alternative name, + + bordersep box border gap - +class="td11"> borderwidth width of box border +class="td11"> the name shown in the user interface calculate backgroundcolor JavaScript code to calculate the value of the field +class="td11"> color of box charsize dimen bordercolor font size of field text +class="td11"> color of border checkboxsymbol char 4 () symbol used for check boxes (ZapfDingbats), +class="ec-lmtt-10">bordersep box border gap borderwidth the value is a character or \ding{number}, +class="td11"> width of box border calculate see package ‘pifont’ from bundle ‘psnfss’ +class="td11"> JavaScript code to calculate the value of the field checked boolean false whether option selected by default +class="ec-lmtt-10">charsize dimen font size of field text color color of text in box +class="ec-lmtt-10">checkboxsymbol char 4 () symbol used for check boxes (ZapfDingbats), combo boolean false choice list is ‘combo’ style +class="td11"> the value is a character or \ding{number}, default default value +class="td11"> see package ‘pifont’ from bundle ‘psnfss’ disabled checked boolean false field disabled +class="td11"> whether option selected by default format color JavaScript code to format the field +class="td11"> color of text in box height dimen height of field box +class="ec-lmtt-10">combo boolean false choice list is ‘combo’ style hidden boolean false field hidden +class="ec-lmtt-10">default default value - disabled boolean false field disabled + ketstroke format JavaScript code to control the keystrokes on entry +class="td11"> JavaScript code to format the field maxlen number 0 number of characters allowed in text field - + menulength number 4 number of elements shown in list +class="ec-lmtt-10">height dimen height of field box multiline hidden boolean false whether text box is multiline +class="td11"> field hidden name name ketstroke name of field (defaults to label) +class="td11"> JavaScript code to control the keystrokes on entry onblur mappingname name JavaScript code +class="td11"> the mapping name to be used when exporting + onchange JavaScript code +class="td11"> onclick JavaScript code +class="td11"> the field data ondblclick JavaScript code +class="ec-lmtt-10">maxlen number 0 number of characters allowed in text field onfocus JavaScript code +class="ec-lmtt-10">menulength number 4 number of elements shown in list onkeydown JavaScript code +class="ec-lmtt-10">multiline boolean false whether text box is multiline onkeypress name name JavaScript code +class="td11"> name of field (defaults to label) onkeyup onblur JavaScript code onmousedown onchange JavaScript code onmousemove onclick JavaScript code onmouseout ondblclick JavaScript code onmouseover onfocus JavaScript code onmouseup onkeydown JavaScript code onselect onkeypress JavaScript code password boolean false text field is ‘password’ style +class="ec-lmtt-10">onkeyup JavaScript code onmousedown JavaScript code + onmousemove JavaScript code + onmouseout JavaScript code + onmouseover JavaScript code + onmouseup JavaScript code + onselect JavaScript code + password boolean popdown boolean false text field is ‘password’ style + popdown boolean false false choice list is ‘popdown’ style radio boolean radio boolean false false choice list is ‘radio’ style radiosymbol char radiosymbol char H () ) symbol used for radio fields (ZapfDingbats), the value is a character or \ding{number}, see package ‘pifont’ from bundle ‘psnfss’ readonly boolean readonly boolean false false field is readonly rotation number rotation number 0 0 rotation of the widget annotation + + (degree, counterclockwise, multiple of 90) tabkey tabkey (as per HTML) validate validate JavaScript code to validate the entry value value initial value width dimen width dimen width of field box -

+

7 Defining a new driver

-

A hyperref driver has to provide definitions for eight macros: -

1.

A hyperref driver has to provide definitions for eight macros: + + +

1. \hyper@anchor -

2.

2. \hyper@link -

3.

3. \hyper@linkfile -

4.

4. \hyper@linkurl -

5.

5. \hyper@anchorstart -

6.

6. \hyper@anchorend -

7. \hyper@linkstart - -

8.

7. \hyper@linkstart +

8. \hyper@linkend -

The draft option defines the macros as follows +

The draft option defines the macros as follows

@@ -4688,11 +4735,11 @@ class="ec-lmtt-10">\hyper@linkend  
\let\hyper@linkstart\@gobbletwo  
\let\hyper@linkend\@empty
-

-

+

+

8 Special support for other packages

-

hyperref aims to cooperate with other packages, but there are several possible sources for conflict, such as

-

The

The hyperref package is distributed with variants on two useful packages designed to work especially well with it. These are xr and minitoc, which support crossdocument links using EX’s normal \label/\ref mechanisms and per-chapter tables of contents, respectively. -

+

9 History and acknowledgments

-

The original authors of

The original authors of hyperbasics.tex and hypertex.sty, from which this package descends, are Tanmoy Bhattacharya (

Tanmoy found a great many of the bugs, and (even better) often provided fixes, which has made the +

Tanmoy found a great many of the bugs, and (even better) often provided fixes, which has made the package more robust. The days spent on RevTEX are entirely due to him! The investigations of Bill Moss (bmoss@math.clemson.edu) into the later versions includ many bugs, and his testing is appreciated. Hans Hagen (pragma@pi.net) provided a lot of insight into PDF. -

Berthold Horn provided help, encouragement and sponsorship for the

Berthold Horn provided help, encouragement and sponsorship for the dvipsone and dviwindo drivers. Sergey Lesenko provided the changes needed for hyper package (developed in parallel with hyperref) showed me solutions for some problems. Hopefully the two packages will combine one day. -

The forms creation section owes a great deal to: T. V. Raman, for encouragement, support and +

The forms creation section owes a great deal to: T. V. Raman, for encouragement, support and ideas; Thomas Merz, whose book Web Publishing with Acrobat/PDF provided crucial insights; D. P. Story, whose detailed article about pdfmarks and forms solved many practical problems; and Hans Hagen, who explained how to do it in pdftex. -

Steve Peter recreated the manual source in July 2003 after it had been lost. -

Especial extra thanks to David Carlisle for the

Steve Peter recreated the manual source in July 2003 after it had been lost. +

Especial extra thanks to David Carlisle for the backref module, the ps2pdf and dviwindo support, frequent general rewrites of my bad code, and for working on changes to the xr package to suit diff --git a/Master/texmf-dist/doc/latex/hyperref/manual.pdf b/Master/texmf-dist/doc/latex/hyperref/manual.pdf index 062d322871b..44cc23b4a9e 100644 Binary files a/Master/texmf-dist/doc/latex/hyperref/manual.pdf and b/Master/texmf-dist/doc/latex/hyperref/manual.pdf differ diff --git a/Master/texmf-dist/doc/latex/hyperref/manual2.html b/Master/texmf-dist/doc/latex/hyperref/manual2.html index a89e74132fd..cd1b51c60e4 100644 --- a/Master/texmf-dist/doc/latex/hyperref/manual2.html +++ b/Master/texmf-dist/doc/latex/hyperref/manual2.html @@ -7,7 +7,7 @@ - + diff --git a/Master/texmf-dist/doc/latex/hyperref/manual3.html b/Master/texmf-dist/doc/latex/hyperref/manual3.html index 95b1fdb38a4..ce28f2cb37e 100644 --- a/Master/texmf-dist/doc/latex/hyperref/manual3.html +++ b/Master/texmf-dist/doc/latex/hyperref/manual3.html @@ -7,7 +7,7 @@ - + diff --git a/Master/texmf-dist/doc/latex/hyperref/nameref.pdf b/Master/texmf-dist/doc/latex/hyperref/nameref.pdf index ca285dff2c2..cd4630f777f 100644 --- a/Master/texmf-dist/doc/latex/hyperref/nameref.pdf +++ b/Master/texmf-dist/doc/latex/hyperref/nameref.pdf @@ -10,7 +10,7 @@ endobj endobj 5 0 obj<> endobj -6 0 obj<> +6 0 obj<> endobj 7 0 obj<> endobj @@ -3775,7 +3775,7 @@ endobj endobj 1411 0 obj<> endobj -1412 0 obj<>/Info 6 0 R/DecodeParms<>/Size 1413/Length 1022>>stream +1412 0 obj<>/Info 6 0 R/DecodeParms<>/Size 1413/Length 1022>>stream xڽXoMAT*,BiRTJ|DhGЅ ‚ZՏ H,l|$""Bkw}o:w~j̙3gΙ;W0cs!& Y6grgi%;f?amQw8\ >p|u+!,_QY 06~em=S(o@=3^!]n-`!{`:Ҧq m-݆p!`U.1%+c@qK|3qs \O$&&_ Xr`O)Eϫ)w^97y˶+>lT n!$o/o0&^.|[u0a/C60R'8LҹЗMlj-0W&hIM)ʚ^95Voڒok7LGɖ]ȷx0!Iz#7\>!?u8_wrjM ?l2/|o)(J]^Gi}m|ꪙ[;XO(GLvvBn7BղS)YSHXq:4ԩ0_j9ҟZTk>i^qR`UK9 X$X#6Cnԭ.f ͅJOZpp-M#b!Bk^f+; 9VVj diff --git a/Master/texmf-dist/source/latex/hyperref/doc/manual.tex b/Master/texmf-dist/source/latex/hyperref/doc/manual.tex index 418d4f493e0..716e5d6bb68 100644 --- a/Master/texmf-dist/source/latex/hyperref/doc/manual.tex +++ b/Master/texmf-dist/source/latex/hyperref/doc/manual.tex @@ -14,7 +14,7 @@ % * Heiko Oberdiek, 2006-2010. % -\def\mydate{September 2010} +\def\mydate{October 2010} \RequirePackage{ifpdf} \ifpdf % We are running pdfTeX in pdf mode @@ -1310,8 +1310,10 @@ Note that all colors must be expressed as RGB triples, in the range 0..1 (i.e.\ \smallskip\noindent\begin{longtable}{>{\ttfamily}ll>{\itshape}ll} accesskey & key & & (as per HTML) \\ -align & number & 0 & alignment within text field; 0 is left-aligned, \\ +align & number & 0 & alignment within text field; 0 is left-aligned,\\* & & & 1 is centered, 2 is right-aligned. \\ +altname & name & & alternative name,\\* + & & & the name shown in the user interface\\ backgroundcolor & & & color of box \\ bordercolor & & & color of border \\ bordersep & & & box border gap \\ @@ -1330,6 +1332,8 @@ format & & & JavaScript code to format the field \\ height & dimen & & height of field box \\ hidden & boolean & false & field hidden \\ ketstroke & & & JavaScript code to control the keystrokes on entry \\ +mappingname & name & & the mapping name to be used when exporting\\* + & & & the field data\\ maxlen & number & 0 & number of characters allowed in text field \\ menulength & number & 4 & number of elements shown in list \\ multiline & boolean & false & whether text box is multiline \\ @@ -1355,7 +1359,7 @@ radiosymbol & char & H (\ding{\number`H}) & symbol used for radio fields &&& the value is a character or \cs{ding}\verb|{|\texttt{\itshape number}\verb|}|, \\ &&& see package `pifont' from bundle `psnfss' \\ readonly & boolean & false & field is readonly \\ -rotation & number & 0 & rotation of the widget annotation \\ +rotation & number & 0 & rotation of the widget annotation \\* & & & (degree, counterclockwise, multiple of 90)\\ tabkey & & & (as per HTML) \\ validate & & & JavaScript code to validate the entry \\ diff --git a/Master/texmf-dist/source/latex/hyperref/hyperref.dtx b/Master/texmf-dist/source/latex/hyperref/hyperref.dtx index f22d44e30e2..5fbd1675a40 100644 --- a/Master/texmf-dist/source/latex/hyperref/hyperref.dtx +++ b/Master/texmf-dist/source/latex/hyperref/hyperref.dtx @@ -44,24 +44,37 @@ %\ProvidesFile{puenc.def} %\ProvidesFile{puvnenc.def} %\ProvidesFile{puarenc.def} -% [2010/09/17 v6.81q +% [2010/10/19 v6.81s % Hypertext links for LaTeX] % Dummy hyperref (SR)] % Hyperref documentation driver file] % Hyperref test file] % Hyperref driver for HyperTeX specials] +%\Hy@VersionCheck{hypertex.def} % Hyperref driver for pdfTeX] +%\Hy@VersionCheck{hpdftex.def} % Hyperref definitions for pdfmark specials] +%\Hy@VersionCheck{pdfmark.def} % Hyperref driver for VTeX in PDF/PS mode (pdfmark specials)] +%\Hy@VersionCheck{hvtexmrk.def} % Hyperref driver for dvips] +%\Hy@VersionCheck{hdvips.def} % Hyperref driver for dvipsone] +%\Hy@VersionCheck{hdvipson.def} % Hyperref driver for Textures] +%\Hy@VersionCheck{htexture.def} % Hyperref driver for dviwindo] +%\Hy@VersionCheck{hdviwind.def} % Hyperref driver for dvipdfm] +%\Hy@VersionCheck{hdvipdfm.def} % Hyperref driver for XeTeX] +%\Hy@VersionCheck{hxetex.def} % Hyperref driver for VTeX in PDF/PS mode] +%\Hy@VersionCheck{hvtex.def} % Hyperref driver for VTeX in HTML mode] +%\Hy@VersionCheck{hvtexhtm.def} % Hyperref driver for TeX4ht] +%\Hy@VersionCheck{htex4ht.def} % Hyperref configuration file for TeX4ht] % Hyperref: PDFDocEncoding definition (HO)] % Hyperref: PDF Unicode definition (HO)] @@ -126,7 +139,7 @@ \end{document} % % \fi -% \CheckSum{27800} +% \CheckSum{27938} % % \MakeShortVerb{|} % \StopEventually{} @@ -589,6 +602,59 @@ } % \end{macrocode} % +% \subsection{Version check} +% +% \begin{macro}{\Hy@VersionChecked} +% \begin{macrocode} +\chardef\Hy@VersionChecked=0 % +% \end{macrocode} +% \end{macro} +% \begin{macro}{\Hy@VersionCheck} +% \begin{macrocode} +\def\Hy@VersionCheck#1{% + \begingroup + \ltx@IfUndefined{ver@hyperref.sty}{% + \Hy@Error{% + This should not happen!\MessageBreak + Missing hyperref version% + }\@ehd + }{% + \ltx@IfUndefined{ver@#1}{% + \Hy@Error{% + This should not happen!\MessageBreak + Missing version of `#1'% + }\@ehd + }{% + \def\x##1##2##3{% + \expandafter\expandafter\expandafter\Hy@@VersionCheck + \expandafter\expandafter\expandafter##2% + \csname ver@##3\endcsname##1##1\@nil + }% + \x{ }\y{hyperref.sty}% + \x{ }\z{#1}% + \ifx\y\z + \else + \Hy@Error{% + Version mismatch!\MessageBreak + * \y: hyperref.sty\MessageBreak + * \z: #1% + }\@ehd + \fi + }% + }% + \endgroup + \chardef\Hy@VersionChecked=1 % +} +% \end{macrocode} +% \end{macro} +% \begin{macro}{\Hy@@VersionCheck} +% \begin{macrocode} +\def\Hy@@VersionCheck #1#2 #3 #4\@nil{% + \def#1{#2 #3}% +} +% \end{macrocode} +% \end{macro} +% % \subsection{Checks with regular expressions} % % \begin{macrocode} @@ -610,6 +676,7 @@ \edef\{{\ltx@backslashchar\ltx@leftbracechar}% \edef\}{\ltx@rightbracechar}% \edef\\{\ltx@backslashchar\ltx@backslashchar}% + \let\ \ltx@space \ifcase\pdfmatch{#2}{#1} % \endgroup \expandafter\ltx@secondoftwo @@ -626,17 +693,17 @@ \expandafter\ltx@firstoftwo \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}% + \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}% + }% }% } % \end{macrocode} @@ -5764,7 +5831,7 @@ }{}{% \Hy@Warning{% Invalid value `\@pdfpageduration'\MessageBreak - of `pdfpageduration'\MessageBreak + of option `pdfpageduration'\MessageBreak is replaced by an empty value% }% \let\@pdfpageduration\ltx@empty @@ -5848,7 +5915,25 @@ \let\@pdfborder\Hy@temp }% } -\define@key{Hyp}{pdfborderstyle}{\def\@pdfborderstyle{#1}} +\define@key{Hyp}{pdfborderstyle}{% + \let\Hy@temp\@pdfborderstyle + \def\@pdfborderstyle{#1}% + \Hy@Match\@pdfborderstyle{% + ^% + ( */Type */Border% + | */W +\HyPat@NonNegativeReal/% + | */S */[SDBIU]% + | */D *\[ *(\HyPat@NonNegativeReal/( \HyPat@NonNegativeReal/)?)?]% + )* *$% + }{}{% + \Hy@Warning{% + Invalid value `\@pdfborderstyle'\MessageBreak + for option `pdfborderstyle'.\MessageBreak + Option setting is ignored% + }% + \let\@pdfborderstyle\Hy@temp + }% +} \def\Hy@setpdfborder{% \ifx\@pdfborder\@empty \else @@ -6172,7 +6257,7 @@ \fi } \def\HyPat@NonNegativeReal/{% - ([0-9]+\.?[0-9]*|[0-9]*\.?[0-9]+)% + \ *([0-9]+\.?[0-9]*|[0-9]*\.?[0-9]+) *% } \define@key{Hyp}{pdfremotestartview}{% \ifx\\#1\\% @@ -6670,7 +6755,11 @@ \fi \fi \Hy@Message{Driver\HyOpt@DriverType: \Hy@driver}% + \chardef\Hy@VersionChecked=0 % \input{\Hy@driver.def}% + \ifcase\Hy@VersionChecked + \Hy@VersionCheck{\Hy@driver.def}% + \fi \let\@unprocessedoptions\relax \Hy@RestoreCatcodes \Hy@DisableOption{tex4ht}% @@ -6702,6 +6791,7 @@ \ifxetex \ifdim\number\XeTeXversion\XeTeXrevision in<0.9995in % \else + \chardef\SpecialDvipdfmxOutlineOpen\@ne \Hy@DvipdfmxOutlineOpentrue \fi \fi @@ -8293,6 +8383,14 @@ \define@key{Field}{name}{% \def\Fld@name{#1}% } +\let\Fld@altname\relax +\define@key{Field}{altname}{% + \def\Fld@altname{#1}% +} +\let\Fld@mappingname\relax +\define@key{Field}{mappingname}{% + \def\Fld@mappingname{#1}% +} \define@key{Field}{width}{% \def\Fld@width{#1}% \Field@Width#1\setbox0=\hbox{m}% @@ -8313,7 +8411,20 @@ \def\Fld@borderwidth{#1}% } \define@key{Field}{borderstyle}{% + \let\Hy@temp\Fld@borderstyle \def\Fld@borderstyle{#1}% + \Hy@Match\Fld@borderstyle{% + ^[SDBIU]$% + }{}{% + \Hy@Warning{% + Invalid value `\@pdfborderstyle'\MessageBreak + for option `pdfborderstyle'. Valid values:\MessageBreak + \space\space S (Solid), D (Dashed), B (Beveled),\MessageBreak + \space\space I (Inset), U (Underline)\MessageBreak + Option setting is ignored% + }% + \let\Fld@borderstyle\Hy@temp + }% } \define@key{Field}{bordersep}{% \def\Fld@bordersep{#1}% @@ -9318,8 +9429,8 @@ \ifHy@unicode \else \Hy@Warning{% - XeTeX driver only supports `unicode=true'.\MessageBreak - Ignoring option setting `unicode=false'% + XeTeX driver only supports `unicode=true'. Ignoring\MessageBreak + option setting `unicode=false'% }% \Hy@unicodetrue \fi @@ -17742,6 +17853,21 @@ % \begin{macro}{\PDFForm@Name} % \begin{macrocode} \def\PDFForm@Name{% + \PDFForm@@Name\Fld@name + \ifx\Fld@altname\relax + \else + \PDFForm@@Name\Fld@altname + \fi + \ifx\Fld@mappingname\relax + \else + \PDFForm@@Name\Fld@mappingname + \fi +} +% \end{macrocode} +% \end{macro} +% \begin{macro}{\PDFForm@@Name} +% \begin{macrocode} +\def\PDFForm@@Name#1{% \begingroup \ifnum\Hy@pdfversion<5 % implementation note 117, PDF spec 1.7 \ifHy@unicode @@ -17749,9 +17875,9 @@ \fi \fi \HyPsd@XeTeXBigCharstrue - \pdfstringdef\Hy@gtemp\Fld@name + \pdfstringdef\Hy@gtemp#1% \endgroup - \let\Fld@name\Hy@gtemp + \let#1\Hy@gtemp } % \end{macrocode} % \end{macro} @@ -17841,13 +17967,28 @@ } % \end{macrocode} % \end{macro} +% \begin{macro}{\Fld@annotnames} +% \begin{macrocode} +\def\Fld@annotnames{% + /T(\Fld@name)% + \ifx\Fld@altname\relax + \else + /TU(\Fld@altname)% + \fi + \ifx\Fld@mappingname\relax + \else + /TM(\Fld@mappingname)% + \fi +} +% \end{macrocode} +% \end{macro} % % \begin{macro}{\PDFForm@Check} % \begin{macrocode} \def\PDFForm@Check{% /Subtype/Widget% \Fld@annotflags - /T(\Fld@name)% + \Fld@annotnames /FT/Btn% \Fld@flags /Q \Fld@align @@ -17882,7 +18023,7 @@ \def\PDFForm@Push{% /Subtype/Widget% \Fld@annotflags - /T(\Fld@name)% + \Fld@annotnames /FT/Btn% \Fld@flags /H/P% @@ -17914,7 +18055,7 @@ \def\PDFForm@List{% /Subtype/Widget% \Fld@annotflags - /T(\Fld@name)% + \Fld@annotnames /FT/Ch% \Fld@flags /Q \Fld@align @@ -17951,7 +18092,7 @@ \def\PDFForm@Radio{% /Subtype/Widget% \Fld@annotflags - /T(\Fld@name)% + \Fld@annotnames /FT/Btn% \Fld@flags /H/P% @@ -17987,7 +18128,7 @@ \def\PDFForm@Text{% /Subtype/Widget% \Fld@annotflags - /T(\Fld@name)% + \Fld@annotnames /FT/Tx% \Fld@flags /Q \Fld@align @@ -18026,7 +18167,7 @@ \def\PDFForm@Submit{% /Subtype/Widget% \Fld@annotflags - /T(\Fld@name)% + \Fld@annotnames /FT/Btn% \Fld@flags /H/P% @@ -18065,7 +18206,7 @@ \def\PDFForm@Reset{% /Subtype/Widget% \Fld@annotflags - /T(\Fld@name)% + \Fld@annotnames /FT/Btn% \Fld@flags /H/P% diff --git a/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def b/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def index 281c5d4e229..2f8bf7e62d8 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def +++ b/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def @@ -29,8 +29,9 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hdvipdfm.def} - [2010/09/17 v6.81q + [2010/10/19 v6.81s Hyperref driver for dvipdfm] +\Hy@VersionCheck{hdvipdfm.def} \def\Hy@PutCatalog#1{\@pdfm@mark{docview << #1 >>}} \ifHy@pagelabels \def\HyPL@StorePageLabel#1{% @@ -989,6 +990,17 @@ \Hy@escapeform{}% \fi \def\PDFForm@Name{% + \PDFForm@@Name\Fld@name + \ifx\Fld@altname\relax + \else + \PDFForm@@Name\Fld@altname + \fi + \ifx\Fld@mappingname\relax + \else + \PDFForm@@Name\Fld@mappingname + \fi +} +\def\PDFForm@@Name#1{% \begingroup \ifnum\Hy@pdfversion<5 % implementation note 117, PDF spec 1.7 \ifHy@unicode @@ -996,9 +1008,9 @@ \fi \fi \HyPsd@XeTeXBigCharstrue - \pdfstringdef\Hy@gtemp\Fld@name + \pdfstringdef\Hy@gtemp#1% \endgroup - \let\Fld@name\Hy@gtemp + \let#1\Hy@gtemp } \def\Fld@@additionalactions{% \ifx\Fld@keystroke@code\@empty @@ -1051,10 +1063,21 @@ \fi \fi } +\def\Fld@annotnames{% + /T(\Fld@name)% + \ifx\Fld@altname\relax + \else + /TU(\Fld@altname)% + \fi + \ifx\Fld@mappingname\relax + \else + /TM(\Fld@mappingname)% + \fi +} \def\PDFForm@Check{% /Subtype/Widget% \Fld@annotflags - /T(\Fld@name)% + \Fld@annotnames /FT/Btn% \Fld@flags /Q \Fld@align @@ -1085,7 +1108,7 @@ \def\PDFForm@Push{% /Subtype/Widget% \Fld@annotflags - /T(\Fld@name)% + \Fld@annotnames /FT/Btn% \Fld@flags /H/P% @@ -1112,7 +1135,7 @@ \def\PDFForm@List{% /Subtype/Widget% \Fld@annotflags - /T(\Fld@name)% + \Fld@annotnames /FT/Ch% \Fld@flags /Q \Fld@align @@ -1145,7 +1168,7 @@ \def\PDFForm@Radio{% /Subtype/Widget% \Fld@annotflags - /T(\Fld@name)% + \Fld@annotnames /FT/Btn% \Fld@flags /H/P% @@ -1177,7 +1200,7 @@ \def\PDFForm@Text{% /Subtype/Widget% \Fld@annotflags - /T(\Fld@name)% + \Fld@annotnames /FT/Tx% \Fld@flags /Q \Fld@align @@ -1212,7 +1235,7 @@ \def\PDFForm@Submit{% /Subtype/Widget% \Fld@annotflags - /T(\Fld@name)% + \Fld@annotnames /FT/Btn% \Fld@flags /H/P% @@ -1247,7 +1270,7 @@ \def\PDFForm@Reset{% /Subtype/Widget% \Fld@annotflags - /T(\Fld@name)% + \Fld@annotnames /FT/Btn% \Fld@flags /H/P% diff --git a/Master/texmf-dist/tex/latex/hyperref/hdvips.def b/Master/texmf-dist/tex/latex/hyperref/hdvips.def index de5432fa913..1ae3f58c94b 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hdvips.def +++ b/Master/texmf-dist/tex/latex/hyperref/hdvips.def @@ -29,8 +29,9 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hdvips.def} - [2010/09/17 v6.81q + [2010/10/19 v6.81s Hyperref driver for dvips] +\Hy@VersionCheck{hdvips.def} \providecommand*{\XR@ext}{pdf} \def\Hy@raisedlink{} \def\literalps@out#1{\special{ps:SDict begin #1 end}}% diff --git a/Master/texmf-dist/tex/latex/hyperref/hdvipson.def b/Master/texmf-dist/tex/latex/hyperref/hdvipson.def index ad3b08a1e07..44bde1ddbe9 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hdvipson.def +++ b/Master/texmf-dist/tex/latex/hyperref/hdvipson.def @@ -29,8 +29,9 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hdvipson.def} - [2010/09/17 v6.81q + [2010/10/19 v6.81s Hyperref driver for dvipsone] +\Hy@VersionCheck{hdvipson.def} \providecommand*{\XR@ext}{pdf} \def\Hy@raisedlink{} \providecommand*\@pdfborder{0 0 1} diff --git a/Master/texmf-dist/tex/latex/hyperref/hdviwind.def b/Master/texmf-dist/tex/latex/hyperref/hdviwind.def index 801f68f8e24..111d972e517 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hdviwind.def +++ b/Master/texmf-dist/tex/latex/hyperref/hdviwind.def @@ -29,8 +29,9 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hdviwind.def} - [2010/09/17 v6.81q + [2010/10/19 v6.81s Hyperref driver for dviwindo] +\Hy@VersionCheck{hdviwind.def} \begingroup \@ifundefined{headerps@out}{}{% \toks@\expandafter{\Hy@FirstPageHook}% diff --git a/Master/texmf-dist/tex/latex/hyperref/hpdftex.def b/Master/texmf-dist/tex/latex/hyperref/hpdftex.def index 3c43fa5bc55..9c6c2875199 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hpdftex.def +++ b/Master/texmf-dist/tex/latex/hyperref/hpdftex.def @@ -29,8 +29,9 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hpdftex.def} - [2010/09/17 v6.81q + [2010/10/19 v6.81s Hyperref driver for pdfTeX] +\Hy@VersionCheck{hpdftex.def} \let\Hy@PutCatalog\pdfcatalog \ifHy@pagelabels \def\HyPL@StorePageLabel#1{% @@ -1208,6 +1209,17 @@ \Hy@escapeform{}% \fi \def\PDFForm@Name{% + \PDFForm@@Name\Fld@name + \ifx\Fld@altname\relax + \else + \PDFForm@@Name\Fld@altname + \fi + \ifx\Fld@mappingname\relax + \else + \PDFForm@@Name\Fld@mappingname + \fi +} +\def\PDFForm@@Name#1{% \begingroup \ifnum\Hy@pdfversion<5 % implementation note 117, PDF spec 1.7 \ifHy@unicode @@ -1215,9 +1227,9 @@ \fi \fi \HyPsd@XeTeXBigCharstrue - \pdfstringdef\Hy@gtemp\Fld@name + \pdfstringdef\Hy@gtemp#1% \endgroup - \let\Fld@name\Hy@gtemp + \let#1\Hy@gtemp } \def\Fld@@additionalactions{% \ifx\Fld@keystroke@code\@empty @@ -1270,10 +1282,21 @@ \fi \fi } +\def\Fld@annotnames{% + /T(\Fld@name)% + \ifx\Fld@altname\relax + \else + /TU(\Fld@altname)% + \fi + \ifx\Fld@mappingname\relax + \else + /TM(\Fld@mappingname)% + \fi +} \def\PDFForm@Check{% /Subtype/Widget% \Fld@annotflags - /T(\Fld@name)% + \Fld@annotnames /FT/Btn% \Fld@flags /Q \Fld@align @@ -1304,7 +1327,7 @@ \def\PDFForm@Push{% /Subtype/Widget% \Fld@annotflags - /T(\Fld@name)% + \Fld@annotnames /FT/Btn% \Fld@flags /H/P% @@ -1331,7 +1354,7 @@ \def\PDFForm@List{% /Subtype/Widget% \Fld@annotflags - /T(\Fld@name)% + \Fld@annotnames /FT/Ch% \Fld@flags /Q \Fld@align @@ -1364,7 +1387,7 @@ \def\PDFForm@Radio{% /Subtype/Widget% \Fld@annotflags - /T(\Fld@name)% + \Fld@annotnames /FT/Btn% \Fld@flags /H/P% @@ -1396,7 +1419,7 @@ \def\PDFForm@Text{% /Subtype/Widget% \Fld@annotflags - /T(\Fld@name)% + \Fld@annotnames /FT/Tx% \Fld@flags /Q \Fld@align @@ -1431,7 +1454,7 @@ \def\PDFForm@Submit{% /Subtype/Widget% \Fld@annotflags - /T(\Fld@name)% + \Fld@annotnames /FT/Btn% \Fld@flags /H/P% @@ -1466,7 +1489,7 @@ \def\PDFForm@Reset{% /Subtype/Widget% \Fld@annotflags - /T(\Fld@name)% + \Fld@annotnames /FT/Btn% \Fld@flags /H/P% diff --git a/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg b/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg index 9804bf7abeb..5a788b7d03b 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/09/17 v6.81q + [2010/10/19 v6.81s 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 5551a83be10..776b453d3ac 100644 --- a/Master/texmf-dist/tex/latex/hyperref/htex4ht.def +++ b/Master/texmf-dist/tex/latex/hyperref/htex4ht.def @@ -29,8 +29,9 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{htex4ht.def} - [2010/09/17 v6.81q + [2010/10/19 v6.81s Hyperref driver for TeX4ht] +\Hy@VersionCheck{htex4ht.def} \providecommand*{\XR@ext}{html} \def\Hy@raisedlink{} \@ifpackageloaded{tex4ht}{% diff --git a/Master/texmf-dist/tex/latex/hyperref/htexture.def b/Master/texmf-dist/tex/latex/hyperref/htexture.def index d794d1c9e4c..53c0a0d64b7 100644 --- a/Master/texmf-dist/tex/latex/hyperref/htexture.def +++ b/Master/texmf-dist/tex/latex/hyperref/htexture.def @@ -29,8 +29,9 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{htexture.def} - [2010/09/17 v6.81q + [2010/10/19 v6.81s Hyperref driver for Textures] +\Hy@VersionCheck{htexture.def} \providecommand*{\XR@ext}{pdf} \begingroup \obeylines % diff --git a/Master/texmf-dist/tex/latex/hyperref/hvtex.def b/Master/texmf-dist/tex/latex/hyperref/hvtex.def index 66adb83c5e2..b22e4ab6d84 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hvtex.def +++ b/Master/texmf-dist/tex/latex/hyperref/hvtex.def @@ -29,8 +29,9 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hvtex.def} - [2010/09/17 v6.81q + [2010/10/19 v6.81s Hyperref driver for VTeX in PDF/PS mode] +\Hy@VersionCheck{hvtex.def} \providecommand*{\XR@ext}{pdf} \edef\Hy@VTeXversion{% \ifx\VTeXversion\@undefined diff --git a/Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def b/Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def index a648e82550d..25c6b37e1dc 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def +++ b/Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def @@ -29,8 +29,9 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hvtexhtml.def} - [2010/09/17 v6.81q + [2010/10/19 v6.81s Hyperref driver for VTeX in HTML mode] +\Hy@VersionCheck{hvtexhtm.def} \providecommand*{\XR@ext}{htm} \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 a24ba9c64c9..64800541981 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def +++ b/Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def @@ -29,8 +29,9 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hvtexmrk.def} - [2010/09/17 v6.81q + [2010/10/19 v6.81s Hyperref driver for VTeX in PDF/PS mode (pdfmark specials)] +\Hy@VersionCheck{hvtexmrk.def} \providecommand*{\XR@ext}{pdf} \def\Hy@raisedlink{} \def\literalps@out#1{\special{pS:#1}}% diff --git a/Master/texmf-dist/tex/latex/hyperref/hxetex.def b/Master/texmf-dist/tex/latex/hyperref/hxetex.def index 17e45c2aec8..8e2307fc428 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hxetex.def +++ b/Master/texmf-dist/tex/latex/hyperref/hxetex.def @@ -29,8 +29,9 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hxetex.def} - [2010/09/17 v6.81q + [2010/10/19 v6.81s Hyperref driver for XeTeX] +\Hy@VersionCheck{hxetex.def} \HyPsd@LoadUnicode \Hy@unicodetrue \ifx\HyPsd@pdfencoding\HyPsd@pdfencoding@unicode @@ -43,8 +44,8 @@ \ifHy@unicode \else \Hy@Warning{% - XeTeX driver only supports `unicode=true'.\MessageBreak - Ignoring option setting `unicode=false'% + XeTeX driver only supports `unicode=true'. Ignoring\MessageBreak + option setting `unicode=false'% }% \Hy@unicodetrue \fi @@ -1051,6 +1052,17 @@ \Hy@escapeform{}% \fi \def\PDFForm@Name{% + \PDFForm@@Name\Fld@name + \ifx\Fld@altname\relax + \else + \PDFForm@@Name\Fld@altname + \fi + \ifx\Fld@mappingname\relax + \else + \PDFForm@@Name\Fld@mappingname + \fi +} +\def\PDFForm@@Name#1{% \begingroup \ifnum\Hy@pdfversion<5 % implementation note 117, PDF spec 1.7 \ifHy@unicode @@ -1058,9 +1070,9 @@ \fi \fi \HyPsd@XeTeXBigCharstrue - \pdfstringdef\Hy@gtemp\Fld@name + \pdfstringdef\Hy@gtemp#1% \endgroup - \let\Fld@name\Hy@gtemp + \let#1\Hy@gtemp } \def\Fld@@additionalactions{% \ifx\Fld@keystroke@code\@empty @@ -1113,10 +1125,21 @@ \fi \fi } +\def\Fld@annotnames{% + /T(\Fld@name)% + \ifx\Fld@altname\relax + \else + /TU(\Fld@altname)% + \fi + \ifx\Fld@mappingname\relax + \else + /TM(\Fld@mappingname)% + \fi +} \def\PDFForm@Check{% /Subtype/Widget% \Fld@annotflags - /T(\Fld@name)% + \Fld@annotnames /FT/Btn% \Fld@flags /Q \Fld@align @@ -1147,7 +1170,7 @@ \def\PDFForm@Push{% /Subtype/Widget% \Fld@annotflags - /T(\Fld@name)% + \Fld@annotnames /FT/Btn% \Fld@flags /H/P% @@ -1174,7 +1197,7 @@ \def\PDFForm@List{% /Subtype/Widget% \Fld@annotflags - /T(\Fld@name)% + \Fld@annotnames /FT/Ch% \Fld@flags /Q \Fld@align @@ -1207,7 +1230,7 @@ \def\PDFForm@Radio{% /Subtype/Widget% \Fld@annotflags - /T(\Fld@name)% + \Fld@annotnames /FT/Btn% \Fld@flags /H/P% @@ -1239,7 +1262,7 @@ \def\PDFForm@Text{% /Subtype/Widget% \Fld@annotflags - /T(\Fld@name)% + \Fld@annotnames /FT/Tx% \Fld@flags /Q \Fld@align @@ -1274,7 +1297,7 @@ \def\PDFForm@Submit{% /Subtype/Widget% \Fld@annotflags - /T(\Fld@name)% + \Fld@annotnames /FT/Btn% \Fld@flags /H/P% @@ -1309,7 +1332,7 @@ \def\PDFForm@Reset{% /Subtype/Widget% \Fld@annotflags - /T(\Fld@name)% + \Fld@annotnames /FT/Btn% \Fld@flags /H/P% diff --git a/Master/texmf-dist/tex/latex/hyperref/hyperref.sty b/Master/texmf-dist/tex/latex/hyperref/hyperref.sty index 29498f28f09..f71579b9203 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/09/17 v6.81q + [2010/10/19 v6.81s Hypertext links for LaTeX] \begingroup \@makeother\`% @@ -121,6 +121,44 @@ Package hyperref Message: #1\ltx@gobble }% } +\chardef\Hy@VersionChecked=0 % +\def\Hy@VersionCheck#1{% + \begingroup + \ltx@IfUndefined{ver@hyperref.sty}{% + \Hy@Error{% + This should not happen!\MessageBreak + Missing hyperref version% + }\@ehd + }{% + \ltx@IfUndefined{ver@#1}{% + \Hy@Error{% + This should not happen!\MessageBreak + Missing version of `#1'% + }\@ehd + }{% + \def\x##1##2##3{% + \expandafter\expandafter\expandafter\Hy@@VersionCheck + \expandafter\expandafter\expandafter##2% + \csname ver@##3\endcsname##1##1\@nil + }% + \x{ }\y{hyperref.sty}% + \x{ }\z{#1}% + \ifx\y\z + \else + \Hy@Error{% + Version mismatch!\MessageBreak + * \y: hyperref.sty\MessageBreak + * \z: #1% + }\@ehd + \fi + }% + }% + \endgroup + \chardef\Hy@VersionChecked=1 % +} +\def\Hy@@VersionCheck #1#2 #3 #4\@nil{% + \def#1{#2 #3}% +} \ltx@IfUndefined{pdfmatch}{% \def\Hy@Match#1#2#3#4{}% }{% @@ -139,6 +177,7 @@ \edef\{{\ltx@backslashchar\ltx@leftbracechar}% \edef\}{\ltx@rightbracechar}% \edef\\{\ltx@backslashchar\ltx@backslashchar}% + \let\ \ltx@space \ifcase\pdfmatch{#2}{#1} % \endgroup \expandafter\ltx@secondoftwo @@ -155,17 +194,17 @@ \expandafter\ltx@firstoftwo \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}% + \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}{% @@ -3269,7 +3308,7 @@ }{}{% \Hy@Warning{% Invalid value `\@pdfpageduration'\MessageBreak - of `pdfpageduration'\MessageBreak + of option `pdfpageduration'\MessageBreak is replaced by an empty value% }% \let\@pdfpageduration\ltx@empty @@ -3327,7 +3366,25 @@ \let\@pdfborder\Hy@temp }% } -\define@key{Hyp}{pdfborderstyle}{\def\@pdfborderstyle{#1}} +\define@key{Hyp}{pdfborderstyle}{% + \let\Hy@temp\@pdfborderstyle + \def\@pdfborderstyle{#1}% + \Hy@Match\@pdfborderstyle{% + ^% + ( */Type */Border% + | */W +\HyPat@NonNegativeReal/% + | */S */[SDBIU]% + | */D *\[ *(\HyPat@NonNegativeReal/( \HyPat@NonNegativeReal/)?)?]% + )* *$% + }{}{% + \Hy@Warning{% + Invalid value `\@pdfborderstyle'\MessageBreak + for option `pdfborderstyle'.\MessageBreak + Option setting is ignored% + }% + \let\@pdfborderstyle\Hy@temp + }% +} \def\Hy@setpdfborder{% \ifx\@pdfborder\@empty \else @@ -3647,7 +3704,7 @@ \fi } \def\HyPat@NonNegativeReal/{% - ([0-9]+\.?[0-9]*|[0-9]*\.?[0-9]+)% + \ *([0-9]+\.?[0-9]*|[0-9]*\.?[0-9]+) *% } \define@key{Hyp}{pdfremotestartview}{% \ifx\\#1\\% @@ -4080,7 +4137,11 @@ \fi \fi \Hy@Message{Driver\HyOpt@DriverType: \Hy@driver}% + \chardef\Hy@VersionChecked=0 % \input{\Hy@driver.def}% + \ifcase\Hy@VersionChecked + \Hy@VersionCheck{\Hy@driver.def}% + \fi \let\@unprocessedoptions\relax \Hy@RestoreCatcodes \Hy@DisableOption{tex4ht}% @@ -4106,6 +4167,7 @@ \ifxetex \ifdim\number\XeTeXversion\XeTeXrevision in<0.9995in % \else + \chardef\SpecialDvipdfmxOutlineOpen\@ne \Hy@DvipdfmxOutlineOpentrue \fi \fi @@ -5294,6 +5356,14 @@ \define@key{Field}{name}{% \def\Fld@name{#1}% } +\let\Fld@altname\relax +\define@key{Field}{altname}{% + \def\Fld@altname{#1}% +} +\let\Fld@mappingname\relax +\define@key{Field}{mappingname}{% + \def\Fld@mappingname{#1}% +} \define@key{Field}{width}{% \def\Fld@width{#1}% \Field@Width#1\setbox0=\hbox{m}% @@ -5314,7 +5384,20 @@ \def\Fld@borderwidth{#1}% } \define@key{Field}{borderstyle}{% + \let\Hy@temp\Fld@borderstyle \def\Fld@borderstyle{#1}% + \Hy@Match\Fld@borderstyle{% + ^[SDBIU]$% + }{}{% + \Hy@Warning{% + Invalid value `\@pdfborderstyle'\MessageBreak + for option `pdfborderstyle'. Valid values:\MessageBreak + \space\space S (Solid), D (Dashed), B (Beveled),\MessageBreak + \space\space I (Inset), U (Underline)\MessageBreak + Option setting is ignored% + }% + \let\Fld@borderstyle\Hy@temp + }% } \define@key{Field}{bordersep}{% \def\Fld@bordersep{#1}% diff --git a/Master/texmf-dist/tex/latex/hyperref/hypertex.def b/Master/texmf-dist/tex/latex/hyperref/hypertex.def index b0b939e9ced..34b44cb116d 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hypertex.def +++ b/Master/texmf-dist/tex/latex/hyperref/hypertex.def @@ -29,8 +29,9 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hypertex.def} - [2010/09/17 v6.81q + [2010/10/19 v6.81s Hyperref driver for HyperTeX specials] +\Hy@VersionCheck{hypertex.def} \providecommand*{\XR@ext}{dvi} \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 ee530705c52..9647c18ee13 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/09/17 v6.81q + [2010/10/19 v6.81s Dummy hyperref (SR)] \RequirePackage{letltxmacro}[2008/06/13] \let\hyper@@anchor\@gobble diff --git a/Master/texmf-dist/tex/latex/hyperref/pd1enc.def b/Master/texmf-dist/tex/latex/hyperref/pd1enc.def index 319adc96b2a..b26db453401 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/09/17 v6.81q + [2010/10/19 v6.81s 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 c6e3d230f61..7f31d5eb32f 100644 --- a/Master/texmf-dist/tex/latex/hyperref/pdfmark.def +++ b/Master/texmf-dist/tex/latex/hyperref/pdfmark.def @@ -29,8 +29,9 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{pdfmark.def} - [2010/09/17 v6.81q + [2010/10/19 v6.81s Hyperref definitions for pdfmark specials] +\Hy@VersionCheck{pdfmark.def} \begingroup \@ifundefined{headerps@out}{}{% \toks@\expandafter{\Hy@FirstPageHook}% @@ -1246,6 +1247,17 @@ \Hy@escapeform{}% \fi \def\PDFForm@Name{% + \PDFForm@@Name\Fld@name + \ifx\Fld@altname\relax + \else + \PDFForm@@Name\Fld@altname + \fi + \ifx\Fld@mappingname\relax + \else + \PDFForm@@Name\Fld@mappingname + \fi +} +\def\PDFForm@@Name#1{% \begingroup \ifnum\Hy@pdfversion<5 % implementation note 117, PDF spec 1.7 \ifHy@unicode @@ -1253,9 +1265,9 @@ \fi \fi \HyPsd@XeTeXBigCharstrue - \pdfstringdef\Hy@gtemp\Fld@name + \pdfstringdef\Hy@gtemp#1% \endgroup - \let\Fld@name\Hy@gtemp + \let#1\Hy@gtemp } \def\Fld@@additionalactions{% \ifx\Fld@keystroke@code\@empty @@ -1308,10 +1320,21 @@ \fi \fi } +\def\Fld@annotnames{% + /T(\Fld@name)% + \ifx\Fld@altname\relax + \else + /TU(\Fld@altname)% + \fi + \ifx\Fld@mappingname\relax + \else + /TM(\Fld@mappingname)% + \fi +} \def\PDFForm@Check{% /Subtype/Widget% \Fld@annotflags - /T(\Fld@name)% + \Fld@annotnames /FT/Btn% \Fld@flags /Q \Fld@align @@ -1342,7 +1365,7 @@ \def\PDFForm@Push{% /Subtype/Widget% \Fld@annotflags - /T(\Fld@name)% + \Fld@annotnames /FT/Btn% \Fld@flags /H/P% @@ -1369,7 +1392,7 @@ \def\PDFForm@List{% /Subtype/Widget% \Fld@annotflags - /T(\Fld@name)% + \Fld@annotnames /FT/Ch% \Fld@flags /Q \Fld@align @@ -1402,7 +1425,7 @@ \def\PDFForm@Radio{% /Subtype/Widget% \Fld@annotflags - /T(\Fld@name)% + \Fld@annotnames /FT/Btn% \Fld@flags /H/P% @@ -1434,7 +1457,7 @@ \def\PDFForm@Text{% /Subtype/Widget% \Fld@annotflags - /T(\Fld@name)% + \Fld@annotnames /FT/Tx% \Fld@flags /Q \Fld@align @@ -1469,7 +1492,7 @@ \def\PDFForm@Submit{% /Subtype/Widget% \Fld@annotflags - /T(\Fld@name)% + \Fld@annotnames /FT/Btn% \Fld@flags /H/P% @@ -1504,7 +1527,7 @@ \def\PDFForm@Reset{% /Subtype/Widget% \Fld@annotflags - /T(\Fld@name)% + \Fld@annotnames /FT/Btn% \Fld@flags /H/P% diff --git a/Master/texmf-dist/tex/latex/hyperref/puarenc.def b/Master/texmf-dist/tex/latex/hyperref/puarenc.def index 37f47bcd315..8736efcf3e5 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/09/17 v6.81q + [2010/10/19 v6.81s 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 b3edb5c0b7a..a854c156358 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/09/17 v6.81q + [2010/10/19 v6.81s 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 e9d32126d91..a4592c7f542 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/09/17 v6.81q + [2010/10/19 v6.81s Hyperref: Additions to puenc.def for VnTeX] \DeclareTextCommand{\abreve}{PU}{\81\003} \DeclareTextCommand{\acircumflex}{PU}{\80\342} -- cgit v1.2.3