summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/hyperref/hyperref.sty
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2012-10-14 17:59:50 +0000
committerKarl Berry <karl@freefriends.org>2012-10-14 17:59:50 +0000
commitf9847227d435563b8d1d02a802e446654f51fd70 (patch)
treea610b8a89d202040d9e9be1db95e9fb7019b30b2 /Master/texmf-dist/tex/latex/hyperref/hyperref.sty
parentddaa801875543cd284c57fee83ae09524f487319 (diff)
hyperref (14oct12)
git-svn-id: svn://tug.org/texlive/trunk@27965 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/hyperref/hyperref.sty')
-rw-r--r--Master/texmf-dist/tex/latex/hyperref/hyperref.sty42
1 files changed, 31 insertions, 11 deletions
diff --git a/Master/texmf-dist/tex/latex/hyperref/hyperref.sty b/Master/texmf-dist/tex/latex/hyperref/hyperref.sty
index f97bf4a6c6a..2b463313eb7 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/09/27 v6.83g %
+ [2012/10/13 v6.83j %
Hypertext links for LaTeX]
\begingroup
\@makeother\`%
@@ -125,6 +125,7 @@
\RequirePackage{infwarerr}[2010/04/08]
\RequirePackage{keyval}[1997/11/10]
\RequirePackage{kvsetkeys}[2007/09/29]
+\RequirePackage{kvdefinekeys}[2011/04/07]
\RequirePackage{pdfescape}[2007/11/11]
\RequirePackage{ifvtex}
\RequirePackage{ifxetex}[2006/08/21]
@@ -3921,15 +3922,22 @@
`\kv@key' is ignored%
}%
\else
- \define@key{pdfinfo}{\HyInfo@Key}{%
- \HyXeTeX@CheckUnicode
- \HyPsd@XeTeXBigCharstrue
- \HyPsd@PrerenderUnicode{##1}%
- \pdfstringdef\HyInfo@Value{##1}%
- \expandafter\let\csname HyInfo@Value@\HyInfo@Key\endcsname
- \HyInfo@Value
+ \def\HyInfo@tmp##1{%
+ \kv@define@key{pdfinfo}{##1}{%
+ \HyXeTeX@CheckUnicode
+ \HyPsd@XeTeXBigCharstrue
+ \HyPsd@PrerenderUnicode{####1}%
+ \pdfstringdef\HyInfo@Value{####1}%
+ \global\expandafter
+ \let\csname HyInfo@Value@##1\endcsname
+ \HyInfo@Value
+ }%
}%
- \edef\HyInfo@AddonList{%
+ \expandafter\HyInfo@tmp\expandafter{\HyInfo@Key}%
+ \global\expandafter
+ \let\csname KV@pdfinfo@\HyInfo@Key\expandafter\endcsname
+ \csname KV@pdfinfo@\HyInfo@Key\endcsname
+ \xdef\HyInfo@AddonList{%
\HyInfo@AddonList
\HyInfo@do{\HyInfo@Key}%
}%
@@ -3971,7 +3979,7 @@
\x
\fi
}
-\let\HyInfo@AddonList\ltx@empty
+\global\let\HyInfo@AddonList\ltx@empty
\define@key{Hyp}{pdfview}{\calculate@pdfview#1 \\}
\define@key{Hyp}{pdflinkmargin}{\setpdflinkmargin{#1}}
\let\setpdflinkmargin\@gobble
@@ -4156,10 +4164,18 @@
a4paper,a5paper,b5paper,letterpaper,legalpaper,executivepaper%
}
\@ifpackageloaded{tex4ht}{%
- \@ifpackagewith{hyperref}{tex4ht}{}{%
+ \@ifpackagewith{hyperref}{tex4ht}{%
+ }{%
\PassOptionsToPackage{tex4ht}{hyperref}%
}%
}{}
+\ltx@IfUndefined{HCode}{%
+}{%
+ \@ifpackagewith{hyperref}{tex4ht}{%
+ }{%
+ \PassOptionsToPackage{tex4ht}{hyperref}%
+ }%
+}
\let\ReadBookmarks\relax
\ProcessKeyvalOptions{Hyp}
\def\Hy@xspace@end{}
@@ -6011,6 +6027,10 @@
\Hy@temp{onblur}
\Hy@temp{onenter}
\Hy@temp{onexit}
+\let\Fld@calculate@sortkey\ltx@empty
+\define@key{Field}{calculatesortkey}[1]{%
+ \def\Fld@calculate@sortkey{#1}%
+}
\ifHy@texht
\def\Hy@temp#1{%
\define@key{Field}{#1}{%