diff options
author | Karl Berry <karl@freefriends.org> | 2012-09-26 22:30:07 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2012-09-26 22:30:07 +0000 |
commit | 21d48443cf41d93582f2b299b10ed2edb65e5814 (patch) | |
tree | d06e8f295678c18a59806c7e843189bc4485313b /Master/texmf-dist/tex/latex/hyperref/hyperref.sty | |
parent | c84525789b24c77f189dbf0a9450103c41326329 (diff) |
hyperref (26sep12)
git-svn-id: svn://tug.org/texlive/trunk@27817 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/hyperref/hyperref.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/hyperref/hyperref.sty | 118 |
1 files changed, 73 insertions, 45 deletions
diff --git a/Master/texmf-dist/tex/latex/hyperref/hyperref.sty b/Master/texmf-dist/tex/latex/hyperref/hyperref.sty index 068bc4e3ae2..51ccd75dcc1 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/09/24 v6.83e % + [2012/09/26 v6.83f % Hypertext links for LaTeX] \begingroup \@makeother\`% @@ -167,11 +167,21 @@ \x{ }\z{#1}% \ifx\y\z \else - \Hy@Error{% - Version mismatch!\MessageBreak - * \y: hyperref.sty\MessageBreak - * \z: #1% - }\@ehd + \edef\a{#1}% + \edef\b{\HyOpt@CustomDriver.def}% + \ifx\a\b + \Hy@WarningNoLine{% + Version mismatch (custom driver)!\MessageBreak + * \y: hyperref.sty\MessageBreak + * \z: \a + }% + \else + \Hy@Error{% + Version mismatch!\MessageBreak + * \y: hyperref.sty\MessageBreak + * \z: \a + }\@ehd + \fi \fi }% }% @@ -3078,6 +3088,17 @@ }% \fi } +\let\HyOpt@CustomDriver\ltx@empty +\define@key{Hyp}{customdriver}{% + \IfFileExists{#1.def}{% + \def\HyOpt@CustomDriver{#1}% + }{% + \Hy@Warning{% + Missing driver file `#1.def',\MessageBreak + ignoring custom driver% + }% + }% +} \define@key{Hyp}{hyperfigures}[true]{% \Hy@boolkey{hyperfigures}{#1}% } @@ -4390,62 +4411,67 @@ \fi \fi \fi - \def\HyOpt@DriverType{}% - \ifx\Hy@driver\@empty - \def\HyOpt@DriverType{ (autodetected)}% - \providecommand*{\Hy@defaultdriver}{hypertex}% - \ifpdf - \def\Hy@driver{hpdftex}% - \else - \ifxetex - \def\Hy@driver{hxetex}% + \let\HyOpt@DriverType\ltx@empty + \ifx\HyOpt@CustomDriver\ltx@empty + \ifx\Hy@driver\@empty + \def\HyOpt@DriverType{ (autodetected)}% + \providecommand*{\Hy@defaultdriver}{hypertex}% + \ifpdf + \def\Hy@driver{hpdftex}% \else - \ifvtexhtml - \def\Hy@driver{hvtexhtm}% - \def\MaybeStopEarly{% - \Hy@Message{Stopped early}% - \Hy@AtBeginDocument{% - \PDF@FinishDoc - \gdef\PDF@FinishDoc{}% - }% - \endinput - }% + \ifxetex + \def\Hy@driver{hxetex}% \else - \ifvtexpdf - \def\Hy@driver{hvtex}% + \ifvtexhtml + \def\Hy@driver{hvtexhtm}% + \def\MaybeStopEarly{% + \Hy@Message{Stopped early}% + \Hy@AtBeginDocument{% + \PDF@FinishDoc + \gdef\PDF@FinishDoc{}% + }% + \endinput + }% \else - \ifvtexps + \ifvtexpdf \def\Hy@driver{hvtex}% \else - \ifx\HyOpt@DriverFallback\ltx@empty - \let\Hy@driver\Hy@defaultdriver - \def\HyOpt@DriverType{ (default)}% + \ifvtexps + \def\Hy@driver{hvtex}% \else - \begingroup - \toks@\expandafter{\HyOpt@DriverFallback}% - \edef\x{\endgroup - \noexpand\kvsetkeys{Hyp}{\the\toks@}% - }% - \x - \ifx\Hy@driver\ltx@empty + \ifx\HyOpt@DriverFallback\ltx@empty \let\Hy@driver\Hy@defaultdriver \def\HyOpt@DriverType{ (default)}% \else - \def\HyOpt@DriverType{ (fallback)}% + \begingroup + \toks@\expandafter{\HyOpt@DriverFallback}% + \edef\x{\endgroup + \noexpand\kvsetkeys{Hyp}{\the\toks@}% + }% + \x + \ifx\Hy@driver\ltx@empty + \let\Hy@driver\Hy@defaultdriver + \def\HyOpt@DriverType{ (default)}% + \else + \def\HyOpt@DriverType{ (fallback)}% + \fi \fi \fi \fi \fi \fi \fi - \fi - \ifx\Hy@driver\Hy@defaultdriver - \def\Hy@temp{hdviwind}% - \ifx\Hy@temp\Hy@driver - \kvsetkeys{Hyp}{colorlinks}% - \PassOptionsToPackage{dviwindo}{color}% + \ifx\Hy@driver\Hy@defaultdriver + \def\Hy@temp{hdviwind}% + \ifx\Hy@temp\Hy@driver + \kvsetkeys{Hyp}{colorlinks}% + \PassOptionsToPackage{dviwindo}{color}% + \fi \fi \fi + \else + \def\HyOpt@DriverType{ (custom)}% + \let\Hy@driver\HyOpt@CustomDriver \fi \Hy@Message{Driver\HyOpt@DriverType: \Hy@driver}% \chardef\Hy@VersionChecked=0 % @@ -4472,6 +4498,8 @@ \Hy@DisableOption{latex2html}% \Hy@DisableOption{ps2pdf}% \Hy@DisableOption{xetex}% + \Hy@DisableOption{driverfallback}% + \Hy@DisableOption{customdriver}% \Hy@DisableOption{pdfversion}% } \newif\ifHy@DvipdfmxOutlineOpen |