From c74d9648abb6877ccf4c69fdd39bb8d3763574bf Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 23 Aug 2012 22:38:37 +0000 Subject: hyperref (23aug12) git-svn-id: svn://tug.org/texlive/trunk@27508 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/hyperref/hyperref.sty | 124 +++++++++++----------- 1 file changed, 63 insertions(+), 61 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 72f4d947935..0344cb8e09c 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hyperref.sty +++ b/Master/texmf-dist/tex/latex/hyperref/hyperref.sty @@ -30,7 +30,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{hyperref} - [2012/08/18 v6.83b % + [2012/08/21 v6.83c % Hypertext links for LaTeX] \begingroup \@makeother\`% @@ -1793,69 +1793,71 @@ \def\HyPsd@@AppendItalcorr#1#2{% \expandafter\def\expandafter#2\expandafter{#2#1}% } -\catcode`\Q=\active -\let Q\ltx@empty -\def\HyPsd@CheckCatcodes#1#2\HyPsd@End{% - \global\let\HyPsd@Rest\relax - \ifcat\relax\noexpand#1\relax - \ifx#1\protect - \else - \ifx#1\penalty - \setbox\z@=\hbox{% - \afterassignment\HyPsd@AfterCountRemove - \count@=#2\HyPsd@End - }% +\begingroup + \catcode`\Q=\active + \let Q\ltx@empty + \gdef\HyPsd@CheckCatcodes#1#2\HyPsd@End{% + \global\let\HyPsd@Rest\relax + \ifcat\relax\noexpand#1\relax + \ifx#1\protect \else - \ifx#1\kern + \ifx#1\penalty \setbox\z@=\hbox{% - \afterassignment\HyPsd@AfterDimenRemove - \dimen@=#2\HyPsd@End + \afterassignment\HyPsd@AfterCountRemove + \count@=#2\HyPsd@End }% \else - \ifx#1\hskip + \ifx#1\kern \setbox\z@=\hbox{% - \afterassignment\HyPsd@AfterSkipRemove - \skip@=#2\HyPsd@End + \afterassignment\HyPsd@AfterDimenRemove + \dimen@=#2\HyPsd@End }% \else - \HyPsd@CatcodeWarning{#1}% + \ifx#1\hskip + \setbox\z@=\hbox{% + \afterassignment\HyPsd@AfterSkipRemove + \skip@=#2\HyPsd@End + }% + \else + \HyPsd@CatcodeWarning{#1}% + \fi \fi \fi \fi - \fi - \else - \ifcat\noexpand#1\noexpandQ% active character - \expandafter\expandafter\expandafter\def - \expandafter\expandafter\expandafter\HyPsd@String - \expandafter\expandafter\expandafter{% - \expandafter\HyPsd@String\string#1% - }% \else - \ifcat#1A% letter - \expandafter\def\expandafter\HyPsd@String\expandafter{% - \HyPsd@String#1% + \ifcat\noexpand#1\noexpandQ% active character + \expandafter\expandafter\expandafter\def + \expandafter\expandafter\expandafter\HyPsd@String + \expandafter\expandafter\expandafter{% + \expandafter\HyPsd@String\string#1% }% \else - \ifcat#1 % SPACE + \ifcat#1A% letter \expandafter\def\expandafter\HyPsd@String\expandafter{% - \HyPsd@String\HyPsd@SPACEOPTI + \HyPsd@String#1% }% \else - \ifcat$#1% - \HyPsd@CatcodeWarning{math shift}% + \ifcat#1 % SPACE + \expandafter\def\expandafter\HyPsd@String\expandafter{% + \HyPsd@String\HyPsd@SPACEOPTI + }% \else - \ifcat% - \HyPsd@CatcodeWarning{alignment tab}% + \ifcat$#1% + \HyPsd@CatcodeWarning{math shift}% \else - \ifcat^#1% - \HyPsd@CatcodeWarning{superscript}% + \ifcat% + \HyPsd@CatcodeWarning{alignment tab}% \else - \ifcat_#1% - \HyPsd@CatcodeWarning{subscript}% + \ifcat^#1% + \HyPsd@CatcodeWarning{superscript}% \else - \expandafter\def\expandafter\HyPsd@String\expandafter{% - \HyPsd@String#1% - }% + \ifcat_#1% + \HyPsd@CatcodeWarning{subscript}% + \else + \expandafter\def\expandafter\HyPsd@String\expandafter{% + \HyPsd@String#1% + }% + \fi \fi \fi \fi @@ -1863,25 +1865,24 @@ \fi \fi \fi - \fi - \ifx\HyPsd@Rest\relax - \ifx\scrollmode#2\scrollmode - \else - \Hy@ReturnAfterFiFiEnd{% - \HyPsd@CheckCatcodes#2\HyPsd@End - }% - \fi - \else - \ifx\HyPsd@Rest\@empty + \ifx\HyPsd@Rest\relax + \ifx\scrollmode#2\scrollmode + \else + \Hy@ReturnAfterFiFiEnd{% + \HyPsd@CheckCatcodes#2\HyPsd@End + }% + \fi \else - \Hy@ReturnAfterFiFiEnd{% - \expandafter\HyPsd@CheckCatcodes\HyPsd@Rest\HyPsd@End - }% + \ifx\HyPsd@Rest\@empty + \else + \Hy@ReturnAfterFiFiEnd{% + \expandafter\HyPsd@CheckCatcodes\HyPsd@Rest\HyPsd@End + }% + \fi \fi - \fi - \Hy@ReturnEnd -} -\catcode`\Q=11 % + \Hy@ReturnEnd + }% +\endgroup \def\HyPsd@AfterCountRemove#1\HyPsd@End{% \gdef\HyPsd@Rest{#1}% } @@ -6237,6 +6238,7 @@ \def\@starttoc#1{% \begingroup \makeatletter + \ltx@ifpackageloaded{parskip}{\parskip\z@}{}% \IfFileExists{\jobname.#1}{% \Hy@WarningNoLine{% old #1 file detected, not used; run LaTeX again% -- cgit v1.2.3