From 83316e68b48213a76b799581c3fdfa3b49602578 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 17 Dec 2009 00:53:48 +0000 Subject: hyperref update (16dec09) git-svn-id: svn://tug.org/texlive/trunk@16430 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/hyperref/hyperref.sty | 143 +++++++++++++++------- 1 file changed, 97 insertions(+), 46 deletions(-) (limited to 'Master/texmf-dist/tex/latex/hyperref/hyperref.sty') diff --git a/Master/texmf-dist/tex/latex/hyperref/hyperref.sty b/Master/texmf-dist/tex/latex/hyperref/hyperref.sty index 8dee55e1f6d..da9b80b7afc 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} - [2009/12/15 v6.79p + [2009/12/16 v6.79u Hypertext links for LaTeX] \begingroup \@makeother\`% @@ -322,13 +322,14 @@ \let\vphantom\@gobble \let\hphantom\@gobble \def\textcolor##1##{\@secondoftwo}% - \def\MakeUppercase{\MakeUppercaseIsNotSupportedInPdfStrings}% - \def\MakeLowercase{\MakeLowercaseIsNotSupportedInPdfStrings}% + \def\MakeUppercase{\MakeUppercaseUnsupportedInPdfStrings}% + \def\MakeLowercase{\MakeLowercaseUnsupportedInPdfStrings}% \let\textlatin\@firstofone \@ifundefined{language@group}{}{% \csname HyPsd@babel@\language@group\endcsname }% \HyPsd@GreekPatch + \HyPsd@BabelPatch \let\@safe@activestrue\relax \let\@safe@activesfalse\relax \let\cyr\relax @@ -357,7 +358,7 @@ \let\mbox\@empty \def\halign{\pdfstringdefWarn\halign\@gobble}% \let\ignorespaces\HyPsd@ignorespaces -\let\Hy@SectionAnchor\@empty + \let\Hy@SectionAnchor\@empty \ifHy@CJKbookmarks \HyPsd@CJKhook \fi @@ -480,7 +481,7 @@ \EdefUnescapeString\HyPsd@temp#1% \ifxetex \StringEncodingConvertTest\HyPsd@temp\HyPsd@temp - {utf16be}{ascii}{% + {utf16be}{ascii-print}{% \EdefEscapeString\HyPsd@temp\HyPsd@temp \global\let#1\HyPsd@temp \Hy@unicodefalse @@ -569,6 +570,50 @@ }% }% \x +\def\HyPsd@BabelPatch{% + \let\HyOrg@languageshorthands\languageshorthands + \let\languageshorthands\HyPsd@LanguageShorthands +} +\RequirePackage{pdftexcmds}[2009/04/10] +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname pdf@strcmp\endcsname\relax + \let\HyPsd@langshort@system\@empty + \def\HyPsd@LanguageShorthands#1{% + \expandafter\ifx\csname HyPsd@langshort@#1\endcsname + \HyPsd@langshort@system + \expandafter\@gobble + \else + \expandafter\@firstofone + \fi + {% + \HyOrg@languageshorthands{#1}% + }% + }% +\else + \def\HyPsd@LanguageShorthands#1{% + \ifnum\pdf@strcmp{#1}{system}=\z@ + \expandafter\@gobble + \else + \expandafter\@firstofone + \fi + {% + \HyOrg@languageshorthands{#1}% + }% + }% +\fi +\def\Hy@temp{% + \@ifpackageloaded{babel}{% + \@ifpackagelater{babel}{2008/03/16}{% + \let\Hy@temp\@empty + }{% + \def\HyPsd@BabelPatch{% + \let\HyOrg@languageshorthands\languageshorthands + }% + }% + }{}% +} +\Hy@temp +\expandafter\AtBeginDocument\expandafter{\Hy@temp} \newif\ifHy@next \@ifundefined{danish@sh@"@sel}{}{% \def\HyPsd@babel@danish{% @@ -1846,6 +1891,23 @@ \Hy@boolkey{final}{#1}% } \let\KV@Hyp@nolinks\KV@Hyp@draft +\def\Hy@ObsoletePaperOption#1{% + \Hy@WarningNoLine{% + Option `#1' is no longer used% + }% + \define@key{Hyp}{#1}[true]{}% +} +\def\Hy@temp#1{% + \define@key{Hyp}{#1}[true]{% + \Hy@ObsoletePaperOption{#1}% + }% +} +\Hy@temp{a4paper} +\Hy@temp{a5paper} +\Hy@temp{b5paper} +\Hy@temp{letterpaper} +\Hy@temp{legalpaper} +\Hy@temp{executivepaper} \define@key{Hyp}{setpagesize}[true]{% \Hy@boolkey{setpagesize}{#1}% } @@ -2001,7 +2063,7 @@ \def\HyPsd@pdfencoding@unicode{unicode} \let\HyPsd@pdfencoding\Hy@pdfencoding@pdfdoc \def\HyPsd@LoadStringEnc{% - \RequirePackage{stringenc}[2007/06/14]% + \RequirePackage{stringenc}[2009/12/15]% \let\HyPsd@LoadStringEnc\relax } \AtBeginDocument{% @@ -2988,36 +3050,6 @@ \ifHy@next \let\texttilde\~% \fi -\@ifpackageloaded{babel}{% - \@ifpackagelater{babel}{2008/03/16}{% - \def\Hy@PatchLanguageShorthands#1{% - \begingroup - \edef\x{#1}% - \@onelevel@sanitize\x - \def\y{system}% - \@onelevel@sanitize\y - \expandafter\endgroup - \ifx\x\y - \else - \HyOrg@languageshorthands{#1}% - \fi - }% - \AtBeginDocument{% - \begingroup - \toks0=\expandafter{\pdfstringdefPreHook}% - \xdef\pdfstringdefPreHook{% - \let\noexpand\HyOrg@languageshorthands - \noexpand\languageshorthands - \let\noexpand\languageshorthands - \noexpand\Hy@PatchLanguageShorthands - \the\toks0 % - \let\noexpand\languageshorthands - \noexpand\HyOrg@languageshorthands - }% - \endgroup - }% - }{}% -}{} \ifHy@figures \Hy@Info{Hyper figures ON}% \else @@ -5302,10 +5334,14 @@ \long\def\@mpfootnotetext#1{% \H@@mpfootnotetext{% \ifHy@nesting - \expandafter\hyper@@anchor\expandafter{\Hy@footnote@currentHref}{#1}% + \expandafter\hyper@@anchor\expandafter{% + \Hy@footnote@currentHref + }{#1}% \else \Hy@raisedlink{% - \expandafter\hyper@@anchor\expandafter{\Hy@footnote@currentHref}{\relax}% + \expandafter\hyper@@anchor\expandafter{% + \Hy@footnote@currentHref + }{\relax}% }#1% \fi }% @@ -5313,10 +5349,14 @@ \long\def\@footnotetext#1{% \H@@footnotetext{% \ifHy@nesting - \expandafter\hyper@@anchor\expandafter{\Hy@footnote@currentHref}{#1}% + \expandafter\hyper@@anchor\expandafter{% + \Hy@footnote@currentHref + }{#1}% \else \Hy@raisedlink{% - \expandafter\hyper@@anchor\expandafter{\Hy@footnote@currentHref}{\relax}% + \expandafter\hyper@@anchor\expandafter{% + \Hy@footnote@currentHref + }{\relax}% }% \let\@currentHlabel\Hy@footnote@currentHlabel \let\@currentHref\Hy@footnote@currentHref @@ -5404,7 +5444,9 @@ \bgroup \aftergroup\V@@@footnotetext \Hy@raisedlink{% - \expandafter\hyper@@anchor\expandafter{\Hy@footnote@currentHref}{\relax}% + \expandafter\hyper@@anchor\expandafter{% + \Hy@footnote@currentHref + }{\relax}% }% \let\@currentHlabel\Hy@footnote@currentHlabel \let\@currentHref\Hy@footnote@currentHref @@ -5494,7 +5536,9 @@ \expandafter\hyper@@anchor\expandafter{\@currentHref}{#3}% \else \Hy@raisedlink{% - \expandafter\hyper@@anchor\expandafter{\@currentHref}{\relax}% + \expandafter\hyper@@anchor\expandafter{% + \@currentHref + }{\relax}% }% #3% \fi @@ -5520,7 +5564,9 @@ #1\relax \ifx\Hy@float@currentHref\@undefined \else - \expandafter\hyper@@anchor\expandafter{\Hy@float@currentHref}{\relax}% + \expandafter\hyper@@anchor\expandafter{% + \Hy@float@currentHref + }{\relax}% \global\let\Hy@float@currentHref\@undefined \fi }% @@ -5778,7 +5824,9 @@ \fi \else \Hy@GlobalStepCount\Hy@pagecounter - \def\Hy@TempPageAnchor{\hyper@@anchor{page.\the\Hy@pagecounter}}% + \def\Hy@TempPageAnchor{% + \hyper@@anchor{page.\the\Hy@pagecounter}% + }% \fi \vbox to 0pt{% \kern\voffset @@ -5911,7 +5959,9 @@ \def\@seteqlabel#1{% \H@seteqlabel{#1}% \xdef\@currentHref{AMS.\the\Hy@linkcounter}% - \Hy@raisedlink{\hyper@anchorstart{\@currentHref}\hyper@anchorend}% + \Hy@raisedlink{% + \hyper@anchorstart{\@currentHref}\hyper@anchorend + }% }% }{} \let\HyOrg@addtoreset\@addtoreset @@ -6462,7 +6512,8 @@ }% }{% \edef\HyRef@currentHtag{% - \expandafter\noexpand\csname\HyRef@name autorefname\endcsname + \expandafter\noexpand + \csname\HyRef@name autorefname\endcsname \noexpand~% }% }% -- cgit v1.2.3