hyperref update (17apr10)

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

21 files changed, 109 insertions, 27 deletions

diff --git a/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def b/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def
index c51019d90b9..8a4e382f9bf 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/03/30 v6.80u
+  [2010/04/17 v6.80x
   Hyperref driver for dvipdfm]
 \def\Hy@PutCatalog#1{\@pdfm@mark{docview << #1 >>}}
 \ifHy@pagelabels
diff --git a/Master/texmf-dist/tex/latex/hyperref/hdvips.def b/Master/texmf-dist/tex/latex/hyperref/hdvips.def
index 6e9959aaa8d..2b4f2d665ec 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/03/30 v6.80u
+  [2010/04/17 v6.80x
   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 8cd5e4e2448..9ce54869c31 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/03/30 v6.80u
+  [2010/04/17 v6.80x
   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 4a18edb1fdf..3615ca07c87 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/03/30 v6.80u
+  [2010/04/17 v6.80x
   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 b2d39109053..100d238294d 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/03/30 v6.80u
+  [2010/04/17 v6.80x
   Hyperref driver for pdfTeX]
 \let\Hy@PutCatalog\pdfcatalog
 \ifHy@pagelabels
diff --git a/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg b/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg
index 491b331fdad..86b0462dddd 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/03/30 v6.80u
+  [2010/04/17 v6.80x
   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 a31364946b8..7c7a5f53f9d 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/03/30 v6.80u
+  [2010/04/17 v6.80x
   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 d3cf4d81de3..6b835d261d0 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/03/30 v6.80u
+  [2010/04/17 v6.80x
   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 f32c33fe57c..404517f5b20 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/03/30 v6.80u
+  [2010/04/17 v6.80x
   Hyperref driver for VTeX in PDF/PS mode]
 \providecommand*{\XR@ext}{pdf}
 \edef\Hy@VTeXversion{%
diff --git a/Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def b/Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def
index 6b553f54c99..247735826b8 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/03/30 v6.80u
+  [2010/04/17 v6.80x
   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 861b39192a1..061494d5f60 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/03/30 v6.80u
+  [2010/04/17 v6.80x
  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 bf43bdc7a84..4e810acfe54 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/03/30 v6.80u
+  [2010/04/17 v6.80x
   Hyperref driver for XeTeX]
 \HyPsd@LoadUnicode
 \Hy@unicodetrue
diff --git a/Master/texmf-dist/tex/latex/hyperref/hyperref.sty b/Master/texmf-dist/tex/latex/hyperref/hyperref.sty
index 8e1c424a548..757d8fc1454 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/03/30 v6.80u
+  [2010/04/17 v6.80x
   Hypertext links for LaTeX]
 \begingroup
   \@makeother\`%
@@ -3946,10 +3946,15 @@
       }%
     \fi
   \fi
-  \DeclareRobustCommand\ref{\@ifstar\@refstar\T@ref}%
+  \DeclareRobustCommand\ref{%
+    \@ifstar\@refstar\T@ref
+  }%
   \DeclareRobustCommand\pageref{%
     \@ifstar\@pagerefstar\T@pageref
   }%
+    \DeclareRobustCommand*{\nameref}{%
+      \@ifstar\@namerefstar\T@nameref
+    }%
 }
 \Hy@AtBeginDocument{%
   \ifHy@texht
@@ -5115,7 +5120,7 @@
 \edef\hyper@hash{\string#}
 \edef\hyper@tilde{\string~}
 \edef\hyper@quote{\string"}
-\let\@currentHref\@empty
+\def\@currentHref{Doc-Start}
 \let\Hy@footnote@currentHref\@empty
 \Hy@AtBeginDocument{%
   \Hy@pdfstringtrue
@@ -7082,6 +7087,9 @@
 \def\@pagerefstar#1{%
   \HyRef@StarSetRef{#1}\@secondoffive
 }
+\def\@namerefstar#1{%
+  \HyRef@StarSetRef{#1}\@thirdoffive
+}
 \Hy@AtBeginDocument{%
   \@ifpackageloaded{varioref}{%
     \def\@Refstar#1{%
diff --git a/Master/texmf-dist/tex/latex/hyperref/hypertex.def b/Master/texmf-dist/tex/latex/hyperref/hypertex.def
index 76a4f7ae4f0..367912d3a86 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/03/30 v6.80u
+  [2010/04/17 v6.80x
   Hyperref driver for HyperTeX specials]
 \providecommand*{\XR@ext}{dvi}
 \def\PDF@FinishDoc{}
diff --git a/Master/texmf-dist/tex/latex/hyperref/nameref.sty b/Master/texmf-dist/tex/latex/hyperref/nameref.sty
index b2138d8257d..041c17d9a07 100644
--- a/Master/texmf-dist/tex/latex/hyperref/nameref.sty
+++ b/Master/texmf-dist/tex/latex/hyperref/nameref.sty
@@ -30,9 +30,10 @@
 %% given in the file `manifest.txt'.
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{nameref}
-  [2010/01/25 v2.36 Cross-referencing by name of section]%
+  [2010/04/17 v2.39 Cross-referencing by name of section]%
 \RequirePackage{refcount}[2006/02/12]
 \RequirePackage{gettitlestring}[2009/12/18]
+\RequirePackage{ltxcmds}[2009/12/12]
 \def\strip@period#1.\relax#2\@@@{#1}
 \newif\ifNR@showkeys
 \NR@showkeysfalse
@@ -140,16 +141,62 @@
   \NR@gettitle{#5}%
   \NR@ssect{#1}{#2}{#3}{#4}{\Sectionformat{#5}{#1}}%
 }
+\ltx@IfUndefined{ifheadnameref}{%
+}{%
+  \ltx@IfUndefined{M@sect}{%
+  }{%
+    \let\NRorg@M@sect\M@sect
+    \def\M@sect#1#2#3#4#5#6[#7][#8]{%
+      \ifheadnameref
+        \NR@gettitle{#8}%
+      \else
+        \NR@gettitle{#7}%
+      \fi
+      \NRorg@M@sect{#1}{#2}{#3}{#4}{#5}{#6}[{#7}][{#8}]%
+    }%
+  }%
+}
 \let\NR@part\@part
-\def\@part[#1]#2{%
+\long\def\@part[#1]#2{%
   \NR@gettitle{#1}%
   \NR@part[{#1}]{#2}%
 }
+\let\NR@spart\@spart
+\long\def\@spart#1{%
+  \NR@gettitle{#1}%
+  \NR@spart{#1}%
+}
 \let\NR@chapter\@chapter
 \def\@chapter[#1]#2{%
   \NR@gettitle{#1}%
   \NR@chapter[{#1}]{#2}%
 }
+\@ifclassloaded{memoir}{%
+  \ltx@IfUndefined{ifheadnameref}{%
+  }{%
+    \def\@chapter[#1]#2{%
+      \ltx@IfUndefined{ch@pt@c}{%
+        \NR@gettitle{#1}%
+      }{%
+        \ifx\ch@pt@c\ltx@empty
+          \NR@gettitle{#2}%
+        \else
+          \def\NR@temp{#1}%
+          \ifx\NR@temp\ltx@empty
+            \expandafter\NR@gettitle\expandafter{\ch@pt@c}%
+          \else
+            \ifheadnameref
+              \NR@gettitle{#1}%
+            \else
+              \expandafter\NR@gettitle\expandafter{\ch@pt@c}%
+            \fi
+          \fi
+        \fi
+      }%
+      \NR@chapter[{#1}]{#2}%
+    }%
+  }%
+}{}
 \let\NR@schapter\@schapter
 \def\@schapter#1{%
   \NR@gettitle{#1}%
@@ -208,8 +255,33 @@
   \NR@PatchBeamer{subsection}%
   \NR@PatchBeamer{subsubsection}%
 }{}
-\def\@currentlabelname{}
-\def\@currentHref{}
+\ltx@IfUndefined{@opargbegintheorem}{}{%
+  \let\NRorg@opargbegintheorem\@opargbegintheorem
+  \def\@opargbegintheorem#1#2#3{%
+    \NR@gettitle{#3}%
+    \NRorg@opargbegintheorem{#1}{#2}{#3}%
+  }%
+}
+\AtBeginDocument{%
+  \@ifpackageloaded{amsthm}{%
+    \let\NRorg@begintheorem\@begintheorem
+    \begingroup
+      \edef\x{macro:\string#1\string#2[\string#3]}%
+      \@onelevel@sanitize\x
+      \def\y#1->#2\@nil{#1}%
+      \edef\z{\expandafter\y\meaning\@begintheorem->\@nil}%
+      \@onelevel@sanitize\z
+    \expandafter\endgroup
+    \ifx\x\z
+      \def\@begintheorem#1#2[#3]{%
+        \NR@gettitle{#3}%
+        \NRorg@begintheorem{#1}{#2}[{#3}]%
+      }%
+    \fi
+  }{}%
+}
+\providecommand*{\@currentlabelname}{}
+\providecommand*{\@currentHref}{}
 \long\def\@firstoffive#1#2#3#4#5{#1}
 \long\def\@secondoffive#1#2#3#4#5{#2}
 \long\def\@thirdoffive#1#2#3#4#5{#3}
@@ -278,7 +350,9 @@
     }%
   \fi
 \fi
-\def\nameref{\protect\T@nameref}
+  \DeclareRobustCommand*{\nameref}{%
+    \@ifstar\T@nameref\T@nameref
+  }%
 \def\Nameref#1{`\nameref{#1}' on page~\pageref{#1}}
 \providecommand\Sectionformat[2]{#1}
 \@ifpackageloaded{ifthen}{%
diff --git a/Master/texmf-dist/tex/latex/hyperref/nohyperref.sty b/Master/texmf-dist/tex/latex/hyperref/nohyperref.sty
index b33af3b204b..363e17fc3f7 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/03/30 v6.80u
+  [2010/04/17 v6.80x
   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 7a34a92e4c5..13d71cbd15b 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/03/30 v6.80u
+  [2010/04/17 v6.80x
   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 225fa7b92ea..bb6ff2f49a6 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/03/30 v6.80u
+  [2010/04/17 v6.80x
   Hyperref definitions for pdfmark specials]
 \begingroup
   \@ifundefined{headerps@out}{}{%
diff --git a/Master/texmf-dist/tex/latex/hyperref/puarenc.def b/Master/texmf-dist/tex/latex/hyperref/puarenc.def
index df9d03cc7c7..20262a7dba7 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/03/30 v6.80u
+  [2010/04/17 v6.80x
   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 860dcce3f7b..76d78099e45 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/03/30 v6.80u
+  [2010/04/17 v6.80x
   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 1aac271d732..55628c59e67 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/03/30 v6.80u
+  [2010/04/17 v6.80x
   Hyperref: Additions to puenc.def for VnTeX]
 \DeclareTextCommand{\abreve}{PU}{\81\003}
 \DeclareTextCommand{\acircumflex}{PU}{\80\342}