hyperref (25sep12)

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

21 files changed, 73 insertions, 53 deletions

diff --git a/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def b/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def
index ed8ea53d910..bbed49f09e6 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}
-  [2012/08/21 v6.83c %
+  [2012/09/24 v6.83e %
   Hyperref driver for dvipdfm]
 \Hy@VersionCheck{hdvipdfm.def}
 \def\Hy@PutCatalog#1{\@pdfm@mark{docview << #1 >>}}
diff --git a/Master/texmf-dist/tex/latex/hyperref/hdvips.def b/Master/texmf-dist/tex/latex/hyperref/hdvips.def
index f4c89c96cd5..a4b5a24e886 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}
-  [2012/08/21 v6.83c %
+  [2012/09/24 v6.83e %
   Hyperref driver for dvips]
 \Hy@VersionCheck{hdvips.def}
 \providecommand*{\XR@ext}{pdf}
diff --git a/Master/texmf-dist/tex/latex/hyperref/hdvipson.def b/Master/texmf-dist/tex/latex/hyperref/hdvipson.def
index c609a5b1d41..efe5f197cbb 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}
-  [2012/08/21 v6.83c %
+  [2012/09/24 v6.83e %
   Hyperref driver for dvipsone]
 \Hy@VersionCheck{hdvipson.def}
 \providecommand*{\XR@ext}{pdf}
diff --git a/Master/texmf-dist/tex/latex/hyperref/hdviwind.def b/Master/texmf-dist/tex/latex/hyperref/hdviwind.def
index f81b774eefe..cb35299bb56 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}
-  [2012/08/21 v6.83c %
+  [2012/09/24 v6.83e %
   Hyperref driver for dviwindo]
 \Hy@VersionCheck{hdviwind.def}
 \begingroup
diff --git a/Master/texmf-dist/tex/latex/hyperref/hpdftex.def b/Master/texmf-dist/tex/latex/hyperref/hpdftex.def
index 69139479d48..b85e949f008 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}
-  [2012/08/21 v6.83c %
+  [2012/09/24 v6.83e %
   Hyperref driver for pdfTeX]
 \Hy@VersionCheck{hpdftex.def}
 \pdf@ifdraftmode{%
@@ -280,6 +280,7 @@
     \begingroup
       \edef\x{\endgroup
         \pdfpageresources{%
+          \the\pdfpageresources
           /Properties<<%
             /OCView \OBJ@OCG@view
             /OCPrint \OBJ@OCG@print
diff --git a/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg b/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg
index 333e36098e1..ab259d2b658 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}
-  [2012/08/21 v6.83c %
+  [2012/09/24 v6.83e %
   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 e9dcd851c75..23ba00aa1af 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}
-  [2012/08/21 v6.83c %
+  [2012/09/24 v6.83e %
   Hyperref driver for TeX4ht]
 \Hy@VersionCheck{htex4ht.def}
 \providecommand*{\XR@ext}{html}
diff --git a/Master/texmf-dist/tex/latex/hyperref/htexture.def b/Master/texmf-dist/tex/latex/hyperref/htexture.def
index 6727a1886d2..31bdb78c678 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}
-  [2012/08/21 v6.83c %
+  [2012/09/24 v6.83e %
   Hyperref driver for Textures]
 \Hy@VersionCheck{htexture.def}
 \providecommand*{\XR@ext}{pdf}
diff --git a/Master/texmf-dist/tex/latex/hyperref/hvtex.def b/Master/texmf-dist/tex/latex/hyperref/hvtex.def
index 35c9b4c72d2..ca73df30a96 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}
-  [2012/08/21 v6.83c %
+  [2012/09/24 v6.83e %
   Hyperref driver for VTeX in PDF/PS mode]
 \Hy@VersionCheck{hvtex.def}
 \providecommand*{\XR@ext}{pdf}
diff --git a/Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def b/Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def
index f9f64dd6cfb..6741be7597c 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}
-  [2012/08/21 v6.83c %
+  [2012/09/24 v6.83e %
   Hyperref driver for VTeX in HTML mode]
 \Hy@VersionCheck{hvtexhtm.def}
 \providecommand*{\XR@ext}{htm}
diff --git a/Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def b/Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def
index 492355703f9..bb0c07de6f8 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}
-  [2012/08/21 v6.83c %
+  [2012/09/24 v6.83e %
  Hyperref driver for VTeX in PDF/PS mode (pdfmark specials)]
 \Hy@VersionCheck{hvtexmrk.def}
 \providecommand*{\XR@ext}{pdf}
diff --git a/Master/texmf-dist/tex/latex/hyperref/hxetex.def b/Master/texmf-dist/tex/latex/hyperref/hxetex.def
index f9433a88b27..9edcff45528 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}
-  [2012/08/21 v6.83c %
+  [2012/09/24 v6.83e %
   Hyperref driver for XeTeX]
 \Hy@VersionCheck{hxetex.def}
 \HyPsd@LoadUnicode
diff --git a/Master/texmf-dist/tex/latex/hyperref/hyperref.sty b/Master/texmf-dist/tex/latex/hyperref/hyperref.sty
index 0344cb8e09c..068bc4e3ae2 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}[1995/12/01]
 \ProvidesPackage{hyperref}
-  [2012/08/21 v6.83c %
+  [2012/09/24 v6.83e %
   Hypertext links for LaTeX]
 \begingroup
   \@makeother\`%
@@ -102,7 +102,7 @@
 \IfFileExists{hobsub-hyperref.sty}{%
   \RequirePackage{hobsub-hyperref}[2011/01/30]%
 }{}
-\RequirePackage{ltxcmds}[2010/10/25]
+\RequirePackage{ltxcmds}[2010/11/12]
 \RequirePackage{ifpdf}[2006/02/20]
 \RequirePackage{pdftexcmds}[2009/04/10]
 \@ifpackagelater{pdftexcmds}{2010/11/04}{}{%
@@ -1793,6 +1793,10 @@
 \def\HyPsd@@AppendItalcorr#1#2{%
   \expandafter\def\expandafter#2\expandafter{#2#1}%
 }
+\ltx@IfUndefined{directlua}{%
+}{%
+  \expandafter\ifx\csname\endcsname\relax\fi
+}
 \begingroup
   \catcode`\Q=\active
   \let Q\ltx@empty
@@ -4986,28 +4990,31 @@
   \@ifnextchar[{\hyper@link@}{\hyper@link@[link]}%
 }
 \def\hyper@link@[#1]#2#3#4{%
-  \begingroup
-    \protected@edef\Hy@tempa{#2}%
-    \Hy@safe@activestrue
-    \edef\x{#3}%
-    \ifx\Hy@tempa\@empty
-      \toks0{\hyper@link{#1}}%
-    \else
-      \toks0{\expandafter\hyper@readexternallink#2\\{#1}}%
-    \fi
-    \toks2{%
-      \Hy@safe@activesfalse
-      #4%
-    }%
-    \edef\Hy@tempa{\the\toks2}%
-    \edef\x{\endgroup
-      \ifx\Hy@tempa\@empty
-        \noexpand\Hy@Warning{Suppressing empty link}%
+  \ltx@ifempty{#4}{% link text
+    \Hy@Warning{Suppressing empty link}%
+  }{%
+    \begingroup
+      \protected@edef\Hy@tempa{#2}%
+      \ifx\Hy@tempa\ltx@empty
+        \toks@{%
+          \endgroup
+          \hyper@link{#1}%
+        }%
       \else
-        \the\toks0 {\x}{\the\toks2}%%
+        \toks@{%
+          \endgroup
+          \expandafter\hyper@readexternallink#2\\{#1}%
+        }%
       \fi
-    }%
-  \x
+      \Hy@safe@activestrue
+      \edef\Hy@tempa{#3}%
+      \Hy@safe@activesfalse
+      \toks@\expandafter{%
+        \the\expandafter\toks@
+        \expandafter{\Hy@tempa}{#4}%
+      }%
+    \the\toks@
+  }%
 }
 \def\hyper@readexternallink#1\\#2#3#4{%
   \begingroup
@@ -7873,15 +7880,27 @@
         \hyper@linkstart{link}{\Hy@tocdestname}{#2}\hyper@linkend
       }{#3}%
     \or % page
-      \csname l@#1\endcsname{{#2}}{%
-        \hyper@linkstart{link}{\Hy@tocdestname}{#3}\hyper@linkend
-      }%
+      \def\Hy@temp{#3}%
+      \ifx\Hy@temp\ltx@empty
+        \csname l@#1\endcsname{#2}{#3}%
+      \else
+        \csname l@#1\endcsname{{#2}}{%
+          \hyper@linkstart{link}{\Hy@tocdestname}{#3}\hyper@linkend
+        }%
+      \fi
     \else % all
-      \csname l@#1\endcsname{%
-        \hyper@linkstart{link}{\Hy@tocdestname}{#2}\hyper@linkend
-      }{%
-        \hyper@linkstart{link}{\Hy@tocdestname}{#3}\hyper@linkend
-      }%
+      \def\Hy@temp{#3}%
+      \ifx\Hy@temp\ltx@empty
+        \csname l@#1\endcsname{%
+          \hyper@linkstart{link}{\Hy@tocdestname}{#2}\hyper@linkend
+        }{}%
+      \else
+        \csname l@#1\endcsname{%
+          \hyper@linkstart{link}{\Hy@tocdestname}{#2}\hyper@linkend
+        }{%
+          \hyper@linkstart{link}{\Hy@tocdestname}{#3}\hyper@linkend
+        }%
+      \fi
     \fi
   \fi
 }
diff --git a/Master/texmf-dist/tex/latex/hyperref/hypertex.def b/Master/texmf-dist/tex/latex/hyperref/hypertex.def
index eec35c9d475..a0c47d3e022 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}
-  [2012/08/21 v6.83c %
+  [2012/09/24 v6.83e %
   Hyperref driver for HyperTeX specials]
 \Hy@VersionCheck{hypertex.def}
 \providecommand*{\XR@ext}{dvi}
diff --git a/Master/texmf-dist/tex/latex/hyperref/nohyperref.sty b/Master/texmf-dist/tex/latex/hyperref/nohyperref.sty
index 1beedebb991..530ee64d2a2 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}[1995/12/01]
 \ProvidesPackage{nohyperref}
-  [2012/08/21 v6.83c %
+  [2012/09/24 v6.83e %
   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 f9ea8522d7b..93635e9e95b 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}
-  [2012/08/21 v6.83c %
+  [2012/09/24 v6.83e %
   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 3af2216a9ea..ffafcfbf618 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}
-  [2012/08/21 v6.83c %
+  [2012/09/24 v6.83e %
   Hyperref definitions for pdfmark specials]
 \Hy@VersionCheck{pdfmark.def}
 \begingroup
diff --git a/Master/texmf-dist/tex/latex/hyperref/psdextra.def b/Master/texmf-dist/tex/latex/hyperref/psdextra.def
index a8fc275d8b2..30912c2c1a0 100644
--- a/Master/texmf-dist/tex/latex/hyperref/psdextra.def
+++ b/Master/texmf-dist/tex/latex/hyperref/psdextra.def
@@ -29,7 +29,7 @@
 %% given in the file `manifest.txt'.
 %%
 \ProvidesFile{psdextra.def}
-  [2012/08/21 v6.83c %
+  [2012/09/24 v6.83e %
   Hyperref: Additions to PDF string support]
 \Hy@VersionCheck{psdextra.def}
 \newcommand*{\psdmapshortnames}{%
@@ -619,7 +619,7 @@
   \let\libra\textlibra
   \let\scorpio\textscorpio
   \let\sagittarius\textsagittarius
-  \let\capricorn\textcapricorn
+  \let\capricornus\textcapricornus
   \let\aquarius\textaquarius
   \let\pisces\textpisces
   \let\quarternote\textquarternote
@@ -1191,7 +1191,7 @@
   \let\Libra\textlibra
   \let\Scorpio\textscorpio
   \let\Sagittarius\textsagittarius
-  \let\Capricorn\textcapricorn
+  \let\Capricorn\textcapricornus
   \let\Aquarius\textaquarius
   \let\Pisces\textpisces
   \let\spadesuit\textspadesuitblack
diff --git a/Master/texmf-dist/tex/latex/hyperref/puarenc.def b/Master/texmf-dist/tex/latex/hyperref/puarenc.def
index b3489476576..01ceb164664 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}
-  [2012/08/21 v6.83c %
+  [2012/09/24 v6.83e %
   Hyperref: Additions to puenc.def for Arabi]
 \DeclareTextCommand{\hamza}{PU}{\86\041}% U+0621
 \DeclareTextCommand{\alefmadda}{PU}{\86\042}% U+0622
diff --git a/Master/texmf-dist/tex/latex/hyperref/puenc.def b/Master/texmf-dist/tex/latex/hyperref/puenc.def
index 66f24619e8d..675bd605ba3 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}
-  [2012/08/21 v6.83c %
+  [2012/09/24 v6.83e %
   Hyperref: PDF Unicode definition (HO)]
 \DeclareFontEncoding{PU}{}{}
 \DeclareTextCommand{\`}{PU}[1]{#1\83\000}% U+0300
@@ -1770,7 +1770,7 @@
 \DeclareTextCommand{\textlibra}{PU}{\9046\116}%* U+264E
 \DeclareTextCommand{\textscorpio}{PU}{\9046\117}%* U+264F
 \DeclareTextCommand{\textsagittarius}{PU}{\9046\120}%* U+2650
-\DeclareTextCommand{\textcapricorn}{PU}{\9046\121}%* U+2651
+\DeclareTextCommand{\textcapricornus}{PU}{\9046\121}%* U+2651
 \DeclareTextCommand{\textaquarius}{PU}{\9046\122}%* U+2652
 \DeclareTextCommand{\textpisces}{PU}{\9046\123}%* U+2653
 \DeclareTextCommand{\textspadesuitblack}{PU}{\9046\140}% U+2660
diff --git a/Master/texmf-dist/tex/latex/hyperref/puvnenc.def b/Master/texmf-dist/tex/latex/hyperref/puvnenc.def
index 23402d1a527..b9f24b6f527 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}
-  [2012/08/21 v6.83c %
+  [2012/09/24 v6.83e %
   Hyperref: Additions to puenc.def for VnTeX]
 \DeclareTextCommand{\abreve}{PU}{\81\003}% U+0103
 \DeclareTextCommand{\acircumflex}{PU}{\80\342}% U+00E2