diff options
Diffstat (limited to 'Master/texmf-dist/source/latex')
4 files changed, 159 insertions, 244 deletions
diff --git a/Master/texmf-dist/source/latex/hyperref/doc/manual.tex b/Master/texmf-dist/source/latex/hyperref/doc/manual.tex index 834ac31a826..b1d65e9d67e 100644 --- a/Master/texmf-dist/source/latex/hyperref/doc/manual.tex +++ b/Master/texmf-dist/source/latex/hyperref/doc/manual.tex @@ -11,7 +11,7 @@ % % Manual updates: % * Steve Peter and Karl Berry, 7/03. -% * Heiko Oberdiek, 2006, 2007. +% * Heiko Oberdiek, 2006-2008. % \RequirePackage{ifpdf} @@ -117,7 +117,7 @@ \title{Hypertext marks in \LaTeX: a manual for \textsf{hyperref}} \author{Sebastian Rahtz \and Heiko Oberdiek} -\date{September 2006} +\date{July 2008} \begin{document} @@ -195,8 +195,6 @@ the \textsf{-z} option), \textsf{OzTeX}, and \textsf{Textures}) PDF writer; this is basically the same as that for \textsf{dvips}, but a few variations remained before version 5.21 \item[tex4ht] produces \verb|\special| commands for use with \textsf{\TeX4ht} \item[pdftex] pdf\TeX, \Hanh{}'s \TeX{} variant that writes PDF directly -% \item[dvipdf] produces \verb|\special| commands for the DVI to PDF driver \textsf{dvipdf} -% (deprecated) \item[dvipdfm] produces \verb|\special| commands for Mark Wicks' DVI to PDF driver \textsf{dvipdfm} \item[dvipdfmx] produces \verb|\special| commands for driver \textsf{dvipdfmx}, a successor of \textsf{dvipdfm} @@ -588,7 +586,6 @@ colorlinks & \textit{false} & color links \\ & \textit{true} & (\textsf{tex4ht}, \textsf{dviwindo}) \\ debug & \textit{false} & provide details of anchors defined; same as verbose \\ draft & \textit{false} & do not do any hyperlinking \\ -dvipdf & & use \textsf{dvipdf} backend (deprecated)\\ dvipdfm & & use \textsf{dvipdfm} backend \\ dvipdfmx & & use \textsf{dvipdfmx} backend \\ dvips & & use \textsf{dvips} backend \\ diff --git a/Master/texmf-dist/source/latex/hyperref/doc/options.tex b/Master/texmf-dist/source/latex/hyperref/doc/options.tex index f70d862be48..62bfb885d3c 100644 --- a/Master/texmf-dist/source/latex/hyperref/doc/options.tex +++ b/Master/texmf-dist/source/latex/hyperref/doc/options.tex @@ -10,8 +10,7 @@ \usepackage{pslatex} \title{hyperref package options} \author{Sebastian Rahtz et. al.} -%\date{October 7th 1999} -\date{September 4th 2006}% HO +\date{July 12th 2008}% HO \newcommand{\optempty}{{\rmfamily\textit{empty}}} \newcommand*{\for}[1]{{\rmfamily(#1)}} \begin{document} @@ -37,9 +36,8 @@ colorlinks &color links&false\\ debug &provide details of anchors defined&false\\ &same as verbose&\\ draft &do not do any hyper linking&false\\ -dvipdf &use dvipdf backend\\ dvipdfm &use dvipdfm backend\\ -dvipdfmx &use dvipdfmx backend\\ +dvipdfmx &use dvipdfmx backend (dvipdfm)\\ dvips &use dvips backend\\ dvipsone &use dvipsone backend\\ dviwindo &use dviwindo backend\\ @@ -119,7 +117,7 @@ urlcolor &color of URL links&magenta\\ verbose &be chatty&false\\ vtex &use V\TeX\ backend\\ vtexpdfmark &use backend for V\TeX\ in PDF/PS mode (pdfmark specials)\\ -xetex &use XeTeX backend\\ +xetex &use XeTeX backend (dvipdfm)\\ \hline \end{longtable} \end{document} diff --git a/Master/texmf-dist/source/latex/hyperref/hyperref.dtx b/Master/texmf-dist/source/latex/hyperref/hyperref.dtx index d169a91dc95..e7125686040 100644 --- a/Master/texmf-dist/source/latex/hyperref/hyperref.dtx +++ b/Master/texmf-dist/source/latex/hyperref/hyperref.dtx @@ -30,7 +30,6 @@ %<textures>\ProvidesFile{htexture.def} %<dviwindo>\ProvidesFile{hdviwind.def} %<dvipdfm>\ProvidesFile{hdvipdfm.def} -%<dvipdf>\ProvidesFile{hdvipdf.def} %<vtex>\ProvidesFile{hvtex.def} %<vtexhtml>\ProvidesFile{hvtexhtml.def} %<tex4ht>\ProvidesFile{htex4ht.def} @@ -39,7 +38,7 @@ %<puenc>\ProvidesFile{puenc.def} %<puvnenc>\ProvidesFile{puvnenc.def} %<puarenc>\ProvidesFile{puarenc.def} -%<!none> [2008/07/05 v6.77v +%<!none> [2008/07/15 v6.78b %<package> Hypertext links for LaTeX] %<nohyperref> Dummy hyperref (SR)] %<driver> Hyperref documentation driver file] @@ -53,7 +52,6 @@ %<textures> Hyperref driver for Textures] %<dviwindo> Hyperref driver for dviwindo] %<dvipdfm> Hyperref driver for dvipdfm] -%<dvipdf> Hyperref driver for dvipdf] %<vtex> Hyperref driver for VTeX in PDF/PS mode] %<vtexhtml> Hyperref driver for VTeX in HTML mode] %<tex4ht> Hyperref driver for TeX4ht] @@ -116,7 +114,7 @@ \end{document} %</driver> % \fi -% \CheckSum{22899} +% \CheckSum{22800} % % \MakeShortVerb{|} % \StopEventually{} @@ -554,6 +552,9 @@ % with the later releases! % \begin{macrocode} \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}} @@ -3802,7 +3803,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}% } @@ -3823,8 +3824,27 @@ % \end{macrocode} % Most PDF-creating drivers do not allow links to be broken % \begin{macrocode} +\def\Hy@setbreaklinks#1{% + \csname breaklinks#1\endcsname +} +% \end{macrocode} +% \begin{macrocode} +\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 +} +% \end{macrocode} +% \begin{macrocode} \define@key{Hyp}{breaklinks}[true]{% \Hy@boolkey{breaklinks}{#1}% + \let\Hy@setbreaklinks\@gobble } % \end{macrocode} % Determines whether an automatic anchor is put on each page @@ -3982,9 +4002,7 @@ % \begin{macrocode} \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}% @@ -3999,30 +4017,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 @@ -4034,18 +4037,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}% @@ -4059,11 +4056,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}% @@ -4089,9 +4084,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 @@ -4105,12 +4098,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]{% @@ -4121,7 +4111,6 @@ % \begin{macrocode} \define@key{Hyp}{ps2pdf}[true]{% \def\Hy@driver{hdvips}% - \def\Hy@raisedlink{}% \providecommand*\@pdfborder{0 0 1}% } % \end{macrocode} @@ -4631,10 +4620,6 @@ % \begin{macrocode} \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}% @@ -5357,74 +5342,115 @@ \def\Hy@driver{htex4ht}% \Hy@texhttrue }{}% +% \end{macrocode} +% Some drivers can be detected. Check for these drivers, +% whether the given driver option is ok. Otherwise force +% the right driver or use the default driver. +% \begin{macrocode} + \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 +% \end{macrocode} +% If the driver is not given, find the right driver or +% use the default driver. +% \begin{macrocode} \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 @@ -5444,7 +5470,6 @@ \fi \Hy@DisableOption{tex4ht} \Hy@DisableOption{pdftex} -\Hy@DisableOption{dvipdf} \Hy@DisableOption{nativepdf} \Hy@DisableOption{dvipdfm} \Hy@DisableOption{dvipdfmx} @@ -5521,6 +5546,8 @@ \Hy@DisableOption{ocgcolorlinks}% \fi \ifHy@colorlinks + \def\@pdfborder{0 0 0}% + \let\@pdfborderstyle\@empty \ifHy@typexml \else \RequirePackage{color}% @@ -7612,6 +7639,7 @@ % For this version \cmd{\VTeXversion} reports 660. % \begin{macrocode} %<*vtex> +\providecommand*{\XR@ext}{pdf} \edef\Hy@VTeXversion{% \ifx\VTeXversion\@undefined \z@ @@ -10111,6 +10139,8 @@ % % \begin{macrocode} %<*pdftex> +\providecommand*{\XR@ext}{pdf} +\Hy@setbreaklinks{true} % \end{macrocode} % This driver is for Han The Thanh's \TeX{} variant % which produces PDF directly. This has new primitives @@ -10785,12 +10815,7 @@ } % \end{macrocode} % -% Let us explicitly turn on PDF generation; they can reverse -% this decision in the document, but since we are emitting PDF -% links anyway, we \emph{must} be in PDF mode. % \begin{macrocode} -\pdfoutput=1 -\pdfcompresslevel=9 \AtBeginDocument{% \ifHy@setpagesize \expandafter\@firstofone @@ -10914,6 +10939,7 @@ % problems. % % \begin{macrocode} +\providecommand*{\XR@ext}{dvi} \def\PDF@FinishDoc{} \def\PDF@SetupDoc{% \ifx\@baseurl\@empty @@ -11035,6 +11061,7 @@ % specified separately in which case a fixed size area % of 10000000sp wide by |\baselineskip| high is used. % \begin{macrocode} +\providecommand*{\XR@ext}{dvi} \providecommand*\wwwbrowser{c:\string\netscape\string\netscape} \def\hyper@anchor#1{% \Hy@SaveLastskip @@ -11266,6 +11293,8 @@ % \subsection{dvipdfm dvi to PDF converter} % Provided by Mark Wicks (mwicks@kettering.edu) % \begin{macrocode} +\providecommand*{\XR@ext}{pdf} +\Hy@setbreaklinks{true} \newsavebox{\pdfm@box} \def\@pdfm@mark#1{\special{pdf:#1}} \def\@pdfm@dest#1{% @@ -11659,6 +11688,7 @@ % see \url{http://www.micropress-inc.com/} for details. % \begin{macrocode} %<*vtexhtml> +\providecommand*{\XR@ext}{htm} \RequirePackage{vtexhtml} \newif\if@Localurl \def\PDF@FinishDoc{} @@ -12420,7 +12450,7 @@ %</pdfmark|dviwindo> % \end{macrocode} % -% \subsection{Direct pdfmark support (dvipdf and pdfmark)} +% \subsection{Direct pdfmark support} % Drivers that load |pdfmark.def| have to provide the % correct macro definitions of % \begin{center} @@ -12442,7 +12472,8 @@ % \end{center} % % \begin{macrocode} -%<*pdfmark|dvipdf> +%<*pdfmark> +\Hy@breaklinks@unsupported \def\hyper@anchor#1{% \Hy@SaveLastskip \begingroup @@ -12455,18 +12486,6 @@ \endgroup \Hy@RestoreLastskip } -%<*dvipdf> -\def\hyper@anchorstart#1{\Hy@activeanchortrue} -\def\hyper@anchorend{\Hy@activeanchorfalse} -\def\hyper@linkstart#1#2{% - \expandafter\Hy@colorlink\csname @#1color\endcsname - \xdef\hyper@currentanchor{#2}% -} -\def\hyper@linkend{% - \Hy@endcolorlink -} -%</dvipdf> -%<*pdfmark> \@ifundefined{hyper@anchorstart}{}{\endinput} \def\hyper@anchorstart#1{% \Hy@SaveLastskip @@ -12524,9 +12543,6 @@ } % \end{macrocode} % -% \begin{macrocode} -%<*pdfmark> -% \end{macrocode} % We have to allow for |\baselineskip| having an optional % stretch and shrink (you meet this in slide packages, for instance), % so we need to strip off the junk. David Carlisle, of course, @@ -12539,7 +12555,6 @@ \gdef\rem@ptetc#1.#2PT#3!{#1\ifnum#2>\z@.#2\fi}% } \def\strip@pt@and@otherjunk#1{\expandafter\rem@ptetc\the#1!} -%</pdfmark> % \end{macrocode} % % \begin{macro}{\hyper@pagetransition} @@ -12607,7 +12622,6 @@ } % \end{macrocode} % \begin{macrocode} -%</pdfmark> \def\hyper@image#1#2{% \hyper@linkurl{#2}{#1}% } @@ -12623,19 +12637,6 @@ \ifx\Hy@testname\@empty \let\Hy@testname\Hy@undefinedname \fi -%<*dvipdf> - \pdfmark[{#3}]{% - pdfmark=/LNK,% - {},% - linktype={#1},% - AcroHighlight=\@pdfhighlight,% - Border=\@pdfborder,% - BorderStyle=\@pdfborderstyle,% - Color=\Hy@tempcolor,% - Dest=\Hy@testname - }% -%</dvipdf> -%<*pdfmarkbase> \pdfmark[{#3}]{% Color=\Hy@tempcolor,% linktype={#1},% @@ -12647,7 +12648,6 @@ PDFAFlags=4,% Dest=\Hy@testname }% -%</pdfmarkbase> \endgroup } \newtoks\pdf@docset @@ -12765,8 +12765,8 @@ }% }% } -%</pdfmark|dvipdf> -%<*pdfmarkbase|dvipdf> +%</pdfmark> +%<*pdfmarkbase> % \end{macrocode} % We define a single macro, pdfmark, which uses the `keyval' system % to define the various allowable keys; these are \emph{exactly} @@ -12796,12 +12796,9 @@ \fi \else \ifx\\#1\\% -%<*pdfmarkbase> \literalps@out{% [\the\pdf@toks\space\pdf@type\space pdfmark% }% -%</pdfmarkbase> -%<dvipdf> \literalps@out{/ANN >>}% \else \@ifundefined{@\pdf@linktype color}{% \Hy@colorlink\@linkcolor @@ -12810,12 +12807,9 @@ \csname @\pdf@linktype color\endcsname }% \pdf@rect{#1}% -%<*pdfmarkbase> \literalps@out{% [\the\pdf@toks\space\pdf@type\space pdfmark% }% -%</pdfmarkbase> -%<dvipdf> \literalps@out{/ANN >>}% \Hy@endcolorlink \fi \fi @@ -12843,7 +12837,6 @@ \providecommand*{\Hy@breaklinksunhbox}{\unhbox} \def\Hy@DEST{/DEST} \def\pdf@rect#1{% -%<dvipdf> \literalps@out{/ANN \pdf@type\space\the\pdf@toks\space <<}#1% \leavevmode \ifHy@breaklinks \Hy@setouterhbox\pdf@box{#1}% @@ -13011,8 +13004,7 @@ % parameter is a integer \define@key{PDF}{SrcPg}{\pdf@addtoks{#1}{SrcPg}} % parameter is a name -%<pdfmarkbase>\define@key{PDF}{Subtype}{\pdf@addtoks{#1}{Subtype}} -%<dvipdf>\define@key{PDF}{Subtype}{\pdf@addtoks{#1}{}} +\define@key{PDF}{Subtype}{\pdf@addtoks{#1}{Subtype}} % parameter is a string \define@key{PDF}{Title}{\pdf@addtoks{(#1)}{Title}} % parameter is a string @@ -13036,8 +13028,8 @@ \define@key{PDF}{ModDate}{\pdf@addtoks{(#1)}{ModDate}} \define@key{PDF}{Base}{\pdf@addtoks{(#1)}{Base}} \define@key{PDF}{URI}{\pdf@addtoks{#1}{URI}} -%</pdfmarkbase|dvipdf> -%<*pdfmark|dvipdf> +%</pdfmarkbase> +%<*pdfmark> \def\Acrobatmenu#1#2{% \Hy@Acrobatmenu{#1}{#2}{% \pdfmark[{#2}]{% @@ -13094,7 +13086,6 @@ \Hy@pstringdef\Hy@pstringURI{#2}% \hyper@chars \leavevmode -%<*pdfmarkbase> \pdfmark[{#1}]{% pdfmark=/ANN,% linktype=url,% @@ -13106,18 +13097,6 @@ Subtype=/Link,% PDFAFlags=4% }% -%</pdfmarkbase> -%<*dvipdf> - \pdfmark[{#1}]{% - pdfmark=/LNK,% - linktype=url,% - AcroHighlight=\@pdfhighlight,% - Border=\@pdfborder,% - BorderStyle=\@pdfborderstyle,% - Color=\@urlbordercolor,% - Action={URI /URI <\Hy@hstringURI>}% - }% -%</dvipdf> \endgroup } \def\hyper@linkfile#1#2#3{% @@ -13125,7 +13104,6 @@ \Hy@pstringdef\Hy@pstringF{#2}% \Hy@pstringdef\Hy@pstringD{#3}% \leavevmode -%<*pdfmark> \pdfmark[{#1}]{% pdfmark=/ANN,% Subtype=/Link,% @@ -13144,25 +13122,6 @@ >>% }% }% -%</pdfmark> -%<*dvipdf> - \pdfmark[{#1}]{% - pdfmark=/LNK,% - linktype=file,% - AcroHighlight=\@pdfhighlight,% - Border=\@pdfborder,% - BorderStyle=\@pdfborderstyle,% - Color=\@filebordercolor,% - Action={% - <<% - /S/GoToR% - \Hy@SetNewWindow - /F(\Hy@pstringF)% - /D\ifx\\#3\\[0 \@pdfstartview]\else(\Hy@pstringD)cvn\fi - >>% - }% - }% -%</dvipdf> \endgroup } \def\@hyper@launch run:#1\\#2#3{% @@ -13170,7 +13129,6 @@ \Hy@pstringdef\Hy@pstringF{#1}% \Hy@pstringdef\Hy@pstringP{#3}% \leavevmode -%<*pdfmark> \pdfmark[{#2}]{% pdfmark=/ANN,% Subtype=/Link,% @@ -13192,31 +13150,9 @@ >>% }% }% -%</pdfmark> -%<*dvipdf> - \pdfmark[{#2}]{% - pdfmark=/LNK,% - linktype=file,% - AcroHighlight=\@pdfhighlight,% - Border=\@pdfborder,% - BorderStyle=\@pdfborderstyle,% - Color=\@filebordercolor,% - Action={% - <<% - /S/GoToR% - \Hy@SetNewWindow - /F(\Hy@pstringF)% - \ifx\\#3\\% - \else - /Win<</P(\Hy@pstringP)/F(\Hy@pstringF)>>% - \fi - >>% - }% - }% -%</dvipdf> \endgroup } -%</pdfmark|dvipdf> +%</pdfmark> % \end{macrocode} % Unfortunately, some parts of the |pdfmark| % PostScript code depend on vagaries @@ -13232,6 +13168,8 @@ % definitions in a moment. % \begin{macrocode} %<*dvips> +\providecommand*{\XR@ext}{pdf} +\def\Hy@raisedlink{} \def\literalps@out#1{\special{ps:SDict begin #1 end}}% \def\headerps@out#1{\special{! #1}}% \input{pdfmark.def}% @@ -13360,6 +13298,8 @@ % % \begin{macrocode} %<*vtexpdfmark> +\providecommand*{\XR@ext}{pdf} +\def\Hy@raisedlink{} \def\literalps@out#1{\special{pS:#1}}% \def\headerps@out#1{\immediate\special{pS:#1}}% \input{pdfmark.def}% @@ -13445,6 +13385,12 @@ % \end{macrocode} % % \subsection{Textures} +% +% \begin{macrocode} +%<*textures> +\providecommand*{\XR@ext}{pdf} +% \end{macrocode} +% % At the suggestion of Jacques Distler (distler@golem.ph.utexas.edu), try % to derive a suitable driver for Textures. This was initially a copy of % dvips, with some guesses about Textures behaviour. @@ -13459,7 +13405,6 @@ % \begin{macro}{\Hy@ps@CR} % The macro \verb|\Hy@ps@CR| contains the end-of-line character. % \begin{macrocode} -%<*textures> \begingroup \obeylines % \gdef\Hy@ps@CR{\noexpand @@ -13696,6 +13641,8 @@ % Over-ride the default setup macro in pdfmark driver to use Y\&Y % |\special| commands. %<*dvipsone> +\providecommand*{\XR@ext}{pdf} +\def\Hy@raisedlink{} \providecommand*\@pdfborder{0 0 1} \providecommand*\@pdfborderstyle{} \def\literalps@out#1{\special{ps:#1}}% @@ -13874,16 +13821,13 @@ }% } %</dvipsone> -%<*dvipdf> -\def\literalps@out#1{\special{pdf: #1}}% -\providecommand*\@pdfborder{0 0 1} -\providecommand*\@pdfborderstyle{} -%</dvipdf> % \end{macrocode} % % \subsection{TeX4ht} % \begin{macrocode} %<*tex4ht> +\providecommand*{\XR@ext}{html} +\def\Hy@raisedlink{} \@ifpackageloaded{tex4ht}{% \typeout{hyperref tex4ht: tex4ht already loaded}% }{% @@ -14393,30 +14337,7 @@ } %</pdfmark> % \end{macrocode} -% \subsection{dvipdf} -% \begin{macrocode} -%<*dvipdf> -\def\@Form[#1]{\typeout{Sorry, I do not support FORMs}} -\def\@endForm{} -\def\@Gauge[#1]#2#3#4{% parameters, label, minimum, maximum - \typeout{Sorry, dvipdf does not support FORM gauges}% -} -\def\@TextField[#1]#2{% parameters, label - \typeout{Sorry, dvipdf does not support FORM text fields}% -} -\def\@CheckBox[#1]#2{% parameters, label - \typeout{Sorry, dvipdf does not support FORM checkboxes}% -} -\def\@ChoiceMenu[#1]#2#3{% parameters, label, choices - \typeout{Sorry, dvipdf does not support FORM choice menus}% -} -\def\@PushButton[#1]#2{% parameters, label - \typeout{Sorry, dvipdf does not support FORM pushbuttons}% -} -\def\@Reset[#1]#2{\typeout{Sorry, dvipdf does not support FORMs}} -\def\@Submit[#1]#2{\typeout{Sorry, dvipdf does not support FORMs}} -%</dvipdf> -% \end{macrocode} +% % \subsection{HyperTeX} % \begin{macrocode} %<*hypertex> diff --git a/Master/texmf-dist/source/latex/hyperref/hyperref.ins b/Master/texmf-dist/source/latex/hyperref/hyperref.ins index f7a7db10811..43fef7ca9b3 100644 --- a/Master/texmf-dist/source/latex/hyperref/hyperref.ins +++ b/Master/texmf-dist/source/latex/hyperref/hyperref.ins @@ -4,7 +4,7 @@ %% LaTeX or TeX. %% %% Copyright 1995-1999 Sebastian Rahtz -%% 1999-2006 Sebastian Rahtz, Heiko Oberdiek +%% 1999-2008 Sebastian Rahtz, Heiko Oberdiek %% %% This file is part of the `Hyperref Bundle'. %% ------------------------------------------- @@ -64,7 +64,6 @@ \file{hdvipson.def}{\from{hyperref.dtx}{dvipsone}} \file{hdvips.def}{\from{hyperref.dtx}{dvips}} \file{hpdftex.def}{\from{hyperref.dtx}{pdftex,pdfform,outlines}} - %\file{hdvipdf.def}{\from{hyperref.dtx}{dvipdf,outlines}} \file{hdviwind.def}{\from{hyperref.dtx}{dviwindo,pdfmarkbase}} \file{htex4ht.def}{\from{hyperref.dtx}{tex4ht}} \file{htex4ht.cfg}{\from{hyperref.dtx}{tex4htcfg}} |