diff options
author | Norbert Preining <preining@logic.at> | 2007-01-28 00:02:01 +0000 |
---|---|---|
committer | Norbert Preining <preining@logic.at> | 2007-01-28 00:02:01 +0000 |
commit | 439c82e71400c11447f0980fb7bed3c4d6fe2ffd (patch) | |
tree | 8d12d48e7315ad94abd1b20f8cf073aa5b1db3a1 /Master/texmf-dist/source | |
parent | c457134470c0cb3400b39fb1105665673731bde4 (diff) |
hyperref update from CTAN
git-svn-id: svn://tug.org/texlive/trunk@3827 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source')
-rw-r--r-- | Master/texmf-dist/source/latex/hyperref/hyperref.dtx | 232 |
1 files changed, 137 insertions, 95 deletions
diff --git a/Master/texmf-dist/source/latex/hyperref/hyperref.dtx b/Master/texmf-dist/source/latex/hyperref/hyperref.dtx index d39d49b2758..7aab98121d9 100644 --- a/Master/texmf-dist/source/latex/hyperref/hyperref.dtx +++ b/Master/texmf-dist/source/latex/hyperref/hyperref.dtx @@ -39,7 +39,7 @@ %<puenc>\ProvidesFile{puenc.def} %<puvnenc>\ProvidesFile{puvnenc.def} %<puarenc>\ProvidesFile{puarenc.def} -%<!none> [2007/01/18 v6.75o +%<!none> [2007/01/25 v6.75q %<package> Hypertext links for LaTeX] %<nohyperref> Dummy hyperref (SR)] %<driver> Hyperref documentation driver file] @@ -116,7 +116,7 @@ \end{document} %</driver> % \fi -% \CheckSum{19735} +% \CheckSum{19782} % % \MakeShortVerb{|} % \StopEventually{} @@ -3960,6 +3960,7 @@ \Hy@boolkey{colorlinks}{#1}% \ifHy@colorlinks \def\@pdfborder{0 0 0}% + \let\@pdfborderstyle\@empty \fi } \define@key{Hyp}{frenchlinks}[true]{% @@ -4127,7 +4128,9 @@ % If the two spaces in the color specification are missing, % then the value is processed as color specification from % package |xcolor| by using |\XC@bordercolor| (since -% xcolor 2004/05/09 v1.11). +% xcolor 2004/05/09 v1.11, versions 2005/03/24 v2.02 until +% 2006/11/28 v2.10 do not work because of a bug that is +% fixed in 2007/01/21 v2.11). % \begin{macrocode} \def\Hy@ColorList{cite,file,link,menu,page,run,url} \@for\Hy@temp:=\Hy@ColorList\do{% @@ -4149,7 +4152,7 @@ \@ifundefined{XC@bordercolor}{% \Hy@Warning{% Unsupported color specification (#4bordercolor).\MessageBreak - Load package `xcolor' (version >= 1.11) first.\MessageBreak + Load package `xcolor' (version >= 2.11) first.\MessageBreak Ignoring color specification% }% \endgroup @@ -5286,12 +5289,6 @@ \define@key{Field}{fillcolor}{% \def\Fld@fillcolor{#1}% } -\define@key{Field}{bordercolor}{% - \def\Fld@bordercolor{#1}% -} -\define@key{Field}{color}{% - \def\Fld@color{#1}% -} \define@key{Field}{borderwidth}{% \def\Fld@borderwidth{#1}% } @@ -5310,12 +5307,47 @@ \define@key{Field}{value}{% \def\Fld@value{#1}% } -\define@key{Field}{backgroundcolor}{% - \def\Fld@bcolor{#1}% -} \define@key{Field}{checkboxsymbol}{% \def\Fld@cbsymbol{#1}% } +% \end{macrocode} +% \begin{macrocode} +\define@key{Field}{backgroundcolor}{% + \Hy@fieldcolor{bcolor}{#1}{ }{backgroundcolor}% +} +\define@key{Field}{bordercolor}{% + \Hy@fieldcolor{bordercolor}{#1}{ }{bordercolor}% +} +\define@key{Field}{color}{% + \Hy@fieldcolor{color}{#1}{ }{color}% +} +\def\Hy@fieldcolor#1#2#3#4{% + \begingroup + \Hy@safe@activestrue + \@ifundefined{XC@edef}{\edef}{\XC@edef}\x{#2}% + \expandafter\Hy@FieldCheckColorSpec\x#3#3\@nil{#1}{#2}{#4}% +} +\def\Hy@FieldCheckColorSpec#1 #2 #3\@nil#4#5#6{% + \ifx\\#3\\% + \@ifundefined{XC@bordercolor}{% + \Hy@Warning{% + Unsupported color specification (#6).\MessageBreak + Load package `xcolor' (version >= 2.11) first.\MessageBreak + Ignoring color specification% + }% + \endgroup + }{% + \endgroup + \XC@bordercolor{temp}{#5}% + \expandafter\let\csname Fld@#4\endcsname\@tempbordercolor + }% + \else + \endgroup + \@namedef{Fld@#4}{#5}% + \fi +} +% \end{macrocode} +% \begin{macrocode} \def\Fld@format@code{} \def\Fld@validate@code{} \def\Fld@calculate@code{} @@ -5802,6 +5834,16 @@ % % \begin{macrocode} \ifHy@pagelabels + \begingroup\expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname thepage\endcsname\relax + \Hy@pagelabelsfalse + \Hy@WarningNoLine{% + Option `pdfpagelabels' is turned off\MessageBreak + because \string\thepage\space is undefined% + }% + \csname fi\endcsname + \csname iffalse\expandafter\endcsname + \fi % \end{macrocode} % % \begin{macro}{\thispdfpagelabel} @@ -12808,17 +12850,17 @@ % \begin{macro}{\PDFForm@Push} % \begin{macrocode} \def\PDFForm@Push{% - /Subtype /Widget - \ifFld@hidden /F 6 \else /F 4 \fi - /T (\Hy@escapestring{\Fld@name}) - /FT /Btn + /Subtype/Widget + \ifFld@hidden /F 6\else /F 4\fi + /T(\Hy@escapestring{\Fld@name})% + /FT/Btn% /Ff 65540 - /H /P - /BS << /W \Fld@borderwidth\space /S /\Fld@borderstyle\space >> - /MK << - /BC [\Fld@bordercolor] - >> - /A << /S /JavaScript /JS (\Hy@escapestring{\Fld@onclick}) >> + /H/P% + /BS<</W \Fld@borderwidth/S/\Fld@borderstyle>>% + /MK<<% + /BC[\Fld@bordercolor]% + >>% + /A<</S/JavaScript/JS(\Hy@escapestring{\Fld@onclick})>>% } % \end{macrocode} % \end{macro} @@ -12832,72 +12874,72 @@ % \begin{macrocode} \ifx\Fld@keystroke@code\@empty \else - /K << /S /JavaScript /JS (\Hy@escapestring{\Fld@keystroke@code}) >> + /K<</S/JavaScript/JS(\Hy@escapestring{\Fld@keystroke@code})>>% \fi % \end{macrocode} % F display format % \begin{macrocode} \ifx\Fld@format@code\@empty \else - /F << /S /JavaScript /JS (\Hy@escapestring{\Fld@format@code}) >> + /F<</S/JavaScript/JS(\Hy@escapestring{\Fld@format@code})>>% \fi % \end{macrocode} % V validation % \begin{macrocode} \ifx\Fld@validate@code\@empty \else - /V << /S /JavaScript /JS (\Hy@escapestring{\Fld@validate@code}) >> + /V<</S/JavaScript/JS(\Hy@escapestring{\Fld@validate@code})>>% \fi % \end{macrocode} % C calculation % \begin{macrocode} \ifx\Fld@calculate@code\@empty \else - /C << /S /JavaScript /JS (\Hy@escapestring{\Fld@calculate@code}) >> + /C<</S/JavaScript/JS(\Hy@escapestring{\Fld@calculate@code})>>% \fi % \end{macrocode} % Fo receiving the input focus % \begin{macrocode} \ifx\Fld@onfocus@code\@empty \else - /Fo << /S /JavaScript /JS (\Hy@escapestring{\Fld@onfocus@code}) >> + /Fo<</S/JavaScript/JS(\Hy@escapestring{\Fld@onfocus@code})>>% \fi % \end{macrocode} % Bl loosing the input focus (blurred) % \begin{macrocode} \ifx\Fld@onblur@code\@empty \else - /Bl << /S /JavaScript /JS (\Hy@escapestring{\Fld@onblur@code}) >> + /Bl<</S/JavaScript/JS(\Hy@escapestring{\Fld@onblur@code})>>% \fi % \end{macrocode} % D pressing the mouse button (down) % \begin{macrocode} \ifx\Fld@onmousedown@code\@empty \else - /D << /S /JavaScript /JS (\Hy@escapestring{\Fld@onmousedown@code}) >> + /D<</S/JavaScript/JS(\Hy@escapestring{\Fld@onmousedown@code})>>% \fi % \end{macrocode} % U releasing the mouse button (up) % \begin{macrocode} \ifx\Fld@onmouseup@code\@empty \else - /U << /S /JavaScript /JS (\Hy@escapestring{\Fld@onmouseup@code}) >> + /U<</S/JavaScript/JS(\Hy@escapestring{\Fld@onmouseup@code})>>% \fi % \end{macrocode} % E cursor enters the annotation's active area. % \begin{macrocode} \ifx\Fld@onenter@code\@empty \else - /E << /S /JavaScript /JS (\Hy@escapestring{\Fld@onenter@code}) >> + /E<</S/JavaScript/JS(\Hy@escapestring{\Fld@onenter@code})>>% \fi % \end{macrocode} % X cursor exits the annotation's active area. % \begin{macrocode} \ifx\Fld@onexit@code\@empty \else - /X << /S /JavaScript /JS (\Hy@escapestring{\Fld@onexit@code}) >> + /X<</S/JavaScript/JS(\Hy@escapestring{\Fld@onexit@code})>>% \fi - >> + >>% } % \end{macrocode} % \end{macro} @@ -12936,26 +12978,26 @@ % \begin{macro}{\PDFForm@Radio} % \begin{macrocode} \def\PDFForm@Radio{% - /Subtype /Widget - \ifFld@hidden /F 6 \else /F 4 \fi - /T (\Hy@escapestring{\Fld@name}) - /FT /Btn - /Ff 49152 - /H /P - /BS << /W \Fld@borderwidth\space /S /\Fld@borderstyle\space >> - /MK << - /BC [\Fld@bordercolor] + /Subtype/Widget% + \ifFld@hidden /F 6\else /F 4\fi + /T(\Hy@escapestring{\Fld@name})% + /FT/Btn% + /Ff 49152% + /H/P + /BS<</W \Fld@borderwidth/S/\Fld@borderstyle>>% + /MK<<% + /BC[\Fld@bordercolor]% \ifx\Fld@bcolor\@empty \else - /BG [\Fld@bcolor] + /BG[\Fld@bcolor]% \fi - /CA (H) - >> - /DA (/ZaDb \strip@pt\Fld@charsize\space Tf \Fld@color\space rg) + /CA(H)% + >>% + /DA(/ZaDb \strip@pt\Fld@charsize\space Tf \Fld@color\space rg)% \ifx\@currValue\Fld@default - /V /\Fld@default\space + /V/\Fld@default \else - /V /Off + /V/Off% \fi \Fld@additionalactions } @@ -12964,30 +13006,30 @@ % \begin{macro}{\PDFForm@Text} % \begin{macrocode} \def\PDFForm@Text{% - /Subtype /Widget - \ifFld@hidden /F 6 \else /F 4 \fi - /T (\Hy@escapestring{\Fld@name}) - /Q \Fld@align\space - /FT /Tx - /BS << /W \Fld@borderwidth\space /S /\Fld@borderstyle\space >> - /MK << - /BC [\Fld@bordercolor] + /Subtype/Widget% + \ifFld@hidden /F 6\else /F 4\fi + /T(\Hy@escapestring{\Fld@name}) + /Q \Fld@align + /FT/Tx% + /BS<</W \Fld@borderwidth\space /S /\Fld@borderstyle>>% + /MK<<% + /BC[\Fld@bordercolor]% \ifx\Fld@bcolor\@empty \else - /BG [\Fld@bcolor] + /BG[\Fld@bcolor]% \fi - >> - /DA (/Helv \strip@pt\Fld@charsize\space Tf \Fld@color\space rg ) - /DV (\Hy@escapestring{\Fld@default}) - /V (\Hy@escapestring{\Fld@value}) + >>% + /DA(/Helv \strip@pt\Fld@charsize\space Tf \Fld@color\space rg)% + /DV(\Hy@escapestring{\Fld@default})% + /V(\Hy@escapestring{\Fld@value})% \Fld@additionalactions \ifFld@multiline - \ifFld@readonly /Ff 4097 \else /Ff 4096 \fi + \ifFld@readonly /Ff 4097\else /Ff 4096\fi \else \ifFld@password - \ifFld@readonly /Ff 8193 \else /Ff 8192 \fi + \ifFld@readonly /Ff 8193\else /Ff 8192\fi \else - \ifFld@readonly /Ff 1 \fi + \ifFld@readonly /Ff 1\fi \fi \fi \ifnum\Fld@maxlen>0/MaxLen \Fld@maxlen \fi @@ -12997,44 +13039,44 @@ % \begin{macro}{\PDFForm@Submit} % \begin{macrocode} \def\PDFForm@Submit{% - /Subtype /Widget - \ifFld@hidden /F 6 \else /F 4 \fi - /T (\Hy@escapestring{\Fld@name}) - /FT /Btn - /Ff 65540 - /H /P - /BS << /W \Fld@borderwidth\space /S /\Fld@borderstyle\space >> - /MK << - /BC [\Fld@bordercolor] - >> - /A << - /S /SubmitForm - /F << - /FS /URL - /F (\Hy@escapestring{\Form@action}) - >> - \ifForm@html /Flags 4 \fi - >> + /Subtype/Widget% + \ifFld@hidden /F 6\else /F 4\fi + /T(\Hy@escapestring{\Fld@name})% + /FT/Btn% + /Ff 65540% + /H/P% + /BS<</W \Fld@borderwidth/S/\Fld@borderstyle>>% + /MK<<% + /BC[\Fld@bordercolor]% + >>% + /A<<% + /S/SubmitForm% + /F<<% + /FS/URL% + /F(\Hy@escapestring{\Form@action})% + >>% + \ifForm@html /Flags 4\fi + >>% } % \end{macrocode} % \end{macro} % \begin{macro}{\PDFForm@Reset} % \begin{macrocode} \def\PDFForm@Reset{% - /Subtype /Widget - \ifFld@hidden /F 6 \else /F 4 \fi - /T (\Hy@escapestring{\Fld@name}) - /FT /Btn - /H /P - /DA (/Helv \strip@pt\Fld@charsize\space Tf 0 0 1 rg) - /Ff 65540 - /MK << - /BC [\Fld@bordercolor] + /Subtype/Widget% + \ifFld@hidden /F 6\else /F 4\fi + /T(\Hy@escapestring{\Fld@name})% + /FT/Btn% + /H/P% + /DA(/Helv \strip@pt\Fld@charsize\space Tf 0 0 1 rg)% + /Ff 65540% + /MK<<% + /BC[\Fld@bordercolor]% % /CA (Clear) % /AC (Done) - >> - /BS << /W \Fld@borderwidth\space /S /\Fld@borderstyle\space >> - /A << /S /ResetForm >> + >>% + /BS<</W \Fld@borderwidth/S/\Fld@borderstyle>>% + /A<</S/ResetForm>>% } % \end{macrocode} % \end{macro} |