diff options
author | Karl Berry <karl@freefriends.org> | 2008-07-17 00:51:17 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2008-07-17 00:51:17 +0000 |
commit | 37417a1382542e5c5170ab3ddca029d1b0fc1eed (patch) | |
tree | f40e3d427fcc7a6ad8471e6f7ae3bf68f8fb8b16 /Master/texmf-dist/tex/latex/hyperref/hyperref.sty | |
parent | 8a65930e95ea64f159fc24ee6b7b0ad9082f467e (diff) |
hyperref update (16jul08)
git-svn-id: svn://tug.org/texlive/trunk@9620 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 | 198 |
1 files changed, 107 insertions, 91 deletions
diff --git a/Master/texmf-dist/tex/latex/hyperref/hyperref.sty b/Master/texmf-dist/tex/latex/hyperref/hyperref.sty index dff3a98c1b8..b03e76c4a8a 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hyperref.sty +++ b/Master/texmf-dist/tex/latex/hyperref/hyperref.sty @@ -25,7 +25,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{hyperref} - [2008/07/05 v6.77v + [2008/07/15 v6.78b Hypertext links for LaTeX] \begingroup \@makeother\`% @@ -95,6 +95,9 @@ \endgroup \Hy@SetCatcodes \RequirePackage{keyval}[1997/11/10] +\RequirePackage{ifpdf}[2006/02/20] +\RequirePackage{ifvtex} +\RequirePackage{ifxetex}[2006/08/21] \RequirePackage{hycolor} \def\Hy@Warning#1{\PackageWarning{hyperref}{#1}} \def\Hy@WarningNoLine#1{\PackageWarningNoLine{hyperref}{#1}} @@ -1782,7 +1785,7 @@ }% } \define@key{Hyp}{extension}{\def\XR@ext{#1}} -\def\XR@ext{dvi} +\let\XR@ext\relax \define@key{Hyp}{verbose}[true]{% \Hy@boolkey{verbose}{#1}% } @@ -1792,8 +1795,23 @@ \define@key{Hyp}{raiselinks}[true]{% \Hy@boolkey{raiselinks}{#1}% } +\def\Hy@setbreaklinks#1{% + \csname breaklinks#1\endcsname +} +\def\Hy@breaklinks@unsupported{% + \ifx\Hy@setbreaklinks\@gobble + \ifHy@breaklinks + \Hy@WarningNoLine{% + You have enabled option `breaklinks'.\MessageBreak + But driver `\Hy@driver.def' does not suppport this.\MessageBreak + Expect trouble with the link areas of broken links% + }% + \fi + \fi +} \define@key{Hyp}{breaklinks}[true]{% \Hy@boolkey{breaklinks}{#1}% + \let\Hy@setbreaklinks\@gobble } \define@key{Hyp}{pageanchor}[true]{% \Hy@boolkey{pageanchor}{#1}% @@ -1919,9 +1937,7 @@ \def\Hy@pdfversion{2} \define@key{Hyp}{hyperref}[true]{} \define@key{Hyp}{tex4ht}[true]{% - \def\XR@ext{html}% \Hy@texhttrue - \def\Hy@raisedlink{}% \setkeys{Hyp}{colorlinks=true}% \def\BeforeTeXIVht{\usepackage{color}}% \def\Hy@driver{htex4ht}% @@ -1936,30 +1952,15 @@ } \define@key{Hyp}{pdftex}[true]{% \def\Hy@driver{hpdftex}% - \def\XR@ext{pdf}% - \PassOptionsToPackage{pdftex}{color}% - \Hy@breaklinkstrue -} -\define@key{Hyp}{dvipdf}[true]{% - \Hy@WarningNoLine{% - Option `dvipdf' is deprecated.\MessageBreak - See the user manual for available driver options% - }% } \define@key{Hyp}{nativepdf}[true]{% \def\Hy@driver{hdvips}% - \def\Hy@raisedlink{}% - \def\XR@ext{pdf}% } \define@key{Hyp}{dvipdfm}[true]{% \def\Hy@driver{hdvipdfm}% - \def\XR@ext{pdf}% - \Hy@breaklinkstrue } \define@key{Hyp}{dvipdfmx}[true]{% \def\Hy@driver{hdvipdfm}% - \def\XR@ext{pdf}% - \Hy@breaklinkstrue } \define@key{Hyp}{dvipdfmx-outline-open}[true]{% \expandafter\ifx\csname if#1\expandafter\endcsname @@ -1971,18 +1972,12 @@ } \define@key{Hyp}{xetex}[true]{% \def\Hy@driver{hdvipdfm}% - \def\XR@ext{pdf}% - \Hy@breaklinkstrue } \define@key{Hyp}{pdfmark}[true]{% \def\Hy@driver{hdvips}% - \def\Hy@raisedlink{}% - \def\XR@ext{pdf}% } \define@key{Hyp}{dvips}[true]{% \def\Hy@driver{hdvips}% - \def\Hy@raisedlink{}% - \def\XR@ext{pdf}% } \define@key{Hyp}{hypertex}[true]{% \def\Hy@driver{hypertex}% @@ -1996,11 +1991,9 @@ \endinput \else \ifnum 0\ifnum\OpMode<1 1\fi \ifnum\OpMode>3 1\fi =0 % - \def\XR@ext{pdf}% \def\Hy@driver{hvtex}% \else \ifnum\OpMode=10\relax - \def\XR@ext{htm}% \def\Hy@driver{hvtexhtm}% \def\MaybeStopEarly{% \typeout{Hyperref stopped early}% @@ -2026,9 +2019,7 @@ \endinput \else \ifnum 0\ifnum\OpMode<1 1\fi \ifnum\OpMode>3 1\fi =0 % - \def\XR@ext{pdf}% \def\Hy@driver{hvtexmrk}% - \def\Hy@raisedlink{}% \else \@latex@error{Mode (\the\OpMode) has no hyperref driver}{}% \let\Hy@MaybeStopNow\endinput @@ -2042,12 +2033,9 @@ \PassOptionsToPackage{dviwindo}{color}% } \define@key{Hyp}{dvipsone}[true]{% - \def\XR@ext{pdf}% \def\Hy@driver{hdvipson}% - \def\Hy@raisedlink{}% } \define@key{Hyp}{textures}[true]{% - \def\XR@ext{pdf}% \def\Hy@driver{htexture}% } \define@key{Hyp}{latex2html}[true]{% @@ -2055,7 +2043,6 @@ } \define@key{Hyp}{ps2pdf}[true]{% \def\Hy@driver{hdvips}% - \def\Hy@raisedlink{}% \providecommand*\@pdfborder{0 0 1}% } \define@key{Hyp}{hyperfigures}[true]{% @@ -2378,10 +2365,6 @@ } \define@key{Hyp}{colorlinks}[true]{% \Hy@boolkey{colorlinks}{#1}% - \ifHy@colorlinks - \def\@pdfborder{0 0 0}% - \let\@pdfborderstyle\@empty - \fi } \define@key{Hyp}{ocgcolorlinks}[true]{% \Hy@boolkey{ocgcolorlinks}{#1}% @@ -2950,73 +2933,105 @@ \Hy@texhttrue }{}% \ifx\Hy@driver\@empty + \else + \def\Hy@temp{hpdftex}% + \ifpdf + \ifx\Hy@driver\Hy@temp + \else + \Hy@WarningNoLine{% + Wrong driver `\Hy@driver.def';\MessageBreak + pdfTeX is running in PDF mode.\MessageBreak + Forcing driver `\Hy@temp.def'% + }% + \let\Hy@driver\Hy@temp + \fi + \else + \ifx\Hy@driver\Hy@temp + \Hy@WarningNoLine{% + Wrong driver `\Hy@driver.def';\MessageBreak + pdfTeX is not running in PDF mode.\MessageBreak + Using default driver% + }% + \let\Hy@driver\@empty + \fi + \fi + \fi + \ifx\Hy@driver\@empty + \else + \def\Hy@temp{hdvipdfm}% + \ifxetex + \ifx\Hy@driver\Hy@temp + \else + \Hy@WarningNoLine{% + Wrong driver `\Hy@driver.def';\MessageBreak + XeTeX is running.\MessageBreak + Forcing driver `\Hy@temp.def' for XeTeX% + }% + \let\Hy@driver\Hy@temp + \fi + \fi + \fi + \ifx\Hy@driver\@empty + \else + \def\Hy@temp{hvtexhtm}% + \ifvtexhtml + \ifx\Hy@driver\Hy@temp + \else + \Hy@WarningNoLine{% + Wrong driver `\Hy@driver.def';\MessageBreak + VTeX is running in HTML mode.\MessageBreak + Forcing driver `\Hy@temp.def'% + }% + \let\Hy@driver\Hy@temp + \fi + \else + \ifx\Hy@driver\Hy@temp + \Hy@WarningNoLine{% + Wrong driver `\Hy@driver.def';\MessageBreak + VTeX is not running in HTML mode.\MessageBreak + Using default driver% + }% + \let\Hy@driver\@empty + \fi + \fi + \fi + \ifx\Hy@driver\@empty \providecommand*{\Hy@defaultdriver}{hypertex}% - \begingroup\expandafter\expandafter\expandafter\endgroup - \expandafter\ifx\csname pdfoutput\endcsname\relax - \begingroup\expandafter\expandafter\expandafter\endgroup - \expandafter\ifx\csname OpMode\endcsname\relax - \begingroup\expandafter\expandafter\expandafter\endgroup - \expandafter\ifx\csname XeTeXversion\endcsname\relax - \let\Hy@driver\Hy@defaultdriver - \else - \def\Hy@driver{hdvipdfm}% - \fi + \ifpdf + \def\Hy@driver{hpdftex}% + \else + \ifxetex + \def\Hy@driver{hdvipdfm}% \else - \ifnum 0\ifnum\OpMode<1 1\fi \ifnum\OpMode>3 1\fi =0 % - \def\Hy@driver{hvtex}% - \def\XR@ext{pdf}% - \else - \ifnum\OpMode=10\relax - \def\XR@ext{htm}% - \def\Hy@driver{hvtexhtm}% - \def\MaybeStopEarly{% - \typeout{Hyperref stopped early}% - \AfterBeginDocument{% - \PDF@FinishDoc - \gdef\PDF@FinishDoc{}% - }% - \endinput + \ifvtexhtml + \def\Hy@driver{hvtexhtm}% + \def\MaybeStopEarly{% + \typeout{Hyperref stopped early}% + \AfterBeginDocument{% + \PDF@FinishDoc + \gdef\PDF@FinishDoc{}% }% + \endinput + }% + \else + \ifvtexpdf + \def\Hy@driver{hvtex}% \else - \let\Hy@driver\Hy@defaultdriver + \ifvtexps + \def\Hy@driver{hvtex}% + \else + \let\Hy@driver\Hy@defaultdriver + \fi \fi \fi \fi - \else - \ifnum\pdfoutput<1 % - \let\Hy@driver\Hy@defaultdriver - \else - \def\Hy@driver{hpdftex}% - \def\XR@ext{pdf}% - \PassOptionsToPackage{pdftex}{color}% - \Hy@breaklinkstrue - \fi \fi \ifx\Hy@driver\Hy@defaultdriver - \def\Hy@temp{hdvips}% - \ifx\Hy@temp\Hy@driver - \def\Hy@raisedlink{}% - \def\XR@ext{pdf}% - \fi - \def\Hy@temp{hdvipdfm}% - \ifx\Hy@temp\Hy@driver - \def\XR@ext{pdf}% - \Hy@breaklinkstrue - \fi \def\Hy@temp{hdviwind}% \ifx\Hy@temp\Hy@driver \setkeys{Hyp}{colorlinks}% \PassOptionsToPackage{dviwindo}{color}% \fi - \def\Hy@temp{hdvipson}% - \ifx\Hy@temp\Hy@driver - \def\XR@ext{pdf}% - \def\Hy@raisedlink{}% - \fi - \def\Hy@temp{textures}% - \ifx\Hy@temp\Hy@driver - \def\XR@ext{pdf}% - \fi \fi \typeout{*hyperref using default driver \Hy@driver*}% \else @@ -3036,7 +3051,6 @@ \fi \Hy@DisableOption{tex4ht} \Hy@DisableOption{pdftex} -\Hy@DisableOption{dvipdf} \Hy@DisableOption{nativepdf} \Hy@DisableOption{dvipdfm} \Hy@DisableOption{dvipdfmx} @@ -3100,6 +3114,8 @@ \Hy@DisableOption{ocgcolorlinks}% \fi \ifHy@colorlinks + \def\@pdfborder{0 0 0}% + \let\@pdfborderstyle\@empty \ifHy@typexml \else \RequirePackage{color}% |