hyperref (25sep12)

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

1 files changed, 49 insertions, 30 deletions

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
 }