updated.

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

1 files changed, 62 insertions, 31 deletions

diff --git a/Master/texmf-dist/tex/latex/hyperref/hyperref.sty b/Master/texmf-dist/tex/latex/hyperref/hyperref.sty
index 06a25c32f74..224b058bbf1 100644
--- a/Master/texmf-dist/tex/latex/hyperref/hyperref.sty
+++ b/Master/texmf-dist/tex/latex/hyperref/hyperref.sty
@@ -23,7 +23,7 @@
 %%
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{hyperref}
-  [2006/09/06 v6.75e
+  [2006/11/15 v6.75g
   Hypertext links for LaTeX]
 \begingroup
   \@makeother\`%
@@ -186,6 +186,8 @@
 \Hy@pagecounter0
 \long\def\Hy@ReturnAfterElseFi#1\else#2\fi{\fi#1}
 \long\def\Hy@ReturnAfterFi#1\fi{\fi#1}
+\def\Hy@safe@activestrue{\csname safe@activestrue\endcsname}
+\def\Hy@safe@activesfalse{\csname safe@activesfalse\endcsname}
 \begingroup\expandafter\expandafter\expandafter\endgroup
 \expandafter\ifx\csname dimexpr\endcsname\relax
   \def\hypercalcbpdef#1#2{%
@@ -1223,6 +1225,9 @@
       \fi
     }%
 \fi
+\@ifclassloaded{memoir}{%
+  \AtEndOfPackage{\RequirePackage{memhfixc}}%
+}{}
 \@ifpackageloaded{subfigure}{%
   \@ifundefined{sub@label}{%
     \Hy@hypertexnamesfalse
@@ -1909,7 +1914,7 @@
 }
 \def\Hy@bordercolor#1#2#3{%
   \begingroup
-    \csname @safe@activestrue\endcsname
+    \Hy@safe@activestrue
     \@ifundefined{XC@edef}{\edef}{\XC@edef}\x{#2}%
     \expandafter\Hy@CheckColorSpec\x#3#3\@nil{#1}{#2}%
 }
@@ -1957,7 +1962,15 @@
   \ifx\Hy@tempa\@empty
     \let\@pdfnonfullscreenpagemode\@empty
   \else
-    \def\@pdfnonfullscreenpagemode{/#1 }%
+    \def\@pdfnonfullscreenpagemode{/#1}%
+  \fi
+}
+\define@key{Hyp}{pdfprintscaling}{%
+  \def\Hy@tempa{#1}%
+  \ifx\Hy@tempa\@empty
+    \let\@pdfprintscaling\@empty
+  \else
+    \def\@pdfprintscaling{/#1}%
   \fi
 }
 \define@key{Hyp}{pdfusetitle}[true]{%
@@ -2030,6 +2043,7 @@
 \def\@pdfhighlight{/I}
 \def\@pdfpagemode{}
 \def\@pdfnonfullscreenpagemode{}
+\def\@pdfprintscaling{}
 \def\@pdftitle{}
 \def\@pdfauthor{}
 \let\@pdfproducer\relax
@@ -2326,14 +2340,14 @@
     \providecommand*\@safe@activestrue{}%
     \providecommand*\@safe@activesfalse{}%
     \def\T@ref#1{%
-      \@safe@activestrue
+      \Hy@safe@activestrue
       \expandafter\@setref\csname r@#1\endcsname\@firstoffive{#1}%
-      \@safe@activesfalse
+      \Hy@safe@activesfalse
     }%
     \def\T@pageref#1{%
-      \@safe@activestrue
+      \Hy@safe@activestrue
       \expandafter\@setref\csname r@#1\endcsname\@secondoffive{#1}%
-      \@safe@activesfalse
+      \Hy@safe@activesfalse
     }%
   \else
     \ifHy@typexml\else\RequirePackage{nameref}\fi
@@ -2384,7 +2398,7 @@
     \let\textasciitilde\hyper@tilde
     \let\\\@backslashchar
     \edef${\string$}
-    \ifx\@safe@activestrue\@undefined\else\@safe@activestrue\fi
+    \Hy@safe@activestrue
     \hyper@n@rmalise
   }
   \catcode`\#=6
@@ -2441,7 +2455,7 @@
 }
 \def\Hy@babelnormalise#1[#2]{%
   \begingroup
-    \csname @safe@activestrue\endcsname
+    \Hy@safe@activestrue
     \edef\Hy@tempa{%
       \endgroup
       \noexpand#1[{#2}]%
@@ -2499,7 +2513,7 @@
 \def\hyper@link@[#1]#2#3#4{%
   \begingroup
     \protected@edef\Hy@tempa{#2}%
-    \csname @safe@activestrue\endcsname
+    \Hy@safe@activestrue
     \edef\x{#3}%
     \ifx\Hy@tempa\@empty
       \toks0{\hyper@link{#1}}%
@@ -2937,6 +2951,7 @@
   \Hy@DisableOption{pdfpagescrop}%
   \Hy@DisableOption{pdfpagemode}%
   \Hy@DisableOption{pdfnonfullscreenpagemode}%
+  \Hy@DisableOption{pdfprintscaling}%
   \Hy@DisableOption{pdfstartview}%
   \Hy@DisableOption{pdfstartpage}%
   \Hy@DisableOption{pdftoolbar}%
@@ -4506,49 +4521,65 @@
   \fi
 }
 \def\@refstar#1{%
-  \@safe@activestrue
+  \Hy@safe@activestrue
   \expandafter\real@setref\csname r@#1\endcsname\@firstoffive{#1}%
-  \@safe@activesfalse
+  \Hy@safe@activesfalse
 }
 \def\@pagerefstar#1{%
-  \@safe@activestrue
+  \Hy@safe@activestrue
   \expandafter\real@setref\csname r@#1\endcsname\@secondoffive{#1}%
-  \@safe@activesfalse
+  \Hy@safe@activesfalse
 }
-\DeclareRobustCommand\autoref[1]{%
-  \@safe@activestrue
-  \expandafter\auto@setref\csname r@#1\endcsname\@firstoffive{#1}%
-  \@safe@activesfalse
+\DeclareRobustCommand\autoref{%
+  \@ifstar{\HyRef@autoref\@gobbletwo}{\HyRef@autoref\hyper@@link}%
+}
+\def\HyRef@autoref#1#2{%
+  \begingroup
+    \Hy@safe@activestrue
+    \expandafter\HyRef@autosetref\csname r@#2\endcsname{#2}{#1}%
+  \endgroup
 }
-\def\auto@setref#1#2#3{% csname, extract group, refname
+\def\HyRef@autosetref#1#2#3{% link command, csname, refname
   \ifcase 0\ifx#1\relax 1\fi\ifx#1\Hy@varioref@undefined 1\fi\relax
-    \edef\@thisref{\expandafter\@fourthoffive#1\@empty\@empty}%
-    \expandafter\test@reftype\@thisref\\%
-    \hyper@@link
-      {\expandafter\@fifthoffive#1}%
-      {\expandafter\@fourthoffive#1\@empty\@empty}%
-      {\@currentHtag\expandafter#2#1\@empty\@empty\null}%
+    \edef\HyRef@thisref{\expandafter\@fourthoffive#1\@empty\@empty\@empty}%
+    \expandafter\HyRef@testreftype\HyRef@thisref\\%
+    \Hy@safe@activesfalse
+    #3{%
+      \expandafter\@fifthoffive#1%
+    }{%
+      \expandafter\@fourthoffive#1\@empty\@empty\@empty
+    }{%
+      \HyRef@currentHtag
+      \expandafter\@firstoffive#1\@empty\@empty\@empty
+      \null
+    }%
   \else
     \protect\G@refundefinedtrue
     \nfss@text{\reset@font\bfseries ??}%
     \@latex@warning{%
-      Reference `#3' on page \thepage \space undefined%
+      Reference `#2' on page \thepage\space undefined%
     }%
   \fi
 }
-\def\test@reftype#1.#2\\{%
+\def\HyRef@testreftype#1.#2\\{%
   \@ifundefined{#1autorefname}{%
     \@ifundefined{#1name}{%
-      \def\@currentHtag{}%
+      \def\HyRef@currentHtag{}%
       \@latex@warning{no tag name for #1 at \the\inputlineno}%
     }{%
-      \def\@currentHtag{\csname#1name\endcsname~}%
+      \edef\HyRef@currentHtag{%
+        \expandafter\noexpand\csname#1name\endcsname
+        \noexpand~%
+      }%
     }%
   }{%
-    \def\@currentHtag{\csname#1autorefname\endcsname~}%
+    \edef\HyRef@currentHtag{%
+      \expandafter\noexpand\csname#1autorefname\endcsname
+      \noexpand~%
+    }%
   }%
 }
-\def\@currentHtag{}
+\def\HyRef@currentHtag{}
 \providecommand\AMSautorefname{\equationautorefname}
 \providecommand\Hfootnoteautorefname{\footnoteautorefname}
 \providecommand\Itemautorefname{\itemautorefname}