summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/hyperref/pdfmark.def
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/pdfmark.def
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/pdfmark.def')
-rw-r--r--Master/texmf-dist/tex/latex/hyperref/pdfmark.def47
1 files changed, 34 insertions, 13 deletions
diff --git a/Master/texmf-dist/tex/latex/hyperref/pdfmark.def b/Master/texmf-dist/tex/latex/hyperref/pdfmark.def
index 8c8a212ecd1..69ced2d0d9c 100644
--- a/Master/texmf-dist/tex/latex/hyperref/pdfmark.def
+++ b/Master/texmf-dist/tex/latex/hyperref/pdfmark.def
@@ -24,22 +24,24 @@
%% given in the file `manifest.txt'.
%%
\ProvidesFile{pdfmark.def}
- [2010/01/08 v6.80a
+ [2010/01/11 v6.80b
Hyperref definitions for pdfmark specials]
\begingroup
- \toks@\expandafter{\Hy@FirstPageHook}%
- \xdef\Hy@FirstPageHook{%
- \noexpand\headerps@out{%
- systemdict /pdfmark known%
- {%
- userdict /?pdfmark systemdict /exec get put%
- }{%
- userdict /?pdfmark systemdict /pop get put %
- userdict /pdfmark systemdict /cleartomark get put%
+ \@ifundefined{headerps@out}{}{%
+ \toks@\expandafter{\Hy@FirstPageHook}%
+ \xdef\Hy@FirstPageHook{%
+ \noexpand\headerps@out{%
+ systemdict /pdfmark known%
+ {%
+ userdict /?pdfmark systemdict /exec get put%
+ }{%
+ userdict /?pdfmark systemdict /pop get put %
+ userdict /pdfmark systemdict /cleartomark get put%
+ }%
+ ifelse%
}%
- ifelse%
+ \the\toks@
}%
- \the\toks@
}%
\endgroup
\def\Hy@PutCatalog#1{%
@@ -325,6 +327,7 @@
\newtoks\pdf@docset
\def\PDF@FinishDoc{%
\Hy@UseMaketitleInfos
+ \HyInfo@GenerateAddons
\let\Hy@temp\@empty
\ifx\@pdfcreationdate\@empty
\else
@@ -352,8 +355,16 @@
Subject=\@pdfsubject,%
Creator=\@pdfcreator,%
Author=\@pdfauthor,%
- Keywords=\@pdfkeywords
+ Keywords=\@pdfkeywords,%
+ Trapped=\@pdftrapped
}%
+ \ifx\HyInfo@Addons\@empty
+ \else
+ \pdfmark{%
+ pdfmark=/DOCINFO,%
+ Raw={\HyInfo@Addons}%
+ }%
+ \fi
\Hy@DisableOption{pdfauthor}%
\Hy@DisableOption{pdftitle}%
\Hy@DisableOption{pdfsubject}%
@@ -362,6 +373,8 @@
\Hy@DisableOption{pdfmoddate}%
\Hy@DisableOption{pdfproducer}%
\Hy@DisableOption{pdfkeywords}%
+ \Hy@DisableOption{pdftrapped}%
+ \Hy@DisableOption{pdfinfo}%
}
\def\PDF@SetupDoc{%
\def\Hy@temp{}%
@@ -612,6 +625,14 @@
\define@key{PDF}{ModDate}{\pdf@addtoks{(#1)}{ModDate}}
\define@key{PDF}{Base}{\pdf@addtoks{(#1)}{Base}}
\define@key{PDF}{URI}{\pdf@addtoks{#1}{URI}}
+\define@key{PDF}{Trapped}{%
+ \edef\Hy@temp{#1}%
+ \ifx\Hy@temp\@empty
+ \else
+ \pdf@addtoks{/#1}{Trapped}%
+ \fi
+}
+
\def\Acrobatmenu#1#2{%
\Hy@Acrobatmenu{#1}{#2}{%
\pdfmark[{#2}]{%