hyperref update (13jan10)

git-svn-id: svn://tug.org/texlive/trunk@16720 c570f23f-e606-0410-a88d-b1316a301751

20 files changed, 244 insertions, 45 deletions

diff --git a/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def b/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def
index 60b504342de..de65307c4ce 100644
--- a/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def
+++ b/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def
@@ -24,7 +24,7 @@
 %% given in the file `manifest.txt'.
 %%
 \ProvidesFile{hdvipdfm.def}
-  [2010/01/08 v6.80a
+  [2010/01/11 v6.80b
   Hyperref driver for dvipdfm]
 \def\Hy@PutCatalog#1{\@pdfm@mark{docview << #1 >>}}
 \ifHy@pagelabels
@@ -439,6 +439,7 @@
 \fi
 \def\PDF@FinishDoc{%
   \Hy@UseMaketitleInfos
+  \HyInfo@GenerateAddons
   \@pdfm@mark{%
     docinfo<<%
       /Title(\@pdftitle)%
@@ -458,6 +459,11 @@
         /Producer(\@pdfproducer)%
       \fi
       /Keywords(\@pdfkeywords)%
+      \ifx\@pdftrapped\@empty
+      \else
+        /Trapped/\@pdftrapped
+      \fi
+      \HyInfo@Addons
     >>%
   }%
   \Hy@DisableOption{pdfauthor}%
@@ -468,6 +474,8 @@
   \Hy@DisableOption{pdfmoddate}%
   \Hy@DisableOption{pdfproducer}%
   \Hy@DisableOption{pdfkeywords}%
+  \Hy@DisableOption{pdftrapped}%
+  \Hy@DisableOption{pdfinfo}%
 }
 \def\PDF@SetupDoc{%
   \edef\Hy@temp{%
diff --git a/Master/texmf-dist/tex/latex/hyperref/hdvips.def b/Master/texmf-dist/tex/latex/hyperref/hdvips.def
index 29d9fe0c1b2..68fa3a0bff7 100644
--- a/Master/texmf-dist/tex/latex/hyperref/hdvips.def
+++ b/Master/texmf-dist/tex/latex/hyperref/hdvips.def
@@ -24,7 +24,7 @@
 %% given in the file `manifest.txt'.
 %%
 \ProvidesFile{hdvips.def}
-  [2010/01/08 v6.80a
+  [2010/01/11 v6.80b
   Hyperref driver for dvips]
 \providecommand*{\XR@ext}{pdf}
 \def\Hy@raisedlink{}
diff --git a/Master/texmf-dist/tex/latex/hyperref/hdvipson.def b/Master/texmf-dist/tex/latex/hyperref/hdvipson.def
index 710307d3f3d..d24bf823b7d 100644
--- a/Master/texmf-dist/tex/latex/hyperref/hdvipson.def
+++ b/Master/texmf-dist/tex/latex/hyperref/hdvipson.def
@@ -24,7 +24,7 @@
 %% given in the file `manifest.txt'.
 %%
 \ProvidesFile{hdvipson.def}
-  [2010/01/08 v6.80a
+  [2010/01/11 v6.80b
   Hyperref driver for dvipsone]
 \providecommand*{\XR@ext}{pdf}
 \def\Hy@raisedlink{}
@@ -36,8 +36,10 @@
 \ifx\@pdfproducer\relax
   \def\@pdfproducer{dvipsone + Distiller}%
 \fi
+\HyInfo@AddonUnsupportedtrue
 \def\PDF@FinishDoc{%
   \Hy@UseMaketitleInfos
+  \HyInfo@TrappedUnsupported
   \special{PDF: Keywords \@pdfkeywords}%
   \special{PDF: Title \@pdftitle}%
   \special{PDF: Creator \@pdfcreator}%
@@ -63,6 +65,8 @@
   \Hy@DisableOption{pdfmoddate}%
   \Hy@DisableOption{pdfproducer}%
   \Hy@DisableOption{pdfkeywords}%
+  \Hy@DisableOption{pdftrapped}%
+  \Hy@DisableOption{pdfinfo}%
 }
 \def\PDF@SetupDoc{%
   \def\Hy@temp{}%
diff --git a/Master/texmf-dist/tex/latex/hyperref/hdviwind.def b/Master/texmf-dist/tex/latex/hyperref/hdviwind.def
index 2d3d384db7a..ec8fe381730 100644
--- a/Master/texmf-dist/tex/latex/hyperref/hdviwind.def
+++ b/Master/texmf-dist/tex/latex/hyperref/hdviwind.def
@@ -24,22 +24,24 @@
 %% given in the file `manifest.txt'.
 %%
 \ProvidesFile{hdviwind.def}
-  [2010/01/08 v6.80a
+  [2010/01/11 v6.80b
   Hyperref driver for dviwindo]
 \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{%
@@ -257,8 +259,10 @@
 \ifx\@pdfproducer\relax
   \def\@pdfproducer{dviwindo + Distiller}%
 \fi
+\HyInfo@AddonUnsupportedtrue
 \def\PDF@FinishDoc{%
   \Hy@UseMaketitleInfos
+  \HyInfo@TrappedUnsupported
   \special{PDF: Keywords \@pdfkeywords}%
   \special{PDF: Title \@pdftitle}%
   \special{PDF: Creator \@pdfcreator}%
@@ -284,6 +288,8 @@
   \Hy@DisableOption{pdfmoddate}%
   \Hy@DisableOption{pdfproducer}%
   \Hy@DisableOption{pdfkeywords}%
+  \Hy@DisableOption{pdftrapped}%
+  \Hy@DisableOption{pdfinfo}%
 }
 \def\PDF@SetupDoc{%
   \ifx\@baseurl\@empty
@@ -567,6 +573,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
+}
+
 \endinput
 %%
 %% End of file `hdviwind.def'.
diff --git a/Master/texmf-dist/tex/latex/hyperref/hpdftex.def b/Master/texmf-dist/tex/latex/hyperref/hpdftex.def
index 4d81282b0eb..bad109da369 100644
--- a/Master/texmf-dist/tex/latex/hyperref/hpdftex.def
+++ b/Master/texmf-dist/tex/latex/hyperref/hpdftex.def
@@ -24,7 +24,7 @@
 %% given in the file `manifest.txt'.
 %%
 \ProvidesFile{hpdftex.def}
-  [2010/01/08 v6.80a
+  [2010/01/11 v6.80b
   Hyperref driver for pdfTeX]
 \let\Hy@PutCatalog\pdfcatalog
 \ifHy@pagelabels
@@ -548,6 +548,7 @@
 }
 \def\PDF@FinishDoc{%
   \Hy@UseMaketitleInfos
+  \HyInfo@GenerateAddons
   \pdfinfo{%
     /Author(\@pdfauthor)%
     /Title(\@pdftitle)%
@@ -566,6 +567,11 @@
       /Producer(\@pdfproducer)%
     \fi
     /Keywords(\@pdfkeywords)%
+    \ifx\@pdftrapped\@empty
+    \else
+      /Trapped/\@pdftrapped
+    \fi
+    \HyInfo@Addons
   }%
   \Hy@DisableOption{pdfauthor}%
   \Hy@DisableOption{pdftitle}%
@@ -575,6 +581,8 @@
   \Hy@DisableOption{pdfmoddate}%
   \Hy@DisableOption{pdfproducer}%
   \Hy@DisableOption{pdfkeywords}%
+  \Hy@DisableOption{pdftrapped}%
+  \Hy@DisableOption{pdfinfo}%
 }
 \def\hyper@pagetransition{%
   \ifx\@pdfpagetransition\relax
diff --git a/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg b/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg
index b8983c620b7..ea6b75a8608 100644
--- a/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg
+++ b/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg
@@ -24,7 +24,7 @@
 %% given in the file `manifest.txt'.
 %%
 \ProvidesFile{htex4ht.cfg}
-  [2010/01/08 v6.80a
+  [2010/01/11 v6.80b
   Hyperref configuration file for TeX4ht]
 \IfFileExists{\jobname.cfg}{\endinput}{}
 \Preamble{html}
diff --git a/Master/texmf-dist/tex/latex/hyperref/htex4ht.def b/Master/texmf-dist/tex/latex/hyperref/htex4ht.def
index 22968b6efe7..ed7061e091b 100644
--- a/Master/texmf-dist/tex/latex/hyperref/htex4ht.def
+++ b/Master/texmf-dist/tex/latex/hyperref/htex4ht.def
@@ -24,7 +24,7 @@
 %% given in the file `manifest.txt'.
 %%
 \ProvidesFile{htex4ht.def}
-  [2010/01/08 v6.80a
+  [2010/01/11 v6.80b
   Hyperref driver for TeX4ht]
 \providecommand*{\XR@ext}{html}
 \def\Hy@raisedlink{}
diff --git a/Master/texmf-dist/tex/latex/hyperref/htexture.def b/Master/texmf-dist/tex/latex/hyperref/htexture.def
index ab69abec972..c909ae324b5 100644
--- a/Master/texmf-dist/tex/latex/hyperref/htexture.def
+++ b/Master/texmf-dist/tex/latex/hyperref/htexture.def
@@ -24,7 +24,7 @@
 %% given in the file `manifest.txt'.
 %%
 \ProvidesFile{htexture.def}
-  [2010/01/08 v6.80a
+  [2010/01/11 v6.80b
   Hyperref driver for Textures]
 \providecommand*{\XR@ext}{pdf}
 \begingroup
diff --git a/Master/texmf-dist/tex/latex/hyperref/hvtex.def b/Master/texmf-dist/tex/latex/hyperref/hvtex.def
index 37a778eedff..a28550b3ba6 100644
--- a/Master/texmf-dist/tex/latex/hyperref/hvtex.def
+++ b/Master/texmf-dist/tex/latex/hyperref/hvtex.def
@@ -24,7 +24,7 @@
 %% given in the file `manifest.txt'.
 %%
 \ProvidesFile{hvtex.def}
-  [2010/01/08 v6.80a
+  [2010/01/11 v6.80b
   Hyperref driver for VTeX in PDF/PS mode]
 \providecommand*{\XR@ext}{pdf}
 \edef\Hy@VTeXversion{%
@@ -566,8 +566,10 @@
     \special{!pdfinfo l=</\@pdfpagelayout\space>}%
   \fi
 }%
+\HyInfo@AddonUnsupportedtrue
 \def\PDF@FinishDoc{%
   \Hy@UseMaketitleInfos
+  \HyInfo@TrappedUnsupported
   \special{!pdfinfo a=<\@pdfauthor>}%
   \special{!pdfinfo t=<\@pdftitle>}%
   \special{!pdfinfo s=<\@pdfsubject>}%
@@ -585,6 +587,8 @@
   \Hy@DisableOption{pdfmoddate}%
   \Hy@DisableOption{pdfproducer}%
   \Hy@DisableOption{pdfkeywords}%
+  \Hy@DisableOption{pdftrapped}%
+  \Hy@DisableOption{pdfinfo}%
 }
 \def\Hy@writebookmark#1#2#3#4#5{%
     % section number, text, label, level, file
diff --git a/Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def b/Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def
index 6ef958d9893..31fc5a59e0e 100644
--- a/Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def
+++ b/Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def
@@ -24,7 +24,7 @@
 %% given in the file `manifest.txt'.
 %%
 \ProvidesFile{hvtexhtml.def}
-  [2010/01/08 v6.80a
+  [2010/01/11 v6.80b
   Hyperref driver for VTeX in HTML mode]
 \providecommand*{\XR@ext}{htm}
 \RequirePackage{vtexhtml}
diff --git a/Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def b/Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def
index 5c6b8448735..9ee316e17a7 100644
--- a/Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def
+++ b/Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def
@@ -24,7 +24,7 @@
 %% given in the file `manifest.txt'.
 %%
 \ProvidesFile{hvtexmrk.def}
-  [2010/01/08 v6.80a
+  [2010/01/11 v6.80b
  Hyperref driver for VTeX in PDF/PS mode (pdfmark specials)]
 \providecommand*{\XR@ext}{pdf}
 \def\Hy@raisedlink{}
diff --git a/Master/texmf-dist/tex/latex/hyperref/hxetex.def b/Master/texmf-dist/tex/latex/hyperref/hxetex.def
index 6ab69750709..0b88977c722 100644
--- a/Master/texmf-dist/tex/latex/hyperref/hxetex.def
+++ b/Master/texmf-dist/tex/latex/hyperref/hxetex.def
@@ -24,7 +24,7 @@
 %% given in the file `manifest.txt'.
 %%
 \ProvidesFile{hxetex.def}
-  [2010/01/08 v6.80a
+  [2010/01/11 v6.80b
   Hyperref driver for XeTeX]
 \HyPsd@LoadUnicode
 \Hy@unicodetrue
@@ -521,6 +521,7 @@
 \fi
 \def\PDF@FinishDoc{%
   \Hy@UseMaketitleInfos
+  \HyInfo@GenerateAddons
   \@pdfm@mark{%
     docinfo<<%
       /Title(\@pdftitle)%
@@ -540,6 +541,11 @@
         /Producer(\@pdfproducer)%
       \fi
       /Keywords(\@pdfkeywords)%
+      \ifx\@pdftrapped\@empty
+      \else
+        /Trapped/\@pdftrapped
+      \fi
+      \HyInfo@Addons
     >>%
   }%
   \Hy@DisableOption{pdfauthor}%
@@ -550,6 +556,8 @@
   \Hy@DisableOption{pdfmoddate}%
   \Hy@DisableOption{pdfproducer}%
   \Hy@DisableOption{pdfkeywords}%
+  \Hy@DisableOption{pdftrapped}%
+  \Hy@DisableOption{pdfinfo}%
 }
 \def\PDF@SetupDoc{%
   \edef\Hy@temp{%
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{}%
diff --git a/Master/texmf-dist/tex/latex/hyperref/hypertex.def b/Master/texmf-dist/tex/latex/hyperref/hypertex.def
index 1194bdfacd3..dfc1c83be83 100644
--- a/Master/texmf-dist/tex/latex/hyperref/hypertex.def
+++ b/Master/texmf-dist/tex/latex/hyperref/hypertex.def
@@ -24,7 +24,7 @@
 %% given in the file `manifest.txt'.
 %%
 \ProvidesFile{hypertex.def}
-  [2010/01/08 v6.80a
+  [2010/01/11 v6.80b
   Hyperref driver for HyperTeX specials]
 \providecommand*{\XR@ext}{dvi}
 \def\PDF@FinishDoc{}
diff --git a/Master/texmf-dist/tex/latex/hyperref/nohyperref.sty b/Master/texmf-dist/tex/latex/hyperref/nohyperref.sty
index d46b43202d9..463c81bf4ca 100644
--- a/Master/texmf-dist/tex/latex/hyperref/nohyperref.sty
+++ b/Master/texmf-dist/tex/latex/hyperref/nohyperref.sty
@@ -25,7 +25,7 @@
 %%
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{nohyperref}
-  [2010/01/08 v6.80a
+  [2010/01/11 v6.80b
   Dummy hyperref (SR)]
 \let\hyper@@anchor\@gobble
 \def\hyper@link#1#2#3{#3}%
diff --git a/Master/texmf-dist/tex/latex/hyperref/pd1enc.def b/Master/texmf-dist/tex/latex/hyperref/pd1enc.def
index 74ecc111948..86b81a7aa82 100644
--- a/Master/texmf-dist/tex/latex/hyperref/pd1enc.def
+++ b/Master/texmf-dist/tex/latex/hyperref/pd1enc.def
@@ -24,7 +24,7 @@
 %% given in the file `manifest.txt'.
 %%
 \ProvidesFile{pd1enc.def}
-  [2010/01/08 v6.80a
+  [2010/01/11 v6.80b
   Hyperref: PDFDocEncoding definition (HO)]
 \DeclareFontEncoding{PD1}{}{}
 \DeclareTextAccent{\`}{PD1}{\textasciigrave}
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}]{%
diff --git a/Master/texmf-dist/tex/latex/hyperref/puarenc.def b/Master/texmf-dist/tex/latex/hyperref/puarenc.def
index 503c63d0775..4a13b8513b2 100644
--- a/Master/texmf-dist/tex/latex/hyperref/puarenc.def
+++ b/Master/texmf-dist/tex/latex/hyperref/puarenc.def
@@ -24,7 +24,7 @@
 %% given in the file `manifest.txt'.
 %%
 \ProvidesFile{puarenc.def}
-  [2010/01/08 v6.80a
+  [2010/01/11 v6.80b
   Hyperref: Additions to puenc.def for Arabi]
 \DeclareTextCommand{\hamza}{PU}{\86\041}% 0621;afii57409;ARABIC LETTER HAMZA
 \DeclareTextCommand{\alefmadda}{PU}{\86\042}% 0622;afii57410;ARABIC LETTER ALEF WITH MADDA ABOVE
diff --git a/Master/texmf-dist/tex/latex/hyperref/puenc.def b/Master/texmf-dist/tex/latex/hyperref/puenc.def
index 3ca6476a767..3668df81860 100644
--- a/Master/texmf-dist/tex/latex/hyperref/puenc.def
+++ b/Master/texmf-dist/tex/latex/hyperref/puenc.def
@@ -24,7 +24,7 @@
 %% given in the file `manifest.txt'.
 %%
 \ProvidesFile{puenc.def}
-  [2010/01/08 v6.80a
+  [2010/01/11 v6.80b
   Hyperref: PDF Unicode definition (HO)]
 \DeclareFontEncoding{PU}{}{}
 \DeclareTextCommand{\`}{PU}[1]{#1\83\000}% U+0300
diff --git a/Master/texmf-dist/tex/latex/hyperref/puvnenc.def b/Master/texmf-dist/tex/latex/hyperref/puvnenc.def
index df40e8b375d..0ecaccb2a0c 100644
--- a/Master/texmf-dist/tex/latex/hyperref/puvnenc.def
+++ b/Master/texmf-dist/tex/latex/hyperref/puvnenc.def
@@ -24,7 +24,7 @@
 %% given in the file `manifest.txt'.
 %%
 \ProvidesFile{puvnenc.def}
-  [2010/01/08 v6.80a
+  [2010/01/11 v6.80b
   Hyperref: Additions to puenc.def for VnTeX]
 \DeclareTextCommand{\abreve}{PU}{\81\003}
 \DeclareTextCommand{\acircumflex}{PU}{\80\342}