summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/hyperref/hyperref.sty
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2010-01-15 00:23:50 +0000
committerKarl Berry <karl@freefriends.org>2010-01-15 00:23:50 +0000
commit500af65c59a551d272e65a1a8591f9e5e1132281 (patch)
tree09186b93306e173a6cf6a74204825d179a24ac5d /Master/texmf-dist/tex/latex/hyperref/hyperref.sty
parenta73ab16648e87732e07a1be4a43b211b03a23953 (diff)
hyperref update (13jan10)
git-svn-id: svn://tug.org/texlive/trunk@16720 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.sty138
1 files changed, 135 insertions, 3 deletions
diff --git a/Master/texmf-dist/tex/latex/hyperref/hyperref.sty b/Master/texmf-dist/tex/latex/hyperref/hyperref.sty
index e5282acddef..c3d610e6172 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}
- [2010/01/08 v6.80a
+ [2010/01/11 v6.80b
Hypertext links for LaTeX]
\begingroup
\@makeother\`%
@@ -95,6 +95,8 @@
\endgroup
\Hy@SetCatcodes
\RequirePackage{keyval}[1997/11/10]
+\RequirePackage{kvsetkeys}[2007/09/29]
+\RequirePackage{pdfescape}[2007/11/11]
\RequirePackage{ifpdf}[2006/02/20]
\RequirePackage{ifvtex}
\RequirePackage{ifxetex}[2006/08/21]
@@ -2285,7 +2287,13 @@
\define@key{Hyp}{dviwindo}[true]{%
\def\Hy@driver{hdviwind}%
\setkeys{Hyp}{colorlinks}%
- \PassOptionsToPackage{dviwindo}{color}%
+ \ifpdf
+ \else
+ \ifxetex
+ \else
+ \PassOptionsToPackage{dviwindo}{color}%
+ \fi
+ \fi
}
\define@key{Hyp}{dvipsone}[true]{%
\def\Hy@driver{hdvipson}%
@@ -2922,6 +2930,130 @@
\HyPsd@XeTeXBigCharstrue
\pdfstringdef\@pdfkeywords{#1}%
}
+\define@key{Hyp}{pdftrapped}{%
+ \lowercase{\edef\Hy@temp{#1}}%
+ \ifx\Hy@temp\HyInfo@trapped@true
+ \def\@pdftrapped{True}%
+ \else
+ \ifx\Hy@temp\HyInfo@trapped@false
+ \def\@pdftrapped{False}%
+ \else
+ \ifx\Hy@temp\HyInfo@trapped@unknown
+ \def\@pdftrapped{Unknown}%
+ \else
+ \ifx\Hy@temp\@empty
+ \else
+ \Hy@Warning{%
+ Unsupported value `#1'\MessageBreak
+ for option `pdftrapped'%
+ }%
+ \fi
+ \def\@pdftrapped{}%
+ \fi
+ \fi
+ \fi
+}
+\def\HyInfo@trapped@true{true}
+\def\HyInfo@trapped@false{false}
+\def\HyInfo@trapped@unknown{unknown}
+\def\HyInfo@TrappedUnsupported{%
+ \ifx\@pdftrapped\@empty
+ \else
+ \Hy@WarningNoLine{`pdftrapped' is not supported by this driver}%
+ \gdef\HyInfo@TrappedUnsupported{}%
+ \fi
+}
+\define@key{Hyp}{pdfinfo}{%
+ \kvsetkeys{pdfinfo}{#1}%
+}
+\def\Hy@temp#1{%
+ \lowercase{\Hy@temp@A{#1}}{#1}%
+}
+\def\Hy@temp@A#1#2{%
+ \define@key{pdfinfo}{#2}{%
+ \hypersetup{pdf#1={##1}}%
+ }%
+}
+\Hy@temp{Title}
+\Hy@temp{Author}
+\Hy@temp{Keywords}
+\Hy@temp{Subject}
+\Hy@temp{Creator}
+\Hy@temp{Producer}
+\Hy@temp{CreationDate}
+\Hy@temp{ModDate}
+\Hy@temp{Trapped}
+\newif\ifHyInfo@AddonUnsupported
+\kv@set@family@handler{pdfinfo}{%
+ \HyInfo@AddonHandler{#1}{#2}%
+}
+\let\HyInfo@do\relax
+\def\HyInfo@AddonHandler#1#2{%
+ \ifx\kv@value\relax
+ \Hy@Warning{%
+ Option `pdfinfo': ignoring key `\kv@key' without value%
+ }%
+ \else
+ \EdefEscapeName\HyInfo@KeyEscaped{\kv@key}%
+ \EdefUnescapeName\HyInfo@Key{\HyInfo@KeyEscaped}%
+ \expandafter\ifx\csname KV@pdfinfo@\HyInfo@Key\endcsname\relax
+ \ifHyInfo@AddonUnsupported
+ \Hy@Warning{%
+ This driver does not support additional\MessageBreak
+ information entries, therefore\MessageBreak
+ `\kv@key' is ignored%
+ }%
+ \else
+ \define@key{pdfinfo}{\HyInfo@Key}{%
+ \HyXeTeX@CheckUnicode
+ \HyPsd@XeTeXBigCharstrue
+ \pdfstringdef\HyInfo@Value{##1}%
+ \expandafter\let\csname HyInfo@Value@\HyInfo@Key\endcsname
+ \HyInfo@Value
+ }%
+ \edef\HyInfo@AddonList{%
+ \HyInfo@AddonList
+ \HyInfo@do{\HyInfo@Key}%
+ }%
+ \kv@parse@normalized{%
+ \HyInfo@Key={#2}%
+ }{%
+ \kv@processor@default{pdfinfo}%
+ }%
+ \fi
+ \else
+ \kv@parse@normalized{%
+ \HyInfo@Key={#2}%
+ }{%
+ \kv@processor@default{pdfinfo}%
+ }%
+ \fi
+ \fi
+}
+\def\HyInfo@GenerateAddons{%
+ \ifHyInfo@AddonUnsupported
+ \def\HyInfo@Addons{}%
+ \else
+ \begingroup
+ \toks@{}%
+ \def\HyInfo@do##1{%
+ \EdefEscapeName\HyInfo@Key{##1}%
+ \edef\x{%
+ \toks@{%
+ \the\toks@
+ /\HyInfo@Key(\csname HyInfo@Value@##1\endcsname)%
+ }%
+ }%
+ \x
+ }%
+ \HyInfo@AddonList
+ \edef\x{\endgroup
+ \def\noexpand\HyInfo@Addons{\the\toks@}%
+ }%
+ \x
+ \fi
+}
+\def\HyInfo@AddonList{}
\define@key{Hyp}{pdfview}{\calculate@pdfview#1 \\}
\define@key{Hyp}{pdflinkmargin}{\setpdflinkmargin{#1}}
\let\setpdflinkmargin\@gobble
@@ -3026,6 +3158,7 @@
\def\@pdfmoddate{}
\def\@pdfsubject{}
\def\@pdfkeywords{}
+\def\@pdftrapped{}
\def\@pdfpagescrop{}
\def\@pdfstartview{ /Fit }
\def\@pdfstartpage{1}
@@ -4145,7 +4278,6 @@
\edef\Fld@flags{/Ff \bitsetGetDec{HyField@Ff}}%
}%
}
-\RequirePackage{kvsetkeys}[2007/09/29]
\def\HyField@PDFChoices#1{%
\begingroup
\gdef\Fld@choices{}%