hyperref update (11sep10)

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

1 files changed, 78 insertions, 62 deletions

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{%