oberdiek update (10apr10)

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

30 files changed, 773 insertions, 113 deletions

diff --git a/Master/texmf-dist/tex/generic/oberdiek/catchfile.sty b/Master/texmf-dist/tex/generic/oberdiek/catchfile.sty
index 30ada35f31f..4706c3f9349 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/catchfile.sty
+++ b/Master/texmf-dist/tex/generic/oberdiek/catchfile.sty
@@ -94,7 +94,7 @@
   \fi
 \expandafter\x\csname ver@catchfile.sty\endcsname
 \ProvidesPackage{catchfile}%
-  [2010/03/01 v1.3 Catches the contents of a file (HO)]
+  [2010/04/08 v1.4 Catches the contents of a file (HO)]
 \begingroup
   \catcode123 1 % {
   \catcode125 2 % }
@@ -179,10 +179,10 @@
         \csname newread\endcsname\@inputcheck
       \fi
       \openin\@inputcheck#1\relax
+      \expandafter\closein\expandafter\@inputcheck
       \ifeof\@inputcheck
         \let\CatchFile@File\relax
       \else
-        \closein\@inputcheck
         \def\CatchFile@File{#1}%
       \fi
     }%
diff --git a/Master/texmf-dist/tex/generic/oberdiek/hologo-test1.tex b/Master/texmf-dist/tex/generic/oberdiek/hologo-test1.tex
new file mode 100644
index 00000000000..c3eeffed29f
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/oberdiek/hologo-test1.tex
@@ -0,0 +1,113 @@
+%%
+%% This is file `hologo-test1.tex',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% hologo.dtx  (with options: `test1')
+%% 
+%% This is a generated file.
+%% 
+%% Copyright (C) 2010 by
+%%    Heiko Oberdiek <heiko.oberdiek at googlemail.com>
+%% 
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either
+%% version 1.3c of this license or (at your option) any later
+%% version. This version of this license is in
+%%    http://www.latex-project.org/lppl/lppl-1-3c.txt
+%% and the latest version of this license is in
+%%    http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of
+%% LaTeX version 2005/12/01 or later.
+%% 
+%% This work has the LPPL maintenance status "maintained".
+%% 
+%% This Current Maintainer of this work is Heiko Oberdiek.
+%% 
+%% The Base Interpreter refers to any `TeX-Format',
+%% because some files are installed in TDS:tex/generic//.
+%% 
+%% This work consists of the main source file hologo.dtx
+%% and the derived files
+%%    hologo.sty, hologo.pdf, hologo.ins, hologo.drv, hologo-test1.tex.
+%% 
+\catcode`\{=1 %
+\catcode`\}=2 %
+\catcode`\#=6 %
+\catcode`\@=11 %
+\expandafter\ifx\csname count@\endcsname\relax
+  \countdef\count@=255 %
+\fi
+\expandafter\ifx\csname @gobble\endcsname\relax
+  \long\def\@gobble#1{}%
+\fi
+\expandafter\ifx\csname @firstofone\endcsname\relax
+  \long\def\@firstofone#1{#1}%
+\fi
+\expandafter\ifx\csname loop\endcsname\relax
+  \expandafter\@firstofone
+\else
+  \expandafter\@gobble
+\fi
+{%
+  \def\loop#1\repeat{%
+    \def\body{#1}%
+    \iterate
+  }%
+  \def\iterate{%
+    \body
+      \let\next\iterate
+    \else
+      \let\next\relax
+    \fi
+    \next
+  }%
+  \let\repeat=\fi
+}%
+\def\RestoreCatcodes{}
+\count@=0 %
+\loop
+  \edef\RestoreCatcodes{%
+    \RestoreCatcodes
+    \catcode\the\count@=\the\catcode\count@\relax
+  }%
+\ifnum\count@<255 %
+  \advance\count@ 1 %
+\repeat
+
+\def\RangeCatcodeInvalid#1#2{%
+  \count@=#1\relax
+  \loop
+    \catcode\count@=15 %
+  \ifnum\count@<#2\relax
+    \advance\count@ 1 %
+  \repeat
+}
+\expandafter\ifx\csname LoadCommand\endcsname\relax
+  \def\LoadCommand{\input hologo.sty\relax}%
+\fi
+\def\Test{%
+  \RangeCatcodeInvalid{0}{47}%
+  \RangeCatcodeInvalid{58}{64}%
+  \RangeCatcodeInvalid{91}{96}%
+  \RangeCatcodeInvalid{123}{255}%
+  \catcode`\@=12 %
+  \catcode`\\=0 %
+  \catcode`\{=1 %
+  \catcode`\}=2 %
+  \catcode`\#=6 %
+  \catcode`\[=12 %
+  \catcode`\]=12 %
+  \catcode`\%=14 %
+  \catcode`\ =10 %
+  \catcode13=5 %
+  \LoadCommand
+  \RestoreCatcodes
+}
+\Test
+\csname @@end\endcsname
+\end
+\endinput
+%%
+%% End of file `hologo-test1.tex'.
diff --git a/Master/texmf-dist/tex/generic/oberdiek/hologo.sty b/Master/texmf-dist/tex/generic/oberdiek/hologo.sty
new file mode 100644
index 00000000000..847353f3596
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/oberdiek/hologo.sty
@@ -0,0 +1,566 @@
+%%
+%% This is file `hologo.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% hologo.dtx  (with options: `package')
+%% 
+%% This is a generated file.
+%% 
+%% Copyright (C) 2010 by
+%%    Heiko Oberdiek <heiko.oberdiek at googlemail.com>
+%% 
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either
+%% version 1.3c of this license or (at your option) any later
+%% version. This version of this license is in
+%%    http://www.latex-project.org/lppl/lppl-1-3c.txt
+%% and the latest version of this license is in
+%%    http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of
+%% LaTeX version 2005/12/01 or later.
+%% 
+%% This work has the LPPL maintenance status "maintained".
+%% 
+%% This Current Maintainer of this work is Heiko Oberdiek.
+%% 
+%% The Base Interpreter refers to any `TeX-Format',
+%% because some files are installed in TDS:tex/generic//.
+%% 
+%% This work consists of the main source file hologo.dtx
+%% and the derived files
+%%    hologo.sty, hologo.pdf, hologo.ins, hologo.drv, hologo-test1.tex.
+%% 
+\begingroup
+  \catcode44 12 % ,
+  \catcode45 12 % -
+  \catcode46 12 % .
+  \catcode58 12 % :
+  \catcode64 11 % @
+  \catcode123 1 % {
+  \catcode125 2 % }
+  \expandafter\let\expandafter\x\csname ver@hologo.sty\endcsname
+  \ifx\x\relax % plain-TeX, first loading
+  \else
+    \def\empty{}%
+    \ifx\x\empty % LaTeX, first loading,
+      % variable is initialized, but \ProvidesPackage not yet seen
+    \else
+      \catcode35 6 % #
+      \expandafter\ifx\csname PackageInfo\endcsname\relax
+        \def\x#1#2{%
+          \immediate\write-1{Package #1 Info: #2.}%
+        }%
+      \else
+        \def\x#1#2{\PackageInfo{#1}{#2, stopped}}%
+      \fi
+      \x{hologo}{The package is already loaded}%
+      \aftergroup\endinput
+    \fi
+  \fi
+\endgroup
+\begingroup
+  \catcode35 6 % #
+  \catcode40 12 % (
+  \catcode41 12 % )
+  \catcode44 12 % ,
+  \catcode45 12 % -
+  \catcode46 12 % .
+  \catcode47 12 % /
+  \catcode58 12 % :
+  \catcode64 11 % @
+  \catcode91 12 % [
+  \catcode93 12 % ]
+  \catcode123 1 % {
+  \catcode125 2 % }
+  \expandafter\ifx\csname ProvidesPackage\endcsname\relax
+    \def\x#1#2#3[#4]{\endgroup
+      \immediate\write-1{Package: #3 #4}%
+      \xdef#1{#4}%
+    }%
+  \else
+    \def\x#1#2[#3]{\endgroup
+      #2[{#3}]%
+      \ifx#1\@undefined
+        \xdef#1{#3}%
+      \fi
+      \ifx#1\relax
+        \xdef#1{#3}%
+      \fi
+    }%
+  \fi
+\expandafter\x\csname ver@hologo.sty\endcsname
+\ProvidesPackage{hologo}%
+  [2010/04/08 v1.0 Logo collection (HO)]
+\begingroup
+  \catcode123 1 % {
+  \catcode125 2 % }
+  \def\x{\endgroup
+    \expandafter\edef\csname HOLOGO@AtEnd\endcsname{%
+      \catcode35 \the\catcode35\relax
+      \catcode64 \the\catcode64\relax
+      \catcode123 \the\catcode123\relax
+      \catcode125 \the\catcode125\relax
+    }%
+  }%
+\x
+\catcode35 6 % #
+\catcode64 11 % @
+\catcode123 1 % {
+\catcode125 2 % }
+\def\TMP@EnsureCode#1#2{%
+  \edef\HOLOGO@AtEnd{%
+    \HOLOGO@AtEnd
+    \catcode#1 \the\catcode#1\relax
+  }%
+  \catcode#1 #2\relax
+}
+\TMP@EnsureCode{10}{12}% ^^J
+\TMP@EnsureCode{33}{12}% !
+\TMP@EnsureCode{36}{3}% $
+\TMP@EnsureCode{39}{12}% '
+\TMP@EnsureCode{40}{12}% (
+\TMP@EnsureCode{41}{12}% )
+\TMP@EnsureCode{42}{12}% *
+\TMP@EnsureCode{43}{12}% +
+\TMP@EnsureCode{44}{12}% ,
+\TMP@EnsureCode{45}{12}% -
+\TMP@EnsureCode{46}{12}% .
+\TMP@EnsureCode{47}{12}% /
+\TMP@EnsureCode{58}{12}% :
+\TMP@EnsureCode{59}{12}% ;
+\TMP@EnsureCode{60}{12}% <
+\TMP@EnsureCode{61}{12}% =
+\TMP@EnsureCode{62}{12}% >
+\TMP@EnsureCode{63}{12}% ?
+\TMP@EnsureCode{91}{12}% [
+\TMP@EnsureCode{93}{12}% ]
+\TMP@EnsureCode{94}{7}% ^ (superscript)
+\TMP@EnsureCode{95}{8}% _ (subscript)
+\TMP@EnsureCode{96}{12}% `
+\TMP@EnsureCode{124}{12}% |
+\edef\HOLOGO@AtEnd{%
+  \HOLOGO@AtEnd
+  \escapechar\the\escapechar\relax
+  \noexpand\endinput
+}
+\escapechar=92 %
+\begingroup\expandafter\expandafter\expandafter\endgroup
+\expandafter\ifx\csname RequirePackage\endcsname\relax
+  \input ltxcmds.sty\relax
+  \input infwarerr.sty\relax
+  \input kvsetkeys.sty\relax
+  \input pdftexcmds.sty\relax
+  \input ifpdf.sty\relax
+  \input ifluatex.sty\relax
+  \input ifxetex.sty\relax
+  \input ifvtex.sty\relax
+\else
+  \RequirePackage{ltxcmds}[2010/04/08]%
+  \RequirePackage{infwarerr}[2010/04/08]%
+  \RequirePackage{kvsetkeys}[2010/03/01]%
+  \RequirePackage{pdftexcmds}[2010/04/01]%
+  \RequirePackage{ifpdf}[2010/01/28]%
+  \RequirePackage{ifluatex}[2010/03/01]%
+  \RequirePackage{ifxetex}[2009/01/23]%
+  \RequirePackage{ifvtex}[2010/03/01]%
+\fi
+\def\HOLOGO@IfExists#1{%
+  \ifx\@undefined#1%
+    \expandafter\ltx@secondoftwo
+  \else
+    \ifx\relax#1%
+      \expandafter\ltx@secondoftwo
+    \else
+      \expandafter\expandafter\expandafter\ltx@firstoftwo
+    \fi
+  \fi
+}
+\HOLOGO@IfExists\hologo{%
+  \@PackageError{hologo}{%
+    \string\hologo\ltx@space is already defined.\MessageBreak
+    Package loading is aborted%
+  }\@ehc
+  \HOLOGO@AtEnd
+}
+\HOLOGO@IfExists\hologorobust{%
+  \@PackageError{hologo}{%
+    \string\hologorobust\ltx@space is already defined.\MessageBreak
+    Package loading is aborted%
+  }\@ehc
+  \HOLOGO@AtEnd
+}
+\ltx@IfUndefined{protected}{%
+  \ltx@IfUndefined{DeclareRobustCommand}{%
+    \def\hologorobust#1%
+  }{%
+    \DeclareRobustCommand*\hologorobust[1]%
+  }%
+}{%
+  \protected\def\hologorobust#1%
+}%
+{%
+  \ltx@ifundefined{HoLogo@#1}{%
+    \@PackageError{hologo}{%
+      Unknown logo `#1'%
+    }\@ehc
+    ?#1?%
+  }{%
+    \csname HoLogo@#1\endcsname
+  }%
+}
+\def\hologo#1{%
+  \HOLOGO@IfExists\texorpdfstring\texorpdfstring\ltx@firstoftwo
+  {%
+    \hologorobust{#1}%
+  }{%
+    \ltx@ifundefined{HoLogoBkm@#1}{%
+      \ltx@ifundefined{HoLogo@#1}{?#1?}{#1}%
+    }{%
+      \csname HoLogoBkm@#1\endcsname
+    }%
+  }%
+}
+\def\HOLOGO@PdfdocUnicode{%
+  \ifx\ifHy@unicode\iftrue
+    \expandafter\ltx@secondoftwo
+  \else
+    \expandafter\ltx@firstoftwo
+  \fi
+}
+\def\HOLOGO@MathSetup{%
+  \mathsurround0pt\relax
+  \HOLOGO@IfExists\f@series{%
+    \if b\expandafter\ltx@car\f@series x\@nil
+      \csname boldmath\endcsname
+   \fi
+  }{}%
+}
+\dimendef\HOLOGO@TempDimen=\ltx@zero
+\def\HOLOGO@NegativeKerning#1{%
+  \begingroup
+    \HOLOGO@TempDimen=0pt\relax
+    \comma@parse@normalized{#1}{%
+      \ifdim\HOLOGO@TempDimen=0pt %
+        \expandafter\HOLOGO@@NegativeKerning\comma@entry
+      \fi
+      \ltx@gobble
+    }%
+    \ifdim\HOLOGO@TempDimen<0pt %
+      \kern\HOLOGO@TempDimen
+    \fi
+  \endgroup
+}
+\def\HOLOGO@@NegativeKerning#1#2{%
+  \setbox\ltx@zero\hbox{#1#2}%
+  \HOLOGO@TempDimen=\wd\ltx@zero
+  \setbox\ltx@zero\hbox{#1\kern0pt#2}%
+  \advance\HOLOGO@TempDimen by -\wd\ltx@zero
+}
+\def\HoLogo@TeX{%
+  T\kern-.1667em\lower.5ex\hbox{E}\kern-.125emX\spacefactor1000 %
+}
+\def\HoLogo@plainTeX{%
+  plain \hologo{TeX}%
+}
+\def\HoLogoBkm@plainTeX{%
+  plain \hologo{TeX}%
+}
+\def\HoLogo@LaTeX{%
+  L%
+  \kern-.36em%
+  \begingroup
+    \setbox\ltx@zero\hbox{T}%
+    \vbox to\ht\ltx@zero{%
+      \hbox{%
+        \ltx@ifundefined{check@mathfonts}{%
+          \csname sevenrm\endcsname
+        }{%
+          \check@mathfonts
+          \fontsize\sf@size\z@
+          \math@fontsfalse\selectfont
+        }%
+        A%
+      }%
+      \vss
+    }%
+  \endgroup
+  \kern-.15em%
+  \hologo{TeX}%
+}
+\def\HoLogo@LaTeXe{%
+  \hologo{LaTeX}%
+  \kern.15em%
+  \hbox{%
+    \HOLOGO@MathSetup
+    2%
+    $_{\textstyle\varepsilon}$%
+  }%
+}
+\def\HoLogoBkm@LaTeXe{%
+  \hologo{LaTeX}%
+  2%
+  \HOLOGO@PdfdocUnicode{e}{\textepsilon}%
+}
+\expandafter\let\csname HoLogo@LaTeX2e\endcsname\HoLogo@LaTeXe
+\expandafter\let\csname HoLogoBkm@LaTeX2e\endcsname\HoLogoBkm@LaTeXe
+\def\HoLogo@eTeX{%
+  \leavevmode
+  \hbox{%
+    \HOLOGO@MathSetup
+    $\varepsilon$%
+    -%
+    \HOLOGO@NegativeKerning{-T,T-,To}%
+    \hologo{TeX}%
+  }%
+}
+\def\HoLogoBkm@eTeX{%
+  \HOLOGO@PdfdocUnicode{e}{\textepsilon}%
+  -%
+  \hologo{TeX}%
+}
+\def\HoLogo@LuaTeX{%
+  Lua%
+  \HOLOGO@NegativeKerning{aT,oT,To}%
+  \hologo{TeX}%
+}
+\def\HoLogo@LuaLaTeX{%
+  Lua%
+  \hologo{LaTeX}%
+}
+\def\HoLogo@Xe{%
+  X%
+  \kern-.1em\relax
+  \ltx@IfUndefined{HOLOGO@ReflectBox}\ltx@firstoftwo{%
+    \ltx@IfUndefined{HOLOGO@ReflectBox@\hologodriver}%
+    \ltx@firstoftwo\ltx@secondoftwo
+  }%
+  {e}{%
+    \lower.5ex\hbox{%
+      \HOLOGO@ReflectBox{E}%
+    }%
+  }%
+}
+\def\HoLogo@XeTeX{%
+  \hologo{Xe}%
+  \kern-.15em\relax
+  \hologo{TeX}%
+}
+\def\HoLogoBkm@XeTeX{XeTeX}
+\def\HoLogo@XeLaTeX{%
+  \hologo{Xe}%
+  \hologo{LaTeX}%
+}
+\def\HoLogo@pdfTeX{%
+  pdf\hologo{TeX}%
+}
+\def\HoLogo@pdfLaTeX{%
+  pdf\hologo{LaTeX}%
+}
+\HOLOGO@IfExists\InputIfFileExists{%
+  \InputIfFileExists{hologo.cfg}{}{}%
+}{%
+  \ltx@IfUndefined{pdf@filesize}{%
+    \chardef\HOLOGO@temp=15 %
+    \def\HOLOGO@CheckRead{%
+      \ifeof\HOLOGO@temp
+      \else
+        \ifcase\HOLOGO@temp
+          \csname newread\endcsname\HOLOGO@temp
+        \else
+          \begingroup
+            \count\ltx@cclv=\HOLOGO@temp
+            \advance\ltx@cclv by -1 %
+            \edef\x{\endgroup
+              \chardef\noexpand\HOLOGO@temp=\the\count\ltx@cclv\relax
+            }%
+          \x
+          \expandafter\expandafter\expandafter\HOLOGO@CheckRead
+        \fi
+      \fi
+    }%
+    \ifeof\HOLOGO@temp
+      \@PackageWarningNoLine{hologo}{%
+        Configuration file ignored, because\MessageBreak
+        a free read register could not be found%
+      }%
+    \else
+      \openin\HOLOGO@temp=hologo.cfg\relax
+      \ifeof\HOLOGO@temp
+        \closein\HOLOGO@temp
+      \else
+        \closein\HOLOGO@temp
+        \input hologo.cfg\relax
+      \fi
+    \fi
+  }{%
+    \edef\HOLOGO@temp{\pdf@filesize{hologo.cfg}}%
+    \ifx\HOLOGO@temp\ltx@empty
+    \else
+      \input hologo.cfg\relax
+    \fi
+  }%
+}
+\ltx@IfUndefined{DeclareOption}{%
+  \ltx@gobble
+}{%
+  \ltx@IfUndefined{ProcessOptions}\ltx@gobble\ltx@firstofone
+}%
+{%
+  \def\HOLOGO@temp#1#2{%
+    \DeclareOption{#1}{\edef\hologodriver{#2}}%
+  }%
+  \kv@parse@normalized{%
+    pdftex,%
+    luatex=pdftex,%
+    dvipdfm,%
+    dvipdfmx=dvipdfm,%
+    dvips,%
+    dvipsone=dvips,%
+    xdvi=dvips,%
+    xetex,%
+    vtex,%
+  }{%
+    \ifx\kv@value\relax
+      \expandafter\HOLOGO@temp\expandafter{\kv@key}\kv@key
+    \else
+      \expandafter\HOLOGO@temp\expandafter{\kv@key}\kv@value
+    \fi
+    \ltx@gobbletwo
+  }%
+  \ProcessOptions*%
+}
+\ifpdf
+  \def\hologodriver{pdftex}%
+  \let\HOLOGO@pdfliteral\pdfliteral
+  \ifluatex
+    \ltx@IfUndefined{HOLOGO@pdfliteral}{%
+      \ifnum\luatexversion<36 %
+      \else
+        \begingroup
+          \let\HOLOGO@temp\endgroup
+          \ifcase0%
+              \directlua{%
+                if tex.enableprimitives then %
+                  tex.enableprimitives('HOLOGO@', {'pdfliteral'})%
+                else %
+                  tex.print('1')%
+                end%
+              }%
+              \ifx\HOLOGO@pdfliteral\@undefined 1\fi%
+              \relax%
+            \endgroup
+            \let\HOLOGO@temp\relax
+            \global\let\HOLOGO@pdfliteral\HOLOGO@pdfliteral
+          \fi%
+        \HOLOGO@temp
+      \fi
+    }{}%
+  \fi
+  \ltx@IfUndefined{HOLOGO@pdfliteral}{%
+    \@PackageWarningNoLine{hologo}{%
+      Cannot find \string\pdfliteral
+    }%
+  }{}%
+\else
+  \ifxetex
+    \def\hologodriver{xetex}%
+  \else
+    \ifvtex
+      \def\hologodriver{vtex}%
+    \fi
+  \fi
+\fi
+\ltx@IfUndefined{reflectbox}{}{%
+  \def\HOLOGO@ReflectBox{%
+    \reflectbox
+  }%
+  \HOLOGO@AtEnd
+}
+\ltx@ifundefined{hologodriver}{%
+  \def\hologodriver{dvips}%
+  \@PackageInfoNoLine{hologo}{Using default driver `\hologodriver'}%
+}{%
+  \@PackageInfoNoLine{hologo}{Using driver `\hologodriver'}%
+}
+\def\HOLOGO@ReflectBox#1{%
+  \ltx@IfUndefined{HOLOGO@ReflectBox@\hologodriver}{%
+    \@PackageWarning{hologo}{%
+      Driver `\hologodriver' misses support for \string\reflectbox
+    }%
+    #1%
+  }{%
+    \begingroup
+      \setbox\ltx@zero\hbox{\begingroup#1\endgroup}%
+      \setbox\ltx@two\hbox{%
+        \kern\wd\ltx@zero
+        \csname HOLOGO@ReflectBox@\hologodriver\endcsname{%
+          \hbox to 0pt{\copy\z@\hss}%
+        }%
+      }%
+      \wd\ltx@two=\wd\ltx@zero
+      \box\ltx@two
+    \endgroup
+  }%
+}
+\def\HOLOGO@temp#1{%
+  \begingroup
+    \def\x{#1}%
+  \expandafter\endgroup
+  \ifx\x\hologodriver
+    \expandafter\ltx@firstofone
+  \else
+    \expandafter\ltx@gobble
+  \fi
+}
+\HOLOGO@temp{pdftex}{%
+  \def\HOLOGO@ReflectBox@pdftex#1{%
+    \HOLOGO@pdfliteral{%
+      q -1 0 0 1 0 0 cm%
+    }%
+    #1%
+    \HOLOGO@pdfliteral{%
+      Q%
+    }%
+  }%
+}
+\HOLOGO@temp{dvips}{%
+  \def\HOLOGO@ReflectBox@dvips#1{%
+    \special{ps:%
+      gsave %
+      currentpoint %
+      currentpoint translate %
+      -1 1 scale %
+      neg exch neg exch translate%
+    }%
+    #1%
+    \special{ps:%
+      currentpoint %
+      grestore %
+      moveto%
+    }%
+  }%
+}
+\HOLOGO@temp{dvipdfm}{%
+  \let\HOLOGO@ReflectBox@dvipdfm\HOLOGO@ReflectBox@dvips
+}
+\HOLOGO@temp{xetex}{%
+  \def\HOLOGO@ReflectBox@xetex#1{%
+    \special{x:gsave}%
+    \special{x:scale -1 1}%
+    #1%
+    \special{x:grestore}%
+  }%
+}
+\HOLOGO@temp{vtex}{%
+  \def\HOLOGO@ReflectBox@vtex#1{%
+    \special{r(-1,0,0,1,0,0}%
+    #1%
+    \special{r)}%
+  }%
+}
+\HOLOGO@AtEnd
+\endinput
+%%
+%% End of file `hologo.sty'.
diff --git a/Master/texmf-dist/tex/generic/oberdiek/infwarerr.sty b/Master/texmf-dist/tex/generic/oberdiek/infwarerr.sty
index a516e682d93..c20ab20c5c7 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/infwarerr.sty
+++ b/Master/texmf-dist/tex/generic/oberdiek/infwarerr.sty
@@ -8,7 +8,7 @@
 %% 
 %% This is a generated file.
 %% 
-%% Copyright (C) 2007 by
+%% Copyright (C) 2007, 2010 by
 %%    Heiko Oberdiek <heiko.oberdiek at googlemail.com>
 %% 
 %% This work may be distributed and/or modified under the
@@ -94,7 +94,7 @@
   \fi
 \expandafter\x\csname ver@infwarerr.sty\endcsname
 \ProvidesPackage{infwarerr}%
-  [2007/09/09 v1.2 Providing info/warning/message (HO)]
+  [2010/04/08 v1.3 Providing info/warning/message (HO)]
 \begingroup
   \catcode123 1 % {
   \catcode125 2 % }
@@ -204,6 +204,7 @@
     \def\@spaces{\space\space\space\space}%
     \def\MessageBreak{^^J#1}%
     \newlinechar=10 %
+    \escapechar=92 %
     \immediate\write-1{#2\on@line.}%
   \endgroup
 }
@@ -215,19 +216,21 @@
     \def\@spaces{\space\space\space\space}%
     \def\MessageBreak{^^J#1}%
     \newlinechar=10 %
+    \escapechar=92 %
     \immediate\write\InfWarErr@unused{^^J#2\on@line.^^J}%
   \endgroup
 }
 \InfWarErr@protected\def\InfWarErr@GenericError#1#2#3#4{%
   \begingroup
     \immediate\write\InfWarErr@unused{}%
-    \newlinechar=10 %
     \def\space{ }%
     \def\@spaces{\space\space\space\space}%
     \let\@ehc\InfWarErr@ehc
     \let\@ehd\InfWarErr@ehd
     \let\on@line\InfWarErr@online
     \def\MessageBreak{^^J}%
+    \newlinechar=10 %
+    \escapechar=92 %
     \edef\InfWarErr@help{\noexpand\errhelp{#4}}%
     \InfWarErr@help
     \def\MessageBreak{^^J#1}%
diff --git a/Master/texmf-dist/tex/generic/oberdiek/ltxcmds.sty b/Master/texmf-dist/tex/generic/oberdiek/ltxcmds.sty
index 953e7935c3c..700cb7746e0 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/ltxcmds.sty
+++ b/Master/texmf-dist/tex/generic/oberdiek/ltxcmds.sty
@@ -93,7 +93,7 @@
   \fi
 \expandafter\x\csname ver@ltxcmds.sty\endcsname
 \ProvidesPackage{ltxcmds}%
-  [2010/03/09 v1.4 LaTeX kernel commands for general use (HO)]
+  [2010/04/08 v1.5 LaTeX kernel commands for general use (HO)]
 \begingroup
   \catcode123 1 % {
   \catcode125 2 % }
@@ -143,8 +143,14 @@
 \long\def\ltx@secondoftwo#1#2{#2}
 \long\def\ltx@car#1#2\@nil{#1}
 \long\def\ltx@cdr#1#2\@nil{#2}
-\long\def\ltx@ReturnAfterFi#1\fi{#1}
-\long\def\ltx@ReturnAfterFi#1\else#2\fi{#1}
+\long\def\ltx@cartwo#1#2#3\@nil{#1#2}
+\long\def\ltx@cdrtwo#1#2#3\@nil{#3}
+\long\def\ltx@carthree#1#2#3#4\@nil{#1#2#3}
+\long\def\ltx@cdrthree#1#2#3#4\@nil{#4}
+\long\def\ltx@carfour#1#2#3#4#5\@nil{#1#2#3#4}
+\long\def\ltx@cdrfour#1#2#3#4#5\@nil{#5}
+\long\def\ltx@ReturnAfterFi#1\fi{\fi#1}
+\long\def\ltx@ReturnAfterElseFi#1\else#2\fi{\fi#1}
 \def\ltx@empty{}
 \def\ltx@space{ }
 \begingroup
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]%
     }%
   }%
 }