hyperref (25sep12)

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

1 files changed, 75 insertions, 36 deletions

diff --git a/Master/texmf-dist/source/latex/hyperref/hyperref.dtx b/Master/texmf-dist/source/latex/hyperref/hyperref.dtx
index 76bffa69333..c8751aaecee 100644
--- a/Master/texmf-dist/source/latex/hyperref/hyperref.dtx
+++ b/Master/texmf-dist/source/latex/hyperref/hyperref.dtx
@@ -45,7 +45,7 @@
 %<puvnenc>\ProvidesFile{puvnenc.def}
 %<puarenc>\ProvidesFile{puarenc.def}
 %<psdextra>\ProvidesFile{psdextra.def}
-%<!none>  [2012/08/21 v6.83c %
+%<!none>  [2012/09/24 v6.83e %
 %<package>  Hypertext links for LaTeX]
 %<nohyperref>  Dummy hyperref (SR)]
 %<driver>  Hyperref documentation driver file]
@@ -147,7 +147,7 @@
 \end{document}
 %</driver>
 % \fi
-% \CheckSum{39268}
+% \CheckSum{39290}
 %
 % \MakeShortVerb{|}
 % \StopEventually{}
@@ -593,7 +593,7 @@
 }{}
 %    \end{macrocode}
 %    \begin{macrocode}
-\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}{}{%
@@ -3665,6 +3665,19 @@
 %    \end{macro}
 %
 % \subsubsection{Catcode check}
+%
+% \paragraph{Workaround for LuaTeX.}
+%    \cs{HyPsd@CheckCatcodes} might trigger a bug
+%    of LuaTeX (0.60.2, 0.70.1, 0.70.2, ...) in the
+%    comparison with \cs{ifcat}, see
+%    \url{http://tracker.luatex.org/view.php?id=773}.
+%    \begin{macrocode}
+\ltx@IfUndefined{directlua}{%
+}{%
+  \expandafter\ifx\csname\endcsname\relax\fi
+}
+%    \end{macrocode}
+%
 % \paragraph{Check catcodes.}
 %    \begin{macro}{\HyPsd@CheckCatcodes}
 %    Because \cs{ifcat} expands its arguments, this is
@@ -7862,29 +7875,36 @@
 \def\hyper@@link{\let\Hy@reserved@a\relax
   \@ifnextchar[{\hyper@link@}{\hyper@link@[link]}%
 }
+% #1: type
+% #2: URL
+% #3: destination name
+% #4: text
 \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@
+  }%
 }
 %    \end{macrocode}
 % The problem here is that the first (URL) parameter may be a
@@ -12171,6 +12191,11 @@
     }%
   \endgroup
 }
+%    \end{macrocode}
+%    \begin{macro}{\contentsline}
+%    The page number might be empty. In this case the link for the
+%    page number is suppressed to avoid little link boxes.
+%    \begin{macrocode}
 \def\contentsline#1#2#3#4{%
   \begingroup
     \Hy@safe@activestrue
@@ -12187,19 +12212,32 @@
         \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
 }
 %    \end{macrocode}
+%    \end{macro}
 %
 %    \begin{macrocode}
 %</package>
@@ -13326,6 +13364,7 @@
     \begingroup
       \edef\x{\endgroup
         \pdfpageresources{%
+          \the\pdfpageresources
           /Properties<<%
             /OCView \OBJ@OCG@view
             /OCPrint \OBJ@OCG@print
@@ -24746,9 +24785,9 @@
 % U+2650 SAGITTARIUS; \sagittarius (wasysym)
 \DeclareTextCommand{\textsagittarius}{PU}{\9046\120}%* U+2650
 %* \textsagittarius -> \Sagittarius (marvosym)
-% U+2651 CAPRICORN; \capricorn (wasysym)
-\DeclareTextCommand{\textcapricorn}{PU}{\9046\121}%* U+2651
-%* \textcapricorn -> \Capricorn (marvosym)
+% U+2651 CAPRICORN; \capricornus (wasysym)
+\DeclareTextCommand{\textcapricornus}{PU}{\9046\121}%* U+2651
+%* \textcapricornus -> \Capricorn (marvosym)
 % U+2652 AQUARIUS; \aquarius (wasysym)
 \DeclareTextCommand{\textaquarius}{PU}{\9046\122}%* U+2652
 %* \textaquarius -> \Aquarius (marvosym)
@@ -26418,7 +26457,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
@@ -26990,7 +27029,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