hyperref (20oct10)

git-svn-id: svn://tug.org/texlive/trunk@20177 c570f23f-e606-0410-a88d-b1316a301751

2 files changed, 175 insertions, 30 deletions

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 @@
 %<puenc>\ProvidesFile{puenc.def}
 %<puvnenc>\ProvidesFile{puvnenc.def}
 %<puarenc>\ProvidesFile{puarenc.def}
-%<!none>  [2010/09/17 v6.81q
+%<!none>  [2010/10/19 v6.81s
 %<package>  Hypertext links for LaTeX]
 %<nohyperref>  Dummy hyperref (SR)]
 %<driver>  Hyperref documentation driver file]
 %<check>  Hyperref test file]
 %<hypertex>  Hyperref driver for HyperTeX specials]
+%<hypertex>\Hy@VersionCheck{hypertex.def}
 %<pdftex>  Hyperref driver for pdfTeX]
+%<pdftex>\Hy@VersionCheck{hpdftex.def}
 %<pdfmark>  Hyperref definitions for pdfmark specials]
+%<pdfmark>\Hy@VersionCheck{pdfmark.def}
 %<vtexpdfmark> Hyperref driver for VTeX in PDF/PS mode (pdfmark specials)]
+%<vtexpdfmark>\Hy@VersionCheck{hvtexmrk.def}
 %<dvips>  Hyperref driver for dvips]
+%<dvips>\Hy@VersionCheck{hdvips.def}
 %<dvipsone>  Hyperref driver for dvipsone]
+%<dvipsone>\Hy@VersionCheck{hdvipson.def}
 %<textures>  Hyperref driver for Textures]
+%<textures>\Hy@VersionCheck{htexture.def}
 %<dviwindo>  Hyperref driver for dviwindo]
+%<dviwindo>\Hy@VersionCheck{hdviwind.def}
 %<dvipdfm>  Hyperref driver for dvipdfm]
+%<dvipdfm>\Hy@VersionCheck{hdvipdfm.def}
 %<xetex>  Hyperref driver for XeTeX]
+%<xetex>\Hy@VersionCheck{hxetex.def}
 %<vtex>  Hyperref driver for VTeX in PDF/PS mode]
+%<vtex>\Hy@VersionCheck{hvtex.def}
 %<vtexhtml>  Hyperref driver for VTeX in HTML mode]
+%<vtexhtml>\Hy@VersionCheck{hvtexhtm.def}
 %<tex4ht>  Hyperref driver for TeX4ht]
+%<tex4ht>\Hy@VersionCheck{htex4ht.def}
 %<tex4htcfg>  Hyperref configuration file for TeX4ht]
 %<pd1enc>  Hyperref: PDFDocEncoding definition (HO)]
 %<puenc>  Hyperref: PDF Unicode definition (HO)]
@@ -126,7 +139,7 @@
 \end{document}
 %</driver>
 % \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%