hyperref

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

3 files changed, 124 insertions, 8 deletions

diff --git a/Master/texmf-dist/source/latex/hyperref/doc/manual.tex b/Master/texmf-dist/source/latex/hyperref/doc/manual.tex
index 716e5d6bb68..b86d289171b 100644
--- a/Master/texmf-dist/source/latex/hyperref/doc/manual.tex
+++ b/Master/texmf-dist/source/latex/hyperref/doc/manual.tex
@@ -11,10 +11,10 @@
 %
 % Manual updates:
 % * Steve Peter and Karl Berry, 7/03.
-% * Heiko Oberdiek, 2006-2010.
+% * Heiko Oberdiek, 2006-2011.
 %
 
-\def\mydate{October 2010}
+\def\mydate{February 2011}
 
 \RequirePackage{ifpdf}
 \ifpdf % We are running pdfTeX in pdf mode
@@ -463,7 +463,9 @@ filecolor      & color   & cyan    & Color for URLs which open local files. \\
 menucolor      & color   & red     & Color for Acrobat menu items. \\
 runcolor       & color   & filecolor & Color for run links (launch annotations). \\
 urlcolor       & color   & magenta & Color for linked URLs. \\
-frenchlinks    & boolean & false   & use small caps instead of color for links
+allcolors      & color   &         & Set all color options (without border and field options).\\
+frenchlinks    & boolean & false   & Use small caps instead of color for links.\\
+hidelinks      &         &         & Hide links (removing color and border). \\
 \end{longtable} \smallskip
 
 Note that all color names must be defined before use, following the
@@ -506,7 +508,8 @@ filebordercolor    & RGB color & 0 .5 .5 & The color of the box around links to
 linkbordercolor    & RGB color & 1 0 0   & The color of the box around normal links \\
 menubordercolor    & RGB color & 1 0 0   & The color of the box around Acrobat menu links \\
 urlbordercolor     & RGB color & 0 1 1   & The color of the box around links to URLs \\
-runbordercolor     & RGB color & 0 .7 .7 & color of border around `run' links \\
+runbordercolor     & RGB color & 0 .7 .7 & Color of border around `run' links \\
+allbordercolors    &           &         & Set all border color options \\
 pdfborder          &           & 0 0 1   & The style of box around links; defaults to a box with lines of 1pt thickness,
                                            but the colorlinks option resets it to produce no border.
 \end{longtable}
diff --git a/Master/texmf-dist/source/latex/hyperref/doc/options.tex b/Master/texmf-dist/source/latex/hyperref/doc/options.tex
index d7e05c77d38..caeec8f06a6 100644
--- a/Master/texmf-dist/source/latex/hyperref/doc/options.tex
+++ b/Master/texmf-dist/source/latex/hyperref/doc/options.tex
@@ -17,6 +17,8 @@
 \maketitle
 \begin{longtable}{@{}>{\ttfamily}lp{70mm}>{\ttfamily}l@{}}
 \hline
+allbordercolors &set all border color options&\\
+allcolors &set all color options (without border and field options)&\\
 anchorcolor &set color of anchors&black\\
 backref &do bibliographical back references&false\\
 baseurl &set base URL for document&\optempty\\
@@ -45,6 +47,7 @@ filebordercolor &color of border around file links& 0 .5 .5\\
 filecolor &color of file links&cyan\\
 final &opposite of option draft&true\\
 frenchlinks &use small caps instead of color for links&false\\
+hidelinks&hide links (no color, no border)&\\
 hyperfigures &make figures hyper links&false\\
 hyperfootnotes &set up hyperlinked footnotes&true\\
 hyperindex &set up hyperlinked indices&true\\
diff --git a/Master/texmf-dist/source/latex/hyperref/hyperref.dtx b/Master/texmf-dist/source/latex/hyperref/hyperref.dtx
index d393441720b..a402ccb0e5c 100644
--- a/Master/texmf-dist/source/latex/hyperref/hyperref.dtx
+++ b/Master/texmf-dist/source/latex/hyperref/hyperref.dtx
@@ -1,7 +1,7 @@
 % \iffalse
 %% File: hyperref.dtx Copyright 1995-2001 Sebastian Rahtz,
 %% with portions written by David Carlisle and Heiko Oberdiek,
-%% 2001-2010 Heiko Oberdiek.
+%% 2001-2011 Heiko Oberdiek.
 %%
 %% This file is part of the `Hyperref Bundle'.
 %% -------------------------------------------
@@ -44,7 +44,7 @@
 %<puenc>\ProvidesFile{puenc.def}
 %<puvnenc>\ProvidesFile{puvnenc.def}
 %<puarenc>\ProvidesFile{puarenc.def}
-%<!none>  [2010/12/16 v6.81z %
+%<!none>  [2011/02/05 v6.82a %
 %<package>  Hypertext links for LaTeX]
 %<nohyperref>  Dummy hyperref (SR)]
 %<driver>  Hyperref documentation driver file]
@@ -139,7 +139,7 @@
 \end{document}
 %</driver>
 % \fi
-% \CheckSum{28201}
+% \CheckSum{28361}
 %
 % \MakeShortVerb{|}
 % \StopEventually{}
@@ -1319,6 +1319,12 @@
     \let\hphantom\@gobble
 %    \end{macrocode}
 %
+% \paragraph{Environments.}
+%    \begin{macrocode}
+    \def\begin#1{\csname#1\endcsname}%
+    \def\end#1{\csname end#1\endcsname}%
+%    \end{macrocode}
+%
 % \paragraph{Package color.}
 %    \begin{macrocode}
     \def\textcolor##1##{\@secondoftwo}%
@@ -1335,6 +1341,7 @@
 %    (from Babel 3.6k). Thanks to Felix Neubauer
 %    (Email: \Email{Felix.Neubauer@gmx.net}).
 %    \begin{macrocode}
+    \let\foreignlanguage\@secondoftwo
     \let\textlatin\@firstofone
     \ltx@IfUndefined{language@group}{}{%
       \csname HyPsd@babel@\language@group\endcsname
@@ -5673,6 +5680,15 @@
 \define@key{Hyp}{colorlinks}[true]{%
   \Hy@boolkey{colorlinks}{#1}%
 }
+\DeclareVoidOption{hidelinks}{%
+  \Hy@colorlinksfalse
+  \Hy@ocgcolorlinksfalse
+  \Hy@frenchlinksfalse
+  \def\Hy@colorlink##1{\begingroup}%
+  \def\Hy@endcolorlink{\endgroup}%
+  \def\@pdfborder{0 0 0}%
+  \let\@pdfborderstyle\ltx@empty
+}
 \define@key{Hyp}{ocgcolorlinks}[true]{%
   \Hy@boolkey{ocgcolorlinks}{#1}%
 }
@@ -5828,6 +5844,15 @@
   \Hy@WarningNoLine{Option `pagecolor' is not available anymore}%
   \global\let\Hy@WarningPageColor\relax
 }
+\define@key{Hyp}{allcolors}{%
+  \HyColor@HyperrefColor{#1}\@linkcolor
+  \HyColor@HyperrefColor{#1}\@anchorcolor
+  \HyColor@HyperrefColor{#1}\@citecolor
+  \HyColor@HyperrefColor{#1}\@filecolor
+  \HyColor@HyperrefColor{#1}\@urlcolor
+  \HyColor@HyperrefColor{#1}\@menucolor
+  \HyColor@HyperrefColor{#1}\@runcolor
+}
 %    \end{macrocode}
 %
 %    \begin{macrocode}
@@ -5926,6 +5951,17 @@
   \Hy@WarningNoLine{Option `pagebordercolor' is not available anymore}%
   \global\let\Hy@WarningPageBorderColor\relax
 }
+\define@key{Hyp}{allbordercolors}{%
+  \def\Hy@temp##1##2{%
+    \HyColor@HyperrefBorderColor{#1}##1{hyperref}{##2bordercolor}%
+  }%
+  \Hy@temp\@citebordercolor{cite}%
+  \Hy@temp\@filebordercolor{file}%
+  \Hy@temp\@linkbordercolor{link}%
+  \Hy@temp\@menubordercolor{menu}%
+  \Hy@temp\@runbordercolor{run}%
+  \Hy@temp\@urlbordercolor{url}%
+}
 %    \end{macrocode}
 %
 %    \begin{macrocode}
@@ -9187,6 +9223,27 @@
   \def\HyPL@alph{a}%
 %    \end{macrocode}
 %
+%    \begin{macrocode}
+  \def\HyPL@SlidesSetPage{}%
+  \ltx@ifclassloaded{slides}{%
+    \def\HyPL@SlidesSetPage{%
+      \advance\c@page\ltx@one
+      \ifnum\value{page}>\ltx@one
+        \protected@edef\HyPL@SlidesOptionalPage{%
+          \Hy@SlidesFormatOptionalPage{\thepage}%
+        }%
+      \else
+        \def\HyPL@SlidesOptionalPage{}%
+      \fi
+      \advance\c@page-\ltx@one
+      \def\HyPL@page{%
+        \csname the\Hy@SlidesPage\endcsname
+        \HyPL@SlidesOptionalPage
+      }%
+    }%
+  }{}%
+%    \end{macrocode}
+%
 %    \begin{macro}{\HyPL@EveryPage}
 %    If a page is shipout and the page number is known,
 %    \cmd{\HyPL@EveryPage} has to be called. It stores the
@@ -9196,13 +9253,16 @@
     \begingroup
       \ifx\HyPL@thisLabel\relax
         \let\HyPL@page\thepage
+        \HyPL@SlidesSetPage
       \else
         \let\HyPL@page\HyPL@thisLabel
         \global\let\HyPL@thisLabel\relax
       \fi
       \let\HyPL@Type\relax
       \ifnum\the\c@page>0 %
-        \expandafter\HyPL@CheckThePage\HyPL@page\@nil
+        \ifx\HyPLSlidesSetPage\ltx@empty
+          \expandafter\HyPL@CheckThePage\HyPL@page\@nil
+        \fi
       \fi
       \let\Hy@temp Y%
       \ifx\HyPL@Type\HyPL@LastType
@@ -11228,18 +11288,68 @@
 %
 % This where we supply a destination for each page.
 %    \begin{macrocode}
+\ltx@ifclassloaded{slides}{%
+  \def\Hy@SlidesFormatOptionalPage#1{(#1)}%
+  \def\Hy@PageAnchorSlidesPlain{%
+    \hyper@@anchor{%
+      page.\the\c@slide.\the\c@overlay.\the\c@note.\the\c@page
+    }%
+  }%
+  \def\Hy@PageAnchorSlide{%
+    \advance\c@page\ltx@one
+    \ifnum\c@page>\ltx@one
+      \ltx@IfUndefined{theHpage}{%
+        \protected@edef\Hy@TheSlideOptionalPage{%
+          \Hy@SlidesFormatOptionalPage{\thepage}%
+        }%
+      }{%
+        \protected@edef\Hy@TheSlideOptionalPage{%
+          \Hy@SlidesFormatOptionalPage{\theHpage}%
+        }%
+      }%
+    \else
+      \def\Hy@TheSlideOptionalPage{}%
+    \fi
+    \advance\c@page-\ltx@one
+    \pdfstringdef\@the@H@page{%
+      \csname
+        the%
+        \ltx@ifundefined{theH\Hy@SlidesPage}{}{H}%
+        \Hy@SlidesPage
+      \endcsname
+      \Hy@TheSlideOptionalPage
+    }%
+    \ltx@gobblethree
+  }%
+  \def\Hy@SlidesPage{slide}%
+  \g@addto@macro\slide{%
+    \def\Hy@SlidesPage{slide}%
+  }%
+  \g@addto@macro\overlay{%
+    \def\Hy@SlidesPage{overlay}%
+  }%
+  \g@addto@macro\note{%
+    \def\Hy@SlidesPage{note}%
+  }%
+}{%
+  \def\Hy@PageAnchorSlidesPlain{}%
+  \def\Hy@PageAnchorSlide{}%
+}
 \def\Hy@EveryPageAnchor{%
   \Hy@DistillerDestFix
   \ifHy@pageanchor
     \ifHy@hypertexnames
       \ifHy@plainpages
         \def\Hy@TempPageAnchor{\hyper@@anchor{page.\the\c@page}}%
+        \Hy@PageAnchorSlidesPlain
       \else
         \begingroup
           \let\@number\@firstofone
           \Hy@unicodefalse
+          \Hy@PageAnchorSlide
           \pdfstringdef\@the@H@page{\thepage}%
         \endgroup
+        \EdefUnescapeString\@the@H@page{\@the@H@page}%
         \def\Hy@TempPageAnchor{\hyper@@anchor{page.\@the@H@page}}%
       \fi
     \else