From 122d749a0aa11870aba704eb168d86722b47457c Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 18 Sep 2010 00:07:43 +0000 Subject: hyperref update (17sep10) git-svn-id: svn://tug.org/texlive/trunk@19782 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/source/latex/hyperref/hyperref.dtx | 102 ++++++++++++++------- 1 file changed, 68 insertions(+), 34 deletions(-) (limited to 'Master/texmf-dist/source/latex/hyperref') diff --git a/Master/texmf-dist/source/latex/hyperref/hyperref.dtx b/Master/texmf-dist/source/latex/hyperref/hyperref.dtx index f56ee4d783a..f22d44e30e2 100644 --- a/Master/texmf-dist/source/latex/hyperref/hyperref.dtx +++ b/Master/texmf-dist/source/latex/hyperref/hyperref.dtx @@ -44,7 +44,7 @@ %\ProvidesFile{puenc.def} %\ProvidesFile{puvnenc.def} %\ProvidesFile{puarenc.def} -% [2010/09/13 v6.81n +% [2010/09/17 v6.81q % Hypertext links for LaTeX] % Dummy hyperref (SR)] % Hyperref documentation driver file] @@ -126,7 +126,7 @@ \end{document} % % \fi -% \CheckSum{27751} +% \CheckSum{27800} % % \MakeShortVerb{|} % \StopEventually{} @@ -575,10 +575,10 @@ \RequirePackage{ifxetex}[2006/08/21] \RequirePackage{hycolor} \RequirePackage{letltxmacro}[2008/06/13] -\def\Hy@Error#1{\@PackageError{hyperref}} -\def\Hy@Warning#1{\@PackageWarning{hyperref}{#1}} -\def\Hy@WarningNoLine#1{\@PackageWarningNoLine{hyperref}{#1}} -\def\Hy@Info#1{\@PackageInfo{hyperref}{#1}} +\def\Hy@Error{\@PackageError{hyperref}} +\def\Hy@Warning{\@PackageWarning{hyperref}} +\def\Hy@WarningNoLine{\@PackageWarningNoLine{hyperref}} +\def\Hy@Info{\@PackageInfo{hyperref}} \def\Hy@InfoNoLine{\@PackageInfoNoLine{hyperref}} \def\Hy@Message#1{% \GenericWarning{% @@ -610,12 +610,20 @@ \edef\{{\ltx@backslashchar\ltx@leftbracechar}% \edef\}{\ltx@rightbracechar}% \edef\\{\ltx@backslashchar\ltx@backslashchar}% - \ifnum\pdfmatch{#2}{#1}=\ltx@one + \ifcase\pdfmatch{#2}{#1} % + \endgroup + \expandafter\ltx@secondoftwo + \or \endgroup \expandafter\ltx@firstoftwo \else + \Hy@Warning{% + Internal error: Wrong pattern!\MessageBreak + --> #2 <--\MessageBreak + Pattern check ignored% + }% \endgroup - \expandafter\ltx@secondoftwo + \expandafter\ltx@firstoftwo \fi }% } @@ -5824,20 +5832,20 @@ \do{/P}{Push}% } \define@key{Hyp}{pdfborder}{% - \def\Hy@temp{#1}% - \Hy@Match\Hy@temp{% - ^(\HyPat@NonNegativeReal/ % - \HyPat@NonNegativeReal/ % - \HyPat@NonNegativeReal/% - ( ?[\HyPat@NonNegativeReal/( \HyPat@NonNegativeReal/)*])?)$% - }{% - \let\@pdfborder\Hy@temp - }{% + \let\Hy@temp\@pdfborder + \def\@pdfborder{#1}% + \Hy@Match\@pdfborder{% + ^\HyPat@NonNegativeReal/ % + \HyPat@NonNegativeReal/ % + \HyPat@NonNegativeReal/% + ( ?\[\HyPat@NonNegativeReal/( \HyPat@NonNegativeReal/)*])?$% + }{}{% \Hy@Warning{% - Invalid value `\Hy@temp'\MessageBreak + Invalid value `\@pdfborder'\MessageBreak for option `pdfborder'.\MessageBreak Option setting is ignored% }% + \let\@pdfborder\Hy@temp }% } \define@key{Hyp}{pdfborderstyle}{\def\@pdfborderstyle{#1}} @@ -6438,6 +6446,32 @@ % \end{macrocode} % % \begin{macrocode} +\def\Hy@wrapper@babel#1#2{% + \begingroup + \Hy@safe@activestrue + \set@display@protect + \edef\x{#2}% + \@onelevel@sanitize\x + \toks@{#1}% + \edef\x{\endgroup\the\toks@{\x}}% + \x +} +\def\Hy@WrapperDef#1{% + \begingroup + \escapechar=\m@ne + \xdef\Hy@gtemp{% + \expandafter\noexpand\csname HyWrap@\string#1\endcsname + }% + \endgroup + \edef#1{% + \noexpand\Hy@wrapper@babel + \expandafter\noexpand\Hy@gtemp + }% + \expandafter\def\Hy@gtemp +} +% \end{macrocode} +% +% \begin{macrocode} \ifHy@figures \Hy@Info{Hyper figures ON}% \else @@ -12176,7 +12210,7 @@ % \end{macrocode} % First define the anchors: % \begin{macrocode} -\def\new@pdflink#1{% +\Hy@WrapperDef\new@pdflink#1{% \ifhmode \@savsf\spacefactor \fi @@ -12886,7 +12920,7 @@ \special{html:}% \fi } -\def\hyper@anchor#1{% +\Hy@WrapperDef\hyper@anchor#1{% \Hy@SaveLastskip \Hy@VerboseAnchor{#1}% \begingroup @@ -12901,7 +12935,7 @@ \Hy@activeanchorfalse \Hy@RestoreLastskip } -\def\hyper@anchorstart#1{% +\Hy@WrapperDef\hyper@anchorstart#1{% \Hy@SaveLastskip \Hy@VerboseAnchor{#1}% \begingroup @@ -13019,7 +13053,7 @@ % \begin{macrocode} \providecommand*{\XR@ext}{dvi} \providecommand*\wwwbrowser{c:\string\netscape\string\netscape} -\def\hyper@anchor#1{% +\Hy@WrapperDef\hyper@anchor#1{% \Hy@SaveLastskip \Hy@VerboseAnchor{#1}% \begingroup @@ -13031,7 +13065,7 @@ \Hy@activeanchorfalse \Hy@RestoreLastskip } -\def\hyper@anchorstart#1{% +\Hy@WrapperDef\hyper@anchorstart#1{% \Hy@SaveLastskip \Hy@VerboseAnchor{#1}% \special{mark: #1}% @@ -13288,7 +13322,7 @@ } \newsavebox{\pdfm@box} \def\@pdfm@mark#1{\special{pdf:#1}} -\def\@pdfm@dest#1{% +\Hy@WrapperDef\@pdfm@dest#1{% \Hy@SaveLastskip \Hy@VerboseAnchor{#1}% \begingroup @@ -13825,7 +13859,7 @@ \special{!direct }% \fi } -\def\hyper@anchorstart#1{% +\Hy@WrapperDef\hyper@anchorstart#1{% \Hy@SaveLastskip \Hy@VerboseAnchor{#1}% \begingroup @@ -13841,7 +13875,7 @@ \Hy@activeanchorfalse \Hy@RestoreLastskip } -\def\hyper@anchor#1{% +\Hy@WrapperDef\hyper@anchor#1{% \Hy@SaveLastskip \Hy@VerboseAnchor{#1}% \begingroup @@ -13927,7 +13961,7 @@ \providecommand*\@pdfborder{0 0 1} \providecommand*\@pdfborderstyle{} \let\CurrentBorderColor\@linkbordercolor -\def\hyper@anchor#1{% +\Hy@WrapperDef\hyper@anchor#1{% \Hy@SaveLastskip \Hy@VerboseAnchor{#1}% \begingroup @@ -13940,7 +13974,7 @@ \Hy@activeanchorfalse \Hy@RestoreLastskip } -\def\hyper@anchorstart#1{% +\Hy@WrapperDef\hyper@anchorstart#1{% \Hy@SaveLastskip \Hy@VerboseAnchor{#1}% \begingroup @@ -14609,7 +14643,7 @@ \def\HyPat@ObjRef{% \{[^{}]+\}% } -\def\hyper@anchor#1{% +\Hy@WrapperDef\hyper@anchor#1{% \Hy@SaveLastskip \Hy@VerboseAnchor{#1}% \begingroup @@ -14623,7 +14657,7 @@ \Hy@RestoreLastskip } \ltx@IfUndefined{hyper@anchorstart}{}{\endinput} -\def\hyper@anchorstart#1{% +\Hy@WrapperDef\hyper@anchorstart#1{% \Hy@SaveLastskip \Hy@VerboseAnchor{#1}% \literalps@out{H.S}% @@ -15784,7 +15818,7 @@ \fi \keepPDF@SetupDoc } -\def\hyper@anchor#1{% +\Hy@WrapperDef\hyper@anchor#1{% \Hy@SaveLastskip \Hy@VerboseAnchor{#1}% \begingroup @@ -15798,7 +15832,7 @@ \Hy@activeanchorfalse \Hy@RestoreLastskip } -\def\hyper@anchorstart#1{% +\Hy@WrapperDef\hyper@anchorstart#1{% \Hy@SaveLastskip \Hy@VerboseAnchor{#1}% \begingroup @@ -16095,7 +16129,7 @@ \special{t4ht=}% \fi } -\def\hyper@anchor#1{% +\Hy@WrapperDef\hyper@anchor#1{% \Hy@SaveLastskip \Hy@VerboseAnchor{#1}% \begingroup @@ -16109,7 +16143,7 @@ \Hy@activeanchorfalse \Hy@RestoreLastskip } -\def\hyper@anchorstart#1{% +\Hy@WrapperDef\hyper@anchorstart#1{% \Hy@SaveLastskip \Hy@VerboseAnchor{#1}% \begingroup -- cgit v1.2.3