diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/hyperref/hyperref.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/hyperref/hyperref.sty | 50 |
1 files changed, 42 insertions, 8 deletions
diff --git a/Master/texmf-dist/tex/latex/hyperref/hyperref.sty b/Master/texmf-dist/tex/latex/hyperref/hyperref.sty index a2147a4cb3b..2f296f98701 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} - [2011/04/17 v6.82g % + [2011/08/19 v6.82h % Hypertext links for LaTeX] \begingroup \@makeother\`% @@ -248,6 +248,7 @@ }% } \RequirePackage{kvoptions}[2009/07/21] +\newif\ifHy@stoppedearly \newif\ifHy@typexml \newif\ifHy@activeanchor \newif\ifHy@backref @@ -382,7 +383,7 @@ }% \else \def\hypercalcbp#1{% - \strip@pt\dimexpr 0.99626401\dimexpr #1\relax\relax + \strip@pt\dimexpr 0.99626401\dimexpr(#1)\relax\relax }% \def\hypercalcbpdef{\def}% \fi @@ -798,9 +799,7 @@ \HyPsd@DisableCommands } \long\def\HyPsd@DisableCommands#1{% - \toks0=\expandafter{\pdfstringdefPreHook}% - \toks1={#1}% - \xdef\pdfstringdefPreHook{\the\toks0 \the\toks1}% + \ltx@GlobalAppendToMacro\pdfstringdefPreHook{#1}% \endgroup } \def\pdfstringdefWarn#1{% @@ -2359,6 +2358,18 @@ family=Hyp,% prefix=HyOpt% } +\def\IfHyperBooleanExists#1{% + \ltx@ifundefined{ifHy@#1}\ltx@secondoftwo\ltx@firstoftwo +} +\def\IfHyperBoolean#1{% + \IfHyperBooleanExists{#1}{% + \csname ifHy@#1\endcsname + \expandafter\ltx@firstoftwo + \else + \expandafter\ltx@secondoftwo + \fi + }\ltx@secondoftwo +} \def\Hy@boolkey{\@dblarg\Hy@@boolkey} \def\Hy@@boolkey[#1]#2#3{% \edef\Hy@tempa{#3}% @@ -2381,6 +2392,17 @@ \Hy@Info{Option `#1' set `\Hy@tempa'}% \csname Hy@#2\Hy@tempa\endcsname \fi + \begingroup + \def\x{#1}% + \def\y{#2}% + \expandafter\endgroup + \ifx\x\y + \else + \expandafter\def\csname ifHy@#1\expandafter\endcsname + \expandafter{% + \csname ifHy@#2\endcsname + }% + \fi } \def\Hy@WarnOptionValue#1#2#3{% \Hy@Warning{% @@ -3891,7 +3913,12 @@ \InputIfFileExists{hyperref.cfg}{}{} \Hy@SetCatcodes \let\ExecuteOptions\hyper@normalise -\Hy@MaybeStopNow +\ifx\Hy@MaybeStopNow\relax +\else + \Hy@stoppedearlytrue + \expandafter\Hy@MaybeStopNow +\fi +\Hy@stoppedearlyfalse \SetupKeyvalOptions{family=Hyp} \DeclareLocalOptions{% a4paper,a5paper,b5paper,letterpaper,legalpaper,executivepaper% @@ -4667,7 +4694,9 @@ \@latex@warning{% Hyper reference `#2' on page \thepage \space undefined% }% - \hyper@@link{}{??}{#3}% + \begingroup + #3% + \endgroup \else \hyper@@link{\expandafter\@fifthoffive#1}% {\expandafter\@fourthoffive#1\@empty\@empty}{#3}% @@ -6115,7 +6144,12 @@ \g@addto@macro\Hy@EveryPageHook{\HyPL@EveryPage}% \fi \Hy@DisableOption{pdfpagelabels} -\MaybeStopEarly +\ifx\MaybeStopEarly\relax +\else + \Hy@stoppedearlytrue + \expandafter\MaybeStopEarly +\fi +\Hy@stoppedearlyfalse \def\Hy@CounterExists#1{% \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname c@#1\endcsname\relax |