hyperref update (12may10)

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

20 files changed, 69 insertions, 33 deletions

diff --git a/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def b/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def
index f3ac5b9dccf..cbf850f3c13 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/05/04 v6.81a
+  [2010/05/13 v6.81e
   Hyperref driver for dvipdfm]
 \def\Hy@PutCatalog#1{\@pdfm@mark{docview << #1 >>}}
 \ifHy@pagelabels
@@ -1305,10 +1305,12 @@
       \fi
       \ifHy@bookmarksnumbered
         \let\numberline\Hy@numberline
+        \let\booknumberline\Hy@numberline
         \let\partnumberline\Hy@numberline
         \let\chapternumberline\Hy@numberline
       \else
         \let\numberline\@gobble
+        \let\booknumberline\@gobble
         \let\partnumberline\@gobble
         \let\chapternumberline\@gobble
       \fi
diff --git a/Master/texmf-dist/tex/latex/hyperref/hdvips.def b/Master/texmf-dist/tex/latex/hyperref/hdvips.def
index 20ec6f9c210..eb84049bcdd 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/05/04 v6.81a
+  [2010/05/13 v6.81e
   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 79d995f78ae..fd479f53ede 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/05/04 v6.81a
+  [2010/05/13 v6.81e
   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 76a1106d7cb..316afe7f501 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/05/04 v6.81a
+  [2010/05/13 v6.81e
   Hyperref driver for dviwindo]
 \begingroup
   \@ifundefined{headerps@out}{}{%
diff --git a/Master/texmf-dist/tex/latex/hyperref/hpdftex.def b/Master/texmf-dist/tex/latex/hyperref/hpdftex.def
index 43a656ab662..a64b6976372 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/05/04 v6.81a
+  [2010/05/13 v6.81e
   Hyperref driver for pdfTeX]
 \let\Hy@PutCatalog\pdfcatalog
 \ifHy@pagelabels
@@ -1522,10 +1522,12 @@
       \fi
       \ifHy@bookmarksnumbered
         \let\numberline\Hy@numberline
+        \let\booknumberline\Hy@numberline
         \let\partnumberline\Hy@numberline
         \let\chapternumberline\Hy@numberline
       \else
         \let\numberline\@gobble
+        \let\booknumberline\@gobble
         \let\partnumberline\@gobble
         \let\chapternumberline\@gobble
       \fi
diff --git a/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg b/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg
index 196cc734729..70566cbcced 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/05/04 v6.81a
+  [2010/05/13 v6.81e
   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 7040a7e1f1e..f267dbe4318 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/05/04 v6.81a
+  [2010/05/13 v6.81e
   Hyperref driver for TeX4ht]
 \providecommand*{\XR@ext}{html}
 \def\Hy@raisedlink{}
diff --git a/Master/texmf-dist/tex/latex/hyperref/htexture.def b/Master/texmf-dist/tex/latex/hyperref/htexture.def
index 588a460d682..209833061ff 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/05/04 v6.81a
+  [2010/05/13 v6.81e
   Hyperref driver for Textures]
 \providecommand*{\XR@ext}{pdf}
 \begingroup
diff --git a/Master/texmf-dist/tex/latex/hyperref/hvtex.def b/Master/texmf-dist/tex/latex/hyperref/hvtex.def
index 8e6f2b0ea6e..06056e5f820 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/05/04 v6.81a
+  [2010/05/13 v6.81e
   Hyperref driver for VTeX in PDF/PS mode]
 \providecommand*{\XR@ext}{pdf}
 \edef\Hy@VTeXversion{%
@@ -648,10 +648,12 @@
       \fi
       \ifHy@bookmarksnumbered
         \let\numberline\Hy@numberline
+        \let\booknumberline\Hy@numberline
         \let\partnumberline\Hy@numberline
         \let\chapternumberline\Hy@numberline
       \else
         \let\numberline\@gobble
+        \let\booknumberline\@gobble
         \let\partnumberline\@gobble
         \let\chapternumberline\@gobble
       \fi
diff --git a/Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def b/Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def
index 0a5cfa9cdb0..08f58e5cd7c 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/05/04 v6.81a
+  [2010/05/13 v6.81e
   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 5d01e22188a..08933fff2a0 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/05/04 v6.81a
+  [2010/05/13 v6.81e
  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 0241f715311..9f4b92ae898 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/05/04 v6.81a
+  [2010/05/13 v6.81e
   Hyperref driver for XeTeX]
 \HyPsd@LoadUnicode
 \Hy@unicodetrue
@@ -1367,10 +1367,12 @@
       \fi
       \ifHy@bookmarksnumbered
         \let\numberline\Hy@numberline
+        \let\booknumberline\Hy@numberline
         \let\partnumberline\Hy@numberline
         \let\chapternumberline\Hy@numberline
       \else
         \let\numberline\@gobble
+        \let\booknumberline\@gobble
         \let\partnumberline\@gobble
         \let\chapternumberline\@gobble
       \fi
diff --git a/Master/texmf-dist/tex/latex/hyperref/hyperref.sty b/Master/texmf-dist/tex/latex/hyperref/hyperref.sty
index 9463f402317..ed78ba3e6aa 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/05/04 v6.81a
+  [2010/05/13 v6.81e
   Hypertext links for LaTeX]
 \begingroup
   \@makeother\`%
@@ -306,8 +306,14 @@
     \def\newline{\pdfstringdefWarn\newline}%
     \def\TeX{TeX}%
     \def\LaTeX{La\TeX}%
-    \def\LaTeXe{\LaTeX2e}%
-    \def\eTeX{e-\TeX}%
+    \def\LaTeXe{%
+      \LaTeX2%
+      \ifHy@unicode\textepsilon\else e\fi
+    }%
+    \def\eTeX{%
+      \ifHy@unicode\textepsilon\else e\fi
+      -\TeX%
+    }%
     \def\SliTeX{Sli\TeX}%
     \def\MF{Metafont}%
     \def\MP{Metapost}%
@@ -2490,6 +2496,7 @@
     }%
   }%
 }
+\def\hypersetup{\setkeys{Hyp}}
 \newif\ifHy@setpdfversion
 \define@key{Hyp}{pdfversion}{%
   \@ifundefined{Hy@pdfversion@#1}{%
@@ -2892,7 +2899,11 @@
     \expandafter\HyLang@addto
         \csname extras#1\expandafter\endcsname
         \csname HyLang@#2\endcsname
-    #3%
+    \begingroup
+      \edef\x{\endgroup
+        #3%
+      }%
+    \x
     \@namedef{HyLang@#1@done}{}%
   }{}%
   \begingroup
@@ -3536,7 +3547,6 @@
   \endgroup
 }
 \def\HyInd@EncapChar{\|}
-\def\hypersetup{\setkeys{Hyp}}
 \let\hyper@normalise\ExecuteOptions
 \let\ExecuteOptions\hypersetup
 \Hy@RestoreCatcodes
@@ -5627,6 +5637,24 @@
   \xdef\Hy@chapapp{\Hy@appendixstring}%
   \HyOrg@appendix
 }
+\def\Hy@Test@alph#1{%
+  \ifcase#1\or
+    a\or b\or c\or d\or e\or f\or g\or h\or i\or j\or
+    k\or l\or m\or n\or o\or p\or q\or r\or s\or t\or
+    u\or v\or w\or x\or y\or z%
+  \else
+    \@ctrerr
+  \fi
+}
+\def\Hy@Test@Alph#1{%
+  \ifcase#1\or
+    A\or B\or C\or D\or E\or F\or G\or H\or I\or J\or
+    K\or L\or M\or N\or O\or P\or Q\or R\or S\or T\or
+    U\or V\or W\or X\or Y\or Z%
+  \else
+    \@ctrerr
+  \fi
+}
 \def\hyper@makecurrent#1{%
   \begingroup
     \edef\Hy@param{#1}%
@@ -5635,16 +5663,14 @@
     \fi
     \ifHy@hypertexnames
       \let\@number\@firstofone
-      \@ifundefined{latin@Alph}{}{%
-        \ifx\@Alph\greek@Alph
-          \def\@Alph{Alph\@arabic}%
-        \fi
-      }%
-      \ifx\@Alph\@Alph@bul
-        \def\@Alph{Alph\@arabic}%
+      \def\@fnsymbol##1{fnsymbol\number##1}%
+      \ifx\@alph\Hy@Test@alph
+      \else
+        \def\@alph{alph\number}%
       \fi
-      \ifx\@alph\@alph@bul
-        \def\@alph{alph\@arabic}%
+      \ifx\@Alph\Hy@Test@Alph
+      \else
+        \def\@Alph{Alph\number}%
       \fi
       \ifHy@naturalnames
         \let\textlatin\@firstofone
diff --git a/Master/texmf-dist/tex/latex/hyperref/hypertex.def b/Master/texmf-dist/tex/latex/hyperref/hypertex.def
index e386e484dfc..5e5f932cd91 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/05/04 v6.81a
+  [2010/05/13 v6.81e
   Hyperref driver for HyperTeX specials]
 \providecommand*{\XR@ext}{dvi}
 \def\PDF@FinishDoc{}
diff --git a/Master/texmf-dist/tex/latex/hyperref/nohyperref.sty b/Master/texmf-dist/tex/latex/hyperref/nohyperref.sty
index 5577bea5ade..96033d74044 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/05/04 v6.81a
+  [2010/05/13 v6.81e
   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 088631540ef..701a9abd952 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/05/04 v6.81a
+  [2010/05/13 v6.81e
   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 8c87fd8208a..10f31dc2a7e 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/05/04 v6.81a
+  [2010/05/13 v6.81e
   Hyperref definitions for pdfmark specials]
 \begingroup
   \@ifundefined{headerps@out}{}{%
@@ -1526,10 +1526,12 @@
       \fi
       \ifHy@bookmarksnumbered
         \let\numberline\Hy@numberline
+        \let\booknumberline\Hy@numberline
         \let\partnumberline\Hy@numberline
         \let\chapternumberline\Hy@numberline
       \else
         \let\numberline\@gobble
+        \let\booknumberline\@gobble
         \let\partnumberline\@gobble
         \let\chapternumberline\@gobble
       \fi
diff --git a/Master/texmf-dist/tex/latex/hyperref/puarenc.def b/Master/texmf-dist/tex/latex/hyperref/puarenc.def
index 0b9d94e3d69..0e6a7a32bd4 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/05/04 v6.81a
+  [2010/05/13 v6.81e
   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 14a32567696..265d377574c 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/05/04 v6.81a
+  [2010/05/13 v6.81e
   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 5f187b5b120..09b5e2adf60 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/05/04 v6.81a
+  [2010/05/13 v6.81e
   Hyperref: Additions to puenc.def for VnTeX]
 \DeclareTextCommand{\abreve}{PU}{\81\003}
 \DeclareTextCommand{\acircumflex}{PU}{\80\342}