oberdiek update (10apr10)

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

25 files changed, 77 insertions, 105 deletions

diff --git a/Master/texmf-dist/tex/latex/oberdiek/bkm-dvipdfm.def b/Master/texmf-dist/tex/latex/oberdiek/bkm-dvipdfm.def
index 962661620c9..d6b4a13c749 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/bkm-dvipdfm.def
+++ b/Master/texmf-dist/tex/latex/oberdiek/bkm-dvipdfm.def
@@ -34,7 +34,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{bkm-dvipdfm.def}%
-  [2010/04/04 v1.11 bookmark driver for dvipdfm (HO)]%
+  [2010/04/08 v1.12 bookmark driver for dvipdfm (HO)]%
 \newcount\BKM@id
 \BKM@id=\z@
 \@namedef{BKM@0}{000}
diff --git a/Master/texmf-dist/tex/latex/oberdiek/bkm-dvips.def b/Master/texmf-dist/tex/latex/oberdiek/bkm-dvips.def
index 3fcb2c96e66..d4a7f73c69a 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/bkm-dvips.def
+++ b/Master/texmf-dist/tex/latex/oberdiek/bkm-dvips.def
@@ -34,7 +34,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{bkm-dvips.def}%
-  [2010/04/04 v1.11 bookmark driver for dvips (HO)]%
+  [2010/04/08 v1.12 bookmark driver for dvips (HO)]%
 \def\BKM@PSHeaderFile#1{%
   \special{header=#1}%
 }
diff --git a/Master/texmf-dist/tex/latex/oberdiek/bkm-dvipsone.def b/Master/texmf-dist/tex/latex/oberdiek/bkm-dvipsone.def
index 9d0e00d5925..51cfc201bd4 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/bkm-dvipsone.def
+++ b/Master/texmf-dist/tex/latex/oberdiek/bkm-dvipsone.def
@@ -34,7 +34,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{bkm-dvipsone.def}%
-  [2010/04/04 v1.11 bookmark driver for dvipsone (HO)]%
+  [2010/04/08 v1.12 bookmark driver for dvipsone (HO)]%
 \def\BKM@PSHeaderFile#1{%
   \special{header=#1}%
 }
diff --git a/Master/texmf-dist/tex/latex/oberdiek/bkm-pdftex.def b/Master/texmf-dist/tex/latex/oberdiek/bkm-pdftex.def
index 76f38d919f5..697a2482a82 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/bkm-pdftex.def
+++ b/Master/texmf-dist/tex/latex/oberdiek/bkm-pdftex.def
@@ -34,7 +34,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{bkm-pdftex.def}%
-  [2010/04/04 v1.11 bookmark driver for pdfTeX (HO)]%
+  [2010/04/08 v1.12 bookmark driver for pdfTeX (HO)]%
 \def\BKM@DO@entry#1#2{%
   \begingroup
     \setkeys{BKM@DO}{#1}%
diff --git a/Master/texmf-dist/tex/latex/oberdiek/bkm-textures.def b/Master/texmf-dist/tex/latex/oberdiek/bkm-textures.def
index 337ed581e9f..6897861aa2b 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/bkm-textures.def
+++ b/Master/texmf-dist/tex/latex/oberdiek/bkm-textures.def
@@ -34,7 +34,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{bkm-textures.def}%
-  [2010/04/04 v1.11 bookmark driver for textures (HO)]%
+  [2010/04/08 v1.12 bookmark driver for textures (HO)]%
 \def\BKM@PSHeaderFile#1{%
   \special{prePostScriptfile #1}%
 }
diff --git a/Master/texmf-dist/tex/latex/oberdiek/bkm-vtex.def b/Master/texmf-dist/tex/latex/oberdiek/bkm-vtex.def
index 7a25d978184..bfb2ec8123a 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/bkm-vtex.def
+++ b/Master/texmf-dist/tex/latex/oberdiek/bkm-vtex.def
@@ -34,7 +34,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{bkm-vtex.def}%
-  [2010/04/04 v1.11 bookmark driver for VTeX (HO)]%
+  [2010/04/08 v1.12 bookmark driver for VTeX (HO)]%
 \ifvtexpdf
 \else
   \PackageWarningNoLine{bookmark}{%
diff --git a/Master/texmf-dist/tex/latex/oberdiek/bookmark.sty b/Master/texmf-dist/tex/latex/oberdiek/bookmark.sty
index 3a7184e18d8..d7f2e1f616b 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/bookmark.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/bookmark.sty
@@ -34,7 +34,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{bookmark}%
-  [2010/04/04 v1.11 PDF bookmarks (HO)]%
+  [2010/04/08 v1.12 PDF bookmarks (HO)]%
 \begingroup\expandafter\expandafter\expandafter\endgroup
 \expandafter\ifx\csname numexpr\endcsname\relax
   \def\BKM@CalcExpr#1#2#3#4{%
@@ -83,7 +83,7 @@
 \RequirePackage{kvoptions}[2009/08/13]
 \RequirePackage{hycolor}[2008/09/08]
 \RequirePackage{bitset}
-\RequirePackage{ltxcmds}[2010/03/01]
+\RequirePackage{ltxcmds}[2010/04/08]
 \SetupKeyvalOptions{family=BKM,prefix=BKM@}
 \DeclareLocalOptions{%
   atend,%
diff --git a/Master/texmf-dist/tex/latex/oberdiek/holtxdoc.sty b/Master/texmf-dist/tex/latex/oberdiek/holtxdoc.sty
index 204f8e23a96..332b9ef66d3 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/holtxdoc.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/holtxdoc.sty
@@ -31,10 +31,13 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{holtxdoc}%
-  [2010/04/03 v0.16 Private additional ltxdoc support (HO)]
+  [2010/04/08 v0.17 Private additional ltxdoc support (HO)]
+\PassOptionsToPackage{pdfencoding=auto}{hyperref}
 \RequirePackage[numbered]{hypdoc}[2010/03/26]
+\RequirePackage{hyperref}[2010/03/30]
 \RequirePackage{pdftexcmds}[2010/04/01]
 \RequirePackage{ltxcmds}[2010/03/09]
+\RequirePackage{hologo}[2010/04/08]
 \RequirePackage{array}
 \def\hld@info#1{%
   \PackageInfo{holtxdoc}{#1\@gobble}%
@@ -192,63 +195,18 @@
   \noindent
   \ignorespacesafterend
 }
-\providecommand*{\eTeX}{\mbox{$\varepsilon$-\TeX}}
-\providecommand*{\pdfTeX}{pdf\TeX}
-\providecommand*{\pdfLaTeX}{pdf\LaTeX}
-\providecommand*{\LuaTeX}{%
-  \begingroup
-    Lua%
-    \setbox0\hbox{aT}%
-    \setbox2\hbox{a\kern0ptT}%
-    \ifdim\wd0<\wd2 %
-    \else
-      \setbox0\hbox{oT}%
-      \setbox2\hbox{o\kern0ptT}%
-      \ifdim\wd0<\wd2 %
-      \else
-        \setbox0\hbox{To}%
-        \setbox2\hbox{T\kern0pto}%
-      \fi
-      \ifdim\wd0<\wd2 %
-        \dimen0=\wd0 %
-        \advance\dimen0-\wd2 %
-        \kern\dimen0 %
-      \fi
-    \fi
-    \TeX
-  \endgroup
-}
-\def\@temp#1#2{%
-  \@ifundefined{\expandafter\@gobble\string#1}{%
-    \DeclareRobustCommand*{#1}{%
-      \texorpdfstring{%
-        \begingroup
-          X%
-          \kern-.1em\relax
-          \@ifundefined{rotatebox}{e}{%
-            \lower0.5ex\hbox{%
-              \setbox0=\hbox{E}%
-              \dimen0=\ht0 %
-              \advance\dimen0 by \dp0 %
-              \raise\dimen0\hbox{\rotatebox{180}{\box0}}%
-            }%
-          }%
-        }{Xe}%
-        \ifx\TeX#2\relax
-          \kern-.15em\relax
-        \fi
-        #2%
-      \endgroup
-    }%
-  }{}%
-}
-\@temp\XeTeX\TeX
-\@temp\XeLaTeX\LaTeX
+\def\eTeX{\hologo{eTeX}}
+\def\pdfTeX{\hologo{pdfTeX}}
+\def\pdfLaTeX{\hologo{pdfLaTeX}}
+\def\LuaTeX{\hologo{LuaTeX}}
+\def\LuaLaTeX{\hologo{LuaLaTeX}}
+\def\XeTeX{\hologo{XeTeX}}
+\def\XeLaTeX{\hologo{XeLaTeX}}
+\def\plainTeX{\hologo{plainTeX}}
 \providecommand*{\teTeX}{te\TeX}
 \providecommand*{\mikTeX}{mik\TeX}
 \providecommand*{\MakeIndex}{\textsl{MakeIndex}}
 \providecommand*{\docstrip}{\textsf{docstrip}}
-\providecommand*{\plainTeX}{\mbox{plain-\TeX}}
 \providecommand*{\iniTeX}{\mbox{ini-\TeX}}
 \providecommand*{\VTeX}{V\TeX}
 \CodelineIndex
diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-abspage.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-abspage.sty
index 6403a6d5d98..0171a6e6ae7 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/zref-abspage.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/zref-abspage.sty
@@ -39,8 +39,8 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-abspage}%
-  [2010/03/29 v2.9 Module abspage for zref (HO)]%
-\RequirePackage{zref-base}[2010/03/29]
+  [2010/04/08 v2.10 Module abspage for zref (HO)]%
+\RequirePackage{zref-base}[2010/04/08]
 \@ifundefined{ZREF@baseok}{\endinput}{}
 \RequirePackage{atbegshi}%
 \begingroup
diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-base.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-base.sty
index 2682c1c7640..9367101c343 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/zref-base.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/zref-base.sty
@@ -39,7 +39,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-base}%
-  [2010/03/29 v2.9 Module base for zref (HO)]%
+  [2010/04/08 v2.10 Module base for zref (HO)]%
 \RequirePackage{ltxcmds}[2010/03/01]
 \def\ZREF@name{zref}
 \def\ZREF@UpdatePdfTeX{Update pdfTeX.}
diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-counter.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-counter.sty
index 30edeeac494..dd96d69dd0f 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/zref-counter.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/zref-counter.sty
@@ -39,8 +39,8 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-counter}%
-  [2010/03/29 v2.9 Module counter for zref (HO)]%
-\RequirePackage{zref-base}[2010/03/29]
+  [2010/04/08 v2.10 Module counter for zref (HO)]%
+\RequirePackage{zref-base}[2010/04/08]
 \@ifundefined{ZREF@baseok}{\endinput}{}
 \zref@newprop{counter}{}
 \zref@addprop\ZREF@mainlist{counter}
diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-dotfill.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-dotfill.sty
index 17519438753..ec57ac6fde0 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/zref-dotfill.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/zref-dotfill.sty
@@ -39,10 +39,10 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-dotfill}%
-  [2010/03/29 v2.9 Module dotfill for zref (HO)]%
-\RequirePackage{zref-base}[2010/03/29]
+  [2010/04/08 v2.10 Module dotfill for zref (HO)]%
+\RequirePackage{zref-base}[2010/04/08]
 \@ifundefined{ZREF@baseok}{\endinput}{}
-\RequirePackage{zref-savepos}[2010/03/29]
+\RequirePackage{zref-savepos}[2010/04/08]
 \zref@require@unique
 \RequirePackage{keyval}
 \define@key{ZREF@DF}{unit}{%
diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-hyperref.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-hyperref.sty
index c579e444ba3..4ac1421e9aa 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/zref-hyperref.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/zref-hyperref.sty
@@ -39,8 +39,8 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-hyperref}%
-  [2010/03/29 v2.9 Module hyperref for zref (HO)]%
-\RequirePackage{zref-base}[2010/03/29]
+  [2010/04/08 v2.10 Module hyperref for zref (HO)]%
+\RequirePackage{zref-base}[2010/04/08]
 \@ifundefined{ZREF@baseok}{\endinput}{}
 \zref@newprop{anchor}[]{%
   \ltx@ifundefined{@currentHref}{}{\@currentHref}%
diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-lastpage.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-lastpage.sty
index 88289e42f69..c88db209024 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/zref-lastpage.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/zref-lastpage.sty
@@ -39,9 +39,9 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-lastpage}%
-  [2010/03/29 v2.9 Module lastpage for zref (HO)]%
-\RequirePackage{zref-base}[2010/03/29]
-\RequirePackage{zref-abspage}[2010/03/29]
+  [2010/04/08 v2.10 Module lastpage for zref (HO)]%
+\RequirePackage{zref-base}[2010/04/08]
+\RequirePackage{zref-abspage}[2010/04/08]
 \RequirePackage{atveryend}[2009/12/07]
 \@ifundefined{ZREF@baseok}{\endinput}{}
 \zref@newlist{LastPage}
diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-marks.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-marks.sty
index dde82e2783f..a07c4a50071 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/zref-marks.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/zref-marks.sty
@@ -39,8 +39,8 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-marks}%
-  [2010/03/29 v2.9 Module marks for zref (HO)]%
-\RequirePackage{zref-base}[2010/03/29]
+  [2010/04/08 v2.10 Module marks for zref (HO)]%
+\RequirePackage{zref-base}[2010/04/08]
 \@ifundefined{ZREF@baseok}{\endinput}{}
 \RequirePackage{kvsetkeys}[2009/07/30]
 \newcommand*{\zref@marks@register}[3][]{%
diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-nextpage.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-nextpage.sty
index fd14d22221e..35667a3bedd 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/zref-nextpage.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/zref-nextpage.sty
@@ -39,12 +39,12 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-nextpage}%
-  [2010/03/29 v2.9 Module nextpage for zref (HO)]%
-\RequirePackage{zref-base}[2010/03/29]
+  [2010/04/08 v2.10 Module nextpage for zref (HO)]%
+\RequirePackage{zref-base}[2010/04/08]
 \@ifundefined{ZREF@baseok}{\endinput}{}
-\RequirePackage{zref-abspage}[2010/03/29]
-\RequirePackage{zref-thepage}[2010/03/29]
-\RequirePackage{zref-lastpage}[2010/03/29]
+\RequirePackage{zref-abspage}[2010/04/08]
+\RequirePackage{zref-thepage}[2010/04/08]
+\RequirePackage{zref-lastpage}[2010/04/08]
 \RequirePackage{uniquecounter}[2009/12/18]
 \UniqueCounterNew{znextpage}
 
diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-perpage.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-perpage.sty
index cfe8cdb2fbe..c7a155ee526 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/zref-perpage.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/zref-perpage.sty
@@ -39,10 +39,10 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-perpage}%
-  [2010/03/29 v2.9 Module perpage for zref (HO)]%
-\RequirePackage{zref-base}[2010/03/29]
+  [2010/04/08 v2.10 Module perpage for zref (HO)]%
+\RequirePackage{zref-base}[2010/04/08]
 \@ifundefined{ZREF@baseok}{\endinput}{}
-\RequirePackage{zref-abspage}[2010/03/29]
+\RequirePackage{zref-abspage}[2010/04/08]
 \zref@newprop*{pagevalue}[0]{\number\c@page}
 \zref@newlist{perpage}
 \zref@addprop{perpage}{abspage}
diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-runs.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-runs.sty
index b1bccfa11a9..c4127fe525d 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/zref-runs.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/zref-runs.sty
@@ -39,7 +39,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-runs}%
-  [2010/03/29 v2.9 Module runs for zref (HO)]%
+  [2010/04/08 v2.10 Module runs for zref (HO)]%
 \providecommand*{\zruns}{0}%
 \AtBeginDocument{%
   \edef\zruns{\number\numexpr\zruns+1}%
diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-savepos.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-savepos.sty
index b69c49fb778..ec9c1ab8c8c 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/zref-savepos.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/zref-savepos.sty
@@ -39,8 +39,8 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-savepos}%
-  [2010/03/29 v2.9 Module savepos for zref (HO)]%
-\RequirePackage{zref-base}[2010/03/29]
+  [2010/04/08 v2.10 Module savepos for zref (HO)]%
+\RequirePackage{zref-base}[2010/04/08]
 \@ifundefined{ZREF@baseok}{\endinput}{}
 \ltx@IfUndefined{pdfsavepos}{%
   \PackageError\ZREF@name{%
diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-thepage.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-thepage.sty
index e9659f1c711..8a8ba72354c 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/zref-thepage.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/zref-thepage.sty
@@ -39,11 +39,11 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-thepage}%
-  [2010/03/29 v2.9 Module thepage for zref (HO)]%
-\RequirePackage{zref-base}[2010/03/29]
+  [2010/04/08 v2.10 Module thepage for zref (HO)]%
+\RequirePackage{zref-base}[2010/04/08]
 \@ifundefined{ZREF@baseok}{\endinput}{}
 \RequirePackage{atbegshi}
-\RequirePackage{zref-abspage}[2010/03/29]
+\RequirePackage{zref-abspage}[2010/04/08]
 \zref@newlist{thepage}
 \zref@addprop{thepage}{page}
 \AtBeginShipout{%
diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-titleref.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-titleref.sty
index c0195ead668..b2403eda426 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/zref-titleref.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/zref-titleref.sty
@@ -39,8 +39,8 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-titleref}%
-  [2010/03/29 v2.9 Module titleref for zref (HO)]%
-\RequirePackage{zref-base}[2010/03/29]
+  [2010/04/08 v2.10 Module titleref for zref (HO)]%
+\RequirePackage{zref-base}[2010/04/08]
 \@ifundefined{ZREF@baseok}{\endinput}{}
 \RequirePackage{gettitlestring}[2009/12/08]
 \RequirePackage{keyval}
diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-totpages.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-totpages.sty
index 7c2ab53dca2..2670629d327 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/zref-totpages.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/zref-totpages.sty
@@ -39,11 +39,11 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-totpages}%
-  [2010/03/29 v2.9 Module totpages for zref (HO)]%
-\RequirePackage{zref-base}[2010/03/29]
+  [2010/04/08 v2.10 Module totpages for zref (HO)]%
+\RequirePackage{zref-base}[2010/04/08]
 \@ifundefined{ZREF@baseok}{\endinput}{}
-\RequirePackage{zref-abspage}[2010/03/29]
-\RequirePackage{zref-lastpage}[2010/03/29]
+\RequirePackage{zref-abspage}[2010/04/08]
+\RequirePackage{zref-lastpage}[2010/04/08]
 \newcommand*{\ztotpages}{%
   \zref@extractdefault{LastPage}{abspage}{0}%
 }
diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-user.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-user.sty
index 051cee3f0b6..708cfed82b5 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/zref-user.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/zref-user.sty
@@ -39,8 +39,8 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-user}%
-  [2010/03/29 v2.9 Module user for zref (HO)]%
-\RequirePackage{zref-base}[2010/03/29]
+  [2010/04/08 v2.10 Module user for zref (HO)]%
+\RequirePackage{zref-base}[2010/04/08]
 \@ifundefined{ZREF@baseok}{\endinput}{}
 \newcommand*\zlabel{%
   \ifx\label\ltx@gobble
diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-xr.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-xr.sty
index 2b74a8397a2..1fde34c1017 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/zref-xr.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/zref-xr.sty
@@ -39,11 +39,12 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-xr}%
-  [2010/03/29 v2.9 Module xr for zref (HO)]%
-\RequirePackage{zref-base}[2010/03/29]
+  [2010/04/08 v2.10 Module xr for zref (HO)]%
+\RequirePackage{zref-base}[2010/04/08]
 \@ifundefined{ZREF@baseok}{\endinput}{}
 \RequirePackage{keyval}
 \zref@newprop{url}{}%
+\zref@newprop{externaldocument}{}%
 \providecommand*{\zref@xr@ext}{%
   \ltx@ifundefined{XR@ext}{pdf}{\XR@ext}%
 }%
@@ -63,7 +64,8 @@
 \def\ZREF@xr@externaldocument[#1]#2{%
     \def\ZREF@xr@prefix{#1}%
     \let\ZREF@xr@filelist\@empty
-    \edef\ZREF@xr@file{#2.aux}%
+    \edef\ZREF@xr@externalfile{#2}%
+    \edef\ZREF@xr@file{\ZREF@xr@externalfile.aux}%
     \filename@parse{#2}%
     \@testopt\ZREF@xr@graburl{#2.\zref@xr@ext}%
 }%
@@ -150,6 +152,12 @@
       \expandafter\ZREF@xr@checklist\x\ZREF@nil
       \expandafter\global\expandafter\let
           \csname \ZREF@xr@refname\endcsname\x
+      \expandafter\g@addto@macro
+          \csname\ZREF@xr@refname\expandafter\endcsname\expandafter{%
+        \expandafter\externaldocument\expandafter{%
+          \ZREF@xr@externalfile
+        }%
+      }%
     \fi
     \ZREF@xr@urlcheck{\ZREF@xr@prefix#1}%
   }{%
@@ -173,6 +181,12 @@
       \expandafter\g@addto@macro
           \csname\ZREF@xr@refname\endcsname{\theotype{#4}}%
     \fi
+    \expandafter\g@addto@macro
+        \csname\ZREF@xr@refname\expandafter\endcsname\expandafter{%
+      \expandafter\externaldocument\expandafter{%
+        \ZREF@xr@externalfile
+      }%
+    }%
     \ZREF@xr@urlcheck{\ZREF@xr@prefix#1}%
   }{%
     \ZREF@xr@ignorewarning{\ZREF@xr@prefix#1}%
diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref.sty b/Master/texmf-dist/tex/latex/oberdiek/zref.sty
index 4a4771916e6..5a5eb83051e 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/zref.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/zref.sty
@@ -39,13 +39,13 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref}
-  [2010/03/29 v2.9 New reference scheme for LaTeX2e (HO)]%
-\RequirePackage{zref-base}[2010/03/29]
+  [2010/04/08 v2.10 New reference scheme for LaTeX2e (HO)]%
+\RequirePackage{zref-base}[2010/04/08]
 \@ifundefined{ZREF@baseok}{\endinput}{}
 \def\ZREF@temp#1{%
   \DeclareOption{#1}{%
     \AtEndOfPackage{%
-      \RequirePackage{zref-#1}[2010/03/29]%
+      \RequirePackage{zref-#1}[2010/04/08]%
     }%
   }%
 }