hyperref (20oct10)

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

20 files changed, 256 insertions, 72 deletions

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}