summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/hyperref/hyperref.sty
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/hyperref/hyperref.sty')
-rw-r--r--Master/texmf-dist/tex/latex/hyperref/hyperref.sty1319
1 files changed, 892 insertions, 427 deletions
diff --git a/Master/texmf-dist/tex/latex/hyperref/hyperref.sty b/Master/texmf-dist/tex/latex/hyperref/hyperref.sty
index 245ba22d0a0..980ea5b7e7a 100644
--- a/Master/texmf-dist/tex/latex/hyperref/hyperref.sty
+++ b/Master/texmf-dist/tex/latex/hyperref/hyperref.sty
@@ -23,7 +23,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{hyperref}
- [2007/02/27 v6.75t
+ [2007/05/29 v6.76g
Hypertext links for LaTeX]
\begingroup
\@makeother\`%
@@ -44,10 +44,10 @@
\def\Hy@SetCatcodes{%
\@makeother\`%
\@makeother\=%
- \catcode`\$=3
- \catcode`\&=4
- \catcode`\^=7
- \catcode`\_=8
+ \catcode`\$=3 %
+ \catcode`\&=4 %
+ \catcode`\^=7 %
+ \catcode`\_=8 %
\@makeother\|%
\@makeother\:%
\@makeother\(%
@@ -93,6 +93,7 @@
\endgroup
\Hy@SetCatcodes
\RequirePackage{keyval}[1997/11/10]
+\RequirePackage{hycolor}
\def\Hy@Warning#1{\PackageWarning{hyperref}{#1}}
\def\Hy@WarningNoLine#1{\PackageWarningNoLine{hyperref}{#1}}
\def\Hy@Info#1{\PackageInfo{hyperref}{#1}}
@@ -186,6 +187,9 @@
\Hy@pagecounter0
\long\def\Hy@ReturnAfterElseFi#1\else#2\fi{\fi#1}
\long\def\Hy@ReturnAfterFi#1\fi{\fi#1}
+\let\Hy@ReturnEnd\@empty
+\long\def\Hy@ReturnAfterFiFiEnd#1\fi#2\Hy@ReturnEnd{\fi\fi#1}
+\long\def\Hy@ReturnAfterElseFiFiEnd#1\else#2\Hy@ReturnEnd{\fi\fi#1}
\def\Hy@safe@activestrue{\csname @safe@activestrue\endcsname}
\def\Hy@safe@activesfalse{\csname @safe@activesfalse\endcsname}
\begingroup\expandafter\expandafter\expandafter\endgroup
@@ -196,7 +200,7 @@
\HyCal@scan#2\hypercalcbp\@nil
\expandafter\endgroup
\expandafter\def\expandafter#1\expandafter{\the\toks@}%
- }
+ }%
\def\HyCal@scan#1\hypercalcbp#2\@nil{%
\toks@\expandafter{\the\toks@ #1}%
\ifx\\#2\\%
@@ -205,7 +209,7 @@
\HyCal@do#2\@nil
}%
\fi
- }
+ }%
\def\HyCal@do#1#2\@nil{%
\@ifpackageloaded{calc}{}{%
\Hy@Warning{%
@@ -222,12 +226,12 @@
}%
}\x
\HyCal@scan#2\@nil
- }
+ }%
\else
\def\hypercalcbp#1{%
\strip@pt\dimexpr 0.99626401\dimexpr #1\relax\relax
- }
- \def\hypercalcbpdef{\def}
+ }%
+ \def\hypercalcbpdef{\def}%
\fi
\def\pdfstringdef#1#2{%
\begingroup
@@ -299,6 +303,7 @@
\@ifundefined{language@group}{}{%
\csname HyPsd@babel@\language@group\endcsname
}%
+ \HyPsd@GreekPatch
\let\@safe@activestrue\relax
\let\@safe@activesfalse\relax
\let\cyr\relax
@@ -477,109 +482,229 @@
\expandafter\noexpand\csname<>-\string#1\endcsname
}
\newif\ifHy@next
-\@ifpackagewith{babel}{danish}{%
+\@ifundefined{danish@sh@"@sel}{}{%
\def\HyPsd@babel@danish{%
\declare@shorthand{danish}{"|}{}%
\declare@shorthand{danish}{"~}{-}%
}%
-}{}
-\Hy@nextfalse
-\@ifpackagewith{babel}{dutch}{\Hy@nexttrue}{}%
-\@ifpackagewith{babel}{afrikaans}{\Hy@nexttrue}{}%
-\ifHy@next
+}
+\@ifundefined{dutch@sh@"@sel}{}{%
\def\HyPsd@babel@dutch{%
\declare@shorthand{dutch}{"|}{}%
\declare@shorthand{dutch}{"~}{-}%
}%
-\fi
-\@ifpackagewith{babel}{finnish}{%
+}
+\@ifundefined{finnish@sh@"@sel}{}{%
\def\HyPsd@babel@finnish{%
\declare@shorthand{finnish}{"|}{}%
}%
-}{}
-\Hy@nextfalse
-\@ifpackagewith{babel}{frenchb}{\Hy@nexttrue}{}
-\@ifpackagewith{babel}{francais}{\Hy@nexttrue}{}
-\ifHy@next
+}
+\@ifundefined{french@sh@:@sel}{}{%
\def\HyPsd@babel@frenchb{%
\def\guill@spacing{ }%
}%
-\fi
-\Hy@nextfalse
-\@ifpackagewith{babel}{german}{\Hy@nexttrue}{}%
-\@ifpackagewith{babel}{germanb}{\Hy@nexttrue}{}%
-\@ifpackagewith{babel}{austrian}{\Hy@nexttrue}{}%
-\ifHy@next
+}
+\@ifundefined{german@sh@"@sel}{}{%
\def\HyPsd@babel@german{%
\declare@shorthand{german}{"f}{f}%
\declare@shorthand{german}{"|}{}%
\declare@shorthand{german}{"~}{-}%
}%
-\fi
-\Hy@nextfalse
-\@ifpackagewith{babel}{ngerman}{\Hy@nexttrue}{}%
-\@ifpackagewith{babel}{ngermanb}{\Hy@nexttrue}{}%
-\@ifpackagewith{babel}{naustrian}{\Hy@nexttrue}{}%
-\ifHy@next
- \def\HyPsd@babel@ngerman{%
- \declare@shorthand{german}{"|}{}%
- \declare@shorthand{german}{"~}{-}%
+}
+\@ifundefined{macedonian@sh@"@sel}{}{%
+ \def\HyPsd@babel@macedonian{%
+ \declare@shorthand{macedonian}{"|}{}%
+ \declare@shorthand{macedonian}{"~}{-}%
}%
-\fi
-\Hy@nextfalse
-\@ifpackagewith{babel}{usorbian}{\Hy@nexttrue}{}%
-\@ifpackagewith{babel}{uppersorbian}{\Hy@nexttrue}{}%
-\ifHy@next
- \def\HyPsd@babel@usorbian{%
- \declare@shorthand{usorbian}{"f}{f}%
- \declare@shorthand{usorbian}{"|}{}%
+}{}
+\@ifundefined{ngerman@sh@"@sel}{}{%
+ \def\HyPsd@babel@ngerman{%
+ \declare@shorthand{ngerman}{"|}{}%
+ \declare@shorthand{ngerman}{"~}{-}%
}%
-\fi
-\Hy@nextfalse
-\@ifpackagewith{babel}{brazil}{\Hy@nexttrue}{}%
-\@ifpackagewith{babel}{brazilian}{\Hy@nexttrue}{}%
-\@ifpackagewith{babel}{portuges}{\Hy@nexttrue}{}%
-\@ifpackagewith{babel}{portuguese}{\Hy@nexttrue}{}%
-\ifHy@next
+}
+\@ifundefined{portuges@sh@"@sel}{}{%
\def\HyPsd@babel@portuges{%
\declare@shorthand{portuges}{"|}{}%
}%
-\fi
-\Hy@nextfalse
-\@ifpackagewith{babel}{russian}{\Hy@nexttrue}{}
-\@ifpackagewith{babel}{russianb}{\Hy@nexttrue}{}
-\ifHy@next
+}
+\@ifundefined{russian@sh@"@sel}{}{%
\def\HyPsd@babel@russian{%
\declare@shorthand{russian}{"|}{}%
\declare@shorthand{russian}{"~}{-}%
}%
-\fi
-\Hy@nextfalse
-\@ifpackagewith{babel}{ukrainian}{\Hy@nexttrue}{}
-\@ifpackagewith{babel}{ukraineb}{\Hy@nexttrue}{}
-\ifHy@next
- \def\HyPsd@babel@ukrainian{%
- \declare@shorthand{ukrainian}{"|}{}%
- \declare@shorthand{ukrainian}{"~}{-}%
- }%
-\fi
-\@ifpackagewith{babel}{macedonian}{%
- \def\HyPsd@babel@macedonian{%
- \declare@shorthand{macedonian}{"|}{}%
- \declare@shorthand{macedonian}{"~}{-}%
- }%
-}{}
-\@ifpackagewith{babel}{slovene}{%
+}
+\@ifundefined{slovene@sh@"@sel}{}{%
\def\HyPsd@babel@slovene{%
\declare@shorthand{slovene}{"|}{}%
}%
-}{}
-\@ifpackagewith{babel}{swedish}{%
+}
+\@ifundefined{spanish@sh@>@sel}{}{%
+ \def\HyPsd@babel@spanish{%
+ \declare@shorthand{spanish}{<<}{\guillemotleft}%
+ \declare@shorthand{spanish}{>>}{\guillemotright}%
+ \declare@shorthand{spanish}{"=}{-}%
+ \declare@shorthand{spanish}{"~}{-}%
+ \declare@shorthand{spanish}{"!}{\textexclamdown}%
+ \declare@shorthand{spanish}{"?}{\textquestiondown}%
+ }%
+}
+\@ifundefined{swedish@sh@"@sel}{}{%
\def\HyPsd@babel@swedish{%
\declare@shorthand{swedish}{"|}{}%
\declare@shorthand{swedish}{"~}{-}%
}%
-}{}
+}
+\@ifundefined{ukrainian@sh@"@sel}{}{%
+ \def\HyPsd@babel@ukrainian{%
+ \declare@shorthand{ukrainian}{"|}{}%
+ \declare@shorthand{ukrainian}{"~}{-}%
+ }%
+}
+\@ifundefined{usorbian@sh@"@sel}{}{%
+ \def\HyPsd@babel@usorbian{%
+ \declare@shorthand{usorbian}{"f}{f}%
+ \declare@shorthand{usorbian}{"|}{}%
+ }%
+}
+\@ifundefined{greek@sh@\string~@sel}{%
+ \let\HyPsd@GreekPatch\@empty
+}{%
+ \def\HyPsd@GreekPatch{%
+ \let\greeknumeral\HyPsd@greeknumeral
+ \let\Greeknumeral\HyPsd@Greeknumeral
+ }%
+}
+\def\HyPsd@greeknumeral#1{%
+ \HyPsd@GreekNum\@firstoftwo{#1}%
+}
+\def\HyPsd@Greeknumeral#1{%
+ \HyPsd@GreekNum\@secondoftwo{#1}%
+}
+\def\HyPsd@GreekNum#1#2{%
+ \ifHy@unicode
+ \ifnum#2<\@ne
+ \@arabic{#2}%
+ \else
+ \ifnum#2<1000000 %
+ \HyPsd@@GreekNum#1{#2}%
+ \else
+ \@arabic{#2}%
+ \fi
+ \fi
+ \else
+ \@arabic{#2}%
+ \fi
+}
+\def\HyPsd@@GreekNum#1#2{%
+ \ifnum#2<\@m
+ \ifnum#2<10 %
+ \expandafter\HyPsd@GreekNumI
+ \expandafter\@gobble\expandafter#1\number#2%
+ \else
+ \ifnum#2<100 %
+ \expandafter\HyPsd@GreekNumII
+ \expandafter\@gobble\expandafter#1\number#2%
+ \else
+ \expandafter\HyPsd@GreekNumIII
+ \expandafter\@gobble\expandafter#1\number#2%
+ \fi
+ \fi
+ \ifnum#2>\z@
+ \textnumeralsigngreek
+ \fi
+ \else
+ \ifnum#2<\@M
+ \expandafter\HyPsd@GreekNumIV\expandafter#1\number#2%
+ \else
+ \ifnum#2<100000 %
+ \expandafter\HyPsd@GreekNumV\expandafter#1\number#2%
+ \else
+ \expandafter\HyPsd@GreekNumVI\expandafter#1\number#2%
+ \fi
+ \fi
+ \fi
+}
+\def\HyPsd@GreekNumI#1#2#3{%
+ #1{%
+ \ifnum#3>\z@
+ \textnumeralsignlowergreek
+ \fi
+ }%
+ \expandafter#2%
+ \ifcase#3 %
+ {}{}%
+ \or\textalpha\textAlpha
+ \or\textbeta\textBeta
+ \or\textgamma\textGamma
+ \or\textdelta\textDelta
+ \or\textepsilon\textEpsilon
+ \or\textstigmagreek\textStigmagreek
+ \or\textzeta\textZeta
+ \or\texteta\textEta
+ \or\texttheta\textTheta
+ \else
+ {}{}%
+ \fi
+}
+\def\HyPsd@GreekNumII#1#2#3#4{%
+ #1{%
+ \ifnum#3>\z@
+ \textnumeralsignlowergreek
+ \fi
+ }%
+ \expandafter#2%
+ \ifcase#3 %
+ {}{}%
+ \or\textiota\textIota
+ \or\textkappa\textKappa
+ \or\textlambda\textLambda
+ \or\textmu\textMu
+ \or\textnu\textNu
+ \or\textxi\textXi
+ \or\textomicron\textOmicron
+ \or\textpi\textPi
+ \or\textkoppagreek\textKoppagreek
+ \else
+ {}{}%
+ \fi
+ \HyPsd@GreekNumI#1#2#4%
+}
+\def\HyPsd@GreekNumIII#1#2#3#4#5{%
+ #1{%
+ \ifnum#3>\z@
+ \textnumeralsignlowergreek
+ \fi
+ }%
+ \expandafter#2%
+ \ifcase#3 %
+ {}{}%
+ \or\textrho\textRho
+ \or\textsigma\textSigma
+ \or\texttau\textTau
+ \or\textupsilon\textUpsilon
+ \or\textphi\textPhi
+ \or\textchi\textChi
+ \or\textpsi\textPsi
+ \or\textomega\textOmega
+ \or\textsampigreek\textSampigreek
+ \else
+ {}{}%
+ \fi
+ \HyPsd@GreekNumII#1#2#4#5%
+}
+\def\HyPsd@GreekNumIV#1#2#3#4#5{%
+ \HyPsd@GreekNumI\@firstofone#1#2%
+ \HyPsd@@GreekNum#1{#3#4#5}%
+}
+\def\HyPsd@GreekNumV#1#2#3#4#5#6{%
+ \HyPsd@GreekNumII\@firstofone#1#2#3%
+ \HyPsd@@GreekNum#1{#4#5#6}%
+}
+\def\HyPsd@GreekNumVI#1#2#3#4#5#6#7{%
+ \HyPsd@GreekNumIII\@firstofone#1#2#3#4%
+ \HyPsd@@GreekNum#1{#5#6#7}%
+}
\begingroup
\catcode"7F=\active
\toks@{%
@@ -600,9 +725,9 @@
\fi
\HyPsd@CJKActiveChars
}%
- \count@=127
+ \count@=127 %
\@whilenum\count@<255 \do{%
- \advance\count@ by 1
+ \advance\count@ by 1 %
\lccode`\~=\count@
\lowercase{%
\toks@\expandafter{\the\toks@ ~}%
@@ -829,65 +954,92 @@
\Hy@Warning{#1}%
\endgroup
}
-\def\HyPsd@ProtectSpaces#1{%
- \expandafter\HyPsd@@ProtectSpaces
- \expandafter|\expandafter\@empty#1| \HyPsd@End#1%
-}
-\def\HyPsd@@ProtectSpaces#1 #2\HyPsd@End#3{%
- \ifx\scrollmode#2\scrollmode
- \HyPsd@RemoveMask#1\HyPsd@End#3%
- \else
- \gdef#3{#1\HyPsd@UnexpandableSpace#2}%
- \Hy@ReturnAfterFi{%
- \expandafter\HyPsd@@ProtectSpaces#3\HyPsd@End#3%
+\RequirePackage{etexcmds}
+\ifetex@unexpanded
+ \expandafter\@secondoftwo
+\else
+ \expandafter\@firstoftwo
+\fi
+{%
+ \def\HyPsd@ProtectSpaces#1{%
+ \iftrue
+ \expandafter\HyPsd@@ProtectSpacesFi
+ \expandafter|\expandafter\@empty#1| \HyPsd@End#1%
+ \fi
+ }%
+ \def\HyPsd@@ProtectSpacesFi#1 #2\HyPsd@End#3\fi{%
+ \fi
+ \ifx\scrollmode#2\scrollmode
+ \HyPsd@RemoveMask#1\HyPsd@End#3%
+ \else
+ \gdef#3{#1\HyPsd@UnexpandableSpace#2}%
+ \expandafter\HyPsd@@ProtectSpacesFi#3\HyPsd@End#3%
+ \fi
+ }%
+ \def\HyPsd@RemoveMask|#1|\HyPsd@End#2{%
+ \toks@\expandafter{#1}%
+ \xdef#2{\the\toks@}%
+ }%
+}{%
+ \let\HyPsd@fi\fi
+ \def\HyPsd@ProtectSpaces#1{%
+ \xdef#1{%
+ \iftrue
+ \expandafter\HyPsd@@ProtectSpacesFi
+ \expandafter|\expandafter\@empty#1| %
+ \HyPsd@fi
}%
- \fi
-}
-\def\HyPsd@RemoveMask|#1|\HyPsd@End#2{%
- \toks@\expandafter{#1}%
- \xdef#2{\the\toks@}%
+ \expandafter\HyPsd@RemoveMask#1\HyPsd@End#1%
+ }%
+ \def\HyPsd@@ProtectSpacesFi#1 #2\HyPsd@fi{%
+ \fi
+ \etex@unexpanded{#1}%
+ \ifx\scrollmode#2\scrollmode
+ \else
+ \HyPsd@@ProtectSpacesFi\HyPsd@UnexpandableSpace#2%
+ \HyPsd@fi
+ }%
+ \def\HyPsd@RemoveMask|#1|\HyPsd@End#2{%
+ \xdef#2{\etex@unexpanded\expandafter{#1}}%
+ }%
}
\def\HyPsd@RemoveBraces#1{%
\ifx\scrollmode#1\scrollmode
\else
- \Hy@ReturnAfterFi{%
- \HyPsd@@RemoveBraces#1\HyPsd@End{#1}%
- }%
+ \HyPsd@@RemoveBracesFi#1\HyPsd@End{#1}%
\fi
}
-\def\HyPsd@@RemoveBraces#1#2\HyPsd@End#3{%
+\def\HyPsd@@RemoveBracesFi#1#2\HyPsd@End#3\fi{%
+ \fi
\def\Hy@temp@A{#1#2}%
\def\Hy@temp@B{#3}%
\ifx\Hy@temp@A\Hy@temp@B
\expandafter\def\expandafter\HyPsd@String\expandafter{%
\HyPsd@String#1%
}%
- \Hy@ReturnAfterElseFi{%
- \ifx\scrollmode#2\scrollmode
- \else
- \Hy@ReturnAfterFi{%
- \HyPsd@RemoveBraces{#2}%
- }%
- \fi
- }%
+ \ifx\scrollmode#2\scrollmode
+ \else
+ \Hy@ReturnAfterFiFiEnd{%
+ \HyPsd@RemoveBraces{#2}%
+ }%
+ \fi
\else
\def\Hy@temp@A{#1}%
\HyPsd@AppendItalcorr\HyPsd@String
- \Hy@ReturnAfterFi{%
- \ifx\Hy@temp@A\@empty
- \Hy@ReturnAfterElseFi{%
- \HyPsd@RemoveBraces{#2}%
- }%
- \else
- \Hy@ReturnAfterFi{%
- \HyPsd@ProtectSpaces\Hy@temp@A
- \HyPsd@AppendItalcorr\Hy@temp@A
- \expandafter\HyPsd@RemoveBraces\expandafter
- {\Hy@temp@A#2}%
- }%
- \fi
- }%
+ \ifx\Hy@temp@A\@empty
+ \Hy@ReturnAfterElseFiFiEnd{%
+ \HyPsd@RemoveBraces{#2}%
+ }%
+ \else
+ \HyPsd@ProtectSpaces\Hy@temp@A
+ \HyPsd@AppendItalcorr\Hy@temp@A
+ \Hy@ReturnAfterFiFiEnd{%
+ \expandafter\HyPsd@RemoveBraces\expandafter
+ {\Hy@temp@A#2}%
+ }%
+ \fi
\fi
+ \Hy@ReturnEnd
}
\def\HyPsd@AppendItalcorr#1{%
\expandafter\HyPsd@@AppendItalcorr\expandafter{\/}#1%
@@ -924,26 +1076,32 @@
\fi
\fi
\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&#1%
- \HyPsd@CatcodeWarning{alignment tab}%
+ \ifcat$#1%
+ \HyPsd@CatcodeWarning{math shift}%
\else
- \ifcat^#1%
- \HyPsd@CatcodeWarning{superscript}%
+ \ifcat&#1%
+ \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
@@ -951,28 +1109,27 @@
\fi
\fi
\ifx\HyPsd@Rest\relax
- \Hy@ReturnAfterElseFi{%
- \ifx\scrollmode#2\scrollmode
- \else
- \Hy@ReturnAfterFi{%
- \HyPsd@CheckCatcodes#2\HyPsd@End
- }%
- \fi
- }%
+ \ifx\scrollmode#2\scrollmode
+ \else
+ \Hy@ReturnAfterFiFiEnd{%
+ \HyPsd@CheckCatcodes#2\HyPsd@End
+ }%
+ \fi
\else
- \Hy@ReturnAfterFi{%
- \ifx\HyPsd@Rest\@empty
- \else
+ \ifx\HyPsd@Rest\@empty
+ \else
+ \Hy@ReturnAfterFiFiEnd{%
\expandafter\HyPsd@CheckCatcodes\HyPsd@Rest\HyPsd@End
- \fi
- }%
+ }%
+ \fi
\fi
+ \Hy@ReturnEnd
}
\def\HyPsd@AfterCountRemove#1\HyPsd@End{%
\gdef\HyPsd@Rest{#1}%
}
\def\HyPsd@AfterDimenRemove#1\HyPsd@End{%
- \ifdim\ifx\HyPsd@String\@empty\z@\else\dimen@\fi>1ex
+ \ifdim\ifx\HyPsd@String\@empty\z@\else\dimen@\fi>1ex %
\HyPsd@ReplaceSpaceWarning{\string\kern\space\the\dimen@}%
\gdef\HyPsd@Rest{\HyPsd@UnexpandableSpace #1}%
\else
@@ -984,7 +1141,7 @@
\fi
}
\def\HyPsd@AfterSkipRemove#1\HyPsd@End{%
- \ifdim\ifx\HyPsd@String\@empty\z@\else\skip@\fi>1ex
+ \ifdim\ifx\HyPsd@String\@empty\z@\else\skip@\fi>1ex %
\HyPsd@ReplaceSpaceWarning{\string\hskip\space\the\skip@}%
\gdef\HyPsd@Rest{\HyPsd@UnexpandableSpace #1}%
\else
@@ -1002,8 +1159,8 @@
}%
}
\begingroup
- \catcode`\|=0
- \catcode`\\=12
+ \catcode`\|=0 %
+ \catcode`\\=12 %
|gdef|HyPsd@RemoveCmdPrefix#1{%
|expandafter|HyPsd@@RemoveCmdPrefix
|string#1|@empty\<>-|@empty|@empty
@@ -1051,18 +1208,19 @@
\fi
}%
\def\HyPsd@Subst#1#2#3{%
- \def\HyPsd@@Replace##1#1##2\END{%
+ \def\HyPsd@@ReplaceFi##1#1##2\END\fi{%
+ \fi
##1%
- \ifx\\##2\\%
+ \ifx\scrollmode##2\scrollmode
\else
#2%
- \Hy@ReturnAfterFi{%
- \HyPsd@@Replace##2\END
- }%
+ \HyPsd@@ReplaceFi##2\END
\fi
}%
\xdef#3{%
- \expandafter\HyPsd@@Replace#3#1\END
+ \iftrue
+ \expandafter\HyPsd@@ReplaceFi#3#1\END
+ \fi
}%
}
\def\HyPsd@StringSubst#1{%
@@ -1093,26 +1251,26 @@
#1%
}%
\begingroup
- \catcode`\|=0
- \catcode`\\=12
+ \catcode`\|=0 %
+ \catcode`\\=12 %
|gdef|HyPsd@ConvertToUnicode#1{%
|xdef#1{%
|expandafter|HyPsd@DoConvert#1|@empty|@empty|@empty
}%
- |xdef#1{%
- |ifx#1|@empty
- |else
+ |ifx#1|@empty
+ |else
+ |xdef#1{%
\376\377%
#1%
- |fi
- }%
- }
+ }%
+ |fi
+ }%
|gdef|HyPsd@DoConvert#1{%
|ifx#1|@empty
|else
|Hy@ReturnAfterFi{%
- |ifx#1\%
- \%
+ |ifx#1\%%
+ \%%
|expandafter|HyPsd@DoEscape
|else
\000#1%
@@ -1120,7 +1278,7 @@
|fi
}%
|fi
- }
+ }%
|gdef|HyPsd@DoEscape#1{%
|ifx#19%
|expandafter|HyPsd@GetTwoBytes
@@ -1135,15 +1293,15 @@
|fi
}%
|fi
- }
+ }%
|gdef|HyPsd@GetTwoBytes#1\#2#3#4{%
#1\#2#3#4%
|HyPsd@DoConvert
- }
+ }%
|gdef|HyPsd@GetOneByte#1#2{%
#1#2%
|HyPsd@DoConvert
- }
+ }%
|endgroup
\def\HyPsd@GetNextTwoTokens#1#2#3\END#4{%
\xdef#4{#4#1#2}%
@@ -1197,7 +1355,7 @@
}%
\def\HyPsd@UTFviii@@four#1|#2#3#4{%
\expandafter\HyPsd@UTFviii@@@four\number#1\expandafter|%
- \number`#2\expandafter|
+ \number`#2\expandafter|%
\number\dimexpr.03125\dimexpr`#2sp\expandafter|%
\number`#3\expandafter|%
\number\dimexpr.03125\dimexpr`#3sp\expandafter|%
@@ -1249,7 +1407,7 @@
.% unsupported (Unicode -> PDF Doc Encoding)
\fi
}%
- \def\HyPsd@UnicodeReplacementCharacter{\9377\375}
+ \def\HyPsd@UnicodeReplacementCharacter{\9377\375}%
\def\HyPsd@unichar@first@byte#1{%
\number\dimexpr.015625\dimexpr#1sp\relax\relax
\expandafter\HyPsd@unichar@octtwo\expandafter{%
@@ -1400,7 +1558,7 @@
Unexpected value `#1'\MessageBreak
of option `#2' instead of\MessageBreak
#3%
- }
+ }%
}
\def\Hy@DisableOption#1{%
\@ifundefined{KV@Hyp@#1@default}{%
@@ -1581,6 +1739,14 @@
\def\XR@ext{pdf}%
\Hy@breaklinkstrue
}
+\define@key{Hyp}{dvipdfmx-outline-open}[true]{%
+ \expandafter\ifx\csname if#1\expandafter\endcsname
+ \csname iftrue\endcsname
+ \chardef\SpecialDvipdfmxOutlineOpen\@ne
+ \else
+ \chardef\SpecialDvipdfmxOutlineOpen\z@
+ \fi
+}
\define@key{Hyp}{xetex}[true]{%
\def\Hy@driver{hdvipdfm}%
\def\XR@ext{pdf}%
@@ -1728,6 +1894,24 @@
\define@key{Hyp}{encap}[\|]{%
\def\HyInd@EncapChar{#1}%
}
+\def\HyLang@afrikaans{%
+ \def\equationautorefname{Vergelyking}%
+ \def\footnoteautorefname{Voetnota}%
+ \def\itemautorefname{Item}%
+ \def\figureautorefname{Figuur}%
+ \def\tableautorefname{Tabel}%
+ \def\partautorefname{Deel}%
+ \def\appendixautorefname{Bylae}%
+ \def\chapterautorefname{Hoofstuk}%
+ \def\sectionautorefname{Afdeling}%
+ \def\subsectionautorefname{Subafdeling}%
+ \def\subsubsectionautorefname{Subsubafdeling}%
+ \def\paragraphautorefname{Paragraaf}%
+ \def\subparagraphautorefname{Subparagraaf}%
+ \def\FancyVerbLineautorefname{Lyn}%
+ \def\theoremautorefname{Teorema}%
+ \def\pageautorefname{Bladsy}%
+}
\def\HyLang@english{%
\def\equationautorefname{Equation}%
\def\footnoteautorefname{footnote}%
@@ -1744,6 +1928,25 @@
\def\subparagraphautorefname{subparagraph}%
\def\FancyVerbLineautorefname{line}%
\def\theoremautorefname{Theorem}%
+ \def\pageautorefname{page}%
+}
+\def\HyLang@french{%
+ \def\equationautorefname{\'Equation}%
+ \def\footnoteautorefname{note}%
+ \def\itemautorefname{item}%
+ \def\figureautorefname{Figure}%
+ \def\tableautorefname{Tableau}%
+ \def\partautorefname{Partie}%
+ \def\appendixautorefname{Appendice}%
+ \def\chapterautorefname{chapitre}%
+ \def\sectionautorefname{section}%
+ \def\subsectionautorefname{sous-section}%
+ \def\subsubsectionautorefname{sous-sous-section}%
+ \def\paragraphautorefname{paragraphe}%
+ \def\subparagraphautorefname{sous-paragraphe}%
+ \def\FancyVerbLineautorefname{ligne}%
+ \def\theoremautorefname{Th\'eor\`eme}%
+ \def\pageautorefname{page}%
}
\def\HyLang@german{%
\def\equationautorefname{Gleichung}%
@@ -1761,6 +1964,25 @@
\def\subparagraphautorefname{Unterabsatz}%
\def\FancyVerbLineautorefname{Zeile}%
\def\theoremautorefname{Theorem}%
+ \def\pageautorefname{Seite}%
+}
+\def\HyLang@italian{%
+ \def\equationautorefname{Equazione}%
+ \def\footnoteautorefname{nota}%
+ \def\itemautorefname{punto}%
+ \def\figureautorefname{Figura}%
+ \def\tableautorefname{Tabella}%
+ \def\partautorefname{Parte}%
+ \def\appendixautorefname{Appendice}%
+ \def\chapterautorefname{Capitolo}%
+ \def\sectionautorefname{sezione}%
+ \def\subsectionautorefname{sottosezione}%
+ \def\subsubsectionautorefname{sottosottosezione}%
+ \def\paragraphautorefname{paragrafo}%
+ \def\subparagraphautorefname{sottoparagrafo}%
+ \def\FancyVerbLineautorefname{linea}%
+ \def\theoremautorefname{Teorema}%
+ \def\pageautorefname{Pag.\@}%
}
\def\HyLang@portuges{%
\def\equationautorefname{Equa\c c\~ao}%
@@ -1778,6 +2000,7 @@
\def\subparagraphautorefname{subpar\'agrafo}%
\def\FancyVerbLineautorefname{linha}%
\def\theoremautorefname{Teorema}%
+ \def\pageautorefname{P\'agina}%
}
\def\HyLang@spanish{%
\def\equationautorefname{Ecuaci\'on}%
@@ -1795,40 +2018,7 @@
\def\subparagraphautorefname{Subp\'arrafo}%
\def\FancyVerbLineautorefname{L\'inea}%
\def\theoremautorefname{Teorema}%
-}
-\def\HyLang@afrikaans{%
- \def\equationautorefname{Vergelyking}%
- \def\footnoteautorefname{Voetnota}%
- \def\itemautorefname{Item}%
- \def\figureautorefname{Figuur}%
- \def\tableautorefname{Tabel}%
- \def\partautorefname{Deel}%
- \def\appendixautorefname{Bylae}%
- \def\chapterautorefname{Hoofstuk}%
- \def\sectionautorefname{Afdeling}%
- \def\subsectionautorefname{Subafdeling}%
- \def\subsubsectionautorefname{Subsubafdeling}%
- \def\paragraphautorefname{Paragraaf}%
- \def\subparagraphautorefname{Subparagraaf}%
- \def\FancyVerbLineautorefname{Lyn}%
- \def\theoremautorefname{Teorema}%
-}
-\def\HyLang@french{%
- \def\equationautorefname{\'Equation}%
- \def\footnoteautorefname{note}%
- \def\itemautorefname{item}%
- \def\figureautorefname{Figure}%
- \def\tableautorefname{Tableau}%
- \def\partautorefname{Partie}%
- \def\appendixautorefname{Appendice}%
- \def\chapterautorefname{chapitre}%
- \def\sectionautorefname{section}%
- \def\subsectionautorefname{sous-section}%
- \def\subsubsectionautorefname{sous-sous-section}%
- \def\paragraphautorefname{paragraphe}%
- \def\subparagraphautorefname{sous-paragraphe}%
- \def\FancyVerbLineautorefname{ligne}%
- \def\theoremautorefname{Th\'eor\`eme}%
+ \def\pageautorefname{P\'agina}%
}
\def\HyLang@vietnamese{%
\def\equationautorefname{Ph\uhorn{}\ohorn{}ng tr\`inh}%
@@ -1846,6 +2036,7 @@
\def\subparagraphautorefname{\dj{}o\d{a}n}%
\def\FancyVerbLineautorefname{d\`ong}%
\def\theoremautorefname{\DJ{}\d{i}nh l\'y}%
+ \def\pageautorefname{Trang}%
}
\def\HyLang@addto#1#2{%
#2%
@@ -1894,6 +2085,7 @@
\HyLang@DeclareLang{francais}{french}
\HyLang@DeclareLang{acadian}{french}
\HyLang@DeclareLang{canadien}{french}
+\HyLang@DeclareLang{italian}{italian}
\define@key{Hyp}{vietnamese}[]{%
\HyLang@addto\extrasvietnamese\HyLang@vietnamese
\AtEndOfPackage{%
@@ -1976,20 +2168,29 @@
\define@key{Hyp}{CJKbookmarks}[true]{%
\Hy@boolkey{CJKbookmarks}{#1}%
}
-\define@key{Hyp}{linkcolor}{\def\@linkcolor{#1}}
-\define@key{Hyp}{anchorcolor}{\def\@anchorcolor{#1}}
-\define@key{Hyp}{citecolor}{\def\@citecolor{#1}}
-\define@key{Hyp}{urlcolor}{\def\@urlcolor{#1}}
-\define@key{Hyp}{menucolor}{\def\@menucolor{#1}}
-\define@key{Hyp}{filecolor}{\def\@filecolor{#1}}
-\define@key{Hyp}{pagecolor}{\def\@pagecolor{#1}}
-\def\@linkcolor{red}
-\def\@anchorcolor{black}
-\def\@citecolor{green}
-\def\@filecolor{cyan}
-\def\@urlcolor{magenta}
-\def\@menucolor{red}
-\def\@pagecolor{red}
+\def\Hy@temp#1{%
+ \expandafter\Hy@@temp\csname @#1color\endcsname{#1}%
+}
+\def\Hy@@temp#1#2#3{%
+ \define@key{Hyp}{#2color}{%
+ \HyColor@HyperrefColor{##1}#1%
+ }%
+ \def#1{#3}%
+}
+\Hy@temp{link}{red}
+\Hy@temp{anchor}{black}
+\Hy@temp{cite}{green}
+\Hy@temp{file}{cyan}
+\Hy@temp{url}{magenta}
+\Hy@temp{menu}{red}
+\Hy@temp{run}{\@filecolor}
+\define@key{Hyp}{pagecolor}{%
+ \Hy@WarningPageColor
+}
+\def\Hy@WarningPageColor{%
+ \Hy@WarningNoLine{Option `pagecolor' is not available anymore}%
+ \global\let\Hy@WarningPageColor\relax
+}
\def\hyperbaseurl#1{\def\@baseurl{#1}}
\define@key{Hyp}{baseurl}{\hyperbaseurl{#1}}
\let\@baseurl\@empty
@@ -2008,38 +2209,25 @@
\global\Hy@useHidKeytrue
\fi
}
-\def\Hy@ColorList{cite,file,link,menu,page,run,url}
+\def\Hy@ColorList{cite,file,link,menu,run,url}
\@for\Hy@temp:=\Hy@ColorList\do{%
\edef\Hy@temp{%
\noexpand\define@key{Hyp}{\Hy@temp bordercolor}{%
- \noexpand\Hy@bordercolor{\Hy@temp}{##1}{ }%
+ \noexpand\HyColor@HyperrefBorderColor
+ {##1}%
+ \expandafter\noexpand\csname @\Hy@temp bordercolor\endcsname
+ {hyperref}%
+ {\Hy@temp bordercolor}%
}%
}%
\Hy@temp
}
-\def\Hy@bordercolor#1#2#3{%
- \begingroup
- \Hy@safe@activestrue
- \@ifundefined{XC@edef}{\edef}{\XC@edef}\x{#2}%
- \expandafter\Hy@CheckColorSpec\x#3#3\@nil{#1}{#2}%
+\define@key{Hyp}{pagebordercolor}{%
+ \Hy@WarningPageBorderColor
}
-\def\Hy@CheckColorSpec#1 #2 #3\@nil#4#5{%
- \ifx\\#3\\%
- \@ifundefined{XC@bordercolor}{%
- \Hy@Warning{%
- Unsupported color specification (#4bordercolor).\MessageBreak
- Load package `xcolor' (version >= 2.11) first.\MessageBreak
- Ignoring color specification%
- }%
- \endgroup
- }{%
- \endgroup
- \XC@bordercolor{#4}{#5}%
- }%
- \else
- \endgroup
- \@namedef{@#4bordercolor}{#5}%
- \fi
+\def\Hy@WarningPageBorderColor{%
+ \Hy@WarningNoLine{Option `pagebordercolor' is not available anymore}%
+ \global\let\Hy@WarningPageBorderColor\relax
}
\define@key{Hyp}{pdfhighlight}{\def\@pdfhighlight{#1}}
\Hy@DefNameKey{pdfhighlight}{%
@@ -2205,7 +2393,6 @@
\def\@filebordercolor{0 .5 .5}
\def\@runbordercolor{0 .7 .7}
\def\@citebordercolor{0 1 0}
-\def\@pagebordercolor{1 1 0}
\def\@pdfhighlight{/I}
\def\@pdftitle{}
\def\@pdfauthor{}
@@ -2224,14 +2411,14 @@
\let\PDF@FinishDoc\@empty
\let\phantomsection\@empty
\@ifundefined{stockwidth}{%
- \edef\special@paper{\the\paperwidth,\the\paperheight}
+ \edef\special@paper{\the\paperwidth,\the\paperheight}%
}{%
- \edef\special@paper{\the\stockwidth,\the\stockheight}
+ \edef\special@paper{\the\stockwidth,\the\stockheight}%
}
\begingroup
\dimen@=\@ifundefined{stockheight}{\paperheight}{\stockheight}\relax
\dimen@=0.99626401\dimen@
- \xdef\Hy@pageheight{\strip@pt\dimen@}
+ \xdef\Hy@pageheight{\strip@pt\dimen@}%
\endgroup
\def\HyInd@EncapChar{\|}
\def\hypersetup{\setkeys{Hyp}}
@@ -2276,7 +2463,7 @@
\ifx\HyPsd@InitUnicode\relax
\define@key{Hyp}{unicode}[true]{%
\Hy@boolkey{unicode}{#1}%
- }
+ }%
\else
\define@key{Hyp}{unicode}[true]{%
\Hy@boolkey{unicode}{#1}%
@@ -2286,43 +2473,46 @@
}%
\Hy@unicodefalse
\fi
- }
+ }%
\fi
\let\HyPsd@InitUnicode\@undefined
\Hy@nextfalse
-\@ifpackagewith{babel}{spanish}{\Hy@nexttrue}{}
-\@ifpackagewith{babel}{galician}{\Hy@nexttrue}{}
-\@ifpackagewith{babel}{estonian}{\Hy@nexttrue}{}
+\@ifundefined{spanish@sh@"@sel}{}{\Hy@nexttrue}
+\@ifundefined{galician@sh@"@sel}{}{\Hy@nexttrue}
+\@ifundefined{estonian@sh@"@sel}{}{\Hy@nexttrue}
\ifHy@next
\let\texttilde\~%
\fi
\ifHy@figures
- \Hy@Info{Hyper figures ON}
+ \Hy@Info{Hyper figures ON}%
\else
- \Hy@Info{Hyper figures OFF}
+ \Hy@Info{Hyper figures OFF}%
\fi
\ifHy@nesting
- \Hy@Info{Link nesting ON}
+ \Hy@Info{Link nesting ON}%
\else
- \Hy@Info{Link nesting OFF}
+ \Hy@Info{Link nesting OFF}%
\fi
\ifHy@hyperindex
- \Hy@Info{Hyper index ON}
+ \Hy@Info{Hyper index ON}%
\else
- \Hy@Info{Hyper index OFF}
+ \Hy@Info{Hyper index OFF}%
\fi
\ifHy@plainpages
- \Hy@Info{Plain pages ON}
+ \Hy@Info{Plain pages ON}%
\else
- \Hy@Info{Plain pages OFF}
+ \Hy@Info{Plain pages OFF}%
\fi
\ifHy@backref
- \Hy@Info{Backreferencing ON}
+ \Hy@Info{Backreferencing ON}%
\else
- \Hy@Info{Backreferencing OFF}
+ \Hy@Info{Backreferencing OFF}%
\fi
\ifHy@typexml
- \AtEndOfPackage{\RequirePackage{color}\RequirePackage{nameref}}
+ \AtEndOfPackage{%
+ \RequirePackage{color}%
+ \RequirePackage{nameref}%
+ }%
\fi
\Hy@DisableOption{typexml}
\ifHy@implicit
@@ -2336,6 +2526,7 @@
}%
\AtBeginDocument{%
\let\autoref\ref
+ \let\autopageref\pageref
\ifx\@pdfpagemode\@empty
\gdef\@pdfpagemode{UseNone}%
\fi
@@ -2426,11 +2617,21 @@
\let\@unprocessedoptions\relax
\Hy@RestoreCatcodes
}
+\newif\ifHy@DvipdfmxOutlineOpen
+\begingroup\expandafter\expandafter\expandafter\endgroup
+\expandafter\ifx\csname SpecialDvipdfmxOutlineOpen\endcsname\relax
+\else
+ \ifnum\SpecialDvipdfmxOutlineOpen>\z@
+ \Hy@DvipdfmxOutlineOpentrue
+ \fi
+\fi
\Hy@DisableOption{tex4ht}
\Hy@DisableOption{pdftex}
\Hy@DisableOption{dvipdf}
\Hy@DisableOption{nativepdf}
\Hy@DisableOption{dvipdfm}
+\Hy@DisableOption{dvipdfmx}
+\Hy@DisableOption{dvipdfmx-outline-open}
\Hy@DisableOption{pdfmark}
\Hy@DisableOption{dvips}
\Hy@DisableOption{hypertex}
@@ -2465,7 +2666,7 @@
\AtEndOfPackage{%
\global\let\ReadBookmarks\relax
\global\let\WriteBookmarks\relax
- }
+ }%
\ifx\@pdfpagemode\@empty
\def\@pdfpagemode{UseNone}%
\fi
@@ -2473,20 +2674,14 @@
\Hy@DisableOption{bookmarks}
\AtBeginDocument{%
\ifHy@colorlinks
- \ifHy@typexml\else\RequirePackage{color}\fi
+ \ifHy@typexml
+ \else
+ \RequirePackage{color}%
+ \fi
\def\Hy@colorlink#1{%
\begingroup
- \expandafter\Hy@colorscan\expandafter#1#1\@nil%
+ \HyColor@UseColor#1%
}%
- \def\Hy@colorscan#1{%
- \@ifnextchar[% ]
- {%
- \Hy@@colorscan
- }{%
- \expandafter\color\expandafter#1\@car{}%
- }%
- }%
- \def\Hy@@colorscan#1\@nil{\color#1}%
\def\Hy@endcolorlink{\endgroup}%
\Hy@Info{Link coloring ON}%
\else
@@ -2535,7 +2730,7 @@
\fi
}
\ifHy@backref
- \RequirePackage{backref}
+ \RequirePackage{backref}%
\else
\let\Hy@backout\@gobble
\fi
@@ -2543,24 +2738,25 @@
\Hy@DisableOption{pagebackref}
\Hy@activeanchorfalse
\begingroup
- \endlinechar=-1
+ \endlinechar=-1 %
+ \catcode`\^^A=14 %
\catcode`\^^M\active
\catcode`\%\active
\catcode`\#\active
\catcode`\_\active
\catcode`\$\active
- \gdef\hyper@normalise{
+ \gdef\hyper@normalise{^^A
\begingroup
\catcode`\^^M\active
- \def^^M{ }
+ \def^^M{ }^^A
\catcode`\%\active
\let%\@percentchar
\let\%\@percentchar
\catcode`\#\active
- \def#{\hyper@hash}
- \def\#{\hyper@hash}
- \@makeother\&
- \edef\textunderscore{\string_}
+ \def#{\hyper@hash}^^A
+ \def\#{\hyper@hash}^^A
+ \@makeother\&^^A
+ \edef\textunderscore{\string_}^^A
\let\_\textunderscore
\catcode`\_\active
\let_\textunderscore
@@ -2568,27 +2764,40 @@
\let\~\hyper@tilde
\let\textasciitilde\hyper@tilde
\let\\\@backslashchar
- \edef${\string$}
+ \edef${\string$}^^A
\Hy@safe@activestrue
\hyper@n@rmalise
- }
- \catcode`\#=6
- \gdef\hyper@n@rmalise#1#2{
- \edef\Hy@tempa{
+ }^^A
+ \catcode`\#=6 ^^A
+ \gdef\Hy@ActiveCarriageReturn{^^M}^^A
+ \gdef\hyper@n@rmalise#1#2{^^A
+ \def\Hy@tempa{#2}^^A
+ \ifx\Hy@tempa\Hy@ActiveCarriageReturn
+ \Hy@ReturnAfterElseFi{^^A
+ \hyper@@normalise{#1}^^A
+ }^^A
+ \else
+ \Hy@ReturnAfterFi{^^A
+ \hyper@@normalise{#1}{#2}^^A
+ }^^A
+ \fi
+ }^^A
+ \gdef\hyper@@normalise#1#2{^^A
+ \edef\Hy@tempa{^^A
\endgroup
- \noexpand#1{\Hy@RemovePercentCr#2%^^M\@nil}
- }
+ \noexpand#1{\Hy@RemovePercentCr#2%^^M\@nil}^^A
+ }^^A
\Hy@tempa
- }
- \gdef\Hy@RemovePercentCr#1%^^M#2\@nil{
- #1
+ }^^A
+ \gdef\Hy@RemovePercentCr#1%^^M#2\@nil{^^A
+ #1^^A
\ifx\limits#2\limits
\else
- \Hy@ReturnAfterFi{
+ \Hy@ReturnAfterFi{^^A
\Hy@RemovePercentCr #2\@nil
- }
+ }^^A
\fi
- }
+ }^^A
\endgroup
\providecommand*\hyper@chars{%
\let\#\hyper@hash
@@ -2597,14 +2806,19 @@
\def\hyperlink#1#2{%
\hyper@@link{}{#1}{#2}%
}
-\DeclareRobustCommand*{\href}{\hyper@normalise\href@}
+\DeclareRobustCommand*{\href}{%
+ \@ifnextchar\bgroup\Hy@href{\hyper@normalise\href@}%
+}
+\def\Hy@href#{%
+ \hyper@normalise\href@
+}
\begingroup
- \catcode`\$=6
- \catcode`\#=12
- \gdef\href@$1{\expandafter\href@split$1##\\}
+ \catcode`\$=6 %
+ \catcode`\#=12 %
+ \gdef\href@$1{\expandafter\href@split$1##\\}%
\gdef\href@split$1#$2#$3\\{%
\hyper@@link{$1}{$2}%
- }
+ }%
\endgroup
\RequirePackage{url}
\let\HyOrg@url\url
@@ -2818,13 +3032,14 @@
\Fld@charsize=10\p@
\def\Fld@maxlen{0}
\def\Fld@align{0}
-\def\Fld@color{0 0 0}
+\def\Fld@color{0 0 0 rg}
\def\Fld@bcolor{1 1 1}
\def\Fld@bordercolor{1 0 0}
\def\Fld@bordersep{1\p@}
\def\Fld@borderwidth{1}
\def\Fld@borderstyle{S}
\def\Fld@cbsymbol{4}
+\def\Fld@rotation{0}
\newtoks\Choice@toks
\def\Form{\@ifnextchar[{\@Form}{\@Form[]}}
\def\endForm{\@endForm}
@@ -2925,9 +3140,6 @@
\define@key{Field}{charsize}{%
\Fld@charsize#1%
}
-\define@key{Field}{fillcolor}{%
- \def\Fld@fillcolor{#1}%
-}
\define@key{Field}{borderwidth}{%
\def\Fld@borderwidth{#1}%
}
@@ -2949,39 +3161,17 @@
\define@key{Field}{checkboxsymbol}{%
\def\Fld@cbsymbol{#1}%
}
+\define@key{Field}{rotation}{%
+ \def\Fld@rotation{#1}%
+}
\define@key{Field}{backgroundcolor}{%
- \Hy@fieldcolor{bcolor}{#1}{ }{backgroundcolor}%
+ \HyColor@FieldBColor{#1}\Fld@bcolor{hyperref}{backgroundcolor}%
}
\define@key{Field}{bordercolor}{%
- \Hy@fieldcolor{bordercolor}{#1}{ }{bordercolor}%
+ \HyColor@FieldBColor{#1}\Fld@bordercolor{hyperref}{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
+ \HyColor@FieldColor{#1}\Fld@color{hyperref}{color}%
}
\def\Fld@format@code{}
\def\Fld@validate@code{}
@@ -3095,13 +3285,13 @@
\sbox0{%
\hskip\Fld@borderwidth bp#1\hskip\Fld@borderwidth bp%
}%
- \@tempdima\ht0
- \advance\@tempdima by \Fld@borderwidth bp
- \advance\@tempdima by \Fld@borderwidth bp
+ \@tempdima\ht0 %
+ \advance\@tempdima by \Fld@borderwidth bp %
+ \advance\@tempdima by \Fld@borderwidth bp %
\ht0\@tempdima
- \@tempdima\dp0
- \advance\@tempdima by \Fld@borderwidth bp
- \advance\@tempdima by \Fld@borderwidth bp
+ \@tempdima\dp0 %
+ \advance\@tempdima by \Fld@borderwidth bp %
+ \advance\@tempdima by \Fld@borderwidth bp %
\dp0\@tempdima
\box0\relax
}
@@ -3116,29 +3306,29 @@
\def\DefaultHeightofText{\baselineskip}
\def\DefaultWidthofText{3cm}
\ifHy@figures
- \Hy@Info{Hyper figures ON}
+ \Hy@Info{Hyper figures ON}%
\else
- \Hy@Info{Hyper figures OFF}
+ \Hy@Info{Hyper figures OFF}%
\fi
\ifHy@nesting
- \Hy@Info{Link nesting ON}
+ \Hy@Info{Link nesting ON}%
\else
- \Hy@Info{Link nesting OFF}
+ \Hy@Info{Link nesting OFF}%
\fi
\ifHy@hyperindex
- \Hy@Info{Hyper index ON}
+ \Hy@Info{Hyper index ON}%
\else
- \Hy@Info{Hyper index OFF}
+ \Hy@Info{Hyper index OFF}%
\fi
\ifHy@backref
- \Hy@Info{backreferencing ON}
+ \Hy@Info{backreferencing ON}%
\else
- \Hy@Info{backreferencing OFF}
+ \Hy@Info{backreferencing OFF}%
\fi
\ifHy@colorlinks
- \Hy@Info{Link coloring ON}
+ \Hy@Info{Link coloring ON}%
\else
- \Hy@Info{Link coloring OFF}
+ \Hy@Info{Link coloring OFF}%
\fi
\edef\hyper@hash{\string#}
\edef\hyper@tilde{\string~}
@@ -3208,7 +3398,7 @@
\if@filesw
\ifHy@typexml
\immediate\closeout\@mainaux
- \immediate\openout\@mainaux\jobname.aux
+ \immediate\openout\@mainaux\jobname.aux\relax
\immediate\write\@auxout{<relaxxml>\relax}%
\fi
\immediate\write\@auxout{%
@@ -3262,7 +3452,7 @@
\def\Hy@scantitle#1{%
\gdef\Hy@title{#1}%
\HyOrg@title{#1}%
- }
+ }%
\def\author{\@ifnextchar[{\Hy@scanoptauthor}{\Hy@scanauthor}}%
\def\Hy@scanoptauthor[#1]{%
\gdef\Hy@author{#1}%
@@ -3271,7 +3461,7 @@
\def\Hy@scanauthor#1{%
\gdef\Hy@author{#1}%
\HyOrg@author{#1}%
- }
+ }%
\begingroup
\def\process@me#1\@nil#2{%
\expandafter\let\expandafter\x\csname @#2\endcsname
@@ -3326,11 +3516,11 @@
\fi
\def\thispdfpagelabel#1{%
\gdef\HyPL@thisLabel{#1}%
- }
+ }%
\global\let\HyPL@thisLabel\relax
- \def\HyPL@Labels{}
+ \def\HyPL@Labels{}%
\newcount\Hy@abspage
- \Hy@abspage=0
+ \Hy@abspage=0 %
\def\HyPL@LastType{init}%
\def\HyPL@LastNumber{0}%
\def\HyPL@LastPrefix{}%
@@ -3348,7 +3538,7 @@
\global\let\HyPL@thisLabel\relax
\fi
\let\HyPL@Type\relax
- \ifnum\the\c@page>0
+ \ifnum\the\c@page>0 %
\expandafter\HyPL@CheckThePage\HyPL@page\@nil
\fi
\let\Hy@temp Y%
@@ -3366,7 +3556,7 @@
\let\Hy@temp N%
\fi
\if Y\Hy@temp
- \advance\c@page by -1
+ \advance\c@page by -1 %
\ifnum\HyPL@LastNumber=\the\c@page\relax
\else
\let\Hy@temp N%
@@ -3375,15 +3565,15 @@
\fi
\if N\Hy@temp
\ifx\HyPL@Type\relax
- \HyPL@StorePageLabel{/P (\HyPL@Prefix)}%
+ \HyPL@StorePageLabel{/P(\HyPL@Prefix)}%
\else
\HyPL@StorePageLabel{%
\ifx\HyPL@Prefix\@empty
\else
- /P (\HyPL@Prefix)
+ /P(\HyPL@Prefix)%
\fi
- /S /\csname HyPL\HyPL@Type\endcsname
- \ifnum\the\c@page=1
+ /S/\csname HyPL\HyPL@Type\endcsname
+ \ifnum\the\c@page=1 %
\else
\space/St \the\c@page
\fi
@@ -3395,10 +3585,10 @@
\global\let\HyPL@LastPrefix\HyPL@Prefix
\endgroup
\Hy@GlobalStepCount\Hy@abspage
- }
+ }%
\def\HyPL@CheckThePage#1\@nil{%
\HyPL@@CheckThePage{#1}#1\csname\endcsname\c@page\@nil
- }
+ }%
\def\HyPL@@CheckThePage#1#2\csname#3\endcsname\c@page#4\@nil{%
\def\Hy@tempa{#4}%
\def\Hy@tempb{\csname\endcsname\c@page}%
@@ -3427,7 +3617,7 @@
\fi
\Hy@next
\fi
- }
+ }%
\def\HyPL@Format#1#2{%
\ifx\HyPL@found\@undefined
\expandafter\ifx\csname c@#2\endcsname\c@page
@@ -3438,7 +3628,7 @@
\else
\expandafter\noexpand\csname#1\endcsname{#2}%
\fi
- }
+ }%
\def\HyPL@@@CheckThePage#1\HyPL@found#2#3\@nil{%
\def\Hy@tempa{#3}%
\def\Hy@tempb{\HyPL@found\relax}%
@@ -3446,9 +3636,9 @@
\def\HyPL@Type{@#2}%
\def\HyPL@Prefix{#1}%
\fi
- }
- \providecommand*{\HyPL@StorePageLabel}[1]{}
- \def\HyPL@Useless{0 << /S /D >> }%
+ }%
+ \providecommand*{\HyPL@StorePageLabel}[1]{}%
+ \def\HyPL@Useless{0<</S/D>>}%
\@onelevel@sanitize\HyPL@Useless
\def\HyPL@SetPageLabels{%
\@onelevel@sanitize\HyPL@Labels
@@ -3456,10 +3646,10 @@
\else
\ifx\HyPL@Labels\HyPL@Useless
\else
- \Hy@PutCatalog{/PageLabels << /Nums [\HyPL@Labels] >>}%
+ \Hy@PutCatalog{/PageLabels<</Nums[\HyPL@Labels]>>}%
\fi
\fi
- }
+ }%
\else
\let\HyPL@EveryPage\@empty
\fi
@@ -3468,14 +3658,14 @@
\newcommand\theHequation{\theHsection.\arabic{equation}}
\@ifundefined{thepart}{}{\newcommand\theHpart{\arabic{part}}}
\@ifundefined{thechapter}{%
- \newcommand\theHsection {\arabic{section}}
- \newcommand\theHfigure {\arabic{figure}}
- \newcommand\theHtable {\arabic{table}}
+ \newcommand\theHsection {\arabic{section}}%
+ \newcommand\theHfigure {\arabic{figure}}%
+ \newcommand\theHtable {\arabic{table}}%
}{%
- \newcommand\theHchapter {\arabic{chapter}}
- \newcommand\theHfigure {\theHchapter.\arabic{figure}}
- \newcommand\theHtable {\theHchapter.\arabic{table}}
- \newcommand\theHsection {\theHchapter.\arabic{section}}
+ \newcommand\theHchapter {\arabic{chapter}}%
+ \newcommand\theHfigure {\theHchapter.\arabic{figure}}%
+ \newcommand\theHtable {\theHchapter.\arabic{table}}%
+ \newcommand\theHsection {\theHchapter.\arabic{section}}%
}
\newcommand\theHsubsection {\theHsection.\arabic{subsection}}
\newcommand\theHsubsubsection{\theHsubsection.\arabic{subsubsection}}
@@ -3528,8 +3718,10 @@
\def\hyper@refstepcounter#1{%
\edef\This@name{#1}%
\ifx\This@name\name@of@eq
- \make@stripped@name{\theequation}%
- \let\theHequation\newname
+ \@ifundefined{theHequation}{%
+ \make@stripped@name{\theequation}%
+ \let\theHequation\newname
+ }{}%
\fi
\@ifundefined{theH#1}{%
\expandafter\def\csname theH#1\endcsname{\arabic{#1}}%
@@ -3566,6 +3758,11 @@
\fi
\ifHy@hypertexnames
\let\@number\@firstofone
+ \@ifundefined{latin@Alph}{}{%
+ \ifx\@Alph\greek@Alph
+ \def\@Alph{Alph\@arabic}%
+ \fi
+ }%
\ifHy@naturalnames
\let\textlatin\@firstofone
\xdef\@currentHlabel{\csname the#1\endcsname}%
@@ -3645,7 +3842,7 @@
\@ifpackageloaded{titletoc}{%
\def\ttl@gobblecontents#1#2#3#4{\ignorespaces}%
}{}
-\def\Hy@varioref@undefined{{???}{??}{}{}{}}
+\def\Hy@varioref@undefined{{??}{??}{}{}{}}
\@ifpackageloaded{varioref}{%
\def\vref@pagenum#1#2{%
\@ifundefined{r@#2}{%
@@ -3705,8 +3902,10 @@
\def\equation{%
\let\refstepcounter\H@refstepcounter
\H@equation
- \make@stripped@name{\theequation}%
- \let\theHequation\newname
+ \@ifundefined{theHequation}{%
+ \make@stripped@name{\theequation}%
+ \let\theHequation\newname
+ }{}%
\hyper@makecurrent{equation}%
\Hy@raisedlink{\hyper@anchorstart{\@currentHref}}%
\let\refstepcounter\new@refstepcounter
@@ -3725,8 +3924,10 @@
\else
\ifx\\\@currentHref\\%
\else
- \make@stripped@name{\theequation}%
- \let\theHequation\newname
+ \@ifundefined{theHequation}{%
+ \make@stripped@name{\theequation}%
+ \let\theHequation\newname
+ }{}%
\hyper@makecurrent{equation}%
\hyper@anchorstart{\@currentHref}{}\hyper@anchorend
\fi
@@ -3747,8 +3948,10 @@
\def\subeqnarray{%
\let\Hy@reserved@a\relax
\H@subeqnarray
- \make@stripped@name{\theequation}%
- \let\theHequation\newname
+ \@ifundefined{theHequation}{%
+ \make@stripped@name{\theequation}%
+ \let\theHequation\newname
+ }{}%
\hyper@makecurrent{equation}%
\hyper@anchorstart{\@currentHref}{}\hyper@anchorend
}%
@@ -3775,9 +3978,24 @@
}%
\endgroup
}
+\begingroup\expandafter\expandafter\expandafter\endgroup
+\expandafter\ifx\csname subequations\endcsname\relax
+\else
+ \let\HyOrg@subequations\subequations
+ \def\subequations{%
+ \stepcounter{equation}%
+ \protected@edef\theHparentequation{%
+ \@ifundefined{theHequation}\theequation\theHequation
+ }%
+ \addtocounter{equation}{-1}%
+ \HyOrg@subequations
+ \def\theHequation{\theHparentequation\alph{equation}}%
+ \ignorespaces
+ }%
+\fi
\@ifpackageloaded{tabularx}{\Hy@hyperfootnotesfalse}{}
\ifHy@hyperfootnotes
- \newcounter{Hfootnote}
+ \newcounter{Hfootnote}%
\let\H@@footnotetext\@footnotetext
\let\H@@footnotemark\@footnotemark
\def\@xfootnotenext[#1]{%
@@ -3935,7 +4153,12 @@
{\@dblarg{\Hy@tempa\@captype}}%
}
\long\def\@caption#1[#2]#3{%
- \hyper@makecurrent{\@captype}%
+ \expandafter\ifx\csname if@capstart\expandafter\endcsname
+ \csname iftrue\endcsname
+ \global\let\@currentHref\hc@currentHref
+ \else
+ \hyper@makecurrent{\@captype}%
+ \fi
\def\@currentlabelname{#2}%
\par\addcontentsline{\csname ext@#1\endcsname}{#1}{%
\protect\numberline{\csname the#1\endcsname}{\ignorespaces #2}%
@@ -3946,14 +4169,20 @@
\@setminipage
\fi
\normalsize
- \@makecaption{\csname fnum@#1\endcsname}{%
- \ignorespaces
- \ifHy@nesting
- \hyper@@anchor{\@currentHref}{#3}%
- \else
- \Hy@raisedlink{\hyper@@anchor{\@currentHref}{\relax}}#3%
- \fi
- }%
+ \expandafter\ifx\csname if@capstart\expandafter\endcsname
+ \csname iftrue\endcsname
+ \global\@capstartfalse
+ \@makecaption{\csname fnum@#1\endcsname}{\ignorespaces#3}%
+ \else
+ \@makecaption{\csname fnum@#1\endcsname}{%
+ \ignorespaces
+ \ifHy@nesting
+ \hyper@@anchor{\@currentHref}{#3}%
+ \else
+ \Hy@raisedlink{\hyper@@anchor{\@currentHref}{\relax}}#3%
+ \fi
+ }%
+ \fi
\par
\endgroup
}
@@ -3962,7 +4191,7 @@
\def\Hy@float@caption{%
\hyper@makecurrent{\@captype}%
\float@caption
- }
+ }%
\let\HyOrg@float@makebox\float@makebox
\renewcommand{\float@makebox}[1]{%
\HyOrg@float@makebox{%
@@ -3990,8 +4219,12 @@
}
\def\hyper@natanchorend{\hyper@anchorend}
\@ifundefined{NAT@parse}{%
+ \providecommand*\@extra@binfo{}%
+ \providecommand*\@extra@b@citeb{}%
\def\bibcite#1#2{%
- \@newl@bel{b}{#1\@extra@binfo}{\hyper@@link[cite]{}{cite.#1}{#2}}%
+ \@newl@bel{b}{#1\@extra@binfo}{%
+ \hyper@@link[cite]{}{cite.#1\@extra@b@citeb}{#2}%
+ }%
}%
\gdef\@extra@binfo{}%
\let\Hy@bibcite\bibcite
@@ -4007,9 +4240,13 @@
\@skiphyperreftrue
\H@item[%
\ifx\Hy@raisedlink\@empty
- \hyper@anchorstart{cite.#2}\@BIBLABEL{#1}\hyper@anchorend
+ \hyper@anchorstart{cite.#2\@extra@b@citeb}%
+ \@BIBLABEL{#1}%
+ \hyper@anchorend
\else
- \Hy@raisedlink{\hyper@anchorstart{cite.#2}\hyper@anchorend}%
+ \Hy@raisedlink{%
+ \hyper@anchorstart{cite.#2\@extra@b@citeb}\hyper@anchorend
+ }%
\@BIBLABEL{#1}%
\fi
\hfill
@@ -4027,7 +4264,9 @@
}%
\def\@bibitem#1{%
\@skiphyperreftrue\H@item\@skiphyperreffalse
- \Hy@raisedlink{\hyper@anchorstart{cite.#1}\relax\hyper@anchorend}%
+ \Hy@raisedlink{%
+ \hyper@anchorstart{cite.#1\@extra@b@citeb}\relax\hyper@anchorend
+ }%
\if@filesw
\begingroup
\let\protect\noexpand
@@ -4198,7 +4437,7 @@
\def\@citedatax@opt[#1]{%
\def\@cite@opt{, #1}%
\@citedatax[{#1}]%
- }
+ }%
}{}
\def\@begindvi{%
\unvbox \@begindvibox
@@ -4269,11 +4508,123 @@
\gdef\PDF@FinishDoc{}%
\fi
}
+\@ifpackageloaded{fancybox}{%
+ \def\fb@outputpage{%
+ \begingroup
+ \catcode`\ =10 %
+ \let\-\@dischyph
+ \let\'\@acci
+ \let\`\@accii
+ \let\=\@acciii
+ \if@specialpage
+ \global\@specialpagefalse\@nameuse{ps@\@specialstyle}%
+ \fi
+ \if@twoside
+ \ifodd\count\z@
+ \let\@thehead\@oddhead
+ \let\@thefoot\@oddfoot
+ \let\@themargin\oddsidemargin
+ \else
+ \let\@thehead\@evenhead
+ \let\@thefoot\@evenfoot
+ \let\@themargin\evensidemargin
+ \fi
+ \fi
+ \csname reset@font\endcsname
+ \normalsize
+ \baselineskip\z@
+ \lineskip\z@
+ \let\par\@@par
+ \ifx\this@fancypage\@empty\else
+ \this@fancypage
+ \gdef\this@fancypage{}%
+ \fi
+ \ifx\the@fancypage\@empty\else
+ \setbox\@outputbox\hbox{\the@fancypage{\box\@outputbox}}%
+ \fi
+ \ifx\fb@@rotatepage\@empty\else
+ \setbox\@outputbox\hbox{\fb@@rotatepage{\box\@outputbox}}%
+ \fi
+ \setbox\@outputbox\vbox{%
+ \@tempdima=\wd\@outputbox
+ \setbox\@tempboxa=\hbox to\@tempdima{%
+ \let\label\@gobble
+ \let\index\@gobble
+ \let\glossary\@gobble
+ \@thehead
+ }%
+ \ht\@tempboxa\headheight
+ \dp\@tempboxa\z@
+ \box\@tempboxa
+ \vskip\headsep
+ \box\@outputbox
+ \baselineskip\footskip
+ \hbox to\@tempdima{%
+ \let\label\@gobble
+ \let\index\@gobble
+ \let\glossary\@gobble
+ \@thefoot
+ }%
+ }%
+ \ifx\the@@fancypage\@empty\else
+ \setbox\@outputbox\hbox{\the@@fancypage{\box\@outputbox}}%
+ \fi
+ \setbox\@outputbox\vbox{%
+ \ifnum\fancyput@flag>-1 \do@fancyput\fi
+ \@begindvi
+ \Hy@TempPageAnchor\relax
+ \hyper@pagetransition
+ \hyper@pageduration
+ \hyper@pagehidden
+ \vskip\topmargin
+ \moveright\@themargin\box\@outputbox
+ }%
+ \ifx\fb@rotatepage\@empty\else
+ \setbox\@outputbox\hbox{\lower\ht\@outputbox\box\@outputbox}%
+ \dp\@outputbox\z@
+ \wd\@outputbox\z@
+ \setbox\@outputbox\hbox{\fb@rotatepage{\box\@outputbox}}%
+ \expandafter\fb@setoffsets\fb@theoffsets
+ \fi
+ \let\protect\noexpand
+ \shipout\box\@outputbox
+ \global\@colht\textheight
+ \endgroup
+ \stepcounter{page}%
+ \let\firstmark\botmark
+ }%
+ \def\fancypage#1#2{%
+ \def\the@fancypage{#1}%
+ \def\the@@fancypage{#2}%
+ \def\@outputpage{\fb@outputpage}%
+ }%
+ \def\thisfancypage#1#2{%
+ \gdef\@outputpage{\fb@outputpage}%
+ \gdef\this@fancypage{\def\the@fancypage{#1}\def\the@@fancypage{#2}}%
+ }%
+ \def\fancyput{%
+ \def\@outputpage{\fb@outputpage}%
+ \@ifstar{\@testtrue\@fancyput}{\@testfalse\@fancyput}%
+ }%
+ \def\thisfancyput{%
+ \gdef\@outputpage{\fb@outputpage}%
+ \@ifstar{\@testtrue\@thisfancyput}{\@testfalse\@thisfancyput}%
+ }%
+ \def\LandScape#1{%
+ \clearpage
+ \def\fb@@rotatepage{#1}%
+ \def\@outputpage{\fb@outputpage}%
+ \@tempdima\textheight
+ \textheight\textwidth
+ \textwidth\@tempdima
+ \UsePageParameters
+ }%
+}{}
\begingroup\expandafter\expandafter\expandafter\endgroup
\expandafter\ifx\csname chapter\endcsname\relax
- \def\toclevel@part{0}
+ \def\toclevel@part{0}%
\else
- \def\toclevel@part{-1}
+ \def\toclevel@part{-1}%
\fi
\def\toclevel@chapter{0}
\def\toclevel@section{1}
@@ -4322,9 +4673,9 @@
\ifHy@verbose
\def\Hy@tempa{#3}%
\@onelevel@sanitize\Hy@tempa
- \typeout{pdftex: bookmark at \the\inputlineno:
- {\csname the#2\endcsname}
- {\Hy@tempa}
+ \typeout{pdftex: bookmark at \the\inputlineno: %
+ {\csname the#2\endcsname}%
+ {\Hy@tempa}%
{\@currentHref}%
{\Hy@toclevel}%
{#1}%
@@ -4412,17 +4763,17 @@
}%
}{%
\Hy@WarningNoLine{%
- \string\numberwithin\space of package `amsmath'
+ \string\numberwithin\space of package `amsmath' %
only fixed\MessageBreak
for version 2000/06/06 v2.12 or newer%
}%
- }
+ }%
}{}
\ifHy@figures
\let\Hy@Gin@setfile\Gin@setfile
\def\Gin@setfile#1#2#3{%
\hyperimage{#3}{\Hy@Gin@setfile{#1}{#2}{#3}}%
- }
+ }%
\fi
\Hy@DisableOption{hyperfigures}
\ifHy@hyperindex
@@ -4452,7 +4803,7 @@
\fi
}%
\else
- \def\@wrindex#1{\@@wrindex#1||\\}
+ \def\@wrindex#1{\@@wrindex#1||\\}%
\def\@@wrindex#1|#2|#3\\{%
\if@filesw
\ifx\\#2\\%
@@ -4703,7 +5054,7 @@
\fi
}%
\def\l@subslide##1##2##3##4{%
- \ifnum\lslide@flag=1
+ \ifnum\lslide@flag=1 %
\@undottedtocline{2}{3.8em}{3.2em}{\hyperlink{##4}{##2}}{}%
\fi
}%
@@ -4749,17 +5100,83 @@
{\expandafter\@secondoffive#1}%
\fi
}
+\def\HyRef@StarSetRef#1{%
+ \begingroup
+ \Hy@safe@activestrue
+ \edef\x{#1}%
+ \@onelevel@sanitize\x
+ \edef\x{\endgroup
+ \noexpand\HyRef@@StarSetRef
+ \expandafter\noexpand\csname r@\x\endcsname{\x}%
+ }%
+ \x
+}
+\def\HyRef@@StarSetRef#1#2#3{%
+ \ifx#1\@undefined
+ \let#1\relax
+ \fi
+ \real@setref#1#3{#2}%
+}
\def\@refstar#1{%
- \Hy@safe@activestrue
- \expandafter\real@setref\csname r@#1\endcsname\@firstoffive{#1}%
- \Hy@safe@activesfalse
+ \HyRef@StarSetRef{#1}\@firstoffive
}
\def\@pagerefstar#1{%
- \Hy@safe@activestrue
- \expandafter\real@setref\csname r@#1\endcsname\@secondoffive{#1}%
- \Hy@safe@activesfalse
+ \HyRef@StarSetRef{#1}\@secondoffive
+}
+\AtBeginDocument{%
+ \@ifpackageloaded{varioref}{%
+ \def\@Refstar#1{%
+ \HyRef@StarSetRef{#1}\HyRef@MakeUppercaseFirstOfFive
+ }%
+ \def\HyRef@MakeUppercaseFirstOfFive#1#2#3#4#5{%
+ \MakeUppercase#1%
+ }%
+ \DeclareRobustCommand*{\Ref}{%
+ \@ifstar\@Refstar\HyRef@Ref
+ }%
+ \def\HyRef@Ref#1{%
+ \hyperref[{#1}]{\Ref*{#1}}%
+ }%
+ \def\Vr@f#1{%
+ \leavevmode\unskip\vref@space
+ \hyperref[{#1}]{%
+ \Ref*{#1}%
+ \let\vref@space\nobreakspace
+ \@vpageref[\unskip]{#1}%
+ }%
+ }%
+ \def\vr@f#1{%
+ \leavevmode\unskip\vref@space
+ \begingroup
+ \let\T@pageref\@pagerefstar
+ \hyperref[{#1}]{%
+ \ref*{#1}%
+ \vpageref[\unskip]{#1}%
+ }%
+ \endgroup
+ }%
+ }{}%
}
-\DeclareRobustCommand\autoref{%
+\DeclareRobustCommand*{\autopageref}{%
+ \@ifstar{%
+ \HyRef@autopagerefname\pageref*%
+ }\HyRef@autopageref
+}
+\def\HyRef@autopageref#1{%
+ \hyperref[{#1}]{\HyRef@autopagerefname\pageref*{#1}}%
+}
+\def\HyRef@autopagerefname{%
+ \@ifundefined{pageautorefname}{%
+ \@ifundefined{pagename}{%
+ \Hy@Warning{No autoref name for `page'}%
+ }{%
+ \pagename\nobreakspace
+ }%
+ }{%
+ \pageautorefname\nobreakspace
+ }%
+}
+\DeclareRobustCommand*{\autoref}{%
\@ifstar{\HyRef@autoref\@gobbletwo}{\HyRef@autoref\hyper@@link}%
}
\def\HyRef@autoref#1#2{%
@@ -4769,12 +5186,13 @@
\endgroup
}
\def\HyRef@autosetref#1#2#3{% link command, csname, refname
+ \HyRef@ShowKeysRef{#2}%
\ifcase 0\ifx#1\relax 1\fi\ifx#1\Hy@varioref@undefined 1\fi\relax
\edef\HyRef@thisref{\expandafter\@fourthoffive#1\@empty\@empty\@empty}%
- \expandafter\HyRef@testreftype\HyRef@thisref\\%
+ \expandafter\HyRef@testreftype\HyRef@thisref.\\%
\Hy@safe@activesfalse
#3{%
- \expandafter\@fifthoffive#1%
+ \expandafter\@fifthoffive#1\@empty\@empty\@empty
}{%
\expandafter\@fourthoffive#1\@empty\@empty\@empty
}{%
@@ -4793,8 +5211,23 @@
\def\HyRef@testreftype#1.#2\\{%
\@ifundefined{#1autorefname}{%
\@ifundefined{#1name}{%
- \def\HyRef@currentHtag{}%
- \@latex@warning{no tag name for #1 at \the\inputlineno}%
+ \HyRef@StripStar#1\\*\\\@nil{#1}%
+ \@ifundefined{\HyRef@name autorefname}{%
+ \@ifundefined{\HyRef@name name}{%
+ \def\HyRef@currentHtag{}%
+ \Hy@Warning{No autoref name for `#1'}%
+ }{%
+ \edef\HyRef@currentHtag{%
+ \expandafter\noexpand\csname\HyRef@name name\endcsname
+ \noexpand~%
+ }%
+ }%
+ }{%
+ \edef\HyRef@currentHtag{%
+ \expandafter\noexpand\csname\HyRef@name autorefname\endcsname
+ \noexpand~%
+ }%
+ }%
}{%
\edef\HyRef@currentHtag{%
\expandafter\noexpand\csname#1name\endcsname
@@ -4808,7 +5241,38 @@
}%
}%
}
+\def\HyRef@StripStar#1*\\#2\@nil#3{%
+ \def\HyRef@name{#2}%
+ \ifx\HyRef@name\HyRef@CaseStar
+ \def\HyRef@name{#1}%
+ \else
+ \def\HyRef@name{#3}%
+ \fi
+}
+\def\HyRef@CaseStar{*\\}
\def\HyRef@currentHtag{}
+\let\HyRef@ShowKeysRef\@gobble
+\def\HyRef@ShowKeysInit{%
+ \begingroup\expandafter\expandafter\expandafter\endgroup
+ \expandafter\ifx\csname SK@@label\endcsname\relax
+ \else
+ \ifx\SK@ref\@empty
+ \else
+ \def\HyRef@ShowKeysRef{%
+ \SK@\SK@@ref
+ }%
+ \fi
+ \fi
+}
+\@ifpackageloaded{showkeys}{%
+ \HyRef@ShowKeysInit
+}{%
+ \AtBeginDocument{%
+ \@ifpackageloaded{showkeys}{%
+ \HyRef@ShowKeysInit
+ }{}%
+ }%
+}
\providecommand*\AMSautorefname{\equationautorefname}
\providecommand*\Hfootnoteautorefname{\footnoteautorefname}
\providecommand*\Itemautorefname{\itemautorefname}
@@ -4828,6 +5292,7 @@
\providecommand*\subparagraphautorefname{subparagraph}
\providecommand*\FancyVerbLineautorefname{line}
\providecommand*\theoremautorefname{Theorem}
+\providecommand*\pageautorefname{page}
\providecommand*{\Hy@DistillerDestFix}{}
\def\phantomsection{%
\Hy@GlobalStepCount\Hy@linkcounter