oberdiek: accsupp, atenddvi, hycolor, iflang (11apr07)

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

52 files changed, 9547 insertions, 1738 deletions

diff --git a/Master/texmf-dist/source/latex/oberdiek/accsupp.dtx b/Master/texmf-dist/source/latex/oberdiek/accsupp.dtx
new file mode 100644
index 00000000000..8fa1842a911
--- /dev/null
+++ b/Master/texmf-dist/source/latex/oberdiek/accsupp.dtx
@@ -0,0 +1,823 @@
+% \iffalse meta-comment
+%
+% Copyright (C) 2007 by Heiko Oberdiek <oberdiek@uni-freiburg.de>
+%
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either
+% version 1.3 of this license or (at your option) any later
+% version. 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.
+%
+% This work consists of the main source file accsupp.dtx
+% and the derived files
+%    accsupp.sty, accsupp.pdf, accsupp.ins, accsupp.drv,
+%    accsupp-pdftex.def, accsupp-dvipdfm.def, accsupp-dvips.def,
+%    accsupp-example.tex.
+%
+% Distribution:
+%    CTAN:macros/latex/contrib/oberdiek/accsupp.dtx
+%    CTAN:macros/latex/contrib/oberdiek/accsupp.pdf
+%
+% Unpacking:
+%    (a) If accsupp.ins is present:
+%           tex accsupp.ins
+%    (b) Without accsupp.ins:
+%           tex accsupp.dtx
+%    (c) If you insist on using LaTeX
+%           latex \let\install=y\input{accsupp.dtx}
+%        (quote the arguments according to the demands of your shell)
+%
+% Documentation:
+%    (a) If accsupp.drv is present:
+%           latex accsupp.drv
+%    (b) Without accsupp.drv:
+%           latex accsupp.dtx; ...
+%    The class ltxdoc loads the configuration file ltxdoc.cfg
+%    if available. Here you can specify further options, e.g.
+%    use A4 as paper format:
+%       \PassOptionsToClass{a4paper}{article}
+%
+%    Programm calls to get the documentation (example):
+%       pdflatex accsupp.dtx
+%       makeindex -s gind.ist accsupp.idx
+%       pdflatex accsupp.dtx
+%       makeindex -s gind.ist accsupp.idx
+%       pdflatex accsupp.dtx
+%
+% Installation:
+%    TDS:tex/latex/oberdiek/accsupp.sty
+%    TDS:tex/latex/oberdiek/accsupp-pdftex.def
+%    TDS:tex/latex/oberdiek/accsupp-dvipdfm.def
+%    TDS:tex/latex/oberdiek/accsupp-dvips.def
+%    TDS:doc/latex/oberdiek/accsupp.pdf
+%    TDS:doc/latex/oberdiek/accsupp-example.tex
+%    TDS:source/latex/oberdiek/accsupp.dtx
+%
+%<*ignore>
+\begingroup
+  \def\x{LaTeX2e}%
+\expandafter\endgroup
+\ifcase 0\ifx\install y1\fi\expandafter
+         \ifx\csname processbatchFile\endcsname\relax\else1\fi
+         \ifx\fmtname\x\else 1\fi\relax
+\else\csname fi\endcsname
+%</ignore>
+%<*install>
+\input docstrip.tex
+\Msg{************************************************************************}
+\Msg{* Installation}
+\Msg{* Package: accsupp 2007/03/21 v0.1 Accessibility support by marked content (HO)}
+\Msg{************************************************************************}
+
+\keepsilent
+\askforoverwritefalse
+
+\preamble
+
+This is a generated file.
+
+Copyright (C) 2007 by Heiko Oberdiek <oberdiek@uni-freiburg.de>
+
+This work may be distributed and/or modified under the
+conditions of the LaTeX Project Public License, either
+version 1.3 of this license or (at your option) any later
+version. 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.
+
+This work consists of the main source file accsupp.dtx
+and the derived files
+   accsupp.sty, accsupp.pdf, accsupp.ins, accsupp.drv,
+   accsupp-pdftex.def, accsupp-dvipdfm.def, accsupp-dvips.def,
+   accsupp-example.tex.
+
+\endpreamble
+
+\generate{%
+  \file{accsupp.ins}{\from{accsupp.dtx}{install}}%
+  \file{accsupp.drv}{\from{accsupp.dtx}{driver}}%
+  \usedir{tex/latex/oberdiek}%
+  \file{accsupp.sty}{\from{accsupp.dtx}{package}}%
+  \file{accsupp-pdftex.def}{\from{accsupp.dtx}{pdftex}}%
+  \file{accsupp-dvipdfm.def}{\from{accsupp.dtx}{dvipdfm}}%
+  \file{accsupp-dvips.def}{\from{accsupp.dtx}{dvips}}%
+  \usedir{doc/latex/oberdiek}%
+  \file{accsupp-example.tex}{\from{accsupp.dtx}{example}}%
+}
+
+\obeyspaces
+\Msg{************************************************************************}
+\Msg{*}
+\Msg{* To finish the installation you have to move the following}
+\Msg{* files into a directory searched by TeX:}
+\Msg{*}
+\Msg{*     accsupp.sty, accsupp-pdftex.def, accsupp-dvipdfm.def,}
+\Msg{*     accsupp-dvips.def}
+\Msg{*}
+\Msg{* To produce the documentation run the file `accsupp.drv'}
+\Msg{* through LaTeX.}
+\Msg{*}
+\Msg{* Happy TeXing!}
+\Msg{*}
+\Msg{************************************************************************}
+
+\endbatchfile
+%</install>
+%<*ignore>
+\fi
+%</ignore>
+%<*driver>
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesFile{accsupp.drv}%
+  [2007/03/21 v0.1 Accessibility support by marked content (HO)]%
+\documentclass{ltxdoc}
+\usepackage{holtxdoc}
+\begin{document}
+  \DocInput{accsupp.dtx}%
+\end{document}
+%</driver>
+% \fi
+%
+% \CheckSum{289}
+%
+% \CharacterTable
+%  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
+%   Lower-case    \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
+%   Digits        \0\1\2\3\4\5\6\7\8\9
+%   Exclamation   \!     Double quote  \"     Hash (number) \#
+%   Dollar        \$     Percent       \%     Ampersand     \&
+%   Acute accent  \'     Left paren    \(     Right paren   \)
+%   Asterisk      \*     Plus          \+     Comma         \,
+%   Minus         \-     Point         \.     Solidus       \/
+%   Colon         \:     Semicolon     \;     Less than     \<
+%   Equals        \=     Greater than  \>     Question mark \?
+%   Commercial at \@     Left bracket  \[     Backslash     \\
+%   Right bracket \]     Circumflex    \^     Underscore    \_
+%   Grave accent  \`     Left brace    \{     Vertical bar  \|
+%   Right brace   \}     Tilde         \~}
+%
+% \GetFileInfo{accsupp.drv}
+%
+% \title{The \xpackage{accsupp} package}
+% \date{2007/03/21 v0.1}
+% \author{Heiko Oberdiek\\\xemail{oberdiek@uni-freiburg.de}}
+%
+% \maketitle
+%
+% \begin{abstract}
+% Since PDF 1.5 portions of a page can be marked for better
+% accessibility support.
+% For example, replacement texts or expansions of abbreviations can be
+% provided. Package \xpackage{accsupp} starts with providing a minimal
+% low-level interface for programmers. Status is experimental.
+% \end{abstract}
+%
+% \tableofcontents
+%
+% \section{Documentation}
+%
+% \subsection{Macros}
+%
+% Section ``10.8 Accessibility Support'' of the PDF reference
+% \cite{pdfspec} lists some features that can be added by
+% operators for marked content.
+%
+% \begin{declcs}{BeginAccSupp} \M{options}
+% \end{declcs}
+% It puts the operator |BDC| in the page stream:
+% \begin{quote}
+%   |/Span|\\
+%   |<<|\dots|>>| \qquad \textit{\% property dictionary}\\
+%   |BDC|
+% \end{quote}
+% The contents of the dictionary is controlled by \meta{options}.
+% See sections \ref{sec:feature} and \ref{sec:method}.
+%
+% \begin{declcs}{EndAccSupp} \M{options}
+% \end{declcs}
+% It puts the operator |EMC| in the page stream.
+% The only option is \xoption{pdfliteral}, see section \ref{sec:pdftex}.
+%
+% \bigskip
+% \noindent\textbf{Note:}
+% The caller is responsible for the placement of \cs{BeginAccSupp}
+% and \cs{EndAccSupp} pairs. Especially page breaks are not allowed
+% in between.
+%
+% \subsubsection{Feature options}\label{sec:feature}
+%
+% The PDF reference \cite{pdfspec} describes and explains the different
+% features. The names of the feature options are the same as the
+% key names for the property dictionary for operator |BDC|, see
+% \cs{BeginAccSupp}.
+%
+% \begin{description}
+% \item[\xoption{ActualText}:]
+%   Provides a replacement text, see example in section \ref{sec:example}.
+% \item[\xoption{Alt}:]
+%   Provides an alternate description.
+% \item[\xoption{E}:]
+%   Provides the expansion of an abbreviation or an acronym.
+% \item[\xoption{Lang}:]
+%   Specifies the language.
+% \end{description}
+%
+% \subsubsection{Input methods}\label{sec:method}
+%
+% Except for \xoption{Lang} option \xoption{method} controls
+% how the argument for \xoption{ActualText}, \xoption{Alt},
+% and \xoption{E} are interpreted.
+% \begin{description}
+% \item[\xoption{method=plain}:]
+%   The string is only expanded and written without further
+%   treatment. Special characters are not protected, thus this method
+%   may result in an invalid PDF file.
+% \item[\xoption{mehod=escape}:]
+%   The string is expanded and special characters are escaped.
+%   The result is a valid PDF string.
+% \item[\xoption{method=hex}:]
+%   The string is given in hexadecimal notation.
+%   Section \ref{sec:example} shows an example.
+% \item[\xoption{method=pdfstringdef}:]
+%   If package \xpackage{hyperref} is loaded, then its \cs{pdfstringdef}
+%   is used. This method is slow, but useful if the string contains
+%   arbitrary \TeX\ code.
+% \item[\xoption{unicode}:]
+%   This option is needed, if the string is given as Unicode string
+%   (16 bit). Internally it adds the string prefix for Unicode.
+%   In case of \xoption{method=pdfstringdef} it passes the option
+%   to \cs{hypersetup}.
+% \end{description}
+%
+% \subsection{Driver options}
+%
+% Driver options are package options only.
+% The special \TeX\ compilers \pdfTeX\ and Xe\TeX are detected
+% automatically. The default for unrecognized drivers can be
+% set by defining \cs{ActualTextDriverDefault}. This can be done
+% in the configuration file \xfile{accsupp.cfg}.
+%
+% \subsubsection{Option \xoption{pdftex}}\label{sec:pdftex}
+% Package option \xoption{pdftex} is used for \pdfTeX\ in PDF mode.
+% Additionally \cs{BeginAccSupp} and \cs{EndAccSupp} understand
+% option \xoption{pdfliteral}. It controls
+% the modifier keyword for \cs{pdfliteral}:
+% \begin{quote}
+%   |pdfliteral=direct| $\Rightarrow$ |\pdfliteral direct{...}|
+% \end{quote}
+%
+% \subsubsection{Option \xoption{dvipdfm}}
+%
+% Package option \xoption{dvipdfm} and its aliases \xoption{dvipdfmx}
+% \xoption{xetex} are used for drivers that support
+% \textsf{dvipdfm} specials.
+%
+% \subsubsection{Option \xoption{dvips}}
+%
+% Package option \xoption{dvips} and its alias \xoption{dvipsone}
+% write pdfmark specials in the output. Unhappily these pdfmark
+% operators are ignored by \textsf{ghostscript} (latest tested
+% version is 8.54). Perhaps they are recognized by commercial
+% distiller applications.
+%
+% \subsubsection{Turning off page stream compression}
+%
+% For debugging it is useful to have uncompressed page stream objects.
+% This can be done afterwards via \textsf{pdftk}:
+% \begin{quote}
+%   |pdftk file.pdf output file-uncompressed.pdf uncompress|
+% \end{quote}
+% Or the PDF file is generated uncompressed:
+% \begin{description}
+% \item[\pdfTeX:] |\pdfcompresslevel=0|
+% \item[dvipdfm:] |dvipdfm -z0 ...|
+% \item[dvipdfmx:] |dvipdfmx -z0 ...|
+% \item[ghostscript/ps2pdf:]
+%      |ps2pdf -dCompressPages=false input.ps output.pdf|
+% \end{description}
+%
+% \section{Example}\label{sec:example}
+%
+%    \begin{macrocode}
+%<*example>
+%    \end{macrocode}
+%    \begin{macrocode}
+\documentclass{article}
+\usepackage{accsupp}
+\usepackage{centernot}
+  % U+2226 NOT PARALLEL
+  % \mathrel{...} prevents page break in between
+\newcommand*{\notparallel}{%
+  \ensuremath{%
+    \mathrel{%
+      \BeginAccSupp{method=hex,unicode,ActualText=2226}%
+      \centernot{\parallel}%
+      \EndAccSupp{}%
+    }%
+  }%
+}
+\begin{document}
+\begin{equation}
+A\notparallel B
+\end{equation}
+\end{document}
+%    \end{macrocode}
+%    \begin{macrocode}
+%</example>
+%    \end{macrocode}
+%
+% \StopEventually{
+% }
+%
+% \section{Implementation}
+%
+% \subsection{Package}
+%
+%    \begin{macrocode}
+%<*package>
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{accsupp}%
+  [2007/03/21 v0.1 Accessibility support by marked content (HO)]%
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+\edef\ACCSUPP@end{%
+  \catcode39 \the\catcode39 % '
+  \catcode40 \the\catcode40 % (
+  \catcode41 \the\catcode41 % )
+  \catcode60 \the\catcode60 % <
+  \catcode61 \the\catcode61 % =
+  \catcode62 \the\catcode62 % >
+  \catcode94 \the\catcode94 % ^
+  \catcode96 \the\catcode96 % `
+  \catcode254 \the\catcode254 % ^^FE
+  \catcode255 \the\catcode255 % ^^FF
+}
+\@makeother\(
+\@makeother\)
+\@makeother\'
+\@makeother\<
+\@makeother\=
+\@makeother\>
+\catcode94 = 7 %
+\@makeother\`
+\@makeother\^^fe
+\@makeother\^^ff
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+\RequirePackage{pdfescape}[2007/02/25]
+\RequirePackage{ifpdf}
+\RequirePackage{ifxetex}
+\RequirePackage{kvoptions}
+%    \end{macrocode}
+%    \begin{macrocode}
+\SetupKeyvalOptions{%
+  family=ACCSUPP,%
+  prefix=ACCSUPP@%
+}
+%    \end{macrocode}
+%
+% \subsection{Driver detection and setup}
+%
+% \paragraph{Driver declarations.}
+%
+%    \begin{macrocode}
+\def\ACCSUPP@DefineDriverKey{%
+  \@dblarg\ACCSUPP@@DefineDriverKey
+}
+\def\ACCSUPP@@DefineDriverKey[#1]#2{%
+  \define@key{ActTxt}{#2}[]{%
+    \def\ACCSUPP@driver{#1}%
+  }%
+  \g@addto@macro\ACCSUPP@DisableOptions{%
+    \DisableKeyvalOption{ActTxt}{#2}%
+  }%
+}
+\let\ACCSUPP@DisableOptions\@empty
+\ACCSUPP@DefineDriverKey{pdftex}
+\ACCSUPP@DefineDriverKey{dvips}
+\ACCSUPP@DefineDriverKey[dvips]{dvipsone}
+\ACCSUPP@DefineDriverKey{dvipdfm}
+\ACCSUPP@DefineDriverKey[dvipdfm]{dvipdfmx}
+\ACCSUPP@DefineDriverKey[dvipdfm]{xetex}
+\InputIfFileExists{accsupp.cfg}{}{}
+\providecommand*{\ActualTextDriverDefault}{dvips}
+\ifpdf
+  \def\ACCSUPP@driver{pdftex}%
+\else
+  \ifxetex
+    \def\ACCSUPP@driver{dvipdfm}%
+  \else
+    \let\ACCSUPP@driver\BookmarkDriverDefault
+  \fi
+\fi
+%    \end{macrocode}
+%
+% \paragraph{Process options.}
+%
+%    \begin{macrocode}
+\ProcessKeyvalOptions*
+\ACCSUPP@DisableOptions
+%    \end{macrocode}
+%
+% \paragraph{Driver validation and loading.}
+%
+%    \begin{macrocode}
+\def\ACCSUPP@temp{pdftex}%
+\ifpdf
+  \ifx\ACCSUPP@temp\ACCSUPP@driver
+  \else
+    \PackageWarningNoLine{accsupp}{%
+      Wrong driver `\ACCSUPP@driver', using `pdftex' instead%
+    }%
+    \let\ACCSUPP@driver\ACCSUPP@temp
+  \fi
+\else
+  \ifx\ACCSUPP@temp\ACCSUPP@driver
+    \PackageError{accsupp}{%
+      Wrong driver, pdfTeX is not running in PDF mode.\MessageBreak
+      Package loading is aborted%
+    }\@ehc
+    \expandafter\expandafter\expandafter\endinput
+  \fi
+  \def\ACCSUPP@temp{dvipdfm}%
+  \ifxetex
+    \ifx\ACCSUPP@temp\ACCSUPP@driver
+    \else
+      \PackageWarningNoLine{accsupp}{%
+        Wrong driver `\ACCSUPP@driver',\MessageBreak
+        using `dvipdfm' for XeTeX instead%
+      }%
+      \let\ACCSUPP@driver\ACCSUPP@temp
+    \fi
+  \fi
+\fi
+\InputIfFileExists{accsupp-\ACCSUPP@driver.def}{}{%
+  \PackageError{accsupp}{%
+    Unsupported driver `\ACCSUPP@driver'.\MessageBreak
+    Package loading is aborted%
+  }\@ehc
+  \endinput
+}
+%    \end{macrocode}
+%
+% \subsection{Main macro}
+%
+%    \begin{macrocode}
+\DeclareBoolOption{unicode}
+\DeclareStringOption[page]{pdfliteral}
+\DeclareStringOption{Lang}
+\def\ACCSUPP@method{escape}
+\define@key{ACCSUPP}{method}{%
+  \@ifundefined{ACCSUPP@method@#1}{%
+    \PackageError{accsupp}{%
+      Ignoring unknown method `#1'%
+    }\@ehc
+  }{%
+    \edef\ACCSUPP@method{#1}%
+  }%
+}
+\let\ACCSUPP@Lang\relax
+\def\ACCSUPP@temp#1{%
+  \expandafter\ACCSUPP@@temp\csname ACCSUPP@#1\endcsname{#1}%
+}
+\def\ACCSUPP@@temp#1#2{%
+  \let#1\relax
+  \define@key{ACCSUPP}{#2}{%
+    \def#1{##1}%
+    \ifx#1\@empty
+      \def#1{()}%
+    \else
+      \csname ACCSUPP@method@\ACCSUPP@method\endcsname#1%
+    \fi
+  }%
+}
+\ACCSUPP@temp{Alt}
+\ACCSUPP@temp{ActualText}
+\ACCSUPP@temp{E}
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+\newcommand*{\BeginAccSupp}[1]{%
+  \begingroup
+    \setkeys{ACCSUPP}{#1}%
+    \edef\ACCSUPP@span{%
+      /Span<<%
+        \ifx\ACCSUPP@Lang\relax
+        \else
+          /Lang\ACCSUPP@Lang
+        \fi
+        \ifx\ACCSUPP@Alt\relax
+        \else
+          /Alt\ACCSUPP@Alt
+        \fi
+        \ifx\ACCSUPP@ActualText\relax
+        \else
+          /ActualText\ACCSUPP@ActualText
+        \fi
+        \ifx\ACCSUPP@E\relax
+        \else
+          /E\ACCSUPP@E
+        \fi
+      >>%
+    }%
+    \ACCSUPP@bdc
+  \endgroup
+}
+\newcommand*{\EndAccSupp}[1]{%
+  \begingroup
+    \setkeys{ACCSUPP}{#1}%
+    \ACCSUPP@emc
+  \endgroup
+}
+%    \end{macrocode}
+%
+% \subsubsection{Input methods}
+%
+%    \begin{macrocode}
+\def\ACCSUPP@method@plain#1{%
+  \csname @safe@activestrue\endcsname
+  \edef#1{%
+    (%
+    \ifACCSUPP@unicode
+      \string\376\string\377%
+    \fi
+    #1%
+    )%
+  }%
+  \@onelevel@sanitize#1%
+}
+%    \end{macrocode}
+%    \begin{macrocode}
+\def\ACCSUPP@method@escape#1{%
+  \EdefEscapeString#1{%
+    \ifACCSUPP@unicode
+      ^^fe^^ff%
+    \fi
+    #1%
+  }%
+  \edef#1{(#1)}%
+}%
+%    \end{macrocode}
+%    \begin{macrocode}
+\def\ACCSUPP@method@hex#1{%
+  \edef#1{%
+    <%
+    \ifACCSUPP@unicode
+      FEFF%
+    \fi
+    #1%
+    >%
+  }%
+}
+%    \end{macrocode}
+%    \begin{macrocode}
+\def\ACCSUPP@method@pdfstringdef#1{%
+  \ifActText@unicode
+    \@ifundefined{hypersetup}{}{%
+      \hypersetup{unicode}%
+    }%
+  \fi
+  \@ifundefined{pdfstringdef}{%
+    \PackageError{accsupp}{%
+      Method `pdfstringdef' requires package `hyperref'%
+    }\@ehc
+    \let\ACCSUPP@temp\@empty
+  }{%
+    \pdfstringdef\ACCSUPP@temp#1%
+  }%
+  \edef#1{(\ACCSUPP@temp)}%
+}
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+\ACCSUPP@end
+%</package>
+%    \end{macrocode}
+%
+% \subsection{Drivers}
+%
+% \subsubsection{Driver \xoption{pdftex}}
+%
+%    \begin{macrocode}
+%<*pdftex>
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesFile{accsupp-pdftex.def}%
+  [2007/03/21 v0.1 accsupp driver for pdfTeX (HO)]%
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+\def\ACCSUPP@bdc{%
+  \pdfliteral\ACCSUPP@pdfliteral{\ACCSUPP@span BDC}%
+}
+\def\ACCSUPP@emc{%
+  \pdfliteral\ACCSUPP@pdfliteral{EMC}%
+}
+%    \end{macrocode}
+%    \begin{macrocode}
+%</pdftex>
+%    \end{macrocode}
+%
+% \subsubsection{Driver \xoption{dvipdfm}}
+%
+%    \begin{macrocode}
+%<*dvipdfm>
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesFile{accsupp-dvipdfm.def}%
+  [2007/03/21 v0.1 accsupp driver for dvipdfm (HO)]%
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+\def\ACCSUPP@bdc{%
+  \special{pdf:content \ACCSUPP@span BDC}%
+}
+\def\ACCSUPP@emc{%
+  \special{pdf:content EMC}%
+}
+%    \end{macrocode}
+%    \begin{macrocode}
+%</dvipdfm>
+%    \end{macrocode}
+%
+% \subsubsection{Driver \xoption{dvips}}
+%
+%    \begin{macrocode}
+%<*dvips>
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesFile{accsupp-dvips.def}%
+  [2007/03/21 v0.1 accsupp driver for dvips (HO)]%
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+\def\ACCSUPP@bdc#1{%
+  \special{ps:[\ACCSUPP@span/BDC pdfmark}%
+}
+\def\ACCSUPP@emc{%
+  \special{ps:[/EMC pdfmark}%
+}
+%    \end{macrocode}
+%    \begin{macrocode}
+%</dvips>
+%    \end{macrocode}
+% \section{Installation}
+%
+% \subsection{Download}
+%
+% \paragraph{Package.} This package is available on
+% CTAN\footnote{\url{ftp://ftp.ctan.org/tex-archive/}}:
+% \begin{description}
+% \item[\CTAN{macros/latex/contrib/oberdiek/accsupp.dtx}] The source file.
+% \item[\CTAN{macros/latex/contrib/oberdiek/accsupp.pdf}] Documentation.
+% \end{description}
+%
+%
+% \paragraph{Bundle.} All the packages of the bundle `oberdiek'
+% are also available in a TDS compliant ZIP archive. There
+% the packages are already unpacked and the documentation files
+% are generated. The files and directories obey the TDS standard.
+% \begin{description}
+% \item[\CTAN{macros/latex/contrib/oberdiek/oberdiek-tds.zip}]
+% \end{description}
+%
+% \subsection{Bundle installation}
+%
+% \paragraph{Unpacking.} Unpack the \xfile{oberdiek-tds.zip} in the
+% TDS tree (also known as \xfile{texmf} tree) of your choice.
+% Example (linux):
+% \begin{quote}
+%   |unzip oberdiek-tds.zip -d ~/texmf|
+% \end{quote}
+%
+% \paragraph{Script installation.}
+% Check the directory \xfile{TDS:scripts/oberdiek/} for
+% scripts that need further installation steps.
+% Package \xpackage{attachfile2} comes with the Perl script
+% \xfile{pdfatfi.pl} that should be installed in such a way
+% that it can be called as \texttt{pdfatfi}.
+% Example (linux):
+% \begin{quote}
+%   |chmod +x scripts/oberdiek/pdfatfi.pl|\\
+%   |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
+% \end{quote}
+%
+% \subsection{Package installation}
+%
+% \paragraph{Unpacking.} The \xfile{.dtx} file is a self-extracting
+% \docstrip\ archive. The files are extracted by running the
+% \xfile{.dtx} through \plainTeX:
+% \begin{quote}
+%   \verb|tex accsupp.dtx|
+% \end{quote}
+%
+% \paragraph{TDS.} Now the different files must be moved into
+% the different directories in your installation TDS tree
+% (also known as \xfile{texmf} tree):
+% \begin{quote}
+% \sbox0{^^A
+% \begin{tabular}{@{}>{\ttfamily}l@{$\quad\rightarrow\quad$}>{\ttfamily}l@{}}
+%   accsupp.sty & tex/latex/oberdiek/accsupp.sty\\
+%   accsupp-pdftex.def & tex/latex/oberdiek/accsupp-pdftex.def\\
+%   accsupp-dvipdfm.def & tex/latex/oberdiek/accsupp-dvipdfm.def\\
+%   accsupp-dvips.def & tex/latex/oberdiek/accsupp-dvips.def\\
+%   accsupp.pdf & doc/latex/oberdiek/accsupp.pdf\\
+%   accsupp-example.tex & doc/latex/oberdiek/accsupp-example.tex\\
+%   accsupp.dtx & source/latex/oberdiek/accsupp.dtx\\
+% \end{tabular}^^A
+% }%
+% \ifdim\wd0>\linewidth
+%   \mbox{}\nobreak\hskip0pt minus\leftmargin
+%   \usebox0
+%   \nobreak\hskip0pt minus\rightmargin
+% \else
+%   \usebox0
+% \fi
+% \end{quote}
+% If you have a \xfile{docstrip.cfg} that configures and enables \docstrip's
+% TDS installing feature, then some files can already be in the right
+% place, see the documentation of \docstrip.
+%
+% \subsection{Refresh file name databases}
+%
+% If your \TeX~distribution
+% (\teTeX, \mikTeX, \dots) relies on file name databases, you must refresh
+% these. For example, \teTeX\ users run \verb|texhash| or
+% \verb|mktexlsr|.
+%
+% \subsection{Some details for the interested}
+%
+% \paragraph{Attached source.}
+%
+% The PDF documentation on CTAN also includes the
+% \xfile{.dtx} source file. It can be extracted by
+% AcrobatReader 6 or higher. Another option is \textsf{pdftk},
+% e.g. unpack the file into the current directory:
+% \begin{quote}
+%   \verb|pdftk accsupp.pdf unpack_files output .|
+% \end{quote}
+%
+% \paragraph{Unpacking with \LaTeX.}
+% The \xfile{.dtx} chooses its action depending on the format:
+% \begin{description}
+% \item[\plainTeX:] Run \docstrip\ and extract the files.
+% \item[\LaTeX:] Generate the documentation.
+% \end{description}
+% If you insist on using \LaTeX\ for \docstrip\ (really,
+% \docstrip\ does not need \LaTeX), then inform the autodetect routine
+% about your intention:
+% \begin{quote}
+%   \verb|latex \let\install=y\input{accsupp.dtx}|
+% \end{quote}
+% Do not forget to quote the argument according to the demands
+% of your shell.
+%
+% \paragraph{Generating the documentation.}
+% You can use both the \xfile{.dtx} or the \xfile{.drv} to generate
+% the documentation. The process can be configured by the
+% configuration file \xfile{ltxdoc.cfg}. For instance, put this
+% line into this file, if you want to have A4 as paper format:
+% \begin{quote}
+%   \verb|\PassOptionsToClass{a4paper}{article}|
+% \end{quote}
+% An example follows how to generate the
+% documentation with pdf\LaTeX:
+% \begin{quote}
+%\begin{verbatim}
+%pdflatex accsupp.dtx
+%makeindex -s gind.ist accsupp.idx
+%pdflatex accsupp.dtx
+%makeindex -s gind.ist accsupp.idx
+%pdflatex accsupp.dtx
+%\end{verbatim}
+% \end{quote}
+%
+% \begin{thebibliography}{9}
+% \bibitem{pdfspec}
+% Adobe Systems Incorporated,
+% \textit{PDF Reference}, 6th edition, 2006.
+% \url{http://www.adobe.com/devnet/acrobat/pdfs/pdf_reference.pdf}
+%
+% \end{thebibliography}
+%
+% \begin{History}
+%   \begin{Version}{2007/03/21 v0.1}
+%   \item
+%     First version.
+%   \end{Version}
+% \end{History}
+%
+% \PrintIndex
+%
+% \Finale
+\endinput
diff --git a/Master/texmf-dist/source/latex/oberdiek/aliascnt.dtx b/Master/texmf-dist/source/latex/oberdiek/aliascnt.dtx
index 51a0ca45e4f..1f1b43cb30c 100644
--- a/Master/texmf-dist/source/latex/oberdiek/aliascnt.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/aliascnt.dtx
@@ -55,7 +55,7 @@
 %
 %<*ignore>
 \begingroup
-  \def\x{LaTeX2e}
+  \def\x{LaTeX2e}%
 \expandafter\endgroup
 \ifcase 0\ifx\install y1\fi\expandafter
          \ifx\csname processbatchFile\endcsname\relax\else1\fi
@@ -126,11 +126,11 @@ and the derived files
 %<*driver>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{aliascnt.drv}%
-  [2006/09/25 v1.2 Alias counter (HO)]
+  [2006/09/25 v1.2 Alias counter (HO)]%
 \documentclass{ltxdoc}
 \usepackage{holtxdoc}
 \begin{document}
-  \DocInput{aliascnt.dtx}
+  \DocInput{aliascnt.dtx}%
 \end{document}
 %</driver>
 % \fi
@@ -236,7 +236,7 @@ and the derived files
 %<*package>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{aliascnt}%
-  [2006/09/25 v1.2 Alias counter (HO)]
+  [2006/09/25 v1.2 Alias counter (HO)]%
 %    \end{macrocode}
 %
 % \subsection{Create new alias counter}
@@ -342,13 +342,47 @@ and the derived files
 %    \end{macrocode}
 % \section{Installation}
 %
-% \paragraph{CTAN.} This package is available on
+% \subsection{Download}
+%
+% \paragraph{Package.} This package is available on
 % CTAN\footnote{\url{ftp://ftp.ctan.org/tex-archive/}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/aliascnt.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/aliascnt.pdf}] Documentation.
 % \end{description}
 %
+%
+% \paragraph{Bundle.} All the packages of the bundle `oberdiek'
+% are also available in a TDS compliant ZIP archive. There
+% the packages are already unpacked and the documentation files
+% are generated. The files and directories obey the TDS standard.
+% \begin{description}
+% \item[\CTAN{macros/latex/contrib/oberdiek/oberdiek-tds.zip}]
+% \end{description}
+%
+% \subsection{Bundle installation}
+%
+% \paragraph{Unpacking.} Unpack the \xfile{oberdiek-tds.zip} in the
+% TDS tree (also known as \xfile{texmf} tree) of your choice.
+% Example (linux):
+% \begin{quote}
+%   |unzip oberdiek-tds.zip -d ~/texmf|
+% \end{quote}
+%
+% \paragraph{Script installation.}
+% Check the directory \xfile{TDS:scripts/oberdiek/} for
+% scripts that need further installation steps.
+% Package \xpackage{attachfile2} comes with the Perl script
+% \xfile{pdfatfi.pl} that should be installed in such a way
+% that it can be called as \texttt{pdfatfi}.
+% Example (linux):
+% \begin{quote}
+%   |chmod +x scripts/oberdiek/pdfatfi.pl|\\
+%   |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
+% \end{quote}
+%
+% \subsection{Package installation}
+%
 % \paragraph{Unpacking.} The \xfile{.dtx} file is a self-extracting
 % \docstrip\ archive. The files are extracted by running the
 % \xfile{.dtx} through \plainTeX:
@@ -379,8 +413,10 @@ and the derived files
 % TDS installing feature, then some files can already be in the right
 % place, see the documentation of \docstrip.
 %
-% \paragraph{Refresh file databases.} If your \TeX~distribution
-% (\teTeX, \mikTeX, \dots) rely on file databases, you must refresh
+% \subsection{Refresh file name databases}
+%
+% If your \TeX~distribution
+% (\teTeX, \mikTeX, \dots) relies on file name databases, you must refresh
 % these. For example, \teTeX\ users run \verb|texhash| or
 % \verb|mktexlsr|.
 %
@@ -431,7 +467,7 @@ and the derived files
 %\end{verbatim}
 % \end{quote}
 %
-% \section{Acknowledment}
+% \section{Acknowledgement}
 %
 % \begin{description}
 % \item[Ulrich Schwarz:] The package is based on his draft for
diff --git a/Master/texmf-dist/source/latex/oberdiek/alphalph.dtx b/Master/texmf-dist/source/latex/oberdiek/alphalph.dtx
index 8d7fd8ef681..a882eef697e 100644
--- a/Master/texmf-dist/source/latex/oberdiek/alphalph.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/alphalph.dtx
@@ -1,6 +1,7 @@
 % \iffalse meta-comment
 %
-% Copyright (C) 1999, 2006 by Heiko Oberdiek <oberdiek@uni-freiburg.de>
+% Copyright (C) 1999, 2006, 2007 by
+%    Heiko Oberdiek <oberdiek@uni-freiburg.de>
 %
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either
@@ -55,7 +56,7 @@
 %
 %<*ignore>
 \begingroup
-  \def\x{LaTeX2e}
+  \def\x{LaTeX2e}%
 \expandafter\endgroup
 \ifcase 0\ifx\install y1\fi\expandafter
          \ifx\csname processbatchFile\endcsname\relax\else1\fi
@@ -66,7 +67,7 @@
 \input docstrip.tex
 \Msg{************************************************************************}
 \Msg{* Installation}
-\Msg{* Package: alphalph 2006/05/30 v1.4 Converting numbers to letters (HO)}
+\Msg{* Package: alphalph 2007/04/11 v1.5 Converting numbers to letters (HO)}
 \Msg{************************************************************************}
 
 \keepsilent
@@ -76,7 +77,8 @@
 
 This is a generated file.
 
-Copyright (C) 1999, 2006 by Heiko Oberdiek <oberdiek@uni-freiburg.de>
+Copyright (C) 1999, 2006, 2007 by
+   Heiko Oberdiek <oberdiek@uni-freiburg.de>
 
 This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either
@@ -126,12 +128,12 @@ and the derived files
 %<*driver>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{alphalph.drv}%
-  [2006/05/30 v1.4 Converting numbers to letters (HO)]
+  [2007/04/11 v1.5 Converting numbers to letters (HO)]%
 \documentclass{ltxdoc}
 \usepackage{holtxdoc}
 \usepackage{alphalph}
 \begin{document}
-  \DocInput{alphalph.dtx}
+  \DocInput{alphalph.dtx}%
 \end{document}
 %</driver>
 % \fi
@@ -157,7 +159,7 @@ and the derived files
 % \GetFileInfo{alphalph.drv}
 %
 % \title{The \xpackage{alphalph} package}
-% \date{2006/05/30 v1.4}
+% \date{2007/04/11 v1.5}
 % \author{Heiko Oberdiek\\\xemail{oberdiek@uni-freiburg.de}}
 %
 % \maketitle
@@ -304,7 +306,7 @@ and the derived files
   \fi
 \expandafter\x\csname ver@alphalph.sty\endcsname
 \ProvidesPackage{alphalph}%
-  [2006/05/30 v1.4 Converting numbers to letters (HO)]
+  [2007/04/11 v1.5 Converting numbers to letters (HO)]
 %    \end{macrocode}
 %
 %    For unique command names this package uses |aa@| as prefix
@@ -408,13 +410,13 @@ and the derived files
 %    Then it expands to nothing like \cmd{\romannumeral}.
 %    \begin{macrocode}
   \def\aa@make#1#2{%
-    \ifnum#1<1
+    \ifnum#1<1 %
     \else
       \@ReturnAfterFi{%
         \aa@process1;#1;1..#2%
       }%
     \fi
-  }
+  }%
 %    \end{macrocode}
 %    \end{macro}
 %
@@ -457,14 +459,14 @@ and the derived files
 %    argument |;#2;|. At last the first character |;| finishes \cmd{\number}.
 %    \begin{macrocode}
   \def\aa@process#1;#2;{%
-    \ifnum#1=#2
+    \ifnum#1=#2 %
       \expandafter\aa@getresult
     \else
       \@ReturnAfterFi{%
         \expandafter\aa@process\number\aa@inc{#1}\aa@alphinc{;#2;}%
       }%
     \fi
-  }
+  }%
 %    \end{macrocode}
 %    \end{macro}
 %
@@ -488,7 +490,7 @@ and the derived files
 %    \begin{macrocode}
   \def\aa@getresult#1..#2{%
     \aa@@getresult!#2#1..%
-  }
+  }%
 %    \end{macrocode}
 %    \end{macro}
 %
@@ -513,7 +515,7 @@ and the derived files
         #2{#3}#1!#2%
       }%
     \fi
-  }
+  }%
 %    \end{macrocode}
 %    \end{macro}
 %
@@ -528,19 +530,19 @@ and the derived files
 %    \begin{macrocode}
 % \aa@inc adds one to its argument #1.
   \def\aa@inc#1{%
-    \ifnum#1<9
+    \ifnum#1<9 %
       \aa@nextdigit{#1}%
     \else
       \aa@reverse#1!!%
     \fi
-  }
+  }%
 %    \end{macrocode}
 %    \end{macro}
 %    \begin{macro}{\aa@nextdigit}
 %    \cmd{\aa@nextdigit} increments the digit |#1|. The result
 %    is a digit again. \cmd{\aa@addone} works off the case ``9+1''.
 %    \begin{macrocode}
-  \def\aa@nextdigit#1{\ifcase#1 1\or2\or3\or4\or5\or6\or7\or8\or9\fi}
+  \def\aa@nextdigit#1{\ifcase#1 1\or2\or3\or4\or5\or6\or7\or8\or9\fi}%
 %    \end{macrocode}
 %    \end{macro}
 %    \begin{macro}{\aa@reverse}
@@ -558,7 +560,7 @@ and the derived files
         \aa@reverse#2!#1#3!%
       }%
     \fi
-  }
+  }%
 %    \end{macrocode}
 %    \end{macro}
 %    \begin{macro}{\aa@addone}
@@ -569,7 +571,7 @@ and the derived files
 %    to take some work of \cmd{\aa@lastreverse}.
 %    \begin{macrocode}
   \def\aa@addone#1#2!#3!{%
-    \ifnum#1<9
+    \ifnum#1<9 %
       \expandafter\aa@lastreverse\number\aa@nextdigit#1 #2!#3!%
     \else
       \@ReturnAfterFi{%
@@ -582,7 +584,7 @@ and the derived files
         \fi
       }%
     \fi
-  }
+  }%
 %    \end{macrocode}
 %    \end{macro}
 %    \begin{macro}{\aa@lastreverse}
@@ -598,7 +600,7 @@ and the derived files
         \aa@lastreverse#2!#1#3!%
       }%
     \fi
-  }
+  }%
 %    \end{macrocode}
 %    \end{macro}
 %
@@ -619,7 +621,7 @@ and the derived files
       }%
     \else
       \@ReturnAfterFi{%
-        \ifnum#2<26
+        \ifnum#2<26 %
           \@ReturnAfterElseFi{%
             \expandafter\aa@alphinclast\expandafter
               {\number\aa@inc{#2}}{#1}%
@@ -631,7 +633,7 @@ and the derived files
         \fi
       }%
     \fi
-  }
+  }%
 %    \end{macrocode}
 %    \end{macro}
 %    \begin{macro}{\aa@alphinclast}
@@ -639,7 +641,7 @@ and the derived files
 %    several tokens (e.g. |;100;|), we cannot jump over it via
 %    \cmd{\expandafter} in \cmd{\aa@alphinc}.
 %    \begin{macrocode}
-  \def\aa@alphinclast#1#2{#2#1.}
+  \def\aa@alphinclast#1#2{#2#1.}%
 %    \end{macrocode}
 %    \end{macro}
 %
@@ -685,7 +687,7 @@ and the derived files
 %    It provides expandible mathematical calculations.
 %    \begin{macrocode}
   \def\aa@eprocess#1;#2{%
-    \ifnum#1<27
+    \ifnum#1<27 %
       \@ReturnAfterElseFi{%
         #2{#1}%
       }%
@@ -788,13 +790,47 @@ and the derived files
 %    \end{macrocode}
 % \section{Installation}
 %
-% \paragraph{CTAN.} This package is available on
+% \subsection{Download}
+%
+% \paragraph{Package.} This package is available on
 % CTAN\footnote{\url{ftp://ftp.ctan.org/tex-archive/}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/alphalph.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/alphalph.pdf}] Documentation.
 % \end{description}
 %
+%
+% \paragraph{Bundle.} All the packages of the bundle `oberdiek'
+% are also available in a TDS compliant ZIP archive. There
+% the packages are already unpacked and the documentation files
+% are generated. The files and directories obey the TDS standard.
+% \begin{description}
+% \item[\CTAN{macros/latex/contrib/oberdiek/oberdiek-tds.zip}]
+% \end{description}
+%
+% \subsection{Bundle installation}
+%
+% \paragraph{Unpacking.} Unpack the \xfile{oberdiek-tds.zip} in the
+% TDS tree (also known as \xfile{texmf} tree) of your choice.
+% Example (linux):
+% \begin{quote}
+%   |unzip oberdiek-tds.zip -d ~/texmf|
+% \end{quote}
+%
+% \paragraph{Script installation.}
+% Check the directory \xfile{TDS:scripts/oberdiek/} for
+% scripts that need further installation steps.
+% Package \xpackage{attachfile2} comes with the Perl script
+% \xfile{pdfatfi.pl} that should be installed in such a way
+% that it can be called as \texttt{pdfatfi}.
+% Example (linux):
+% \begin{quote}
+%   |chmod +x scripts/oberdiek/pdfatfi.pl|\\
+%   |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
+% \end{quote}
+%
+% \subsection{Package installation}
+%
 % \paragraph{Unpacking.} The \xfile{.dtx} file is a self-extracting
 % \docstrip\ archive. The files are extracted by running the
 % \xfile{.dtx} through \plainTeX:
@@ -825,8 +861,10 @@ and the derived files
 % TDS installing feature, then some files can already be in the right
 % place, see the documentation of \docstrip.
 %
-% \paragraph{Refresh file databases.} If your \TeX~distribution
-% (\teTeX, \mikTeX, \dots) rely on file databases, you must refresh
+% \subsection{Refresh file name databases}
+%
+% If your \TeX~distribution
+% (\teTeX, \mikTeX, \dots) relies on file name databases, you must refresh
 % these. For example, \teTeX\ users run \verb|texhash| or
 % \verb|mktexlsr|.
 %
@@ -925,6 +963,10 @@ and the derived files
 %   \item
 %     \cs{newalphalph} added.
 %   \end{Version}
+%   \begin{Version}{2007/04/11 v1.5}
+%   \item
+%     Line ends sanitized.
+%   \end{Version}
 % \end{History}
 %
 % \PrintIndex
diff --git a/Master/texmf-dist/source/latex/oberdiek/atenddvi.dtx b/Master/texmf-dist/source/latex/oberdiek/atenddvi.dtx
new file mode 100644
index 00000000000..b2140bbb033
--- /dev/null
+++ b/Master/texmf-dist/source/latex/oberdiek/atenddvi.dtx
@@ -0,0 +1,506 @@
+% \iffalse meta-comment
+%
+% Copyright (C) 2007 by Heiko Oberdiek <oberdiek@uni-freiburg.de>
+%
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either
+% version 1.3 of this license or (at your option) any later
+% version. 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.
+%
+% This work consists of the main source file atenddvi.dtx
+% and the derived files
+%    atenddvi.sty, atenddvi.pdf, atenddvi.ins, atenddvi.drv.
+%
+% Distribution:
+%    CTAN:macros/latex/contrib/oberdiek/atenddvi.dtx
+%    CTAN:macros/latex/contrib/oberdiek/atenddvi.pdf
+%
+% Unpacking:
+%    (a) If atenddvi.ins is present:
+%           tex atenddvi.ins
+%    (b) Without atenddvi.ins:
+%           tex atenddvi.dtx
+%    (c) If you insist on using LaTeX
+%           latex \let\install=y\input{atenddvi.dtx}
+%        (quote the arguments according to the demands of your shell)
+%
+% Documentation:
+%    (a) If atenddvi.drv is present:
+%           latex atenddvi.drv
+%    (b) Without atenddvi.drv:
+%           latex atenddvi.dtx; ...
+%    The class ltxdoc loads the configuration file ltxdoc.cfg
+%    if available. Here you can specify further options, e.g.
+%    use A4 as paper format:
+%       \PassOptionsToClass{a4paper}{article}
+%
+%    Programm calls to get the documentation (example):
+%       pdflatex atenddvi.dtx
+%       makeindex -s gind.ist atenddvi.idx
+%       pdflatex atenddvi.dtx
+%       makeindex -s gind.ist atenddvi.idx
+%       pdflatex atenddvi.dtx
+%
+% Installation:
+%    TDS:tex/latex/oberdiek/atenddvi.sty
+%    TDS:doc/latex/oberdiek/atenddvi.pdf
+%    TDS:source/latex/oberdiek/atenddvi.dtx
+%
+%<*ignore>
+\begingroup
+  \def\x{LaTeX2e}%
+\expandafter\endgroup
+\ifcase 0\ifx\install y1\fi\expandafter
+         \ifx\csname processbatchFile\endcsname\relax\else1\fi
+         \ifx\fmtname\x\else 1\fi\relax
+\else\csname fi\endcsname
+%</ignore>
+%<*install>
+\input docstrip.tex
+\Msg{************************************************************************}
+\Msg{* Installation}
+\Msg{* Package: atenddvi 2007/03/20 v1.0 At end DVI hook (HO)}
+\Msg{************************************************************************}
+
+\keepsilent
+\askforoverwritefalse
+
+\preamble
+
+This is a generated file.
+
+Copyright (C) 2007 by Heiko Oberdiek <oberdiek@uni-freiburg.de>
+
+This work may be distributed and/or modified under the
+conditions of the LaTeX Project Public License, either
+version 1.3 of this license or (at your option) any later
+version. 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.
+
+This work consists of the main source file atenddvi.dtx
+and the derived files
+   atenddvi.sty, atenddvi.pdf, atenddvi.ins, atenddvi.drv.
+
+\endpreamble
+
+\generate{%
+  \file{atenddvi.ins}{\from{atenddvi.dtx}{install}}%
+  \file{atenddvi.drv}{\from{atenddvi.dtx}{driver}}%
+  \usedir{tex/latex/oberdiek}%
+  \file{atenddvi.sty}{\from{atenddvi.dtx}{package}}%
+}
+
+\obeyspaces
+\Msg{************************************************************************}
+\Msg{*}
+\Msg{* To finish the installation you have to move the following}
+\Msg{* file into a directory searched by TeX:}
+\Msg{*}
+\Msg{*     atenddvi.sty}
+\Msg{*}
+\Msg{* To produce the documentation run the file `atenddvi.drv'}
+\Msg{* through LaTeX.}
+\Msg{*}
+\Msg{* Happy TeXing!}
+\Msg{*}
+\Msg{************************************************************************}
+
+\endbatchfile
+%</install>
+%<*ignore>
+\fi
+%</ignore>
+%<*driver>
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesFile{atenddvi.drv}%
+  [2007/03/20 v1.0 At end DVI hook (HO)]%
+\documentclass{ltxdoc}
+\usepackage{holtxdoc}
+\begin{document}
+  \DocInput{atenddvi.dtx}%
+\end{document}
+%</driver>
+% \fi
+%
+% \CheckSum{98}
+%
+% \CharacterTable
+%  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
+%   Lower-case    \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
+%   Digits        \0\1\2\3\4\5\6\7\8\9
+%   Exclamation   \!     Double quote  \"     Hash (number) \#
+%   Dollar        \$     Percent       \%     Ampersand     \&
+%   Acute accent  \'     Left paren    \(     Right paren   \)
+%   Asterisk      \*     Plus          \+     Comma         \,
+%   Minus         \-     Point         \.     Solidus       \/
+%   Colon         \:     Semicolon     \;     Less than     \<
+%   Equals        \=     Greater than  \>     Question mark \?
+%   Commercial at \@     Left bracket  \[     Backslash     \\
+%   Right bracket \]     Circumflex    \^     Underscore    \_
+%   Grave accent  \`     Left brace    \{     Vertical bar  \|
+%   Right brace   \}     Tilde         \~}
+%
+% \GetFileInfo{atenddvi.drv}
+%
+% \title{The \xpackage{atenddvi} package}
+% \date{2007/03/20 v1.0}
+% \author{Heiko Oberdiek\\\xemail{oberdiek@uni-freiburg.de}}
+%
+% \maketitle
+%
+% \begin{abstract}
+% \LaTeX\ offers \cs{AtBeginDvi}. This package \xpackage{atenddvi}
+% provides the counterpart \cs{AtEndDvi}. The execution of its
+% argument is delayed to the end of the document at the end of the
+% last page. Thus \cs{special} and \cs{write} remain effective, because
+% they are put into the last page. This is the main difference
+% to \cs{AtEndDocument}.
+% \end{abstract}
+%
+% \tableofcontents
+%
+% \section{Documentation}
+%
+% \begin{declcs}{AtEndDvi} \M{code}
+% \end{declcs}
+% Macro \cs{AtEndDvi} provides a hook mechanism to put \meta{code}
+% at the end of the last output page. It is the logical counterpart
+% to \cs{AtBeginDvi}. Despite the name the output type DVI, PDF or whatever
+% does not matter.
+%
+% Unlike \cs{AtBeginDvi} the \meta{code} is not put in a box and
+% therefore executed immediately. The hook for \cs{AtEndDvi} is based on
+% a macro similar to \cs{AtBeginDocument} or \cs{AtEndDocument}. The
+% execution of \meta{code} is delayed until the hook is executed on
+% the last page.
+%
+% Commands such as \cs{special} or \cs{write} (not the \cs{immediate}
+% variant) must go as nodes into the contents of a page to have the
+% desired effect.
+% When the hook for \cs{AtEndDocument} is executed, the last intended
+% page may already be shipped out. Therefore \cs{special} or \cs{write}
+% cannot be used in a reliable way without generating new page.
+%
+% This gap is closed by \cs{AtEndDvi} of this package \xpackage{atenddvi}.
+% If the document is compiled the first time, the package remembers
+% the last page in a reference. In the sceond run, it puts the hook
+% on the page that has been detected in the previous run as last page.
+% The package detectes if the number of pages has changed, and then
+% generates a warning to rerun \LaTeX.
+%
+% \StopEventually{
+% }
+%
+% \section{Implementation}
+%
+%    \begin{macrocode}
+%<*package>
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{atenddvi}%
+  [2007/03/20 v1.0 At end DVI hook (HO)]%
+%    \end{macrocode}
+%
+%    Load the required packages
+%    \begin{macrocode}
+\RequirePackage{zref-abspage,zref-lastpage}[2007/03/19]
+\RequirePackage{everyshi}
+%    \end{macrocode}
+%
+%    \begin{macro}{\AtEndDvi@Hook}
+%    Macro \cs{AtEndDvi@Hook} is the data storage macro
+%    for the code that is executed later at end of the last page.
+%    \begin{macrocode}
+\let\AtEndDvi@Hook\@empty
+%    \end{macrocode}
+%    \end{macro}
+%    \begin{macro}{\AtEndDvi}
+%    Macro \cs{AtEndDvi} is called in the same way as
+%    \cs{AtBeginDocument}. The argument is added to the hook macro.
+%    \begin{macrocode}
+\newcommand*{\AtEndDvi}{%
+  \g@addto@macro\AtEndDvi@Hook
+}
+%    \end{macrocode}
+%    \end{macro}
+%
+%    \begin{macro}{\AtEndDvi@EveryShipout}
+%    \begin{macrocode}
+\def\AtEndDvi@EveryShipout{%
+  \begingroup
+%    \end{macrocode}
+%    The hook of package \xpackage{everyshi} is called during
+%    the output routine, where \cs{protect} has the meaning
+%    of \cs{noexpand}. However we need \cs{@typeset@protect}.
+%    It is not set by package \xpackage{everyshi}, thus we
+%    do it ourselves:
+%    \begin{macrocode}
+    \set@typeset@protect
+%    \end{macrocode}
+%    The reference `LastPage' is marked used. If the reference
+%    is not yet defined, then the user gets the warning because of
+%    the undefined reference and the rerun warning at the end of
+%    the compile run. However, we do not need a warning each page,
+%    the first page is enough.
+%    \begin{macrocode}
+    \ifnum\value{abspage}=1 %
+      \zref@refused{LastPage}%
+    \fi
+%    \end{macrocode}
+%    The current absolute page number is compared with the
+%    absolute page number of the reference `LastPage'.
+%    \begin{macrocode}
+    \ifnum\zref@extractdefault{LastPage}{abspage}{0}=\value{abspage}%
+%    \end{macrocode}
+%    \begin{macro}{\AtEndDvi@LastPage}
+%    We found the right page and remember it in a macro.
+%    \begin{macrocode}
+      \xdef\AtEndDvi@LastPage{\number\value{abspage}}%
+%    \end{macrocode}
+%    \end{macro}
+%    The hook of \cs{AtEndDvi} is now put on the last page
+%    after the contents of the page.
+%    \begin{macrocode}
+      \global\setbox\@cclv=\vbox{%
+        \hbox{%
+          \box\@cclv
+          \setbox\@cclv=\hbox{%
+            \begingroup
+              \AtEndDvi@Hook
+            \endgroup
+          }%
+          \wd\@cclv=\z@
+          \ht\@cclv=\z@
+          \dp\@cclv=\z@
+          \box\@cclv
+        }%
+      }%
+%    \end{macrocode}
+%    We do not need the every page hook.
+%    \begin{macrocode}
+      \global\let\AtEndDvi@EveryShipout\@empty
+%    \end{macrocode}
+%    The hook is consumed, \cs{AtEndDvi} does not have an effect.
+%    \begin{macrocode}
+      \global\let\AtEndDvi\@gobble
+%    \end{macrocode}
+%    Make a protocol entry, which page is used by this package
+%    as last page.
+%    \begin{macrocode}
+      \let\on@line\@empty
+      \PackageInfo{atenddvi}{Last page = \AtEndDvi@LastPage}%
+    \fi
+  \endgroup
+}
+%    \end{macrocode}
+%    \end{macro}
+%
+%    \begin{macro}{\AtEndDvi@AtBeginDocument}
+%    In order to get as late as possible in the chain of the
+%    every shipout hook, the call of \cs{EveryShipout} is delayed.
+%    \begin{macrocode}
+\def\AtEndDvi@AtBeginDocument{%
+  \EveryShipout{\AtEndDvi@EveryShipout}%
+%    \end{macrocode}
+%    \begin{macro}{\AtEndDvi@Check}
+%    After \cs{AtEndDocument} \LaTeX\ reads its \xfile{.aux} files
+%    again. Code in \cs{AtEndDocument} could generate additional
+%    pages. This is unlikely by code in the \xfile{.aux} file,
+%    thus we use the \xfile{.aux} file to run macro
+%    \cs{AtEndDvi@Check} for checking the last page.
+%
+%    During the first reading of the \xfile{.aux} file,
+%    \cs{AtEndDvi@Check} is disabled, its real meaning
+%    is assigned afterwards.
+%    \begin{macrocode}
+  \if@filesw
+    \immediate\write\@mainaux{%
+      \string\providecommand\string\AtEndDvi@Check{}%
+    }%
+    \immediate\write\@mainaux{%
+      \string\AtEndDvi@Check
+    }%
+  \fi
+  \let\AtEndDvi@Check\AtEndDvi@CheckImpl
+}
+%    \end{macrocode}
+%    \end{macro}
+%    \begin{macrocode}
+\AtBeginDocument{\AtEndDvi@AtBeginDocument}
+%    \end{macrocode}
+%    \end{macro}
+%
+%    \begin{macro}{\AtEndDvi@CheckImpl}
+%    First check is whether a last page was found at all.
+%    Secondly the found last page is compared with the real last page.
+%    \begin{macrocode}
+\def\AtEndDvi@CheckImpl{%
+  \@ifundefined{AtEndDvi@LastPage}{%
+    \PackageWarningNoLine{atenddvi}{%
+      Rerun LaTeX, last page not yet found%
+    }%
+  }{%
+    \ifnum\AtEndDvi@LastPage=\value{abspage}%
+    \else
+      \PackageWarningNoLine{atenddvi}{%
+        Rerun LaTeX, last page has changed%
+      }%
+    \fi
+  }%
+}
+%    \end{macrocode}
+%    \end{macro}
+%
+%    \begin{macrocode}
+%</package>
+%    \end{macrocode}
+% \section{Installation}
+%
+% \subsection{Download}
+%
+% \paragraph{Package.} This package is available on
+% CTAN\footnote{\url{ftp://ftp.ctan.org/tex-archive/}}:
+% \begin{description}
+% \item[\CTAN{macros/latex/contrib/oberdiek/atenddvi.dtx}] The source file.
+% \item[\CTAN{macros/latex/contrib/oberdiek/atenddvi.pdf}] Documentation.
+% \end{description}
+%
+%
+% \paragraph{Bundle.} All the packages of the bundle `oberdiek'
+% are also available in a TDS compliant ZIP archive. There
+% the packages are already unpacked and the documentation files
+% are generated. The files and directories obey the TDS standard.
+% \begin{description}
+% \item[\CTAN{macros/latex/contrib/oberdiek/oberdiek-tds.zip}]
+% \end{description}
+%
+% \subsection{Bundle installation}
+%
+% \paragraph{Unpacking.} Unpack the \xfile{oberdiek-tds.zip} in the
+% TDS tree (also known as \xfile{texmf} tree) of your choice.
+% Example (linux):
+% \begin{quote}
+%   |unzip oberdiek-tds.zip -d ~/texmf|
+% \end{quote}
+%
+% \paragraph{Script installation.}
+% Check the directory \xfile{TDS:scripts/oberdiek/} for
+% scripts that need further installation steps.
+% Package \xpackage{attachfile2} comes with the Perl script
+% \xfile{pdfatfi.pl} that should be installed in such a way
+% that it can be called as \texttt{pdfatfi}.
+% Example (linux):
+% \begin{quote}
+%   |chmod +x scripts/oberdiek/pdfatfi.pl|\\
+%   |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
+% \end{quote}
+%
+% \subsection{Package installation}
+%
+% \paragraph{Unpacking.} The \xfile{.dtx} file is a self-extracting
+% \docstrip\ archive. The files are extracted by running the
+% \xfile{.dtx} through \plainTeX:
+% \begin{quote}
+%   \verb|tex atenddvi.dtx|
+% \end{quote}
+%
+% \paragraph{TDS.} Now the different files must be moved into
+% the different directories in your installation TDS tree
+% (also known as \xfile{texmf} tree):
+% \begin{quote}
+% \sbox0{^^A
+% \begin{tabular}{@{}>{\ttfamily}l@{$\quad\rightarrow\quad$}>{\ttfamily}l@{}}
+%   atenddvi.sty & tex/latex/oberdiek/atenddvi.sty\\
+%   atenddvi.pdf & doc/latex/oberdiek/atenddvi.pdf\\
+%   atenddvi.dtx & source/latex/oberdiek/atenddvi.dtx\\
+% \end{tabular}^^A
+% }%
+% \ifdim\wd0>\linewidth
+%   \mbox{}\nobreak\hskip0pt minus\leftmargin
+%   \usebox0
+%   \nobreak\hskip0pt minus\rightmargin
+% \else
+%   \usebox0
+% \fi
+% \end{quote}
+% If you have a \xfile{docstrip.cfg} that configures and enables \docstrip's
+% TDS installing feature, then some files can already be in the right
+% place, see the documentation of \docstrip.
+%
+% \subsection{Refresh file name databases}
+%
+% If your \TeX~distribution
+% (\teTeX, \mikTeX, \dots) relies on file name databases, you must refresh
+% these. For example, \teTeX\ users run \verb|texhash| or
+% \verb|mktexlsr|.
+%
+% \subsection{Some details for the interested}
+%
+% \paragraph{Attached source.}
+%
+% The PDF documentation on CTAN also includes the
+% \xfile{.dtx} source file. It can be extracted by
+% AcrobatReader 6 or higher. Another option is \textsf{pdftk},
+% e.g. unpack the file into the current directory:
+% \begin{quote}
+%   \verb|pdftk atenddvi.pdf unpack_files output .|
+% \end{quote}
+%
+% \paragraph{Unpacking with \LaTeX.}
+% The \xfile{.dtx} chooses its action depending on the format:
+% \begin{description}
+% \item[\plainTeX:] Run \docstrip\ and extract the files.
+% \item[\LaTeX:] Generate the documentation.
+% \end{description}
+% If you insist on using \LaTeX\ for \docstrip\ (really,
+% \docstrip\ does not need \LaTeX), then inform the autodetect routine
+% about your intention:
+% \begin{quote}
+%   \verb|latex \let\install=y\input{atenddvi.dtx}|
+% \end{quote}
+% Do not forget to quote the argument according to the demands
+% of your shell.
+%
+% \paragraph{Generating the documentation.}
+% You can use both the \xfile{.dtx} or the \xfile{.drv} to generate
+% the documentation. The process can be configured by the
+% configuration file \xfile{ltxdoc.cfg}. For instance, put this
+% line into this file, if you want to have A4 as paper format:
+% \begin{quote}
+%   \verb|\PassOptionsToClass{a4paper}{article}|
+% \end{quote}
+% An example follows how to generate the
+% documentation with pdf\LaTeX:
+% \begin{quote}
+%\begin{verbatim}
+%pdflatex atenddvi.dtx
+%makeindex -s gind.ist atenddvi.idx
+%pdflatex atenddvi.dtx
+%makeindex -s gind.ist atenddvi.idx
+%pdflatex atenddvi.dtx
+%\end{verbatim}
+% \end{quote}
+%
+% \begin{History}
+%   \begin{Version}{2007/03/20 v1.0}
+%   \item
+%     First version.
+%   \end{Version}
+% \end{History}
+%
+% \PrintIndex
+%
+% \Finale
+\endinput
diff --git a/Master/texmf-dist/source/latex/oberdiek/attachfile2.dtx b/Master/texmf-dist/source/latex/oberdiek/attachfile2.dtx
index 78949098baf..18fc6f4fd78 100644
--- a/Master/texmf-dist/source/latex/oberdiek/attachfile2.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/attachfile2.dtx
@@ -59,7 +59,7 @@
 %
 %<*ignore>
 \begingroup
-  \def\x{LaTeX2e}
+  \def\x{LaTeX2e}%
 \expandafter\endgroup
 \ifcase 0\ifx\install y1\fi\expandafter
          \ifx\csname processbatchFile\endcsname\relax\else1\fi
@@ -70,7 +70,7 @@
 \input docstrip.tex
 \Msg{************************************************************************}
 \Msg{* Installation}
-\Msg{* Package: attachfile2 2006/08/16 v2.2 attach files into PDF (HO)}
+\Msg{* Package: attachfile2 2007/04/11 v2.3 attach files into PDF (HO)}
 \Msg{************************************************************************}
 
 \keepsilent
@@ -138,25 +138,25 @@ and the derived files
 %<*driver>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{attachfile2.drv}%
-  [2006/08/16 v2.2 attach files into PDF (HO)]
+  [2007/04/11 v2.3 attach files into PDF (HO)]%
 \documentclass{ltxdoc}
 \usepackage{holtxdoc}
 \AtBeginDocument{%
   \csname @ifpackageloaded\endcsname{dtx-attach}{%
-    \embedfile[
-      stringmethod=escape,
-      mimetype=text/plain,
-      desc={Helper Perl script for package `attachfile2'}
+    \embedfile[%
+      stringmethod=escape,%
+      mimetype=text/plain,%
+      desc={Helper Perl script for package `attachfile2'}%
     ]{pdfatfi.pl}%
   }{}%
 }
 \begin{document}
-  \DocInput{attachfile2.dtx}
+  \DocInput{attachfile2.dtx}%
 \end{document}
 %</driver>
 % \fi
 %
-% \CheckSum{1382}
+% \CheckSum{1383}
 %
 % \CharacterTable
 %  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -177,7 +177,7 @@ and the derived files
 % \GetFileInfo{attachfile2.drv}
 %
 % \title{The \xpackage{attachfile2} package}
-% \date{2006/08/16 v2.2}
+% \date{2007/04/11 v2.3}
 % \author{Heiko Oberdiek\\\xemail{oberdiek@uni-freiburg.de}}
 %
 % \maketitle
@@ -334,7 +334,7 @@ and the derived files
 %<*package>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{attachfile2}%
-  [2006/08/16 v2.2 attach files into PDF (HO)]
+  [2007/04/11 v2.3 attach files into PDF (HO)]%
 %    \end{macrocode}
 %    \begin{macrocode}
 \RequirePackage{ifpdf}
@@ -480,7 +480,7 @@ and the derived files
 
 % time options timezone and date
 \def\atfi@pad@ii#1{%
-  \ifnum#1>9
+  \ifnum#1>9 %
     \number#1%
   \else
     0\number#1%
@@ -628,16 +628,16 @@ and the derived files
 \ifatfi@draft
   \def\atfi@dummy@pushpin{%
     \raisebox{-1.25bp}{\parbox[b][14bp]{24bp}{}}%
-  }
+  }%
   \DeclareRobustCommand{\textattachfile}[3][]{%
     \notextattachfile[#1]{#3}%
-  }
+  }%
   \DeclareRobustCommand{\noattachfile}[1][]{%
     \notextattachfile[#1]{\atfi@dummy@pushpin}%
-  }
+  }%
   \DeclareRobustCommand{\attachfile}[2][]{%
     \noattachfile[#1]%
-  }
+  }%
   \expandafter\endinput
 \fi
 
@@ -938,7 +938,7 @@ and the derived files
   \let\atfi@writefile\@gobble
 \else
   \newwrite\atfi@stream
-  \immediate\openout\atfi@stream=\jobname.atfi
+  \immediate\openout\atfi@stream=\jobname.atfi\relax
   \immediate\write\atfi@stream{%
     \string\attachfile@timezone{\atfi@timezone}%
   }%
@@ -1096,7 +1096,7 @@ and the derived files
 %<*pdftex>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{atfipdftex.def}%
-  [2006/08/16 v2.2 attachfile2 driver for pdfTeX (HO)]
+  [2007/04/11 v2.3 attachfile2 driver for pdfTeX (HO)]%
 %    \end{macrocode}
 %    \begin{macrocode}
 \let\atfi@literal\pdfliteral
@@ -1233,7 +1233,7 @@ and the derived files
 %<*dvips>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{atfipdftex.def}%
-  [2006/08/16 v2.2 attachfile2 driver for dvips (HO)]
+  [2007/04/11 v2.3 attachfile2 driver for dvips (HO)]%
 %    \end{macrocode}
 %    \begin{macrocode}
 \def\atfi@literal#1{%
@@ -1247,194 +1247,194 @@ and the derived files
 % --- macros for graphics data ---
 
 \atfi@header{%
-  userdict begin 20 dict dup /atfi_dict exch def end begin
-    /atfi_?pdfmark systemdict
-    dup /pdfmark known
-    {
-      /exec get def
-    }{
-      /pop get def
-    } ifelse
-    {
+  userdict begin 20 dict dup /atfi_dict exch def end begin%
+    /atfi_?pdfmark systemdict %
+    dup/pdfmark known%
+    {%
+      /exec get def%
+    }{%
+      /pop get def%
+    } ifelse%
+    {%
       %
       % x y width height atfi_re ->
-      languagelevel 2 ge {
-        /atfi_rectfill { rectfill } bind def
-        /atfi_rectstroke { rectstroke } bind def
+      languagelevel 2 ge {%
+        /atfi_rectfill { rectfill } bind def%
+        /atfi_rectstroke { rectstroke } bind def%
       }{%
-        /atfi_rect {
-          /atfi_height exch def
-          /atfi_width exch def
-          /atfi_x exch def
-          /atfi_y exch def
-          newpath
-          atfi_x atfi_y moveto
-          atfi_x atfi_width add atfi_y lineto
-          atfi_x atfi_width add atfi_y atfi_height add lineto
-          atfi_x atfi_y atfi_height add lineto
-          closepath
-        } bind def
-        /atfi_rectfill {
-          atfi_rect fill
-        } bind def
-        /atfi_rectstroke {
-          atfi_rect stroke
-        } bind def
-      } ifelse
-      /atfi_curveto_v {
-        currentpoint 6 2 roll curveto
-      } bind def
-      /atfi_curveto_y {
-        2 copy curveto
-      } bind def
+        /atfi_rect {%
+          /atfi_height exch def%
+          /atfi_width exch def%
+          /atfi_x exch def%
+          /atfi_y exch def %
+          newpath %
+          atfi_x atfi_y moveto %
+          atfi_x atfi_width add atfi_y lineto %
+          atfi_x atfi_width add atfi_y atfi_height add lineto %
+          atfi_x atfi_y atfi_height add lineto %
+          closepath%
+        } bind def%
+        /atfi_rectfill {%
+          atfi_rect fill%
+        } bind def%
+        /atfi_rectstroke {%
+          atfi_rect stroke%
+        } bind def%
+      } ifelse%
+      /atfi_curveto_v {%
+        currentpoint 6 2 roll curveto%
+      } bind def%
+      /atfi_curveto_y {%
+        2 copy curveto%
+      } bind def%
       %
       % help macro for atfi_convert_date
-      /atfi_two {
-        dup 10 lt
-        {
-          1 string cvs
-          exch 1 add exch
-        }{
-          2 string cvs
-        } ifelse
-        putinterval
-      } bind def
+      /atfi_two {%
+        dup 10 lt%
+        {%
+          1 string cvs %
+          exch 1 add exch%
+        }{%
+          2 string cvs%
+        } ifelse %
+        putinterval%
+      } bind def%
       %
       % <seconds since 1970-01-01> atfi_convert_date -> (D:...Z)
-      /atfi_convert_date {
-        dup
-        /atfi_days exch 3600 idiv 24 idiv def
+      /atfi_convert_date {%
+        dup%
+        /atfi_days exch 3600 idiv 24 idiv def%
         % calc date part
-        /atfi_year 1970 def
-        {
-          atfi_year 400 mod 0 eq
-          atfi_year 100 mod 0 ne
-          atfi_year 4   mod 0 eq
-          and or
-          { 366 } { 365 } ifelse
-          dup atfi_days lt
-          {
-            atfi_days exch sub /atfi_days exch def
-            /atfi_year atfi_year 1 add def
-          }{
-            exit
-          } ifelse
-        } loop
-        /atfi_month 1 def
-        /atfi_days atfi_days 1 add def
-        31 atfi_days lt
-        {
-          atfi_days 31 sub /atfi_days exch def
-          /atfi_month atfi_month 1 add def
-          366 eq { 29 } { 28 } ifelse dup atfi_days lt
-          {
-            atfi_days exch sub /atfi_days exch def
-            /atfi_month atfi_month 1 add def
-          31 atfi_days lt
-          {
-            atfi_days 31 sub /atfi_days exch def
-            /atfi_month atfi_month 1 add def
-          30 atfi_days lt
-          {
-            atfi_days 30 sub /atfi_days exch def
-            /atfi_month atfi_month 1 add def
-            31 atfi_days lt
-            {
-              atfi_days 31 sub /atfi_days exch def
-              /atfi_month atfi_month 1 add def
-            30 atfi_days lt
-            {
-              atfi_days 30 sub /atfi_days exch def
-              /atfi_month atfi_month 1 add def
-            31 atfi_days lt
-            {
-              atfi_days 31 sub /atfi_days exch def
-              /atfi_month atfi_month 1 add def
-            31 atfi_days lt
-            {
-              atfi_days 31 sub /atfi_days exch def
-              /atfi_month atfi_month 1 add def
-            30 atfi_days lt
-            {
-              atfi_days 30 sub /atfi_days exch def
-              /atfi_month atfi_month 1 add def
-            31 atfi_days lt
-            {
-              atfi_days 31 sub /atfi_days exch def
-              /atfi_month atfi_month 1 add def
-            30 atfi_days lt
-            {
-              atfi_days 30 sub /atfi_days exch def
-              /atfi_month atfi_month 1 add def
-            31 atfi_days lt
-            {
-              atfi_days 31 sub /atfi_days exch def
-              /atfi_month atfi_month 1 add def
-            } if
-            } if
-            } if
-            } if
-            } if
-            } if
-            } if
-            } if
-            } if
-            } if
-          } { pop } ifelse
-        }{ pop } ifelse
+        /atfi_year 1970 def%
+        {%
+          atfi_year 400 mod 0 eq %
+          atfi_year 100 mod 0 ne %
+          atfi_year 4   mod 0 eq %
+          and or%
+          {366} {365} ifelse %
+          dup atfi_days lt%
+          {%
+            atfi_days exch sub /atfi_days exch def%
+            /atfi_year atfi_year 1 add def%
+          }{%
+            exit%
+          } ifelse%
+        } loop%
+        /atfi_month 1 def%
+        /atfi_days atfi_days 1 add def %
+        31 atfi_days lt%
+        {%
+          atfi_days 31 sub /atfi_days exch def%
+          /atfi_month atfi_month 1 add def %
+          366 eq {29} {28} ifelse dup atfi_days lt%
+          {%
+            atfi_days exch sub /atfi_days exch def%
+            /atfi_month atfi_month 1 add def %
+          31 atfi_days lt%
+          {%
+            atfi_days 31 sub /atfi_days exch def%
+            /atfi_month atfi_month 1 add def %
+          30 atfi_days lt%
+          {%
+            atfi_days 30 sub /atfi_days exch def%
+            /atfi_month atfi_month 1 add def %
+            31 atfi_days lt%
+            {%
+              atfi_days 31 sub /atfi_days exch def%
+              /atfi_month atfi_month 1 add def %
+            30 atfi_days lt%
+            {%
+              atfi_days 30 sub /atfi_days exch def%
+              /atfi_month atfi_month 1 add def %
+            31 atfi_days lt%
+            {%
+              atfi_days 31 sub /atfi_days exch def%
+              /atfi_month atfi_month 1 add def %
+            31 atfi_days lt%
+            {%
+              atfi_days 31 sub /atfi_days exch def%
+              /atfi_month atfi_month 1 add def %
+            30 atfi_days lt%
+            {%
+              atfi_days 30 sub /atfi_days exch def%
+              /atfi_month atfi_month 1 add def %
+            31 atfi_days lt%
+            {%
+              atfi_days 31 sub /atfi_days exch def%
+              /atfi_month atfi_month 1 add def %
+            30 atfi_days lt%
+            {%
+              atfi_days 30 sub /atfi_days exch def%
+              /atfi_month atfi_month 1 add def %
+            31 atfi_days lt%
+            {%
+              atfi_days 31 sub /atfi_days exch def%
+              /atfi_month atfi_month 1 add def%
+            } if%
+            } if%
+            } if%
+            } if%
+            } if%
+            } if%
+            } if%
+            } if%
+            } if%
+            } if%
+          } { pop } ifelse%
+        }{ pop } ifelse %
         % calc time part
-        3600 24 mul mod
-        dup 3600 idiv dup /atfi_hour exch def
-        3600 mul sub
-        dup 60 idiv dup /atfi_min exch def
-        60 mul sub
-        /atfi_sec exch def
-        (D:19700101000000Z)
-        dup 2  atfi_year 4 string cvs putinterval
-        dup 6  atfi_month atfi_two
-        dup 8  atfi_days  atfi_two
-        dup 10 atfi_hour  atfi_two
-        dup 12 atfi_min   atfi_two
-        dup 14 atfi_sec   atfi_two
-      } bind def
+        3600 24 mul mod %
+        dup 3600 idiv dup /atfi_hour exch def %
+        3600 mul sub %
+        dup 60 idiv dup /atfi_min exch def %
+        60 mul sub %
+        /atfi_sec exch def%
+        (D:19700101000000Z)%
+        dup 2  atfi_year 4 string cvs putinterval %
+        dup 6  atfi_month atfi_two %
+        dup 8  atfi_days  atfi_two %
+        dup 10 atfi_hour  atfi_two %
+        dup 12 atfi_min   atfi_two %
+        dup 14 atfi_sec   atfi_two%
+      } bind def %
       %
       % <filename> atfi_calc_checksum -> /CheckSum <checksum>
       % or returns nothing, if MD5Encode is not given
-      false
-      languagelevel 2 ge {
-        (MD5Encode)
-        { pop true or }
-        (MD5Encode) length string
-        /Filter
-        resourceforall
-      } if
-      {
-        /atfi_calc_checksum {
-          /atfi_checksum 16 string def
-          /atfi_file exch (r) file def
-          /atfi_md5sum atfi_checksum /MD5Encode filter def
+      false %
+      languagelevel 2 ge {%
+        (MD5Encode)%
+        { pop true or }%
+        (MD5Encode) length string%
+        /Filter %
+        resourceforall%
+      } if%
+      {%
+        /atfi_calc_checksum {%
+          /atfi_checksum 16 string def%
+          /atfi_file exch (r) file def%
+          /atfi_md5sum atfi_checksum /MD5Encode filter def %
           % not too efficient to read and write byte by byte,
           % using a buffer is probably faster
-          atfi_size {
-            atfi_file read
-            {
-              atfi_md5sum exch write
-            } if
-          } repeat
-          atfi_md5sum closefile
-          atfi_file closefile
-          /CheckSum atfi_checksum
-        } bind def
-      }{
-        /atfi_calc_checksum { pop } bind def
-      } ifelse
+          atfi_size {%
+            atfi_file read%
+            {%
+              atfi_md5sum exch write%
+            } if%
+          } repeat %
+          atfi_md5sum closefile %
+          atfi_file closefile%
+          /CheckSum atfi_checksum%
+        } bind def%
+      }{%
+        /atfi_calc_checksum { pop } bind def%
+      } ifelse%
       %
-      /atfi_pttobp { 72.27 div 72 mul } bind def
-      /atfi_pdftodvipsx { 72.27 div Resolution mul } bind def
-      /atfi_pdftodvipsy { 72.27 div VResolution mul } bind def
+      /atfi_pttobp { 72.27 div 72 mul } bind def%
+      /atfi_pdftodvipsx { 72.27 div Resolution mul } bind def%
+      /atfi_pdftodvipsy { 72.27 div VResolution mul } bind def%
       %
-    } atfi_?pdfmark
-  end
+    } atfi_?pdfmark %
+  end%
 }
 
 \def\atfi@GSAVE{gsave }
@@ -1453,10 +1453,10 @@ and the derived files
 \def\atfi@RECTSTROKEFILL#1#2#3{%
   #3%
   #1%
-  gsave atfi_rectfill grestore
+  gsave atfi_rectfill grestore %
   #2%
   #3%
-  atfi_rectstroke
+  atfi_rectstroke %
   #1%
 }
 \def\atfi@SETMITERLIMIT{setmiterlimit }
@@ -1499,14 +1499,14 @@ and the derived files
         \x
       }%
       \atfi@literal{%
-        /atfi_filename (\atfi@psfilename) def
-        atfi_filename status
-        {
+        /atfi_filename(\atfi@psfilename)def %
+        atfi_filename status%
+        {%
           % ok: file found
           % save parameters of status command
-          /atfi_created exch def
-          /atfi_referenced exch def
-          /atfi_size exch def
+          /atfi_created exch def%
+          /atfi_referenced exch def%
+          /atfi_size exch def %
           pop % drop parameter "pages" (storage space), never needed
           % ghostscript:
           %   created:       stat.st_ctime
@@ -1523,63 +1523,63 @@ and the derived files
           % TODO: how are these values interpreted by other distiller
           %       programs?
           %
-          [
+          [%
             /_objdef \theatfi@obj
-            /type /stream
-          /OBJ pdfmark
-          [
+            /type/stream%
+          /OBJ pdfmark%
+          [%
             \theatfi@obj
-            <<
-              /Type /EmbeddedFile
+            <<%
+              /Type/EmbeddedFile%
               \atfi@mimetype
-              /Params
-              <<
+              /Params%
+              <<%
                 \atfi@params
                 %
-                /Size atfi_size
+                /Size atfi_size%
                 %
-                /product where
-                {
-                  pop
+                /product where%
+                {%
+                  pop %
                   % check for ghostscript
-                  product (Ghostscript) search
-                  {
-                    pop pop pop
+                  product (Ghostscript) search%
+                  {%
+                    pop pop pop %
                     % ghostscript is running
                     %
                     \ifatfi@creationdate
                     \else
                       false % TODO: test for windows
-                      {
-                        /CreationDate atfi_created atfi_convert_date
-                      } if
+                      {%
+                        /CreationDate atfi_created atfi_convert_date%
+                      } if%
                     \fi
                     \ifatfi@moddate
                     \else
-                      /ModDate atfi_referenced atfi_convert_date
+                      /ModDate atfi_referenced atfi_convert_date%
                     \fi
-                  } if
+                  } if%
                   %
                   % look for MD5Encode filter and calculate CheckSum
-                } if
+                } if %
                 \ifatfi@checksum
                 \else
-                  atfi_filename atfi_calc_checksum
+                  atfi_filename atfi_calc_checksum%
                 \fi
-              >>
-            >>
-          /PUT pdfmark
-          [
+              >>%
+            >>%
+          /PUT pdfmark%
+          [%
             \theatfi@obj
-            atfi_filename (r) file
-          /PUT pdfmark
-          [
+            atfi_filename (r) file%
+          /PUT pdfmark%
+          [%
             \theatfi@obj
-          /CLOSE pdfmark
-        }{
+          /CLOSE pdfmark%
+        }{%
           % error: file not found
           % currently nothing is done
-        } ifelse
+        } ifelse%
       }%
     \endgroup
   }{%
@@ -1595,19 +1595,19 @@ and the derived files
   \stepcounter{atfi@obj}%
   \edef\atfi@appearanceobj{\theatfi@obj}%
   \atfi@literal{%
-    [
+    [%
       /_objdef \atfi@appearanceobj
-      /BBox [
-        0
-        0
-        \strip@pt\wd\atfi@appearancebox\space atfi_pttobp
+      /BBox[%
+        0 %
+        0 %
+        \strip@pt\wd\atfi@appearancebox\space atfi_pttobp %
         \strip@pt\dimexpr\dp\atfi@appearancebox
-            +\ht\atfi@appearancebox\relax\space atfi_pttobp
-      ]
-    /BP pdfmark
+            +\ht\atfi@appearancebox\relax\space atfi_pttobp%
+      ]%
+    /BP pdfmark %
     \csname atfi@acro\atfi@icon@icon @data\endcsname
-    [
-    /EP pdfmark
+    [%
+    /EP pdfmark%
   }%
 }
 % output: \atfi@appearanceobj
@@ -1618,27 +1618,27 @@ and the derived files
   \begingroup
     \setbox0=\hbox{%
       \atfi@literal{%
-        [
+        [%
           /_objdef \atfi@appearanceobj
-          /BBox [
-            currentpoint
-              \strip@pt\dp\atfi@appearancebox\space sub
-            currentpoint
-              exch \strip@pt\wd\atfi@appearancebox\space add
-              exch \strip@pt\ht\atfi@appearancebox\space add
-          ]
-        /BP pdfmark
-        gsave
-        currentpoint
-        2 copy translate
-        72.27 Resolution div 72.27 VResolution div neg scale
-        exch neg exch neg translate
+          /BBox[%
+            currentpoint %
+              \strip@pt\dp\atfi@appearancebox\space sub %
+            currentpoint %
+              exch \strip@pt\wd\atfi@appearancebox\space add %
+              exch \strip@pt\ht\atfi@appearancebox\space add%
+          ]%
+        /BP pdfmark %
+        gsave %
+        currentpoint %
+        2 copy translate %
+        72.27 Resolution div 72.27 VResolution div neg scale %
+        exch neg exch neg translate%
       }%
       \usebox{\atfi@appearancebox}%
       \atfi@literal{%
-        grestore
-        [
-        /EP pdfmark
+        grestore%
+        [%
+        /EP pdfmark%
       }%
     }%
     % do not allocate any space for xobject definition
@@ -1652,11 +1652,11 @@ and the derived files
 \def\atfi@refxform#1{%
   \raisebox{-\atfi@appearancedepth}{%
     \atfi@literal{%
-      gsave
-        currentpoint translate
-        Resolution 72 div VResolution neg 72 div scale
-        [ #1 /SP pdfmark
-      grestore
+      gsave %
+        currentpoint translate %
+        Resolution 72 div VResolution neg 72 div scale%
+        [#1 /SP pdfmark %
+      grestore%
     }%
     \makebox[\atfi@appearancewidth]{}%
   }%
@@ -1683,25 +1683,25 @@ and the derived files
     \expandafter\xdef\csname atfi@fsobj@#1\endcsname{\theatfi@obj}%
     \atfi@pdfstringdef\atfi@file{#1}%
     \atfi@literal{%
-      [
+      [%
         /_objdef \theatfi@obj
-        /type /dict
-      /OBJ pdfmark
-      [
+        /type/dict%
+      /OBJ pdfmark%
+      [%
         \theatfi@obj
-        <<
-          /Type /Filespec
-          /F (\atfi@file)
-          /EF <<
+        <<%
+          /Type/Filespec%
+          /F(\atfi@file)%
+          /EF<<%
             /F \csname atfi@fileobj@#1\endcsname
-          >>
-        >>
-      /PUT pdfmark
+          >>%
+        >>%
+      /PUT pdfmark%
     }%
   }{%
   }%
   \atfi@literal{%
-    [
+    [%
       /Subtype/FileAttachment%
       \atfi@icon
       \atfi@color
@@ -1713,17 +1713,17 @@ and the derived files
       \atfi@appearance@dict
       /F \theatfi@flags
       /FS \csname atfi@fsobj@#1\endcsname
-      /Rect [
-        currentpoint
+      /Rect[%
+        currentpoint %
           \strip@pt\dimexpr\atfi@scale\atfi@appearancedepth\relax
-            \space atfi_pdftodvipsy add
-        currentpoint
+            \space atfi_pdftodvipsy add %
+        currentpoint %
           exch \strip@pt\dimexpr\atfi@scale\atfi@appearancewidth\relax
-            \space atfi_pdftodvipsx add
+            \space atfi_pdftodvipsx add %
           exch \strip@pt\dimexpr\atfi@scale\atfi@appearanceheight\relax
-            \space atfi_pdftodvipsy sub
-      ]
-    /ANN pdfmark
+            \space atfi_pdftodvipsy sub %
+      ]%
+    /ANN pdfmark%
   }%
   \rule{0pt}{\atfi@appearanceheight}%
   \rule[-\atfi@appearancedepth]{0pt}{\atfi@appearancedepth}%
@@ -1768,8 +1768,8 @@ $^W=1; # turn warning on
 #
 my $file        = "pdfatfi.pl";
 my $program     = uc($&) if $file =~ /^\w+/;
-my $version     = "2.2";
-my $date        = "2006/08/16";
+my $version     = "2.3";
+my $date        = "2007/04/11";
 my $author      = "Heiko Oberdiek";
 my $copyright   = "Copyright (c) 2005, 2006 by $author.";
 #
@@ -1931,7 +1931,9 @@ __END__
 %
 % \section{Installation}
 %
-% \paragraph{CTAN.} This package is available on
+% \subsection{Download}
+%
+% \paragraph{Package.} This package is available on
 % CTAN\footnote{\url{ftp://ftp.ctan.org/tex-archive/}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/attachfile2.dtx}] The source file.
@@ -1939,6 +1941,38 @@ __END__
 % \item[\CTAN{macros/latex/contrib/oberdiek/pdfatfi.pl}] Script.
 % \end{description}
 %
+%
+% \paragraph{Bundle.} All the packages of the bundle `oberdiek'
+% are also available in a TDS compliant ZIP archive. There
+% the packages are already unpacked and the documentation files
+% are generated. The files and directories obey the TDS standard.
+% \begin{description}
+% \item[\CTAN{macros/latex/contrib/oberdiek/oberdiek-tds.zip}]
+% \end{description}
+%
+% \subsection{Bundle installation}
+%
+% \paragraph{Unpacking.} Unpack the \xfile{oberdiek-tds.zip} in the
+% TDS tree (also known as \xfile{texmf} tree) of your choice.
+% Example (linux):
+% \begin{quote}
+%   |unzip oberdiek-tds.zip -d ~/texmf|
+% \end{quote}
+%
+% \paragraph{Script installation.}
+% Check the directory \xfile{TDS:scripts/oberdiek/} for
+% scripts that need further installation steps.
+% Package \xpackage{attachfile2} comes with the Perl script
+% \xfile{pdfatfi.pl} that should be installed in such a way
+% that it can be called as \texttt{pdfatfi}.
+% Example (linux):
+% \begin{quote}
+%   |chmod +x scripts/oberdiek/pdfatfi.pl|\\
+%   |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
+% \end{quote}
+%
+% \subsection{Package installation}
+%
 % \paragraph{Unpacking.} The \xfile{.dtx} file is a self-extracting
 % \docstrip\ archive. The files are extracted by running the
 % \xfile{.dtx} through \plainTeX:
@@ -1972,12 +2006,14 @@ __END__
 % TDS installing feature, then some files can already be in the right
 % place, see the documentation of \docstrip.
 %
-% \paragraph{Refresh file databases.} If your \TeX~distribution
-% (\teTeX, \mikTeX, \dots) rely on file databases, you must refresh
+% \subsection{Refresh file name databases}
+%
+% If your \TeX~distribution
+% (\teTeX, \mikTeX, \dots) relies on file name databases, you must refresh
 % these. For example, \teTeX\ users run \verb|texhash| or
 % \verb|mktexlsr|.
 %
-% \paragraph{Script install.}
+% \subsection{Script installation}
 %    This package comes with a Perl script \xfile{pdfatfi.pl}.
 %    Install it somewhere so that it is executed, when it is called
 %    as \verb|pdfatfi| on the command line. Example for
@@ -2100,6 +2136,10 @@ __END__
 %   \item
 %     A little documentation.
 %   \end{Version}
+%   \begin{Version}{2007/04/11 v2.3}
+%   \item
+%     Line ends sanitized.
+%   \end{Version}
 % \end{History}
 %
 % \PrintIndex
diff --git a/Master/texmf-dist/source/latex/oberdiek/auxhook.dtx b/Master/texmf-dist/source/latex/oberdiek/auxhook.dtx
index bfb040d2c56..41d58d7698f 100644
--- a/Master/texmf-dist/source/latex/oberdiek/auxhook.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/auxhook.dtx
@@ -1,6 +1,6 @@
 % \iffalse meta-comment
 %
-% Copyright (C) 2006 by Heiko Oberdiek <oberdiek@uni-freiburg.de>
+% Copyright (C) 2006, 2007 by Heiko Oberdiek <oberdiek@uni-freiburg.de>
 %
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either
@@ -55,7 +55,7 @@
 %
 %<*ignore>
 \begingroup
-  \def\x{LaTeX2e}
+  \def\x{LaTeX2e}%
 \expandafter\endgroup
 \ifcase 0\ifx\install y1\fi\expandafter
          \ifx\csname processbatchFile\endcsname\relax\else1\fi
@@ -66,7 +66,7 @@
 \input docstrip.tex
 \Msg{************************************************************************}
 \Msg{* Installation}
-\Msg{* Package: auxhook 2006/05/31 v1.0 Hooks for auxiliary files (HO)}
+\Msg{* Package: auxhook 2006/04/06 v1.1 Hooks for auxiliary files (HO)}
 \Msg{************************************************************************}
 
 \keepsilent
@@ -76,7 +76,7 @@
 
 This is a generated file.
 
-Copyright (C) 2006 by Heiko Oberdiek <oberdiek@uni-freiburg.de>
+Copyright (C) 2006, 2007 by Heiko Oberdiek <oberdiek@uni-freiburg.de>
 
 This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either
@@ -126,16 +126,16 @@ and the derived files
 %<*driver>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{auxhook.drv}%
-  [2006/05/31 v1.0 Hooks for auxiliary files (HO)]
+  [2006/04/06 v1.1 Hooks for auxiliary files (HO)]%
 \documentclass{ltxdoc}
 \usepackage{holtxdoc}
 \begin{document}
-  \DocInput{auxhook.dtx}
+  \DocInput{auxhook.dtx}%
 \end{document}
 %</driver>
 % \fi
 %
-% \CheckSum{126}
+% \CheckSum{143}
 %
 % \CharacterTable
 %  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -156,7 +156,7 @@ and the derived files
 % \GetFileInfo{auxhook.drv}
 %
 % \title{The \xpackage{auxhook} package}
-% \date{2006/05/31 v1.0}
+% \date{2006/04/06 v1.1}
 % \author{Heiko Oberdiek\\\xemail{oberdiek@uni-freiburg.de}}
 %
 % \maketitle
@@ -237,7 +237,7 @@ and the derived files
 %<*package>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{auxhook}%
-  [2006/05/31 v1.0 Hooks for auxiliary files (HO)]
+  [2006/04/06 v1.1 Hooks for auxiliary files (HO)]%
 %    \end{macrocode}
 %
 % \subsection{Hook setup}
@@ -290,22 +290,28 @@ and the derived files
 %
 %    \begin{macrocode}
 \begingroup
-  \def\y#1\immediate\write\@mainaux#2#3\auxhook@nil{%
+  \@ifundefined{beamer@origdocument}{%
+    \def\auxhook@document{\document}%
+  }{%
+    \def\auxhook@document{\beamer@origdocument}%
+  }%
+  \long\def\y#1\immediate\write\@mainaux#2#3\auxhook@nil{%
     \toks@{%
       #1\immediate\write\@mainaux{#2}%
       \@beginmainauxhook
       #3%
     }%
-    \xdef\document{\the\toks@}%
+    \expandafter\xdef\auxhook@document{\the\toks@}%
     \endgroup
   }%
-  \def\x#1\immediate\write\@mainaux#2#3\auxhook@nil{%
+  \long\def\x#1\immediate\write\@mainaux#2#3\auxhook@nil{%
     \toks@{#3}%
     \edef\x{\the\toks@}%
     \ifx\x\@empty
       \PackageWarningNoLine{auxhook}{%
-        Cannot patch \string\document,\MessageBreak
-        use \string\AtBeginDocument\space instead%
+        Cannot patch \expandafter\string\auxhook@document,%
+        \MessageBreak
+        using \string\AtBeginDocument\space instead%
       }%
       \endgroup
       \AtBeginDocument{%
@@ -314,17 +320,19 @@ and the derived files
         \fi
       }%
     \else
-      \expandafter\y\document\auxhook@nil
+      \expandafter\expandafter\expandafter\y\auxhook@document
+          \auxhook@nil
     \fi
   }%
-\expandafter\x\document\immediate\write\@mainaux{}\auxhook@nil
+\expandafter\expandafter\expandafter\x\auxhook@document
+    \immediate\write\@mainaux{}\auxhook@nil
 %    \end{macrocode}
 %
 % \subsubsection{\cs{@include}}
 %
 %    \begin{macrocode}
 \begingroup
-  \def\y#1\immediate\write\@partaux#2#3\auxhook@nil{%
+  \long\def\y#1\immediate\write\@partaux#2#3\auxhook@nil{%
     \endgroup
     \def\@include##1 {%
       #1\immediate\write\@partaux{#2}%
@@ -332,7 +340,7 @@ and the derived files
       #3%
     }%
   }%
-  \def\x#1\immediate\write\@partaux#2#3\auxhook@nil{%
+  \long\def\x#1\immediate\write\@partaux#2#3\auxhook@nil{%
     \toks@{#3}%
     \edef\x{\the\toks@}%
     \ifx\x\@empty
@@ -353,13 +361,47 @@ and the derived files
 %    \end{macrocode}
 % \section{Installation}
 %
-% \paragraph{CTAN.} This package is available on
+% \subsection{Download}
+%
+% \paragraph{Package.} This package is available on
 % CTAN\footnote{\url{ftp://ftp.ctan.org/tex-archive/}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/auxhook.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/auxhook.pdf}] Documentation.
 % \end{description}
 %
+%
+% \paragraph{Bundle.} All the packages of the bundle `oberdiek'
+% are also available in a TDS compliant ZIP archive. There
+% the packages are already unpacked and the documentation files
+% are generated. The files and directories obey the TDS standard.
+% \begin{description}
+% \item[\CTAN{macros/latex/contrib/oberdiek/oberdiek-tds.zip}]
+% \end{description}
+%
+% \subsection{Bundle installation}
+%
+% \paragraph{Unpacking.} Unpack the \xfile{oberdiek-tds.zip} in the
+% TDS tree (also known as \xfile{texmf} tree) of your choice.
+% Example (linux):
+% \begin{quote}
+%   |unzip oberdiek-tds.zip -d ~/texmf|
+% \end{quote}
+%
+% \paragraph{Script installation.}
+% Check the directory \xfile{TDS:scripts/oberdiek/} for
+% scripts that need further installation steps.
+% Package \xpackage{attachfile2} comes with the Perl script
+% \xfile{pdfatfi.pl} that should be installed in such a way
+% that it can be called as \texttt{pdfatfi}.
+% Example (linux):
+% \begin{quote}
+%   |chmod +x scripts/oberdiek/pdfatfi.pl|\\
+%   |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
+% \end{quote}
+%
+% \subsection{Package installation}
+%
 % \paragraph{Unpacking.} The \xfile{.dtx} file is a self-extracting
 % \docstrip\ archive. The files are extracted by running the
 % \xfile{.dtx} through \plainTeX:
@@ -390,8 +432,10 @@ and the derived files
 % TDS installing feature, then some files can already be in the right
 % place, see the documentation of \docstrip.
 %
-% \paragraph{Refresh file databases.} If your \TeX~distribution
-% (\teTeX, \mikTeX, \dots) rely on file databases, you must refresh
+% \subsection{Refresh file name databases}
+%
+% If your \TeX~distribution
+% (\teTeX, \mikTeX, \dots) relies on file name databases, you must refresh
 % these. For example, \teTeX\ users run \verb|texhash| or
 % \verb|mktexlsr|.
 %
@@ -467,6 +511,10 @@ and the derived files
 %   \item
 %     First version.
 %   \end{Version}
+%   \begin{Version}{2007/04/06 v1.1}
+%   \item
+%     Fix for class \xclass{beamer}.
+%   \end{Version}
 % \end{History}
 %
 % \PrintIndex
diff --git a/Master/texmf-dist/source/latex/oberdiek/bmpsize.dtx b/Master/texmf-dist/source/latex/oberdiek/bmpsize.dtx
index 7a6d0d6c575..60251dc0a91 100644
--- a/Master/texmf-dist/source/latex/oberdiek/bmpsize.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/bmpsize.dtx
@@ -62,7 +62,7 @@
 %
 %<*ignore>
 \begingroup
-  \def\x{LaTeX2e}
+  \def\x{LaTeX2e}%
 \expandafter\endgroup
 \ifcase 0\ifx\install y1\fi\expandafter
          \ifx\csname processbatchFile\endcsname\relax\else1\fi
@@ -73,7 +73,7 @@
 \input docstrip.tex
 \Msg{************************************************************************}
 \Msg{* Installation}
-\Msg{* Package: bmpsize 2007/02/18 v1.1 Extract size and resolution data from bitmap files (HO)}
+\Msg{* Package: bmpsize 2007/04/11 v1.2 Extract size and resolution data from bitmap files (HO)}
 \Msg{************************************************************************}
 
 \keepsilent
@@ -142,11 +142,11 @@ and the derived files
 %<*driver>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{bmpsize.drv}%
-  [2007/02/18 v1.1 Extract size and resolution data from bitmap files (HO)]
+  [2007/04/11 v1.2 Extract size and resolution data from bitmap files (HO)]%
 \documentclass{ltxdoc}
 \usepackage{holtxdoc}
 \begin{document}
-  \DocInput{bmpsize.dtx}
+  \DocInput{bmpsize.dtx}%
 \end{document}
 %</driver>
 % \fi
@@ -172,7 +172,7 @@ and the derived files
 % \GetFileInfo{bmpsize.drv}
 %
 % \title{The \xpackage{bmpsize} package}
-% \date{2007/02/18 v1.1}
+% \date{2007/04/11 v1.2}
 % \author{Heiko Oberdiek\\\xemail{oberdiek@uni-freiburg.de}}
 %
 % \maketitle
@@ -368,7 +368,7 @@ and the derived files
 %    \begin{macrocode}
 %<*base>
 \ProvidesPackage{bmpsize-base}%
-  [2007/02/18 v1.1 Basic part of bmpsize (HO)]
+  [2007/04/11 v1.2 Basic part of bmpsize (HO)]%
 %    \end{macrocode}
 %    Modules of package \xpackage{fp} are used for calculations.
 %    \begin{macrocode}
@@ -785,7 +785,7 @@ and the derived files
 % \subsection{Bitmap formats}
 %
 % \subsubsection{png}
-% 
+%
 %<*ignore>
 %\begin{verbatim}
 %begin png
@@ -893,7 +893,7 @@ and the derived files
 %    \end{macro}
 %
 % \subsubsection{jpg}
-% 
+%
 %<*ignore>
 %\begin{verbatim}
 %begin jpg
@@ -912,7 +912,7 @@ and the derived files
 %    stop
 %  fi
 %  % look for JFIF APP0 segment
-%  if numeq $temp 0xE0 % APP0  
+%  if numeq $temp 0xE0 % APP0
 %    num 2       -> $length
 %    if numeq $exifdensity 0
 %      if numge $length 16 % a JFIF segment has 16 bytes at least
@@ -1359,7 +1359,7 @@ and the derived files
 %    \end{macro}
 %
 % \subsubsection{bmp}
-% 
+%
 %<*ignore>
 %\begin{verbatim}
 %begin bmp
@@ -1396,7 +1396,7 @@ and the derived files
 %read 8 38
 %num 4 -> $pixelx
 %num 4 -> $pixely
-%assign {100cm} -> $unit 
+%assign {100cm} -> $unit
 %end
 %\end{verbatim}
 %</ignore>
@@ -1460,7 +1460,7 @@ and the derived files
 %    \end{macro}
 %
 % \subsubsection{gif}
-% 
+%
 %<*ignore>
 %\begin{verbatim}
 %begin gif
@@ -1525,7 +1525,7 @@ and the derived files
 %    \end{macro}
 %
 % \subsubsection{tiff}
-% 
+%
 %<*ignore>
 %\begin{verbatim}
 %begin tiff
@@ -1751,7 +1751,7 @@ and the derived files
 %    \end{macro}
 %
 % \subsubsection{pnm}
-% 
+%
 %<*ignore>
 %\begin{verbatim}
 %begin pnm
@@ -1989,7 +1989,7 @@ and the derived files
 %    \end{macro}
 %
 % \subsubsection{pam}
-% 
+%
 %<*ignore>
 %\begin{verbatim}
 %begin pam
@@ -2358,7 +2358,7 @@ and the derived files
 %    \end{macro}
 %
 % \subsubsection{xpm}
-% 
+%
 %<*ignore>
 %\begin{verbatim}
 %begin xpm
@@ -2656,7 +2656,7 @@ and the derived files
 %    \end{macro}
 %
 % \subsubsection{tga}
-% 
+%
 %<*ignore>
 %\begin{verbatim}
 %begin tga
@@ -2777,7 +2777,7 @@ and the derived files
 %    \end{macro}
 %
 % \subsubsection{pcx}
-% 
+%
 %<*ignore>
 %\begin{verbatim}
 %begin pcx
@@ -2851,7 +2851,7 @@ and the derived files
 %    \end{macro}
 %
 % \subsubsection{msp}
-% 
+%
 %<*ignore>
 %\begin{verbatim}
 %begin msp
@@ -2924,7 +2924,8 @@ and the derived files
 %    \end{macro}
 %
 % \subsubsection{sgi}
-% 
+%
+%<*ignore>
 %\begin{verbatim}
 %begin sgi
 %big-endian
@@ -2940,6 +2941,7 @@ and the derived files
 %ok
 %end
 %\end{verbatim}
+%</ignore>
 %    \begin{macro}{\bmpsize@read@sgi}
 %    \begin{macrocode}
 %<*base>
@@ -2978,7 +2980,7 @@ and the derived files
 %    \begin{macrocode}
 %<*package>
 \ProvidesPackage{bmpsize}%
-  [2007/02/18 v1.1 Extract size and resolution data from bitmap files (HO)]
+  [2007/04/11 v1.2 Extract size and resolution data from bitmap files (HO)]%
 \RequirePackage{ifpdf}
 \ifpdf
   \PackageInfo{bmpsize}{Superseded by pdfTeX in PDF mode}%
@@ -3122,7 +3124,7 @@ and the derived files
             \let\Gin@viewport@code\Gin@viewport
             \@bmpsize@warning{%
               Explicit bounding box replaced by\MessageBreak
-              viewport setting
+              viewport setting%
             }%
           \else
             \@bmpsize@warning{Explicit bounding box is ignored}%
@@ -3173,7 +3175,7 @@ and the derived files
 %    \begin{macrocode}
 %<*dvips>
 \ProvidesFile{bmpsize-dvips.def}%
-  [2007/02/18 v1.1 Graphics bitmap driver for dvips (HO)]
+  [2007/04/11 v1.2 Graphics bitmap driver for dvips (HO)]%
 %    \end{macrocode}
 %    Ensure correct catcodes.
 %    \begin{macrocode}
@@ -3209,15 +3211,15 @@ and the derived files
         \hbox to\z@{%
           \kern\Gin@req@width
           \special{ps:%
-            currentpoint
-            newpath
-            3 index 3 index moveto
-            1 index 3 index lineto
-            2 copy lineto
-            exch pop exch pop
-            lineto
-            closepath
-            clip
+            currentpoint %
+            newpath %
+            3 index 3 index moveto %
+            1 index 3 index lineto %
+            2 copy lineto %
+            exch pop exch pop %
+            lineto %
+            closepath %
+            clip %
           }%
           \hss
         }%
@@ -3296,7 +3298,7 @@ and the derived files
 %    \begin{macrocode}
 %<*dvipdfm>
 \ProvidesFile{bmpsize-dvipdfm.def}%
-  [2007/02/18 v1.1 Graphics bitmap driver for dvipdfm (HO)]
+  [2007/04/11 v1.2 Graphics bitmap driver for dvipdfm (HO)]%
 %    \end{macrocode}
 %    Ensure correct catcodes.
 %    \begin{macrocode}
@@ -3456,7 +3458,7 @@ and the derived files
 %    \begin{macrocode}
 %<*dvipdfmx>
 \ProvidesFile{bmpsize-dvipdfmx.def}%
-  [2007/02/18 v1.1 Graphics bitmap driver for dvipdfmx (HO)]
+  [2007/04/11 v1.2 Graphics bitmap driver for dvipdfmx (HO)]%
 %    \end{macrocode}
 %    Ensure correct catcodes.
 %    \begin{macrocode}
@@ -3603,13 +3605,47 @@ and the derived files
 %
 % \section{Installation}
 %
-% \paragraph{CTAN.} This package is available on
+% \subsection{Download}
+%
+% \paragraph{Package.} This package is available on
 % CTAN\footnote{\url{ftp://ftp.ctan.org/tex-archive/}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/bmpsize.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/bmpsize.pdf}] Documentation.
 % \end{description}
 %
+%
+% \paragraph{Bundle.} All the packages of the bundle `oberdiek'
+% are also available in a TDS compliant ZIP archive. There
+% the packages are already unpacked and the documentation files
+% are generated. The files and directories obey the TDS standard.
+% \begin{description}
+% \item[\CTAN{macros/latex/contrib/oberdiek/oberdiek-tds.zip}]
+% \end{description}
+%
+% \subsection{Bundle installation}
+%
+% \paragraph{Unpacking.} Unpack the \xfile{oberdiek-tds.zip} in the
+% TDS tree (also known as \xfile{texmf} tree) of your choice.
+% Example (linux):
+% \begin{quote}
+%   |unzip oberdiek-tds.zip -d ~/texmf|
+% \end{quote}
+%
+% \paragraph{Script installation.}
+% Check the directory \xfile{TDS:scripts/oberdiek/} for
+% scripts that need further installation steps.
+% Package \xpackage{attachfile2} comes with the Perl script
+% \xfile{pdfatfi.pl} that should be installed in such a way
+% that it can be called as \texttt{pdfatfi}.
+% Example (linux):
+% \begin{quote}
+%   |chmod +x scripts/oberdiek/pdfatfi.pl|\\
+%   |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
+% \end{quote}
+%
+% \subsection{Package installation}
+%
 % \paragraph{Unpacking.} The \xfile{.dtx} file is a self-extracting
 % \docstrip\ archive. The files are extracted by running the
 % \xfile{.dtx} through \plainTeX:
@@ -3645,8 +3681,10 @@ and the derived files
 % TDS installing feature, then some files can already be in the right
 % place, see the documentation of \docstrip.
 %
-% \paragraph{Refresh file databases.} If your \TeX~distribution
-% (\teTeX, \mikTeX, \dots) rely on file databases, you must refresh
+% \subsection{Refresh file name databases}
+%
+% If your \TeX~distribution
+% (\teTeX, \mikTeX, \dots) relies on file name databases, you must refresh
 % these. For example, \teTeX\ users run \verb|texhash| or
 % \verb|mktexlsr|.
 %
@@ -3786,6 +3824,10 @@ and the derived files
 %   \item
 %     1in replaced by 72.27pt, because TeX is inaccurate if 1in is given.
 %   \end{Version}
+%   \begin{Version}{2007/04/11 v1.2}
+%   \item
+%     Line ends sanitized.
+%   \end{Version}
 % \end{History}
 %
 % \PrintIndex
diff --git a/Master/texmf-dist/source/latex/oberdiek/bookmark.dtx b/Master/texmf-dist/source/latex/oberdiek/bookmark.dtx
index 4ce1a3dbe44..1f8ffa13564 100644
--- a/Master/texmf-dist/source/latex/oberdiek/bookmark.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/bookmark.dtx
@@ -65,7 +65,7 @@
 %
 %<*ignore>
 \begingroup
-  \def\x{LaTeX2e}
+  \def\x{LaTeX2e}%
 \expandafter\endgroup
 \ifcase 0\ifx\install y1\fi\expandafter
          \ifx\csname processbatchFile\endcsname\relax\else1\fi
@@ -76,7 +76,7 @@
 \input docstrip.tex
 \Msg{************************************************************************}
 \Msg{* Installation}
-\Msg{* Package: bookmark 2007/03/03 v0.6 PDF bookmarks (HO)}
+\Msg{* Package: bookmark 2007/04/09 v0.8 PDF bookmarks (HO)}
 \Msg{************************************************************************}
 
 \keepsilent
@@ -149,16 +149,16 @@ and the derived files
 %<*driver>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{bookmark.drv}%
-  [2007/03/03 v0.6 PDF bookmarks (HO)]
+  [2007/04/09 v0.8 PDF bookmarks (HO)]%
 \documentclass{ltxdoc}
 \usepackage{holtxdoc}
 \begin{document}
-  \DocInput{bookmark.dtx}
+  \DocInput{bookmark.dtx}%
 \end{document}
 %</driver>
 % \fi
 %
-% \CheckSum{1846}
+% \CheckSum{1950}
 %
 % \CharacterTable
 %  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -179,7 +179,7 @@ and the derived files
 % \GetFileInfo{bookmark.drv}
 %
 % \title{The \xpackage{bookmark} package}
-% \date{2007/03/03 v0.6}
+% \date{2007/04/09 v0.8}
 % \author{Heiko Oberdiek\\\xemail{oberdiek@uni-freiburg.de}}
 %
 % \maketitle
@@ -230,10 +230,11 @@ and the derived files
 % Options can be given at three places:
 % \begin{enumerate}
 % \item \cs{usepackage}|[|\meta{options}|]{bookmark}|\\
-%       This is the only place for driver options.
+%       This is the only place for driver options
+%       and option \xoption{atend}.
 % \item \cs{bookmarksetup}|{|\meta{options}|}|\\
 %       This command is just for setting options.
-% \item \cs{pdfbookmark}|[|\meta{options}|]{|\meta{title}|}|\\
+% \item \cs{bookmark}|[|\meta{options}|]{|\meta{title}|}|\\
 %       This command sets the bookmark. The option settings remain
 %       limited to this bookmark.
 % \end{enumerate}
@@ -243,7 +244,7 @@ and the derived files
 % Supported drivers are \xoption{pdftex}, \xoption{dvips},
 % \xoption{dvipsone}, \xoption{textures},
 % \xoption{dvipdfm} (\xoption{xetex}), and \xoption{vtex}.
-% The \TeX\ engines pdf\TeX, Xe\TeX, and V\TeX\ are automatically detected.
+% The \TeX\ engines \pdfTeX, Xe\TeX, and V\TeX\ are automatically detected.
 % The default for the DVI drivers is \xoption{dvips}. This can
 % be changed in the configuration file \xfile{bookmark.cfg} by
 % \cs{BookmarkDefaultDriver}, e.g.:
@@ -251,6 +252,18 @@ and the derived files
 % |\def\BookmarkDefaultDriver{dvipdfm}|
 % \end{quote}
 %
+% \paragraph{Open bookmarks with dvipdfmx.} Since 2007-03-29 the
+% cvs version of dvipmdfmx contains a patch that extends the
+% \cs{special} for bookmarks in order to specify the open status of
+% an outline entry. Option \xoption{dvipdfmx-outline-open} notifies
+% the package that the dvi driver program understands this kind
+% of \cs{special}. Alternatively \cs{SpecialDvipdfmxOutlineOpen}
+% can be defined as number one in the configuration file or before
+% the package is loaded, e.g.:
+% \begin{quote}
+% |\chardef\SpecialDvipdfmxOutlineOpen=1\relax|
+% \end{quote}
+%
 % \subsubsection{Style options}
 %
 % \paragraph{Font options.}
@@ -263,22 +276,31 @@ and the derived files
 % Both \xoption{bold} and \xoption{italic} can be used together.
 % Using value |false| disables the font option.
 %
-% \paragraph{Color options.}
+% These options are ignored with a warning if \eTeX\ is not
+% detected.
+%
+% \paragraph{Color option.}
 %
 % Colored bookmarks are a feature of PDF 1.4, they are not supported
 % by all PDF viewers.
 % \begin{description}
-% \item[\xoption{rgbcolor}:] This option expects an RGB tripel,
-%   three space separated values in the range 0 until 1.
-%   Example for blue: |rgbcolor=0 0 1|
 % \item[\xoption{color}:] Here the color can be given as
-%   color specification of packages \xpackage{color}/\xpackage{xcolor}.
-%   Package \xpackage{xcolor} must be loaded first, before this option
-%   can be used.
+%   color specification of packages \xpackage{color} or \xpackage{xcolor}.
+%   An empty value means that the color property is not set.
+%   Without package \xpackage{xcolor} the recognized values
+%   are restricted to
+%   \begin{itemize}
+%   \item Empty value, no color is set,\\
+%         example: |color={}|
+%   \item Explicit color specification of color model rgb,\\
+%         example for red: |color=[rgb]{1,0,0}|
+%   \item Explicit color specification of color model gray,\\
+%         example for dark gray: |color=[gray]{0.25}|
+%   \end{itemize}
+%   Note that this restriction also holds if package \xpackage{color}
+%   is loaded. With \xpackage{xcolor}, however, the full range
+%   of color specifications can be used.
 % \end{description}
-% Both options are exclusive. Used together the second option overwrites
-% the previous color option settings. The use of color is disabled by
-% using the empty value, e.g.: |color={}|
 %
 % \subsubsection{Action options}
 %
@@ -403,19 +425,60 @@ and the derived files
 %   \cs{belowpdfbookmark}
 % \end{quote}
 %
+% \subsection{Adding bookmarks at the end}
+%
+% Package option \xoption{atend} enables the following macro:
+% \begin{declcs}{BookmarkAtEnd}
+%   \M{stuff}
+% \end{declcs}
+% Macro \cs{BookmarkAtEnd} puts \meta{stuff} at the end
+% of the document. \meta{stuff} means bookmark commands.
+% Example:
+% \begin{quote}
+%\begin{verbatim}
+%\usepackage[atend]{bookmark}
+%\BookmarkAtEnd{%
+%  \bookmarksetup{startatroot}%
+%  \bookmark[named=LastPage, level=0]{Last page}%
+%}
+%\end{verbatim}
+% \end{quote}
+%
+% \paragraph{Remarks.}
+% \begin{itemize}
+% \item
+%   \cs{BookmarkAtEnd} hides the fact that the method for
+%   adding bookmarks at the end of the document depends
+%   on the driver.
+%
+%   Some drivers
+%   (\xoption{pdftex}, \xoption{dvips}, \xoption{dvipsone},
+%   \xoption{textures})
+%   uses \LaTeX's \cs{AtEndDocument} for this purpose.
+%
+%   However \cs{AtEndDocument} cannot be used in general.
+%   The last page can already be finished if the hook
+%   of \cs{AtEndDocument} is called.
+%   The implementation of the other drivers
+%   (\xoption{dvipdfm}, \xoption{xetex}, \xoption{vtex})
+%   depends on
+%   \cs{special} that does not have an effect after the last
+%   page. In this case \cs{AtEndDvi} of package \xpackage{atenddvi}
+%   helps. It puts its argument on last page of the document.
+%   Two \LaTeX\ runs are necessary at least, because
+%   the last page is detected by a reference.
+% \item
+%   The time of expansion of the argument of \cs{BookmarkAtEnd}
+%   is not specified. This can happen immediately or at the end
+%   of the document.
+% \end{itemize}
+%
 % \subsection{Limitations/ToDos}
 %
 % \begin{itemize}
-% \item Support for missing driver (vtexpdfmark).
 % \item Support for missing actions (Launch, \dots).
 % \item Better design for \xpackage{hyperref}'s option
 %       \xoption{bookmarkstype}.
-% \item Adding bookmarks at the end of the document
-%   is difficult for \xoption{dvipdfm}, because the \cs{special}
-%   must go into a page. The problem can be solved by two runs
-%   using \xpackage{zref-abspage} for detecting the last page and
-%   package \xpackage{everyshi} for adding the \cs{special}s at the
-%   end of the last page.
 % \end{itemize}
 %
 % \section{Example}
@@ -429,30 +492,37 @@ and the derived files
 \usepackage{hyperref}
 \usepackage[
   open,
-  openlevel=2
-]{bookmark}
+  openlevel=2,
+  atend
+]{bookmark}[2007/04/09]
 
 \bookmarksetup{color=blue}
 
+\BookmarkAtEnd{%
+  \bookmarksetup{startatroot}%
+  \bookmark[named=LastPage, level=0]{End/Last page}%
+  \bookmark[named=FirstPage, level=1]{First page}%
+}
+
 \begin{document}
 \section{First section}
 \subsection{Subsection A}
 \begin{figure}
   \hypertarget{fig}{}%
-  \bookmark[
-    rellevel=1,
-    keeplevel,
-    dest=fig
-  ]{A figure}
   A figure.
 \end{figure}
+\bookmark[
+  rellevel=1,
+  keeplevel,
+  dest=fig
+]{A figure}
 \subsection{Subsection B}
 \subsubsection{Subsubsection C}
 \subsection{Umlauts: \"A\"O\"U\"a\"o\"u\ss}
 \newpage
 \bookmarksetup{
   bold,
-  rgbcolor=1 0 0
+  color=[rgb]{1,0,0}
 }
 \section{Very important section}
 \bookmarksetup{
@@ -527,13 +597,41 @@ and the derived files
 %<*package>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{bookmark}%
-  [2007/03/03 v0.6 PDF bookmarks (HO)]
+  [2007/04/09 v0.8 PDF bookmarks (HO)]%
 %    \end{macrocode}
 %
 % \subsubsection{Requirements}
 %
+% \paragraph{\eTeX.}
+%
 %    \begin{macrocode}
-\RequirePackage{pdfescape}%
+\newif\ifBKM@WithFlags
+\begingroup\expandafter\expandafter\expandafter\endgroup
+\expandafter\ifx\csname numexpr\endcsname\relax
+  \def\BKM@CalcExpr#1#2#3#4{%
+    \begingroup
+      \count@=#2\relax
+      \advance\count@ by#3#4\relax
+      \edef\x{\endgroup
+        \def\noexpand#1{\the\count@}%
+      }%
+    \x
+  }%
+  \BKM@WithFlagsfalse
+\else
+  \def\BKM@CalcExpr#1#2#3#4{%
+    \edef#1{%
+      \the\numexpr#2#3#4\relax
+    }%
+  }%
+  \BKM@WithFlagstrue
+\fi
+%    \end{macrocode}
+%
+% \paragraph{Escape features of \pdfTeX.}
+%
+%    \begin{macrocode}
+\RequirePackage{pdfescape}[2007/03/20]
 \def\BKM@EscapeName#1{%
   \ifx#1\@empty
   \else
@@ -565,8 +663,11 @@ and the derived files
 \RequirePackage{ifvtex}
 \RequirePackage{hyperref}
 \RequirePackage{auxhook}
-\RequirePackage{flags}
 \RequirePackage{kvoptions}
+\RequirePackage{hycolor}
+\ifBKM@WithFlags
+  \RequirePackage{flags}%
+\fi
 %    \end{macrocode}
 %
 % \subsubsection{Package options}
@@ -623,7 +724,7 @@ and the derived files
 \DeclareBoolOption{keeplevel}
 \DeclareBoolOption{startatroot}
 \define@key{BKM}{rellevel}{%
-  \edef\BKM@level{\number\numexpr#1+\BKM@currentlevel\relax}%
+  \BKM@CalcExpr\BKM@level{#1}+\BKM@currentlevel
 }
 \def\BKM@currentlevel{0}
 %    \end{macrocode}
@@ -670,48 +771,50 @@ and the derived files
 % \paragraph{Style options.}
 %
 %    \begin{macrocode}
-\resetflags{BKM@style}
-\define@key{BKM}{italic}[true]{%
-  \expandafter\ifx\csname if#1\endcsname\iftrue
-    \setflag{BKM@style}{1}%
-  \else
-    \clearflag{BKM@style}{1}%
-  \fi
-}
-\define@key{BKM}{bold}[true]{%
-  \expandafter\ifx\csname if#1\endcsname\iftrue
-    \setflag{BKM@style}{2}%
-  \else
-    \clearflag{BKM@style}{2}%
-  \fi
+\ifBKM@WithFlags
+  \expandafter\@firstoftwo
+\else
+  \expandafter\@secondoftwo
+\fi
+{%
+  \resetflags{BKM@style}%
+  \define@key{BKM}{italic}[true]{%
+    \expandafter\ifx\csname if#1\endcsname\iftrue
+      \setflag{BKM@style}{1}%
+    \else
+      \clearflag{BKM@style}{1}%
+    \fi
+  }%
+  \define@key{BKM}{bold}[true]{%
+    \expandafter\ifx\csname if#1\endcsname\iftrue
+      \setflag{BKM@style}{2}%
+    \else
+      \clearflag{BKM@style}{2}%
+    \fi
+  }%
+  \def\BKM@PrintStyle{%
+    \printflags{BKM@style}%
+  }%
+}{%
+  \def\BKM@temp#1{%
+    \define@key{BKM}{#1}[true]{%
+      \PackageWarning{bookmark}{%
+        Option `#1' is not available\MessageBreak
+        because of missing e-TeX%
+      }%
+    }%
+  }%
+  \BKM@temp{italic}%
+  \BKM@temp{bold}%
+  \def\BKM@PrintStyle{0}%
 }
 %    \end{macrocode}
 %
 % \paragraph{Options for color.}
 %
 %    \begin{macrocode}
-\define@key{BKM}{rgbcolor}{%
-  \def\BKM@color{#1}%
-}
 \define@key{BKM}{color}{%
-  \ifx\\#1\\%
-    \let\BKM@color\@empty
-  \else
-    \@ifundefined{XC@bordercolor}{%
-      \PackageWarning{bookmark}{%
-          Load package `xcolor' (version >= 2.11) first.\MessageBreak
-          Ignoring color specification%
-      }%
-    }{%
-      \begingroup
-        \csname @safe@activestrue\endcsname
-        \XC@bordercolor{}{#1}%
-      \expandafter\endgroup
-      \expandafter\def\expandafter\BKM@color\expandafter{%
-        \@bordercolor
-      }%
-    }%
-  \fi
+  \HyColor@BookmarkColor{#1}\BKM@color{bookmark}{color}%
 }
 \let\BKM@color\@empty
 %    \end{macrocode}
@@ -906,6 +1009,15 @@ and the derived files
 }
 %    \end{macrocode}
 %
+% \subsubsection{Option \xoption{atend}}
+%
+%    \begin{macrocode}
+\DeclareBoolOption{atend}
+\def\BKM@DisableOptions{%
+  \DisableKeyvalOption{BKM}{atend}%
+}
+%    \end{macrocode}
+%
 % \subsubsection{Driver setup and loading}
 %
 % \paragraph{Driver detection.}
@@ -915,18 +1027,31 @@ and the derived files
   \define@key{BKM}{#1}[]{%
     \def\BKM@driver{#1}%
   }%
-  \g@addto@macro\BKM@DisableDriverOptions{%
+  \g@addto@macro\BKM@DisableOptions{%
     \DisableKeyvalOption{BKM}{#1}%
   }%
 }
-\let\BKM@DisableDriverOptions\@empty
 \BKM@DefineDriverKey{pdftex}
 \BKM@DefineDriverKey{dvips}
 \BKM@DefineDriverKey{dvipsone}
 \BKM@DefineDriverKey{textures}
 \BKM@DefineDriverKey{dvipdfm}
+\BKM@DefineDriverKey{dvipdfmx}
 \BKM@DefineDriverKey{xetex}
 \BKM@DefineDriverKey{vtex}
+\define@key{BKM}{dvipdfmx-outline-open}[true]{%
+  \expandafter\ifx\csname if#1\expandafter\endcsname
+                  \csname iftrue\endcsname
+    \chardef\SpecialDvipdfmxOutlineOpen\@ne
+  \else
+    \chardef\SpecialDvipdfmxOutlineOpen\z@
+  \fi
+}
+\g@addto@macro\BKM@DisableOptions{%
+  \DisableKeyvalOption{BKM}{dvipdfmx-outline-open}%
+}
+%    \end{macrocode}
+%    \begin{macrocode}
 \InputIfFileExists{bookmark.cfg}{}{}
 \providecommand*{\BookmarkDriverDefault}{dvips}
 \ifpdf
@@ -938,7 +1063,7 @@ and the derived files
     \ifvtex
       \def\BKM@driver{vtex}%
     \else
-      \let\BKM@driver\BookmarkDriverDefault
+      \edef\BKM@driver{\BookmarkDriverDefault}%
     \fi
   \fi
 \fi
@@ -948,12 +1073,26 @@ and the derived files
 %
 %    \begin{macrocode}
 \ProcessKeyvalOptions*
-\BKM@DisableDriverOptions
+\BKM@DisableOptions
 %    \end{macrocode}
 %
 % \paragraph{Driver validation and loading.}
 %
 %    \begin{macrocode}
+\newif\ifBKM@DvipdfmxOutlineOpen
+\begingroup\expandafter\expandafter\expandafter\endgroup
+\expandafter\ifx\csname SpecialDvipdfmxOutlineOpen\endcsname\relax
+\else
+  \ifnum\SpecialDvipdfmxOutlineOpen>\z@
+    \BKM@DvipdfmxOutlineOpentrue
+  \fi
+\fi
+%    \end{macrocode}
+%    \begin{macrocode}
+\def\BKM@temp{dvipdfmx}%
+\ifx\BKM@temp\BKM@driver
+  \def\BKM@driver{dvipdfm}%
+\fi
 \def\BKM@temp{pdftex}%
 \ifpdf
   \ifx\BKM@temp\BKM@driver
@@ -1023,9 +1162,8 @@ and the derived files
   \pdfbookmark[\BKM@currentlevel]%
 }
 \renewcommand*{\subpdfbookmark}{%
-  \expandafter\pdfbookmark\expandafter[%
-    \the\numexpr\BKM@currentlevel+1\relax
-  ]%
+  \BKM@CalcExpr\BKM@CalcResult\BKM@currentlevel+1%
+  \expandafter\pdfbookmark\expandafter[\BKM@CalcResult]%
 }
 \renewcommand*{\belowpdfbookmark}[2]{%
   \xdef\BKM@gtemp{\number\BKM@currentlevel}%
@@ -1072,7 +1210,7 @@ and the derived files
 %<*dvipdfm>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{bkm-dvipdfm.def}%
-  [2007/03/03 v0.6 bookmark driver for dvipdfm (HO)]
+  [2007/04/09 v0.8 bookmark driver for dvipdfm (HO)]%
 %    \end{macrocode}
 %
 %    \begin{macrocode}
@@ -1111,7 +1249,7 @@ and the derived files
           \expandafter\expandafter\expandafter\BKM@getx
               \csname BKM@\BKM@prev\endcsname
           \ifnum\BKM@level>\BKM@x@level\relax
-            \edef\BKM@abslevel{\the\numexpr\BKM@x@abslevel+1\relax}%
+            \BKM@CalcExpr\BKM@abslevel\BKM@x@abslevel+1%
             \expandafter\xdef\csname BKM@\the\BKM@id\endcsname{%
               {\BKM@prev}{\BKM@level}\BKM@abslevel
             }%
@@ -1122,7 +1260,7 @@ and the derived files
         \fi
       }%
       \pdfstringdef\BKM@title{#2}%
-      \edef\BKM@FLAGS{\printflags{BKM@style}}%
+      \edef\BKM@FLAGS{\BKM@PrintStyle}%
       \let\BKM@action\@empty
       \ifx\BKM@gotor\@empty
         \ifx\BKM@dest\@empty
@@ -1170,7 +1308,7 @@ and the derived files
           \ifx\BKM@page\@empty
             \def\BKM@page{0}%
           \else
-            \edef\BKM@page{\the\numexpr\BKM@page-1\relax}%
+            \BKM@CalcExpr\BKM@page\BKM@page-1%
           \fi
           \ifx\BKM@view\@empty
             \def\BKM@view{Fit}%
@@ -1190,7 +1328,14 @@ and the derived files
         }%
       \fi
       \special{pdf:%
-        out \BKM@abslevel
+        out \ifBKM@DvipdfmxOutlineOpen
+              \ifBKM@open
+                \ifnum\BKM@level<\BKM@openlevel
+                  -%
+                \fi
+              \fi
+            \fi
+            \BKM@abslevel
         <<%
           /Title(\BKM@title)%
           \ifx\BKM@color\@empty
@@ -1225,7 +1370,7 @@ and the derived files
 %<*vtex>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{bkm-vtex.def}%
-  [2007/03/03 v0.6 bookmark driver for VTeX (HO)]
+  [2007/04/09 v0.8 bookmark driver for VTeX (HO)]%
 %    \end{macrocode}
 %
 %    \begin{macrocode}
@@ -1285,7 +1430,7 @@ and the derived files
       }%
       \pdfstringdef\BKM@title{#2}%
       \BKM@vtex@title
-      \edef\BKM@FLAGS{\printflags{BKM@style}}%
+      \edef\BKM@FLAGS{\BKM@PrintStyle}%
       \let\BKM@action\@empty
       \ifx\BKM@gotor\@empty
         \ifx\BKM@dest\@empty
@@ -1510,7 +1655,7 @@ and the derived files
 %<*pdftex>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{bkm-pdftex.def}%
-  [2007/03/03 v0.6 bookmark driver for pdftex (HO)]
+  [2007/04/09 v0.8 bookmark driver for pdfTeX (HO)]%
 %    \end{macrocode}
 %
 %    \begin{macrocode}
@@ -1580,7 +1725,7 @@ and the derived files
         \ifx\BKM@DO@page\@empty
           \def\BKM@DO@page{0}%
         \else
-          \edef\BKM@DO@page{\the\numexpr\BKM@DO@page-1\relax}%
+          \BKM@CalcExpr\BKM@DO@page\BKM@DO@page-1%
         \fi
         \ifx\BKM@DO@view\@empty
           \def\BKM@DO@view{Fit}%
@@ -1622,7 +1767,7 @@ and the derived files
 %<*dvips>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{bkm-dvips.def}%
-  [2007/03/03 v0.6 bookmark driver for dvips (HO)]
+  [2007/04/09 v0.8 bookmark driver for dvips (HO)]%
 %    \end{macrocode}
 %    \begin{macrocode}
 \def\BKM@PSHeaderFile#1{%
@@ -1637,7 +1782,7 @@ and the derived files
 %<*dvipsone>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{bkm-dvipsone.def}%
-  [2007/03/03 v0.6 bookmark driver for dvipsone (HO)]
+  [2007/04/09 v0.8 bookmark driver for dvipsone (HO)]%
 %    \end{macrocode}
 %    \begin{macrocode}
 \def\BKM@PSHeaderFile#1{%
@@ -1652,7 +1797,7 @@ and the derived files
 %<*textures>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{bkm-textures.def}%
-  [2007/03/03 v0.6 bookmark driver for textures (HO)]
+  [2007/04/09 v0.8 bookmark driver for textures (HO)]%
 %    \end{macrocode}
 %    \begin{macrocode}
 \def\BKM@PSHeaderFile#1{%
@@ -1685,7 +1830,7 @@ and the derived files
       /pdfmark/cleartomark load put%
     }%
   }%
-  \BKM@write{ifelse}
+  \BKM@write{ifelse}%
 }
 \def\BKM@write#{%
   \immediate\write\BKM@file
@@ -1871,10 +2016,9 @@ and the derived files
               {\BKM@prev}{\BKM@level}0%
             }%
             \ifnum\BKM@prev>\z@
+              \BKM@CalcExpr\BKM@CalcResult\BKM@x@childs+1%
               \expandafter\xdef\csname BKM@\BKM@prev\endcsname{%
-                {\BKM@x@parent}{\BKM@x@level}{%
-                  \the\numexpr\BKM@x@childs+1\relax
-                }%
+                {\BKM@x@parent}{\BKM@x@level}{\BKM@CalcResult}%
               }%
             \fi
             \BKM@swfalse
@@ -1884,7 +2028,7 @@ and the derived files
         \fi
       }%
       \pdfstringdef\BKM@title{#2}%
-      \edef\BKM@FLAGS{\printflags{BKM@style}}%
+      \edef\BKM@FLAGS{\BKM@PrintStyle}%
       \BKM@EscapeHex\BKM@dest
       \BKM@EscapeHex\BKM@uri
       \BKM@EscapeHex\BKM@gotor
@@ -1958,16 +2102,134 @@ and the derived files
 %</pdftex|pdfmark>
 %    \end{macrocode}
 %
+% \subsection{Option \xoption{atend}}
 %
+% \subsubsection{Hook}
+%
+%    \begin{macrocode}
+%<*package>
+%    \end{macrocode}
+%    \begin{macrocode}
+\ifBKM@atend
+\else
+%    \end{macrocode}
+%    \begin{macro}{\BookmarkAtEnd}
+%    This is a dummy definition that generates a warning
+%    if option \xoption{atend} has not been given.
+%    \begin{macrocode}
+  \newcommand{\BookmarkAtEnd}[1]{%
+    \PackageWarning{bookmark}{%
+      Ignored, because option `atend' is missing%
+    }%
+  }%
+%    \end{macrocode}
+%    \end{macro}
+%    \begin{macrocode}
+  \expandafter\endinput
+\fi
+%    \end{macrocode}
+%    \begin{macro}{\BookmarkAtEnd}
+%    \begin{macrocode}
+\newcommand*{\BookmarkAtEnd}{%
+  \g@addto@macro\BKM@EndHook
+}
+%    \end{macrocode}
+%    \end{macro}
+%    \begin{macrocode}
+\let\BKM@EndHook\@empty
+%    \end{macrocode}
+%    \begin{macrocode}
+%</package>
+%    \end{macrocode}
+%
+% \subsubsection{Drivers using \cs{AtEndDocument}}
+%
+%    \cs{AtEndDocument} can be used, if the implementation
+%    of \cs{bookmark} does not depend on \cs{special}:
+%    \begin{itemize}
+%    \item
+%      Driver \xoption{pdftex} uses \cs{pdfoutline} that can
+%      be used after the last page.
+%    \item
+%      PostScript drivers such as
+%      \xoption{dvips} use an external PostScript header file
+%      for the bookmarks. File writing can be done after
+%      the last shipout page, thus \cs{AtEndDocument} works.
+%    \end{itemize}
+%    \begin{macrocode}
+%<*pdftex|pdfmark>
+\ifBKM@atend
+  \AtBeginDocument{%
+    \AtEndDocument{%
+      \clearpage
+      \BKM@EndHook
+    }%
+  }%
+\fi
+%</pdftex|pdfmark>
+%    \end{macrocode}
+%
+% \subsubsection{Drivers using \cs{AtEndDvi}}
+%
+%    The other drivers implement \cs{bookmark} using \cs{special}
+%    commands. Thus the last bookmarks must be put on the last page,
+%    not afterwards.
+%    \cs{AtEndDocument} cannot be used, because it is too late, the
+%    last page can already be output. Therefore we use package
+%    \xpackage{atenddvi} that uses the help of packages \xpackage{everyshi}
+%    and \xpackage{zref}. The argument of \cs{AtEndDvi} is put
+%    at the end of the last page. At least two \LaTeX\ runs are necessary.
+%    \begin{macrocode}
+%<*dvipdfm|vtex>
+\ifBKM@atend
+  \RequirePackage{atenddvi}%
+  \AtEndDvi{\BKM@EndHook}%
+\fi
+%</dvipdfm|vtex>
+%    \end{macrocode}
 % \section{Installation}
 %
-% \paragraph{CTAN.} This package is available on
+% \subsection{Download}
+%
+% \paragraph{Package.} This package is available on
 % CTAN\footnote{\url{ftp://ftp.ctan.org/tex-archive/}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/bookmark.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/bookmark.pdf}] Documentation.
 % \end{description}
 %
+%
+% \paragraph{Bundle.} All the packages of the bundle `oberdiek'
+% are also available in a TDS compliant ZIP archive. There
+% the packages are already unpacked and the documentation files
+% are generated. The files and directories obey the TDS standard.
+% \begin{description}
+% \item[\CTAN{macros/latex/contrib/oberdiek/oberdiek-tds.zip}]
+% \end{description}
+%
+% \subsection{Bundle installation}
+%
+% \paragraph{Unpacking.} Unpack the \xfile{oberdiek-tds.zip} in the
+% TDS tree (also known as \xfile{texmf} tree) of your choice.
+% Example (linux):
+% \begin{quote}
+%   |unzip oberdiek-tds.zip -d ~/texmf|
+% \end{quote}
+%
+% \paragraph{Script installation.}
+% Check the directory \xfile{TDS:scripts/oberdiek/} for
+% scripts that need further installation steps.
+% Package \xpackage{attachfile2} comes with the Perl script
+% \xfile{pdfatfi.pl} that should be installed in such a way
+% that it can be called as \texttt{pdfatfi}.
+% Example (linux):
+% \begin{quote}
+%   |chmod +x scripts/oberdiek/pdfatfi.pl|\\
+%   |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
+% \end{quote}
+%
+% \subsection{Package installation}
+%
 % \paragraph{Unpacking.} The \xfile{.dtx} file is a self-extracting
 % \docstrip\ archive. The files are extracted by running the
 % \xfile{.dtx} through \plainTeX:
@@ -2005,8 +2267,10 @@ and the derived files
 % TDS installing feature, then some files can already be in the right
 % place, see the documentation of \docstrip.
 %
-% \paragraph{Refresh file databases.} If your \TeX~distribution
-% (\teTeX, \mikTeX, \dots) rely on file databases, you must refresh
+% \subsection{Refresh file name databases}
+%
+% If your \TeX~distribution
+% (\teTeX, \mikTeX, \dots) relies on file name databases, you must refresh
 % these. For example, \teTeX\ users run \verb|texhash| or
 % \verb|mktexlsr|.
 %
@@ -2083,10 +2347,11 @@ and the derived files
 %     Driver options \xoption{vtex} (PDF mode), \xoption{dvipsone},
 %     and \xoption{textures} added.
 %   \item
-%     Option \xoption{depth} also accepts division name like \xpackage{hyperref}'s
+%     Implementation of option \xoption{depth} completed. Division names
+%     are supported, see \xpackage{hyperref}'s
 %     option \xoption{bookmarksdepth}.
 %   \item
-%     \xpackage{hyperref}'s \xoption{bookmarksopen},
+%     \xpackage{hyperref}'s options \xoption{bookmarksopen},
 %     \xoption{bookmarksopenlevel}, and \xoption{bookmarksdepth} respected.
 %   \end{Version}
 %   \begin{Version}{2007/03/03 v0.6}
@@ -2094,6 +2359,23 @@ and the derived files
 %     Option \xoption{numbered} as alias for \xpackage{hyperref}'s
 %     \xoption{bookmarksnumbered}.
 %   \end{Version}
+%   \begin{Version}{2007/03/07 v0.7}
+%   \item
+%     Dependency from \eTeX\ removed.
+%   \end{Version}
+%   \begin{Version}{2007/04/09 v0.8}
+%   \item
+%     Option \xoption{atend} added.
+%   \item
+%     Option \xoption{rgbcolor} removed.
+%     \verb|rgbcolor=<r> <g> <b>| can be replaced by
+%     \verb|color=[rgb]{<r>,<g>,<b>}|.
+%   \item
+%     Support of recent cvs version (2007-03-29) of dvipdfmx
+%     that extends the \cs{special} for bookmarks to specify
+%     open outline entries. Option \xoption{dvipdfmx-outline-open}
+%     or \cs{SpecialDvipdfmxOutlineOpen} notify the package.
+%   \end{Version}
 % \end{History}
 %
 % \PrintIndex
diff --git a/Master/texmf-dist/source/latex/oberdiek/centernot.dtx b/Master/texmf-dist/source/latex/oberdiek/centernot.dtx
index 7142c164f55..f9ca5ccec58 100644
--- a/Master/texmf-dist/source/latex/oberdiek/centernot.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/centernot.dtx
@@ -55,7 +55,7 @@
 %
 %<*ignore>
 \begingroup
-  \def\x{LaTeX2e}
+  \def\x{LaTeX2e}%
 \expandafter\endgroup
 \ifcase 0\ifx\install y1\fi\expandafter
          \ifx\csname processbatchFile\endcsname\relax\else1\fi
@@ -126,12 +126,12 @@ and the derived files
 %<*driver>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{centernot.drv}%
-  [2006/12/02 v1.0 Centers the not symbol horizontally (HO)]
+  [2006/12/02 v1.0 Centers the not symbol horizontally (HO)]%
 \documentclass{ltxdoc}
 \usepackage{holtxdoc}
 \usepackage{centernot}
 \begin{document}
-  \DocInput{centernot.dtx}
+  \DocInput{centernot.dtx}%
 \end{document}
 %</driver>
 % \fi
@@ -200,7 +200,7 @@ and the derived files
 %<*package>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{centernot}
-  [2006/12/02 v1.0 Centers the not symbol horizontally (HO)]
+  [2006/12/02 v1.0 Centers the not symbol horizontally (HO)]%
 %    \end{macrocode}
 %
 %    \noindent
@@ -259,13 +259,47 @@ and the derived files
 %    \end{macrocode}
 % \section{Installation}
 %
-% \paragraph{CTAN.} This package is available on
+% \subsection{Download}
+%
+% \paragraph{Package.} This package is available on
 % CTAN\footnote{\url{ftp://ftp.ctan.org/tex-archive/}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/centernot.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/centernot.pdf}] Documentation.
 % \end{description}
 %
+%
+% \paragraph{Bundle.} All the packages of the bundle `oberdiek'
+% are also available in a TDS compliant ZIP archive. There
+% the packages are already unpacked and the documentation files
+% are generated. The files and directories obey the TDS standard.
+% \begin{description}
+% \item[\CTAN{macros/latex/contrib/oberdiek/oberdiek-tds.zip}]
+% \end{description}
+%
+% \subsection{Bundle installation}
+%
+% \paragraph{Unpacking.} Unpack the \xfile{oberdiek-tds.zip} in the
+% TDS tree (also known as \xfile{texmf} tree) of your choice.
+% Example (linux):
+% \begin{quote}
+%   |unzip oberdiek-tds.zip -d ~/texmf|
+% \end{quote}
+%
+% \paragraph{Script installation.}
+% Check the directory \xfile{TDS:scripts/oberdiek/} for
+% scripts that need further installation steps.
+% Package \xpackage{attachfile2} comes with the Perl script
+% \xfile{pdfatfi.pl} that should be installed in such a way
+% that it can be called as \texttt{pdfatfi}.
+% Example (linux):
+% \begin{quote}
+%   |chmod +x scripts/oberdiek/pdfatfi.pl|\\
+%   |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
+% \end{quote}
+%
+% \subsection{Package installation}
+%
 % \paragraph{Unpacking.} The \xfile{.dtx} file is a self-extracting
 % \docstrip\ archive. The files are extracted by running the
 % \xfile{.dtx} through \plainTeX:
@@ -296,8 +330,10 @@ and the derived files
 % TDS installing feature, then some files can already be in the right
 % place, see the documentation of \docstrip.
 %
-% \paragraph{Refresh file databases.} If your \TeX~distribution
-% (\teTeX, \mikTeX, \dots) rely on file databases, you must refresh
+% \subsection{Refresh file name databases}
+%
+% If your \TeX~distribution
+% (\teTeX, \mikTeX, \dots) relies on file name databases, you must refresh
 % these. For example, \teTeX\ users run \verb|texhash| or
 % \verb|mktexlsr|.
 %
diff --git a/Master/texmf-dist/source/latex/oberdiek/chemarr.dtx b/Master/texmf-dist/source/latex/oberdiek/chemarr.dtx
index b6fd81441bd..ed5a735c165 100644
--- a/Master/texmf-dist/source/latex/oberdiek/chemarr.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/chemarr.dtx
@@ -57,7 +57,7 @@
 %
 %<*ignore>
 \begingroup
-  \def\x{LaTeX2e}
+  \def\x{LaTeX2e}%
 \expandafter\endgroup
 \ifcase 0\ifx\install y1\fi\expandafter
          \ifx\csname processbatchFile\endcsname\relax\else1\fi
@@ -131,12 +131,12 @@ and the derived files
 %<*driver>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{chemarr.drv}%
-  [2006/02/20 v1.2 Chemical reaction arrows (HO)]
+  [2006/02/20 v1.2 Chemical reaction arrows (HO)]%
 \documentclass{ltxdoc}
 \usepackage{holtxdoc}
 \usepackage{chemarr}
 \begin{document}
-  \DocInput{chemarr.dtx}
+  \DocInput{chemarr.dtx}%
 \end{document}
 %</driver>
 % \fi
@@ -217,7 +217,7 @@ and the derived files
 %    \end{center}
 %    \[
 %      A
-%      \xrightleftharpoons[T \geq 400\,\mathrm{K}]{p > 10\,\mathrm{hPa}}  
+%      \xrightleftharpoons[T \geq 400\,\mathrm{K}]{p > 10\,\mathrm{hPa}}
 %      B
 %    \]
 %
@@ -296,13 +296,47 @@ and the derived files
 %    \end{macrocode}
 % \section{Installation}
 %
-% \paragraph{CTAN.} This package is available on
+% \subsection{Download}
+%
+% \paragraph{Package.} This package is available on
 % CTAN\footnote{\url{ftp://ftp.ctan.org/tex-archive/}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/chemarr.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/chemarr.pdf}] Documentation.
 % \end{description}
 %
+%
+% \paragraph{Bundle.} All the packages of the bundle `oberdiek'
+% are also available in a TDS compliant ZIP archive. There
+% the packages are already unpacked and the documentation files
+% are generated. The files and directories obey the TDS standard.
+% \begin{description}
+% \item[\CTAN{macros/latex/contrib/oberdiek/oberdiek-tds.zip}]
+% \end{description}
+%
+% \subsection{Bundle installation}
+%
+% \paragraph{Unpacking.} Unpack the \xfile{oberdiek-tds.zip} in the
+% TDS tree (also known as \xfile{texmf} tree) of your choice.
+% Example (linux):
+% \begin{quote}
+%   |unzip oberdiek-tds.zip -d ~/texmf|
+% \end{quote}
+%
+% \paragraph{Script installation.}
+% Check the directory \xfile{TDS:scripts/oberdiek/} for
+% scripts that need further installation steps.
+% Package \xpackage{attachfile2} comes with the Perl script
+% \xfile{pdfatfi.pl} that should be installed in such a way
+% that it can be called as \texttt{pdfatfi}.
+% Example (linux):
+% \begin{quote}
+%   |chmod +x scripts/oberdiek/pdfatfi.pl|\\
+%   |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
+% \end{quote}
+%
+% \subsection{Package installation}
+%
 % \paragraph{Unpacking.} The \xfile{.dtx} file is a self-extracting
 % \docstrip\ archive. The files are extracted by running the
 % \xfile{.dtx} through \plainTeX:
@@ -334,8 +368,10 @@ and the derived files
 % TDS installing feature, then some files can already be in the right
 % place, see the documentation of \docstrip.
 %
-% \paragraph{Refresh file databases.} If your \TeX~distribution
-% (\teTeX, \mikTeX, \dots) rely on file databases, you must refresh
+% \subsection{Refresh file name databases}
+%
+% If your \TeX~distribution
+% (\teTeX, \mikTeX, \dots) relies on file name databases, you must refresh
 % these. For example, \teTeX\ users run \verb|texhash| or
 % \verb|mktexlsr|.
 %
diff --git a/Master/texmf-dist/source/latex/oberdiek/classlist.dtx b/Master/texmf-dist/source/latex/oberdiek/classlist.dtx
index 9a2132f06c5..a4f7e2cef6c 100644
--- a/Master/texmf-dist/source/latex/oberdiek/classlist.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/classlist.dtx
@@ -55,7 +55,7 @@
 %
 %<*ignore>
 \begingroup
-  \def\x{LaTeX2e}
+  \def\x{LaTeX2e}%
 \expandafter\endgroup
 \ifcase 0\ifx\install y1\fi\expandafter
          \ifx\csname processbatchFile\endcsname\relax\else1\fi
@@ -126,11 +126,11 @@ and the derived files
 %<*driver>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{classlist.drv}%
-  [2006/02/20 v1.2 Record loaded classes (HO)]
+  [2006/02/20 v1.2 Record loaded classes (HO)]%
 \documentclass{ltxdoc}
 \usepackage{holtxdoc}
 \begin{document}
-  \DocInput{classlist.dtx}
+  \DocInput{classlist.dtx}%
 \end{document}
 %</driver>
 % \fi
@@ -276,7 +276,7 @@ and the derived files
       }%
     \fi
     \CL@org@fileswith@pti@ns{#1}[{#2}]{#3}[{#4}]%
-  }
+  }%
   \let\@@fileswith@pti@ns\@fileswith@pti@ns
 \else
 %    \end{macrocode}
@@ -314,7 +314,7 @@ and the derived files
 %    Names with more than one \cs{@clsextension} are not supported.
 %    \begin{macrocode}
     \fi
-  }
+  }%
   \@for\CL@entry:=\@filelist\do{%
     \expandafter\expandafter\expandafter\CL@test\expandafter
         \CL@entry\@clsextension\@nil
@@ -375,7 +375,7 @@ and the derived files
     \let\ClassListEntry\CL@InfoEntry
     \ClassList
     \let\on@line\@empty
-    \PackageInfo{classlist}{\CL@Info}
+    \PackageInfo{classlist}{\CL@Info}%
   \endgroup
 }
 %    \end{macrocode}
@@ -385,13 +385,47 @@ and the derived files
 %    \end{macrocode}
 % \section{Installation}
 %
-% \paragraph{CTAN.} This package is available on
+% \subsection{Download}
+%
+% \paragraph{Package.} This package is available on
 % CTAN\footnote{\url{ftp://ftp.ctan.org/tex-archive/}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/classlist.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/classlist.pdf}] Documentation.
 % \end{description}
 %
+%
+% \paragraph{Bundle.} All the packages of the bundle `oberdiek'
+% are also available in a TDS compliant ZIP archive. There
+% the packages are already unpacked and the documentation files
+% are generated. The files and directories obey the TDS standard.
+% \begin{description}
+% \item[\CTAN{macros/latex/contrib/oberdiek/oberdiek-tds.zip}]
+% \end{description}
+%
+% \subsection{Bundle installation}
+%
+% \paragraph{Unpacking.} Unpack the \xfile{oberdiek-tds.zip} in the
+% TDS tree (also known as \xfile{texmf} tree) of your choice.
+% Example (linux):
+% \begin{quote}
+%   |unzip oberdiek-tds.zip -d ~/texmf|
+% \end{quote}
+%
+% \paragraph{Script installation.}
+% Check the directory \xfile{TDS:scripts/oberdiek/} for
+% scripts that need further installation steps.
+% Package \xpackage{attachfile2} comes with the Perl script
+% \xfile{pdfatfi.pl} that should be installed in such a way
+% that it can be called as \texttt{pdfatfi}.
+% Example (linux):
+% \begin{quote}
+%   |chmod +x scripts/oberdiek/pdfatfi.pl|\\
+%   |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
+% \end{quote}
+%
+% \subsection{Package installation}
+%
 % \paragraph{Unpacking.} The \xfile{.dtx} file is a self-extracting
 % \docstrip\ archive. The files are extracted by running the
 % \xfile{.dtx} through \plainTeX:
@@ -422,8 +456,10 @@ and the derived files
 % TDS installing feature, then some files can already be in the right
 % place, see the documentation of \docstrip.
 %
-% \paragraph{Refresh file databases.} If your \TeX~distribution
-% (\teTeX, \mikTeX, \dots) rely on file databases, you must refresh
+% \subsection{Refresh file name databases}
+%
+% If your \TeX~distribution
+% (\teTeX, \mikTeX, \dots) relies on file name databases, you must refresh
 % these. For example, \teTeX\ users run \verb|texhash| or
 % \verb|mktexlsr|.
 %
diff --git a/Master/texmf-dist/source/latex/oberdiek/colonequals.dtx b/Master/texmf-dist/source/latex/oberdiek/colonequals.dtx
index dbe7495a46e..9c2603afbcd 100644
--- a/Master/texmf-dist/source/latex/oberdiek/colonequals.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/colonequals.dtx
@@ -55,7 +55,7 @@
 %
 %<*ignore>
 \begingroup
-  \def\x{LaTeX2e}
+  \def\x{LaTeX2e}%
 \expandafter\endgroup
 \ifcase 0\ifx\install y1\fi\expandafter
          \ifx\csname processbatchFile\endcsname\relax\else1\fi
@@ -126,7 +126,7 @@ and the derived files
 %<*driver>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{colonequals.drv}%
-  [2006/08/01 v1.0 Colon equals symbols (HO)]
+  [2006/08/01 v1.0 Colon equals symbols (HO)]%
 \documentclass{ltxdoc}
 \usepackage{holtxdoc}
 \usepackage{colonequals}
@@ -134,7 +134,7 @@ and the derived files
 \usepackage{capt-of}
 \usepackage{longtable}
 \begin{document}
-  \DocInput{colonequals.dtx}
+  \DocInput{colonequals.dtx}%
 \end{document}
 %</driver>
 % \fi
@@ -276,7 +276,7 @@ and the derived files
 %<*package>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{colonequals}%
-  [2006/08/01 v1.0 Colon equals symbols (HO)]
+  [2006/08/01 v1.0 Colon equals symbols (HO)]%
 %    \end{macrocode}
 %
 % \subsection{Distance control}
@@ -409,13 +409,47 @@ and the derived files
 %    \end{macrocode}
 % \section{Installation}
 %
-% \paragraph{CTAN.} This package is available on
+% \subsection{Download}
+%
+% \paragraph{Package.} This package is available on
 % CTAN\footnote{\url{ftp://ftp.ctan.org/tex-archive/}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/colonequals.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/colonequals.pdf}] Documentation.
 % \end{description}
 %
+%
+% \paragraph{Bundle.} All the packages of the bundle `oberdiek'
+% are also available in a TDS compliant ZIP archive. There
+% the packages are already unpacked and the documentation files
+% are generated. The files and directories obey the TDS standard.
+% \begin{description}
+% \item[\CTAN{macros/latex/contrib/oberdiek/oberdiek-tds.zip}]
+% \end{description}
+%
+% \subsection{Bundle installation}
+%
+% \paragraph{Unpacking.} Unpack the \xfile{oberdiek-tds.zip} in the
+% TDS tree (also known as \xfile{texmf} tree) of your choice.
+% Example (linux):
+% \begin{quote}
+%   |unzip oberdiek-tds.zip -d ~/texmf|
+% \end{quote}
+%
+% \paragraph{Script installation.}
+% Check the directory \xfile{TDS:scripts/oberdiek/} for
+% scripts that need further installation steps.
+% Package \xpackage{attachfile2} comes with the Perl script
+% \xfile{pdfatfi.pl} that should be installed in such a way
+% that it can be called as \texttt{pdfatfi}.
+% Example (linux):
+% \begin{quote}
+%   |chmod +x scripts/oberdiek/pdfatfi.pl|\\
+%   |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
+% \end{quote}
+%
+% \subsection{Package installation}
+%
 % \paragraph{Unpacking.} The \xfile{.dtx} file is a self-extracting
 % \docstrip\ archive. The files are extracted by running the
 % \xfile{.dtx} through \plainTeX:
@@ -446,8 +480,10 @@ and the derived files
 % TDS installing feature, then some files can already be in the right
 % place, see the documentation of \docstrip.
 %
-% \paragraph{Refresh file databases.} If your \TeX~distribution
-% (\teTeX, \mikTeX, \dots) rely on file databases, you must refresh
+% \subsection{Refresh file name databases}
+%
+% If your \TeX~distribution
+% (\teTeX, \mikTeX, \dots) relies on file name databases, you must refresh
 % these. For example, \teTeX\ users run \verb|texhash| or
 % \verb|mktexlsr|.
 %
diff --git a/Master/texmf-dist/source/latex/oberdiek/dvipscol.dtx b/Master/texmf-dist/source/latex/oberdiek/dvipscol.dtx
index ddf3c55fcf2..9297c36794e 100644
--- a/Master/texmf-dist/source/latex/oberdiek/dvipscol.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/dvipscol.dtx
@@ -55,7 +55,7 @@
 %
 %<*ignore>
 \begingroup
-  \def\x{LaTeX2e}
+  \def\x{LaTeX2e}%
 \expandafter\endgroup
 \ifcase 0\ifx\install y1\fi\expandafter
          \ifx\csname processbatchFile\endcsname\relax\else1\fi
@@ -126,11 +126,11 @@ and the derived files
 %<*driver>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{dvipscol.drv}%
-  [2006/02/20 v1.1 Fix for dvips.def (HO)]
+  [2006/02/20 v1.1 Fix for dvips.def (HO)]%
 \documentclass{ltxdoc}
 \usepackage{holtxdoc}
 \begin{document}
-  \DocInput{dvipscol.dtx}
+  \DocInput{dvipscol.dtx}%
 \end{document}
 %</driver>
 % \fi
@@ -187,7 +187,7 @@ and the derived files
 % But the color stack size of dvips is limited,
 % so a stack overflow can occur, if there are
 % too many color setting operations in a group.
-% 
+%
 % Only at the bottom group level (no group),
 % the color can be set directly without pushing
 % the current color on the stack before, because
@@ -294,13 +294,47 @@ and the derived files
 %    \end{macrocode}
 % \section{Installation}
 %
-% \paragraph{CTAN.} This package is available on
+% \subsection{Download}
+%
+% \paragraph{Package.} This package is available on
 % CTAN\footnote{\url{ftp://ftp.ctan.org/tex-archive/}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/dvipscol.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/dvipscol.pdf}] Documentation.
 % \end{description}
 %
+%
+% \paragraph{Bundle.} All the packages of the bundle `oberdiek'
+% are also available in a TDS compliant ZIP archive. There
+% the packages are already unpacked and the documentation files
+% are generated. The files and directories obey the TDS standard.
+% \begin{description}
+% \item[\CTAN{macros/latex/contrib/oberdiek/oberdiek-tds.zip}]
+% \end{description}
+%
+% \subsection{Bundle installation}
+%
+% \paragraph{Unpacking.} Unpack the \xfile{oberdiek-tds.zip} in the
+% TDS tree (also known as \xfile{texmf} tree) of your choice.
+% Example (linux):
+% \begin{quote}
+%   |unzip oberdiek-tds.zip -d ~/texmf|
+% \end{quote}
+%
+% \paragraph{Script installation.}
+% Check the directory \xfile{TDS:scripts/oberdiek/} for
+% scripts that need further installation steps.
+% Package \xpackage{attachfile2} comes with the Perl script
+% \xfile{pdfatfi.pl} that should be installed in such a way
+% that it can be called as \texttt{pdfatfi}.
+% Example (linux):
+% \begin{quote}
+%   |chmod +x scripts/oberdiek/pdfatfi.pl|\\
+%   |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
+% \end{quote}
+%
+% \subsection{Package installation}
+%
 % \paragraph{Unpacking.} The \xfile{.dtx} file is a self-extracting
 % \docstrip\ archive. The files are extracted by running the
 % \xfile{.dtx} through \plainTeX:
@@ -331,8 +365,10 @@ and the derived files
 % TDS installing feature, then some files can already be in the right
 % place, see the documentation of \docstrip.
 %
-% \paragraph{Refresh file databases.} If your \TeX~distribution
-% (\teTeX, \mikTeX, \dots) rely on file databases, you must refresh
+% \subsection{Refresh file name databases}
+%
+% If your \TeX~distribution
+% (\teTeX, \mikTeX, \dots) relies on file name databases, you must refresh
 % these. For example, \teTeX\ users run \verb|texhash| or
 % \verb|mktexlsr|.
 %
diff --git a/Master/texmf-dist/source/latex/oberdiek/embedfile.dtx b/Master/texmf-dist/source/latex/oberdiek/embedfile.dtx
index 2361892e02b..c5c25f9434d 100644
--- a/Master/texmf-dist/source/latex/oberdiek/embedfile.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/embedfile.dtx
@@ -1,6 +1,6 @@
 % \iffalse meta-comment
 %
-% Copyright (C) 2006 by Heiko Oberdiek <oberdiek@uni-freiburg.de>
+% Copyright (C) 2006, 2007 by Heiko Oberdiek <oberdiek@uni-freiburg.de>
 %
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either
@@ -58,7 +58,7 @@
 %
 %<*ignore>
 \begingroup
-  \def\x{LaTeX2e}
+  \def\x{LaTeX2e}%
 \expandafter\endgroup
 \ifcase 0\ifx\install y1\fi\expandafter
          \ifx\csname processbatchFile\endcsname\relax\else1\fi
@@ -69,7 +69,7 @@
 \input docstrip.tex
 \Msg{************************************************************************}
 \Msg{* Installation}
-\Msg{* Package: embedfile 2006/08/16 v1.0 embed files into PDF (HO)}
+\Msg{* Package: embedfile 2007/04/11 v1.1 embed files into PDF (HO)}
 \Msg{************************************************************************}
 
 \keepsilent
@@ -79,7 +79,7 @@
 
 This is a generated file.
 
-Copyright (C) 2006 by Heiko Oberdiek <oberdiek@uni-freiburg.de>
+Copyright (C) 2006, 2007 by Heiko Oberdiek <oberdiek@uni-freiburg.de>
 
 This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either
@@ -133,11 +133,11 @@ and the derived files
 %<*driver>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{embedfile.drv}%
-  [2006/08/16 v1.0 embed files into PDF (HO)]
+  [2007/04/11 v1.1 embed files into PDF (HO)]%
 \documentclass{ltxdoc}
 \usepackage{holtxdoc}
 \begin{document}
-  \DocInput{embedfile.dtx}
+  \DocInput{embedfile.dtx}%
 \end{document}
 %</driver>
 % \fi
@@ -163,7 +163,7 @@ and the derived files
 % \GetFileInfo{embedfile.drv}
 %
 % \title{The \xpackage{embedfile} package}
-% \date{2006/08/16 v1.0}
+% \date{2007/04/11 v1.1}
 % \author{Heiko Oberdiek\\\xemail{oberdiek@uni-freiburg.de}}
 %
 % \maketitle
@@ -330,12 +330,12 @@ This example document contains three embedded files.
 %<*dtxattach>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{dtx-attach}
-  [2006/08/16 v1.0 Embed \string\jobname.dtx (HO)]
-\RequirePackage{embedfile}[2006/08/16]
-\embedfile[
-  stringmethod=escape,
-  mimetype=plain/text,
-  desc={LaTeX docstrip source archive for package `\jobname'}
+  [2007/04/11 v1.1 Embed \string\jobname.dtx (HO)]%
+\RequirePackage{embedfile}[2007/04/11]
+\embedfile[%
+  stringmethod=escape,%
+  mimetype=plain/text,%
+  desc={LaTeX docstrip source archive for package `\jobname'}%
 ]{\jobname.dtx}
 %</dtxattach>
 %    \end{macrocode}
@@ -394,7 +394,7 @@ This example document contains three embedded files.
   \fi
 \expandafter\x\csname ver@embedfile.sty\endcsname
 \ProvidesPackage{embedfile}%
-  [2006/08/16 v1.0 embed files into PDF (HO)]
+  [2007/04/11 v1.1 embed files into PDF (HO)]
 %    \end{macrocode}
 %
 %    \begin{macrocode}
@@ -724,13 +724,47 @@ This example document contains three embedded files.
 %    \end{macrocode}
 % \section{Installation}
 %
-% \paragraph{CTAN.} This package is available on
+% \subsection{Download}
+%
+% \paragraph{Package.} This package is available on
 % CTAN\footnote{\url{ftp://ftp.ctan.org/tex-archive/}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/embedfile.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/embedfile.pdf}] Documentation.
 % \end{description}
 %
+%
+% \paragraph{Bundle.} All the packages of the bundle `oberdiek'
+% are also available in a TDS compliant ZIP archive. There
+% the packages are already unpacked and the documentation files
+% are generated. The files and directories obey the TDS standard.
+% \begin{description}
+% \item[\CTAN{macros/latex/contrib/oberdiek/oberdiek-tds.zip}]
+% \end{description}
+%
+% \subsection{Bundle installation}
+%
+% \paragraph{Unpacking.} Unpack the \xfile{oberdiek-tds.zip} in the
+% TDS tree (also known as \xfile{texmf} tree) of your choice.
+% Example (linux):
+% \begin{quote}
+%   |unzip oberdiek-tds.zip -d ~/texmf|
+% \end{quote}
+%
+% \paragraph{Script installation.}
+% Check the directory \xfile{TDS:scripts/oberdiek/} for
+% scripts that need further installation steps.
+% Package \xpackage{attachfile2} comes with the Perl script
+% \xfile{pdfatfi.pl} that should be installed in such a way
+% that it can be called as \texttt{pdfatfi}.
+% Example (linux):
+% \begin{quote}
+%   |chmod +x scripts/oberdiek/pdfatfi.pl|\\
+%   |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
+% \end{quote}
+%
+% \subsection{Package installation}
+%
 % \paragraph{Unpacking.} The \xfile{.dtx} file is a self-extracting
 % \docstrip\ archive. The files are extracted by running the
 % \xfile{.dtx} through \plainTeX:
@@ -763,8 +797,10 @@ This example document contains three embedded files.
 % TDS installing feature, then some files can already be in the right
 % place, see the documentation of \docstrip.
 %
-% \paragraph{Refresh file databases.} If your \TeX~distribution
-% (\teTeX, \mikTeX, \dots) rely on file databases, you must refresh
+% \subsection{Refresh file name databases}
+%
+% If your \TeX~distribution
+% (\teTeX, \mikTeX, \dots) relies on file name databases, you must refresh
 % these. For example, \teTeX\ users run \verb|texhash| or
 % \verb|mktexlsr|.
 %
@@ -847,7 +883,11 @@ This example document contains three embedded files.
 % \begin{History}
 %   \begin{Version}{2006/08/16 v1.0}
 %   \item
-%     First public version,
+%     First public version.
+%   \end{Version}
+%   \begin{Version}{2007/04/11 v1.1}
+%   \item
+%     Line ends sanitized.
 %   \end{Version}
 % \end{History}
 %
diff --git a/Master/texmf-dist/source/latex/oberdiek/engord.dtx b/Master/texmf-dist/source/latex/oberdiek/engord.dtx
index edb9fa358d4..3df12ea7c9c 100644
--- a/Master/texmf-dist/source/latex/oberdiek/engord.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/engord.dtx
@@ -1,6 +1,6 @@
 % \iffalse meta-comment
 %
-% Copyright (C) 2000, 2003, 2006 by
+% Copyright (C) 2000, 2003, 2006, 2007 by
 %    Heiko Oberdiek <oberdiek@uni-freiburg.de>
 %
 % This work may be distributed and/or modified under the
@@ -56,7 +56,7 @@
 %
 %<*ignore>
 \begingroup
-  \def\x{LaTeX2e}
+  \def\x{LaTeX2e}%
 \expandafter\endgroup
 \ifcase 0\ifx\install y1\fi\expandafter
          \ifx\csname processbatchFile\endcsname\relax\else1\fi
@@ -67,7 +67,7 @@
 \input docstrip.tex
 \Msg{************************************************************************}
 \Msg{* Installation}
-\Msg{* Package: engord 2006/02/20 v1.2 Provides the ifpdf switch (HO)}
+\Msg{* Package: engord 2007/04/11 v1.3 Provides the ifpdf switch (HO)}
 \Msg{************************************************************************}
 
 \keepsilent
@@ -77,7 +77,7 @@
 
 This is a generated file.
 
-Copyright (C) 2000, 2003, 2006 by
+Copyright (C) 2000, 2003, 2006, 2007 by
    Heiko Oberdiek <oberdiek@uni-freiburg.de>
 
 This work may be distributed and/or modified under the
@@ -128,11 +128,11 @@ and the derived files
 %<*driver>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{engord.drv}%
-  [2006/02/20 v1.2 Provides the ifpdf switch (HO)]
+  [2007/04/11 v1.3 Provides the ifpdf switch (HO)]%
 \documentclass{ltxdoc}
 \usepackage{holtxdoc}
 \begin{document}
-  \DocInput{engord.dtx}
+  \DocInput{engord.dtx}%
 \end{document}
 %</driver>
 % \fi
@@ -158,7 +158,7 @@ and the derived files
 % \GetFileInfo{engord.drv}
 %
 % \title{The \xpackage{engord} package}
-% \date{2006/02/20 v1.2}
+% \date{2007/04/11 v1.3}
 % \author{Heiko Oberdiek\\\xemail{oberdiek@uni-freiburg.de}}
 %
 % \maketitle
@@ -305,7 +305,7 @@ and the derived files
   \fi
 \expandafter\x\csname ver@engord.sty\endcsname
 \ProvidesPackage{engord}%
-  [2006/02/20 v1.2 Provides the ifpdf switch (HO)]
+  [2007/04/11 v1.3 Provides the ifpdf switch (HO)]
 %    \end{macrocode}
 %
 % \subsection{Help commands for plain compatibility}
@@ -456,10 +456,10 @@ and the derived files
   \ifnum#1<1 % handle the error case
     \engorderror{#1}%
   \else
-    \ifnum#1<21
+    \ifnum#1<21 %
       \EO@ord{#1}%
     \else
-      \ifnum#1<100
+      \ifnum#1<100 %
         \EO@twodigits#1%
       \else
         \@ReturnAfterFi{%
@@ -540,7 +540,7 @@ and the derived files
 %    \begin{macrocode}
 \def\EO@reverseback#1#2#3\@nil{%
   \EO@reverse#3\@nil{}\@firstofone
-  \ifnum#2#1<21
+  \ifnum#2#1<21 %
     \EO@ord{#2#1}%
   \else
     #2\EO@ord{#1}%
@@ -559,13 +559,47 @@ and the derived files
 %    \end{macrocode}
 % \section{Installation}
 %
-% \paragraph{CTAN.} This package is available on
+% \subsection{Download}
+%
+% \paragraph{Package.} This package is available on
 % CTAN\footnote{\url{ftp://ftp.ctan.org/tex-archive/}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/engord.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/engord.pdf}] Documentation.
 % \end{description}
 %
+%
+% \paragraph{Bundle.} All the packages of the bundle `oberdiek'
+% are also available in a TDS compliant ZIP archive. There
+% the packages are already unpacked and the documentation files
+% are generated. The files and directories obey the TDS standard.
+% \begin{description}
+% \item[\CTAN{macros/latex/contrib/oberdiek/oberdiek-tds.zip}]
+% \end{description}
+%
+% \subsection{Bundle installation}
+%
+% \paragraph{Unpacking.} Unpack the \xfile{oberdiek-tds.zip} in the
+% TDS tree (also known as \xfile{texmf} tree) of your choice.
+% Example (linux):
+% \begin{quote}
+%   |unzip oberdiek-tds.zip -d ~/texmf|
+% \end{quote}
+%
+% \paragraph{Script installation.}
+% Check the directory \xfile{TDS:scripts/oberdiek/} for
+% scripts that need further installation steps.
+% Package \xpackage{attachfile2} comes with the Perl script
+% \xfile{pdfatfi.pl} that should be installed in such a way
+% that it can be called as \texttt{pdfatfi}.
+% Example (linux):
+% \begin{quote}
+%   |chmod +x scripts/oberdiek/pdfatfi.pl|\\
+%   |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
+% \end{quote}
+%
+% \subsection{Package installation}
+%
 % \paragraph{Unpacking.} The \xfile{.dtx} file is a self-extracting
 % \docstrip\ archive. The files are extracted by running the
 % \xfile{.dtx} through \plainTeX:
@@ -596,8 +630,10 @@ and the derived files
 % TDS installing feature, then some files can already be in the right
 % place, see the documentation of \docstrip.
 %
-% \paragraph{Refresh file databases.} If your \TeX~distribution
-% (\teTeX, \mikTeX, \dots) rely on file databases, you must refresh
+% \subsection{Refresh file name databases}
+%
+% If your \TeX~distribution
+% (\teTeX, \mikTeX, \dots) relies on file name databases, you must refresh
 % these. For example, \teTeX\ users run \verb|texhash| or
 % \verb|mktexlsr|.
 %
@@ -669,6 +705,10 @@ and the derived files
 %   \item
 %     DTX framework.
 %   \end{Version}
+%   \begin{Version}{2007/04/11 v1.3}
+%   \item
+%     Line ends sanitized.
+%   \end{Version}
 % \end{History}
 %
 % \PrintIndex
diff --git a/Master/texmf-dist/source/latex/oberdiek/epstopdf.dtx b/Master/texmf-dist/source/latex/oberdiek/epstopdf.dtx
index 035d10c575e..ded8879a4ce 100644
--- a/Master/texmf-dist/source/latex/oberdiek/epstopdf.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/epstopdf.dtx
@@ -55,7 +55,7 @@
 %
 %<*ignore>
 \begingroup
-  \def\x{LaTeX2e}
+  \def\x{LaTeX2e}%
 \expandafter\endgroup
 \ifcase 0\ifx\install y1\fi\expandafter
          \ifx\csname processbatchFile\endcsname\relax\else1\fi
@@ -126,11 +126,11 @@ and the derived files
 %<*driver>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{epstopdf.drv}%
-  [2006/08/26 v1.3 Conversion with epstopdf on the fly (HO)]
+  [2006/08/26 v1.3 Conversion with epstopdf on the fly (HO)]%
 \documentclass{ltxdoc}
 \usepackage{holtxdoc}
 \begin{document}
-  \DocInput{epstopdf.dtx}
+  \DocInput{epstopdf.dtx}%
 \end{document}
 %</driver>
 % \fi
@@ -304,7 +304,7 @@ and the derived files
   \else
     \PackageWarningNoLine{epstopdf}{%
       Graphics driver file \string`pdftex.def\string' not found%
-    }
+    }%
     \expandafter\endgroup\expandafter\endinput
   \fi
 \endgroup
@@ -368,13 +368,47 @@ and the derived files
 %    \end{macrocode}
 % \section{Installation}
 %
-% \paragraph{CTAN.} This package is available on
+% \subsection{Download}
+%
+% \paragraph{Package.} This package is available on
 % CTAN\footnote{\url{ftp://ftp.ctan.org/tex-archive/}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/epstopdf.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/epstopdf.pdf}] Documentation.
 % \end{description}
 %
+%
+% \paragraph{Bundle.} All the packages of the bundle `oberdiek'
+% are also available in a TDS compliant ZIP archive. There
+% the packages are already unpacked and the documentation files
+% are generated. The files and directories obey the TDS standard.
+% \begin{description}
+% \item[\CTAN{macros/latex/contrib/oberdiek/oberdiek-tds.zip}]
+% \end{description}
+%
+% \subsection{Bundle installation}
+%
+% \paragraph{Unpacking.} Unpack the \xfile{oberdiek-tds.zip} in the
+% TDS tree (also known as \xfile{texmf} tree) of your choice.
+% Example (linux):
+% \begin{quote}
+%   |unzip oberdiek-tds.zip -d ~/texmf|
+% \end{quote}
+%
+% \paragraph{Script installation.}
+% Check the directory \xfile{TDS:scripts/oberdiek/} for
+% scripts that need further installation steps.
+% Package \xpackage{attachfile2} comes with the Perl script
+% \xfile{pdfatfi.pl} that should be installed in such a way
+% that it can be called as \texttt{pdfatfi}.
+% Example (linux):
+% \begin{quote}
+%   |chmod +x scripts/oberdiek/pdfatfi.pl|\\
+%   |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
+% \end{quote}
+%
+% \subsection{Package installation}
+%
 % \paragraph{Unpacking.} The \xfile{.dtx} file is a self-extracting
 % \docstrip\ archive. The files are extracted by running the
 % \xfile{.dtx} through \plainTeX:
@@ -405,8 +439,10 @@ and the derived files
 % TDS installing feature, then some files can already be in the right
 % place, see the documentation of \docstrip.
 %
-% \paragraph{Refresh file databases.} If your \TeX~distribution
-% (\teTeX, \mikTeX, \dots) rely on file databases, you must refresh
+% \subsection{Refresh file name databases}
+%
+% If your \TeX~distribution
+% (\teTeX, \mikTeX, \dots) relies on file name databases, you must refresh
 % these. For example, \teTeX\ users run \verb|texhash| or
 % \verb|mktexlsr|.
 %
diff --git a/Master/texmf-dist/source/latex/oberdiek/flags.dtx b/Master/texmf-dist/source/latex/oberdiek/flags.dtx
index 68a354ea2c6..f4d86de9a53 100644
--- a/Master/texmf-dist/source/latex/oberdiek/flags.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/flags.dtx
@@ -55,7 +55,7 @@
 %
 %<*ignore>
 \begingroup
-  \def\x{LaTeX2e}
+  \def\x{LaTeX2e}%
 \expandafter\endgroup
 \ifcase 0\ifx\install y1\fi\expandafter
          \ifx\csname processbatchFile\endcsname\relax\else1\fi
@@ -66,7 +66,7 @@
 \input docstrip.tex
 \Msg{************************************************************************}
 \Msg{* Installation}
-\Msg{* Package: flags 2007/02/18 v0.1 Flag setting in bit fields (HO)}
+\Msg{* Package: flags 2007/03/07 v0.3 Flag setting in bit fields (HO)}
 \Msg{************************************************************************}
 
 \keepsilent
@@ -126,16 +126,16 @@ and the derived files
 %<*driver>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{flags.drv}%
-  [2007/02/18 v0.1 Flag setting in bit fields (HO)]
+  [2007/03/07 v0.3 Flag setting in bit fields (HO)]%
 \documentclass{ltxdoc}
 \usepackage{holtxdoc}
 \begin{document}
-  \DocInput{flags.dtx}
+  \DocInput{flags.dtx}%
 \end{document}
 %</driver>
 % \fi
 %
-% \CheckSum{156}
+% \CheckSum{247}
 %
 % \CharacterTable
 %  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -156,7 +156,7 @@ and the derived files
 % \GetFileInfo{flags.drv}
 %
 % \title{The \xpackage{flags} package}
-% \date{2007/02/18 v0.1}
+% \date{2007/03/07 v0.3}
 % \author{Heiko Oberdiek\\\xemail{oberdiek@uni-freiburg.de}}
 %
 % \maketitle
@@ -173,6 +173,9 @@ and the derived files
 %
 % \subsection{User interface}
 %
+% Flag positions are one-based, thus the flag position must be
+% a positive integer. Currently supported range: |1..31|
+%
 % \begin{declcs}{resetflags} \M{fname}
 % \end{declcs}
 % The bit field \meta{fname} is cleared.
@@ -194,9 +197,26 @@ and the derived files
 % The bit field \meta{fname} is converted to a decimal number.
 % The macro is expandible.
 %
+% \begin{declcs}{extractflag} \M{fname} \M{position}
+% \end{declcs}
+% Extracts the flag setting at bit position \meta{position}.
+% \cs{extractflag} expands to |1| if the flag is set and |0| otherwise.
+%
+% \begin{declcs}{queryflag} \M{fname} \M{position}
+%    \M{set part} \M{clear part}
+% \end{declcs}
+% It is a wrapper for \cs{extractflag}. \meta{set part} is called if
+% \cs{extractflag} returns |1|. Otherwise \meta{clear part} is executed.
+%
 % \paragraph{Example.} See package \xpackage{bookmark}.
 % It uses package \xpackage{flags} for its font style options.
 %
+% \subsection{Requirements}
+%
+% \begin{itemize}
+% \item \eTeX\ (\cs{numexpr})
+% \end{itemize}
+%
 % \subsection{ToDo}
 %
 % \begin{itemize}
@@ -218,7 +238,19 @@ and the derived files
 %<*package>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{flags}%
-  [2007/02/18 v0.1 Flag setting in bit fields (HO)]
+  [2007/03/07 v0.3 Flag setting in bit fields (HO)]%
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+\begingroup\expandafter\expandafter\expandafter\endgroup
+\expandafter\ifx\csname numexpr\endcsname\relax
+  \PackageError{flags}{%
+    Missing e-TeX, package loading aborted%
+  }{%
+    This packages makes heavy use of \string\numexpr.%
+  }%
+  \expandafter\endinput
+\fi
 %    \end{macrocode}
 %
 %    \begin{macro}{\resetflags}
@@ -260,10 +292,17 @@ and the derived files
 %    \begin{macro}{\setflag}
 %    \begin{macrocode}
 \newcommand*{\setflag}[2]{%
-  \expandafter\@setflag\csname flags@#1\expandafter\endcsname
-    \expandafter{\romannumeral\number\numexpr#2-1\relax000}%
+  \ifnum#2>\z@
+    \expandafter\@setflag\csname flags@#1\expandafter\endcsname
+      \expandafter{\romannumeral\number\numexpr#2-1\relax000}%
+  \else
+    \PackageError{flags}{Position must be a positive number}\@ehc
+  \fi
 }
 \def\@setflag#1#2{%
+  \ifx#1\relax
+    \let#1\@empty
+  \fi
   \edef#1{%
     \expandafter\@@setflag\expandafter{#1}{#2}%
   }%
@@ -276,14 +315,14 @@ and the derived files
     \ifx\\#2\\%
       1\@gobble#1%
     \else
-      \@car#1\@nil
-      \expandafter\@@@setflag\expandafter{\@gobble#2}{#1}%
+      \@@@setflag#1|#2%
     \fi
   \fi
 }
-\def\@@@setflag#1#2\fi\fi{%
+\def\@@@setflag#1#2|#3#4\fi\fi{%
   \fi\fi
-  \expandafter\@@setflag\expandafter{\@cdr#2\@nil}{#1}%
+  #1%
+  \@@setflag{#2}{#4}%
 }
 %    \end{macrocode}
 %    \end{macro}
@@ -291,10 +330,17 @@ and the derived files
 %    \begin{macro}{\clearflag}
 %    \begin{macrocode}
 \newcommand*{\clearflag}[2]{%
-  \expandafter\@clearflag\csname flags@#1\expandafter\endcsname
-    \expandafter{\romannumeral\number\numexpr#2-1\relax000}%
+  \ifnum#2>\z@
+    \expandafter\@clearflag\csname flags@#1\expandafter\endcsname
+      \expandafter{\romannumeral\number\numexpr#2-1\relax000}%
+  \else
+    \PackageError{flags}{Position must be a positive number}\@ehc
+  \fi
 }
 \def\@clearflag#1#2{%
+  \ifx#1\relax
+    \let#1\@empty
+  \fi
   \edef#1{%
     \expandafter\@@clearflag\expandafter{#1}{#2}%
   }%
@@ -305,14 +351,14 @@ and the derived files
     \ifx\\#2\\%
       0\@gobble#1%
     \else
-      \@car#1\@nil
-      \expandafter\@@@clearflag\expandafter{\@gobble#2}{#1}%
+      \@@@clearflag#1|#2%
     \fi
   \fi
 }
-\def\@@@clearflag#1#2\fi\fi{%
+\def\@@@clearflag#1#2|#3#4\fi\fi{%
   \fi\fi
-  \expandafter\@@clearflag\expandafter{\@cdr#2\@nil}{#1}%
+  #1%
+  \@@clearflag{#2}{#4}%
 }
 %    \end{macrocode}
 %    \end{macro}
@@ -327,18 +373,107 @@ and the derived files
 }
 %    \end{macrocode}
 %
+%    \begin{macro}{\queryflag}
+%    \begin{macrocode}
+\newcommand*{\queryflag}[2]{%
+  \ifnum\extractflag{#1}{#2}=\@ne
+    \expandafter\@firstoftwo
+  \else
+    \expandafter\@secondoftwo
+  \fi
+}
+%    \end{macrocode}
+%    \end{macro}
+%
+%    \begin{macro}{\extractflag}
+%    \begin{macrocode}
+\newcommand*{\extractflag}[1]{%
+  \expandafter\@extractflag\csname flags@#1\endcsname
+}
+\def\@extractflag#1#2{%
+  \ifx#1\@undefined
+    0%
+  \else
+    \ifx#1\relax
+      0%
+    \else
+      \ifx#1\@empty
+        0%
+      \else
+        \expandafter\expandafter\expandafter\@@extractflag
+        \expandafter\expandafter\expandafter{%
+        \expandafter#1\expandafter
+        }\expandafter{%
+          \romannumeral\number\numexpr#2-1\relax000%
+        }%
+      \fi
+    \fi
+  \fi
+}
+\def\@@extractflag#1#2{%
+  \ifx\\#1\\%
+    0%
+  \else
+    \ifx\\#2\\%
+      \@car#1\@nil
+    \else
+      \@@@extractflag#1|#2%
+    \fi
+  \fi
+}
+\def\@@@extractflag#1#2|#3#4\fi\fi{%
+  \fi\fi
+  \@@extractflag{#2}{#4}%
+}
+%    \end{macrocode}
+%    \end{macro}
+%
 %    \begin{macrocode}
 %</package>
 %    \end{macrocode}
 % \section{Installation}
 %
-% \paragraph{CTAN.} This package is available on
+% \subsection{Download}
+%
+% \paragraph{Package.} This package is available on
 % CTAN\footnote{\url{ftp://ftp.ctan.org/tex-archive/}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/flags.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/flags.pdf}] Documentation.
 % \end{description}
 %
+%
+% \paragraph{Bundle.} All the packages of the bundle `oberdiek'
+% are also available in a TDS compliant ZIP archive. There
+% the packages are already unpacked and the documentation files
+% are generated. The files and directories obey the TDS standard.
+% \begin{description}
+% \item[\CTAN{macros/latex/contrib/oberdiek/oberdiek-tds.zip}]
+% \end{description}
+%
+% \subsection{Bundle installation}
+%
+% \paragraph{Unpacking.} Unpack the \xfile{oberdiek-tds.zip} in the
+% TDS tree (also known as \xfile{texmf} tree) of your choice.
+% Example (linux):
+% \begin{quote}
+%   |unzip oberdiek-tds.zip -d ~/texmf|
+% \end{quote}
+%
+% \paragraph{Script installation.}
+% Check the directory \xfile{TDS:scripts/oberdiek/} for
+% scripts that need further installation steps.
+% Package \xpackage{attachfile2} comes with the Perl script
+% \xfile{pdfatfi.pl} that should be installed in such a way
+% that it can be called as \texttt{pdfatfi}.
+% Example (linux):
+% \begin{quote}
+%   |chmod +x scripts/oberdiek/pdfatfi.pl|\\
+%   |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
+% \end{quote}
+%
+% \subsection{Package installation}
+%
 % \paragraph{Unpacking.} The \xfile{.dtx} file is a self-extracting
 % \docstrip\ archive. The files are extracted by running the
 % \xfile{.dtx} through \plainTeX:
@@ -369,8 +504,10 @@ and the derived files
 % TDS installing feature, then some files can already be in the right
 % place, see the documentation of \docstrip.
 %
-% \paragraph{Refresh file databases.} If your \TeX~distribution
-% (\teTeX, \mikTeX, \dots) rely on file databases, you must refresh
+% \subsection{Refresh file name databases}
+%
+% If your \TeX~distribution
+% (\teTeX, \mikTeX, \dots) relies on file name databases, you must refresh
 % these. For example, \teTeX\ users run \verb|texhash| or
 % \verb|mktexlsr|.
 %
@@ -422,10 +559,21 @@ and the derived files
 % \end{quote}
 %
 % \begin{History}
-%   \begin{Version}{2007/02/18 v1.0}
+%   \begin{Version}{2007/02/18 v0.1}
 %   \item
 %     First version.
 %   \end{Version}
+%   \begin{Version}{2007/03/07 v0.2}
+%   \item
+%     Raise an error if \eTeX\ is not detected.
+%   \end{Version}
+%   \begin{Version}{2007/03/31 v0.3}
+%   \item
+%     \cs{queryflag} and \cs{extractflag} added.
+%   \item
+%     Raise an error if position is not positive in case of
+%     \cs{setflag} and \cs{clearflag}.
+%   \end{Version}
 % \end{History}
 %
 % \PrintIndex
diff --git a/Master/texmf-dist/source/latex/oberdiek/grffile.dtx b/Master/texmf-dist/source/latex/oberdiek/grffile.dtx
index 2540a45fc29..05cb4cc8958 100644
--- a/Master/texmf-dist/source/latex/oberdiek/grffile.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/grffile.dtx
@@ -1,6 +1,6 @@
 % \iffalse meta-comment
 %
-% Copyright (C) 2006 by Heiko Oberdiek <oberdiek@uni-freiburg.de>
+% Copyright (C) 2006, 2007 by Heiko Oberdiek <oberdiek@uni-freiburg.de>
 %
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either
@@ -55,7 +55,7 @@
 %
 %<*ignore>
 \begingroup
-  \def\x{LaTeX2e}
+  \def\x{LaTeX2e}%
 \expandafter\endgroup
 \ifcase 0\ifx\install y1\fi\expandafter
          \ifx\csname processbatchFile\endcsname\relax\else1\fi
@@ -66,7 +66,7 @@
 \input docstrip.tex
 \Msg{************************************************************************}
 \Msg{* Installation}
-\Msg{* Package: grffile 2006/11/30 v1.2 Extended file name support for graphics (HO)}
+\Msg{* Package: grffile 2007/04/11 v1.3 Extended file name support for graphics (HO)}
 \Msg{************************************************************************}
 
 \keepsilent
@@ -76,7 +76,7 @@
 
 This is a generated file.
 
-Copyright (C) 2006 by Heiko Oberdiek <oberdiek@uni-freiburg.de>
+Copyright (C) 2006, 2007 by Heiko Oberdiek <oberdiek@uni-freiburg.de>
 
 This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either
@@ -126,11 +126,11 @@ and the derived files
 %<*driver>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{grffile.drv}%
-  [2006/11/30 v1.2 Extended file name support for graphics (HO)]
+  [2007/04/11 v1.3 Extended file name support for graphics (HO)]%
 \documentclass{ltxdoc}
 \usepackage{holtxdoc}
 \begin{document}
-  \DocInput{grffile.dtx}
+  \DocInput{grffile.dtx}%
 \end{document}
 %</driver>
 % \fi
@@ -156,7 +156,7 @@ and the derived files
 % \GetFileInfo{grffile.drv}
 %
 % \title{The \xpackage{grffile} package}
-% \date{2006/11/30 v1.2}
+% \date{2007/04/11 v1.3}
 % \author{Heiko Oberdiek\\\xemail{oberdiek@uni-freiburg.de}}
 %
 % \maketitle
@@ -304,7 +304,7 @@ and the derived files
 %<*package>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{grffile}%
-  [2006/11/30 v1.2 Extended file name support for graphics (HO)]
+  [2007/04/11 v1.3 Extended file name support for graphics (HO)]%
 %    \end{macrocode}
 %
 % \subsection{Catcode stuff}
@@ -337,9 +337,9 @@ and the derived files
 %    \begin{macrocode}
 \RequirePackage{ifpdf}
 \RequirePackage{kvoptions}[2006/08/17]
-\SetupKeyvalOptions{
-  family=Gin,
-  prefix=grffile@
+\SetupKeyvalOptions{%
+  family=Gin,%
+  prefix=grffile@%
 }
 \DeclareBoolOption[true]{multidot}
 \DeclareBoolOption[true]{babel}
@@ -534,13 +534,47 @@ and the derived files
 %    \end{macrocode}
 % \section{Installation}
 %
-% \paragraph{CTAN.} This package is available on
+% \subsection{Download}
+%
+% \paragraph{Package.} This package is available on
 % CTAN\footnote{\url{ftp://ftp.ctan.org/tex-archive/}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/grffile.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/grffile.pdf}] Documentation.
 % \end{description}
 %
+%
+% \paragraph{Bundle.} All the packages of the bundle `oberdiek'
+% are also available in a TDS compliant ZIP archive. There
+% the packages are already unpacked and the documentation files
+% are generated. The files and directories obey the TDS standard.
+% \begin{description}
+% \item[\CTAN{macros/latex/contrib/oberdiek/oberdiek-tds.zip}]
+% \end{description}
+%
+% \subsection{Bundle installation}
+%
+% \paragraph{Unpacking.} Unpack the \xfile{oberdiek-tds.zip} in the
+% TDS tree (also known as \xfile{texmf} tree) of your choice.
+% Example (linux):
+% \begin{quote}
+%   |unzip oberdiek-tds.zip -d ~/texmf|
+% \end{quote}
+%
+% \paragraph{Script installation.}
+% Check the directory \xfile{TDS:scripts/oberdiek/} for
+% scripts that need further installation steps.
+% Package \xpackage{attachfile2} comes with the Perl script
+% \xfile{pdfatfi.pl} that should be installed in such a way
+% that it can be called as \texttt{pdfatfi}.
+% Example (linux):
+% \begin{quote}
+%   |chmod +x scripts/oberdiek/pdfatfi.pl|\\
+%   |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
+% \end{quote}
+%
+% \subsection{Package installation}
+%
 % \paragraph{Unpacking.} The \xfile{.dtx} file is a self-extracting
 % \docstrip\ archive. The files are extracted by running the
 % \xfile{.dtx} through \plainTeX:
@@ -571,8 +605,10 @@ and the derived files
 % TDS installing feature, then some files can already be in the right
 % place, see the documentation of \docstrip.
 %
-% \paragraph{Refresh file databases.} If your \TeX~distribution
-% (\teTeX, \mikTeX, \dots) rely on file databases, you must refresh
+% \subsection{Refresh file name databases}
+%
+% If your \TeX~distribution
+% (\teTeX, \mikTeX, \dots) relies on file name databases, you must refresh
 % these. For example, \teTeX\ users run \verb|texhash| or
 % \verb|mktexlsr|.
 %
@@ -660,6 +696,10 @@ and the derived files
 %     New option \xoption{babel}. Before this feature was part
 %     of option \xoption{extendedchars}.
 %   \end{Version}
+%   \begin{Version}{2007/04/11 v1.3}
+%   \item
+%     Line ends sanitized.
+%   \end{Version}
 % \end{History}
 %
 % \PrintIndex
diff --git a/Master/texmf-dist/source/latex/oberdiek/holtxdoc.dtx b/Master/texmf-dist/source/latex/oberdiek/holtxdoc.dtx
index 79cf3d16609..5272f3859f1 100644
--- a/Master/texmf-dist/source/latex/oberdiek/holtxdoc.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/holtxdoc.dtx
@@ -55,7 +55,7 @@
 %
 %<*ignore>
 \begingroup
-  \def\x{LaTeX2e}
+  \def\x{LaTeX2e}%
 \expandafter\endgroup
 \ifcase 0\ifx\install y1\fi\expandafter
          \ifx\csname processbatchFile\endcsname\relax\else1\fi
@@ -126,11 +126,11 @@ and the derived files
 %<*driver>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{holtxdoc.drv}%
-  [2006/06/02 v0.7 Private additional ltxdoc support (HO)]
+  [2006/06/02 v0.7 Private additional ltxdoc support (HO)]%
 \documentclass{ltxdoc}
 \usepackage{holtxdoc}
 \begin{document}
-  \DocInput{holtxdoc.dtx}
+  \DocInput{holtxdoc.dtx}%
 \end{document}
 %</driver>
 % \fi
@@ -393,13 +393,47 @@ and the derived files
 %    \end{macrocode}
 % \section{Installation}
 %
-% \paragraph{CTAN.} This package is available on
+% \subsection{Download}
+%
+% \paragraph{Package.} This package is available on
 % CTAN\footnote{\url{ftp://ftp.ctan.org/tex-archive/}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/holtxdoc.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/holtxdoc.pdf}] Documentation.
 % \end{description}
 %
+%
+% \paragraph{Bundle.} All the packages of the bundle `oberdiek'
+% are also available in a TDS compliant ZIP archive. There
+% the packages are already unpacked and the documentation files
+% are generated. The files and directories obey the TDS standard.
+% \begin{description}
+% \item[\CTAN{macros/latex/contrib/oberdiek/oberdiek-tds.zip}]
+% \end{description}
+%
+% \subsection{Bundle installation}
+%
+% \paragraph{Unpacking.} Unpack the \xfile{oberdiek-tds.zip} in the
+% TDS tree (also known as \xfile{texmf} tree) of your choice.
+% Example (linux):
+% \begin{quote}
+%   |unzip oberdiek-tds.zip -d ~/texmf|
+% \end{quote}
+%
+% \paragraph{Script installation.}
+% Check the directory \xfile{TDS:scripts/oberdiek/} for
+% scripts that need further installation steps.
+% Package \xpackage{attachfile2} comes with the Perl script
+% \xfile{pdfatfi.pl} that should be installed in such a way
+% that it can be called as \texttt{pdfatfi}.
+% Example (linux):
+% \begin{quote}
+%   |chmod +x scripts/oberdiek/pdfatfi.pl|\\
+%   |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
+% \end{quote}
+%
+% \subsection{Package installation}
+%
 % \paragraph{Unpacking.} The \xfile{.dtx} file is a self-extracting
 % \docstrip\ archive. The files are extracted by running the
 % \xfile{.dtx} through \plainTeX:
@@ -430,8 +464,10 @@ and the derived files
 % TDS installing feature, then some files can already be in the right
 % place, see the documentation of \docstrip.
 %
-% \paragraph{Refresh file databases.} If your \TeX~distribution
-% (\teTeX, \mikTeX, \dots) rely on file databases, you must refresh
+% \subsection{Refresh file name databases}
+%
+% If your \TeX~distribution
+% (\teTeX, \mikTeX, \dots) relies on file name databases, you must refresh
 % these. For example, \teTeX\ users run \verb|texhash| or
 % \verb|mktexlsr|.
 %
diff --git a/Master/texmf-dist/source/latex/oberdiek/hycolor.dtx b/Master/texmf-dist/source/latex/oberdiek/hycolor.dtx
new file mode 100644
index 00000000000..4d32f2b1efa
--- /dev/null
+++ b/Master/texmf-dist/source/latex/oberdiek/hycolor.dtx
@@ -0,0 +1,1481 @@
+% \iffalse meta-comment
+%
+% Copyright (C) 2007 by Heiko Oberdiek <oberdiek@uni-freiburg.de>
+%
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either
+% version 1.3 of this license or (at your option) any later
+% version. 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.
+%
+% This work consists of the main source file hycolor.dtx
+% and the derived files
+%    hycolor.sty, hycolor.pdf, hycolor.ins, hycolor.drv,
+%    hycolor-test1.tex, hycolor-test2.tex.
+%
+% Distribution:
+%    CTAN:macros/latex/contrib/oberdiek/hycolor.dtx
+%    CTAN:macros/latex/contrib/oberdiek/hycolor.pdf
+%
+% Unpacking:
+%    (a) If hycolor.ins is present:
+%           tex hycolor.ins
+%    (b) Without hycolor.ins:
+%           tex hycolor.dtx
+%    (c) If you insist on using LaTeX
+%           latex \let\install=y\input{hycolor.dtx}
+%        (quote the arguments according to the demands of your shell)
+%
+% Documentation:
+%    (a) If hycolor.drv is present:
+%           latex hycolor.drv
+%    (b) Without hycolor.drv:
+%           latex hycolor.dtx; ...
+%    The class ltxdoc loads the configuration file ltxdoc.cfg
+%    if available. Here you can specify further options, e.g.
+%    use A4 as paper format:
+%       \PassOptionsToClass{a4paper}{article}
+%
+%    Programm calls to get the documentation (example):
+%       pdflatex hycolor.dtx
+%       makeindex -s gind.ist hycolor.idx
+%       pdflatex hycolor.dtx
+%       makeindex -s gind.ist hycolor.idx
+%       pdflatex hycolor.dtx
+%
+% Installation:
+%    TDS:tex/latex/oberdiek/hycolor.sty
+%    TDS:doc/latex/oberdiek/hycolor.pdf
+%    TDS:doc/latex/oberdiek/hycolor-test1.tex
+%    TDS:doc/latex/oberdiek/hycolor-test2.tex
+%    TDS:source/latex/oberdiek/hycolor.dtx
+%
+%<*ignore>
+\begingroup
+  \def\x{LaTeX2e}%
+\expandafter\endgroup
+\ifcase 0\ifx\install y1\fi\expandafter
+         \ifx\csname processbatchFile\endcsname\relax\else1\fi
+         \ifx\fmtname\x\else 1\fi\relax
+\else\csname fi\endcsname
+%</ignore>
+%<*install>
+\input docstrip.tex
+\Msg{************************************************************************}
+\Msg{* Installation}
+\Msg{* Package: hycolor 2007/04/11 v1.1 Code for color options of hyperref/bookmark (HO)}
+\Msg{************************************************************************}
+
+\keepsilent
+\askforoverwritefalse
+
+\preamble
+
+This is a generated file.
+
+Copyright (C) 2007 by Heiko Oberdiek <oberdiek@uni-freiburg.de>
+
+This work may be distributed and/or modified under the
+conditions of the LaTeX Project Public License, either
+version 1.3 of this license or (at your option) any later
+version. 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.
+
+This work consists of the main source file hycolor.dtx
+and the derived files
+   hycolor.sty, hycolor.pdf, hycolor.ins, hycolor.drv,
+   hycolor-test1.tex, hycolor-test2.tex.
+
+\endpreamble
+
+\generate{%
+  \file{hycolor.ins}{\from{hycolor.dtx}{install}}%
+  \file{hycolor.drv}{\from{hycolor.dtx}{driver}}%
+  \usedir{tex/latex/oberdiek}%
+  \file{hycolor.sty}{\from{hycolor.dtx}{package}}%
+  \usedir{doc/latex/oberdiek}%
+  \file{hycolor-test1.tex}{\from{hycolor.dtx}{test,test1}}%
+  \file{hycolor-test2.tex}{\from{hycolor.dtx}{test,test2}}%
+}
+
+\obeyspaces
+\Msg{************************************************************************}
+\Msg{*}
+\Msg{* To finish the installation you have to move the following}
+\Msg{* file into a directory searched by TeX:}
+\Msg{*}
+\Msg{*     hycolor.sty}
+\Msg{*}
+\Msg{* To produce the documentation run the file `hycolor.drv'}
+\Msg{* through LaTeX.}
+\Msg{*}
+\Msg{* Happy TeXing!}
+\Msg{*}
+\Msg{************************************************************************}
+
+\endbatchfile
+%</install>
+%<*ignore>
+\fi
+%</ignore>
+%<*driver>
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesFile{hycolor.drv}%
+  [2007/04/11 v1.1 Code for color options of hyperref/bookmark (HO)]%
+\documentclass{ltxdoc}
+\usepackage{holtxdoc}
+\usepackage[ruled]{algorithm2e}
+
+\makeatletter
+\newcommand*{\makedefaultH}[1]{%
+  \expandafter\edef\csname #1\endcsname{%
+      \noexpand\@protected@testopt
+      \expandafter\noexpand\csname#1\endcsname
+      \expandafter\noexpand\csname
+          \expandafter\string\csname#1\endcsname\endcsname
+      {H}%
+  }%
+}
+\makeatother
+\makedefaultH{algorithm}
+\makedefaultH{procedure}
+\makedefaultH{function}
+
+\SetKwInput{KwParam}{Param}
+\newcommand*{\Param}[2]{%
+  \KwParam{\ArgSty{#1} (#2)}%
+}
+\newcommand*{\Dat}[1]{%
+  \texttt{\upshape#1}%
+}
+\newcommand*{\Var}[1]{%
+  \ArgSty{#1}%
+}
+\newcommand*{\Gets}{%
+  \ensuremath{\leftarrow}%
+  \ %
+}
+
+\makeatletter
+\newcommand*{\bs}{\texttt{\@backslashchar}}
+\makeatother
+\begin{document}
+  \DocInput{hycolor.dtx}%
+\end{document}
+%</driver>
+% \fi
+%
+% \CheckSum{1043}
+%
+% \CharacterTable
+%  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
+%   Lower-case    \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
+%   Digits        \0\1\2\3\4\5\6\7\8\9
+%   Exclamation   \!     Double quote  \"     Hash (number) \#
+%   Dollar        \$     Percent       \%     Ampersand     \&
+%   Acute accent  \'     Left paren    \(     Right paren   \)
+%   Asterisk      \*     Plus          \+     Comma         \,
+%   Minus         \-     Point         \.     Solidus       \/
+%   Colon         \:     Semicolon     \;     Less than     \<
+%   Equals        \=     Greater than  \>     Question mark \?
+%   Commercial at \@     Left bracket  \[     Backslash     \\
+%   Right bracket \]     Circumflex    \^     Underscore    \_
+%   Grave accent  \`     Left brace    \{     Vertical bar  \|
+%   Right brace   \}     Tilde         \~}
+%
+% \GetFileInfo{hycolor.drv}
+%
+% \title{The \xpackage{hycolor} package}
+% \date{2007/04/11 v1.1}
+% \author{Heiko Oberdiek\\\xemail{oberdiek@uni-freiburg.de}}
+%
+% \maketitle
+%
+% \begin{abstract}
+% Package \xpackage{hycolor} implements the color option stuff that
+% is used by packages \xpackage{hyperref} and \xpackage{bookmark}.
+% It is not intended as package for the user.
+% \end{abstract}
+%
+% \tableofcontents
+%
+% \section{Documentation}
+%
+% The package \xpackage{hycolor} implements color options
+% for packages \xpackage{hyperref} and \xpackage{bookmark}.
+%
+% Package \xpackage{xcolor} provides macros for extracting
+% color values and converting color data to other color models.
+% If this package is loaded, the full range of color specifications
+% of packages \xpackage{color} and \xpackage{xcolor} are supported
+% including the optional argument for the color model.
+% \begin{quote}
+%   |\hyperref{linkbordercolor=red}%| needs \xpackage{xcolor}\\
+%   |\hyperref{linkbordercolor=[named]{red}%| needs \xpackage{xcolor}\\
+%   |\hyperref{linkbordercolor=[rgb]{1,0,0}|\\
+% \end{quote}
+%
+% Without package \xpackage{xcolor} some of the options only
+% support some models, if they are given directly, e.g.:
+% \begin{quote}
+%   |\bookmarksetup{color=[rgb]{1,0,0}}|
+% \end{quote}
+%
+% Because of compatibility some options of \xpackage{hyperref}
+% also support space separated RGB values:
+% \begin{quote}
+%   |\hypersetup{linkbordercolor=1 0 0}%| is the same as\\
+%   |\hypersetup{linkbordercolor=[rgb]{1,0,0}}|
+% \end{quote}
+%
+% Coloring is optional, it can be turned off by using an empty
+% value:
+% \begin{quote}
+%   |\hypersetup{linkbordercolor={}}|
+% \end{quote}
+%
+% The PDF specification knows some kind of an emtpy color setting
+% without values. This applies to form field colors. The new
+% A virtual color model \texttt{empty} is introduced for this
+% purpose, e.g.
+% \begin{quote}
+%   |\TextField[backgroundcolor={[empty]{}}, ...]{...}%| or\\
+%   |\TextField[{backgroundcolor=[empty]{}, ...}]{...}|
+% \end{quote}
+% PDF specification 1.7 also allows this for border link colors.
+% But this isn't currently supported by this package, because
+% the tested viewers (AR7/Linux, xpdf 3.00, ghostscript 8.54)
+% don't support this yet. In contrary ghostscript generates an
+% error message.
+%
+% \subsection{Summary}
+%
+% \begin{quote}
+% \begin{tabular}{@{}llll@{}}
+%   Color option & Models without \xpackage{xcolor}
+%   & RGB color & Model empty\\
+%   \hline
+%   |BKM.color| & |gray|, |rgb| & no & no\\
+%   |Hyp.*color| & all & no & no\\
+%   |Hyp.*bordercolor| & |gray|, |rgb| & yes & no\\
+%   |Field.*color| & |gray|, |rgb|, |cmyk| & yes & yes\\
+% \end{tabular}
+% \end{quote}
+% Explanation of the color option prefixes:
+% \begin{quote}
+% \begin{tabular}{@{}ll@{}}
+%   Prefix & Explanation\\
+%   \hline
+%   |BKM| & Package \xpackage{bookmark}\\
+%   |Hyp| & Package \xpackage{hyperref}:
+%           package options or |\hypersetup|\\
+%   |Field| & Package \xpackage{hyperref}:
+%             Form field options\\
+% \end{tabular}
+% \end{quote}
+%
+%
+% \StopEventually{
+% }
+%
+% \section{Implementation}
+%
+%    \begin{macrocode}
+%<*package>
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{hycolor}%
+  [2007/04/11 v1.1 Code for color options of hyperref/bookmark (HO)]%
+%    \end{macrocode}
+%
+% \subsection{Normalization}
+%
+% \subsubsection{Sanitize value of color option}
+%
+%    \begin{procedure}
+%      \Param{cmd}{macro}
+%      \Param{value}{value of color option}
+%      \BlankLine
+%      \KwResult{\ArgSty{value} is expanded, sanitized, and
+%                stored in macro \ArgSty{cmd}.}
+%      \caption{DefSanitized(cmd, value)}
+%      \BlankLine
+%      Initialize active characters\;
+%      \ArgSty{cmd} := Expand \ArgSty{value}\;
+%      Sanitize \ArgSty{cmd}\;
+%    \end{procedure}
+%    \emph{Sanitization} means that the string does not contain any
+%    macros or special tokens. It consists of characters with
+%    catcode 12 (other). The only exception is the space with
+%    catcode 10 (space).
+%    \begin{macro}{\HyColor@DefSanitized}
+%    \begin{macrocode}
+\begingroup
+  \catcode`\!=13 %
+  \catcode`\:=13 %
+  \catcode`\-=13 %
+  \catcode`\+=13 %
+  \catcode`\;=13 %
+  \catcode`\"=13 %
+  \catcode`\>=13 %
+  \edef\x{%
+    \def\noexpand!{\string!}%
+    \def\noexpand:{\string:}%
+    \def\noexpand-{\string-}%
+    \def\noexpand+{\string+}%
+    \def\noexpand;{\string;}%
+    \def\noexpand"{\string"}%
+    \def\noexpand>{\string>}%
+  }%
+  \def\y#1{\endgroup
+    \def\HyColor@DefSanitized##1##2{%
+      \begingroup
+        \csname @safe@activestrue\endcsname
+        #1%
+        \edef\x{\endgroup
+          \def\noexpand##1{##2}%
+        }%
+      \x
+      \@onelevel@sanitize##1%
+    }%
+  }%
+\expandafter\y\expandafter{\x}
+%    \end{macrocode}
+%    \end{macro}
+%
+% \subsubsection{Normalize result}
+%
+%    \begin{procedure}
+%      \Param{value}{Sanitized explicit number}
+%      \Param{cmd}{Macro that stores result}
+%      \BlankLine
+%      \KwResult{\ArgSty{cmd} contains normalized number}
+%      \caption{NormalizeNum(value, cmd)}
+%      \BlankLine
+%      \uIf{\Var{value}\,\Dat{pt} $<$ \Dat{0pt}}{
+%        \ArgSty{cmd} \Gets \Dat{0}\;
+%      }
+%      \uElseIf{number before dot of \Var{value} $<$ \Dat{1}}{
+%        \Var{cmd} \Gets number after dot of \Var{value}\;
+%        \Var{cmd} \Gets strip trailing zeros from \Var{cmd}\;
+%        \If{dot remains only}{
+%          \Var{cmd} \Gets \Dat{0}\;
+%        }
+%      }
+%      \Else{
+%        \Var{cmd} \Gets \Dat{1}\;
+%      }
+%    \end{procedure}
+%    The number is limited to the range between 0.0 and 1.0 and
+%    formatted as short PDF number without leading or trailing zeros.
+%    The precision of the number isn't changed.
+%    \begin{macro}{\HyColor@NormalizeNum}
+%    \begin{macrocode}
+\def\HyColor@NormalizeNum#1#2{%
+  \ifdim#1pt<\z@
+    \def#2{0}%
+  \else
+    \edef#2{\zap@space#1 \@empty}%
+    \expandafter\HyColor@CheckDot#2..\@nil#2%
+  \fi
+}
+\def\HyColor@CheckDot#1.#2.#3\@nil#4{%
+  \ifnum0#1<\@ne
+    \ifx\\#2\\%
+      \def#4{0}%
+    \else
+      \edef#4{\HyColor@ReverseString#2\@nil{}}%
+      \edef#4{\expandafter\HyColor@StripLeadingZeros#4\@empty}%
+      \ifx#4\@empty
+        \def#4{0}%
+      \else
+        \edef#4{.\expandafter\HyColor@ReverseString#4\@nil{}}%
+      \fi
+    \fi
+  \else
+    \def#4{1}%
+  \fi
+}
+\def\HyColor@ReverseString#1#2\@nil#3{%
+  \ifx\\#2\\%
+    #1#3%
+  \else
+    \@ReturnAfterFi{%
+      \HyColor@ReverseString#2\@nil{#1#3}%
+    }%
+  \fi
+}
+\long\def\@ReturnAfterFi#1\fi{\fi#1}
+\def\HyColor@StripLeadingZeros#1{%
+  \ifx#10%
+    \expandafter\HyColor@StripLeadingZeros
+  \else
+    #1%
+  \fi
+}
+%    \end{macrocode}
+%    \end{macro}
+%
+%    \begin{macro}{\HyColor@NormalizeCommaRGB}
+%    \begin{macrocode}
+\def\HyColor@NormalizeCommaRGB#1,#2,#3\@nil#4{%
+  \HyColor@NormalizeNum{#1}\HyColor@temp
+  \let#4\HyColor@temp
+  \HyColor@NormalizeNum{#2}\HyColor@temp
+  \edef#4{#4 \HyColor@temp}%
+  \HyColor@NormalizeNum{#3}\HyColor@temp
+  \edef#4{#4 \HyColor@temp}%
+}
+%    \end{macrocode}
+%    \end{macro}
+%
+%    \begin{macro}{\HyColor@NormalizeCommaCMYK}
+%    \begin{macrocode}
+\def\HyColor@NormalizeCommaCMYK#1,#2,#3,#4\@nil#5{%
+  \HyColor@NormalizeNum{#1}\HyColor@temp
+  \let#5\HyColor@temp
+  \HyColor@NormalizeNum{#2}\HyColor@temp
+  \edef#5{#5 \HyColor@temp}%
+  \HyColor@NormalizeNum{#3}\HyColor@temp
+  \edef#5{#5 \HyColor@temp}%
+  \HyColor@NormalizeNum{#4}\HyColor@temp
+  \edef#5{#5 \HyColor@temp}%
+}
+%    \end{macrocode}
+%    \end{macro}
+%
+% \subsection{Main algorithm for color options}
+%
+% \begin{procedure}
+%   \Param{key}{name of color option}
+%   \Param{value}{value of color option}
+%   \Param{cmd}{macro that stores result}
+%   \BlankLine
+%   \KwResult{Macro \ArgSty{cmd} contains the calculated
+%      color specification string or has the meaning of \cs{relax}
+%      if the color must not set}
+%   \caption{Main color option algorithm()}
+%   \BlankLine
+%   DefSanitized(\ArgSty{temp}, \ArgSty{value})\;
+%   Call option specific algorithm(\ArgSty{key}, \ArgSty{temp}, \ArgSty{cmd})\;
+% \end{procedure}
+%
+% \subsection{Package \xpackage{bookmark}}
+%
+% Since v0.8 2007/03/27 package \xpackage{bookmark} only provides
+% one color option \xoption{color}. Because option \xoption{rgbcolor}
+% can easily given as color specification in model rgb:
+% \begin{quote}
+%   |rgbcolor=r g b| $\equiv$ |color=[rgb]{r,g,b}|
+% \end{quote}
+% Package \xpackage{bookmark} stores the result in macro \cs{BKM@color}.
+% The empty string is interpreted as \emph{no color}.
+%
+% \begin{procedure}
+%   \Param{value}{value of option \xoption{color}}
+%   \Param{cmd}{macro for result}
+%   \Param{package}{package name for error message}
+%   \Param{option}{option name for error message}
+%   \BlankLine
+%   \Switch{\Var{value}}{
+%     \Case{empty}{
+%       \Var{cmd} \Gets no color\;
+%     }
+%     \Case{with model}{
+%       \eIf{with xcolor}{
+%         \Var{cmd} \Gets ConvertToRGB(\Var{model}, \Var{values})\;
+%       }{
+%         \uIf{model $=$ rgb}{
+%           \Var{cmd} \Gets \Var{values} as normalized values\;
+%         }
+%         \uElseIf{model $=$ gray}{
+%           \Var{cmd} \Gets \Var{values} as normalized tripled values\;
+%         }
+%         \Else{
+%           error\;
+%         }
+%       }
+%     }
+%     \Other{
+%       \eIf{with xcolor}{
+%         (\Var{model}, \Var{values} \Gets get model and values\;
+%         \Var{cmd} \Gets ConvertToRGB(\Var{model}, \Var{values})\;
+%       }{
+%         error\;
+%       }
+%     }
+%   }
+% \end{procedure}
+%
+%    \begin{macrocode}
+\def\HyColor@BookmarkColor#1#2#3#4{%
+  \HyColor@IfModel{#1}{%
+    \HyColor@IfXcolor{%
+      \convertcolorspec\HyColor@model\HyColor@values
+                       \HyColor@model@rgb#2%
+      \expandafter\HyColor@NormalizeCommaRGB#2\@nil#2%
+    }{%
+      \ifx\HyColor@model\HyColor@model@rgb
+        \expandafter\HyColor@NormalizeCommaRGB\HyColor@values\@nil#2%
+      \else
+        \ifx\HyColor@model\HyColor@model@gray
+          \expandafter\HyColor@NormalizeNum
+              \expandafter{\HyColor@values}#2%
+          \edef#2{#2 #2 #2}%
+        \else
+          \let#2\@empty
+          \HyColor@ErrorModelNoXcolor{#3}{#4}%
+        \fi
+      \fi
+    }%
+  }{%
+    \let#2\HyColor@values
+    \ifx#2\@empty
+    \else
+      \HyColor@IfXcolor{%
+        \extractcolorspec{#1}#2%
+        \expandafter\convertcolorspec#2\HyColor@model@rgb#2%
+        \expandafter\HyColor@NormalizeCommaRGB#2\@nil#2%
+      }{%
+        \let#2\@empty
+        \HyColor@ErrorSpecNoXcolor{#3}{#4}%
+      }%
+    \fi
+  }%
+}
+%    \end{macrocode}
+%    \begin{macrocode}
+\def\HyColor@ErrorModelNoXcolor#1#2{%
+  \PackageError{#1}{%
+    Color model `\HyColor@model' is not supported\MessageBreak
+    without package `xcolor' in\MessageBreak
+    `#2=[\HyColor@model]{\HyColor@values}'%
+  }\@ehc
+}
+%    \end{macrocode}
+%    \begin{macrocode}
+\def\HyColor@ErrorSpecNoXcolor#1#2{%
+  \PackageError{#1}{%
+    This color specification is not supported\MessageBreak
+    without package `xcolor' in\MessageBreak
+    `#2=\HyColor@values'%
+  }\@ehc
+}
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+\def\HyColor@IfModel#1{%
+  \@ifnextchar[{%
+    \HyColor@WithModel
+  }{%
+    \HyColor@WithoutModel
+  }%
+  #1\@nil
+}
+\def\HyColor@WithModel[#1]#2\@nil{%
+  \HyColor@DefSanitized\HyColor@model{#1}%
+  \HyColor@DefSanitized\HyColor@values{#2}%
+  \@firstoftwo
+}
+\def\HyColor@WithoutModel#1\@nil{%
+  \let\HyColor@model\relax
+  \HyColor@DefSanitized\HyColor@values{#1}%
+  \@secondoftwo
+}
+%    \end{macrocode}
+%
+% \subsection{Utils}
+%
+%    \begin{macro}{\@ReturnAfterFi}
+%    \begin{macrocode}
+\long\def\@ReturnAfterFi#1\fi{\fi#1}
+%    \end{macrocode}
+%    \end{macro}
+%
+%    \begin{macro}{\HyColor@IfXcolor}
+%    \begin{macrocode}
+\def\HyColor@IfXcolor{%
+  \begingroup\expandafter\expandafter\expandafter\endgroup
+  \expandafter\ifx\csname convertcolorspec\endcsname\relax
+    \expandafter\@secondoftwo
+  \else
+    \expandafter\@firstoftwo
+  \fi
+}
+%    \end{macrocode}
+%    \end{macro}
+%
+%    \begin{macrocode}
+\def\HyColor@model@empty{empty}
+\@onelevel@sanitize\HyColor@model@empty
+\def\HyColor@model@gray{gray}
+\@onelevel@sanitize\HyColor@model@gray
+\def\HyColor@model@rgb{rgb}
+\@onelevel@sanitize\HyColor@model@rgb
+\def\HyColor@model@cmyk{cmyk}
+\@onelevel@sanitize\HyColor@model@cmyk
+\def\HyColor@model@Gray{Gray}
+\@onelevel@sanitize\HyColor@model@Gray
+%    \end{macrocode}
+%
+% \subsection{Package \xpackage{hyperref}}
+%
+% \subsubsection{Options \xoption{Hyp.*color}}
+%
+%    \begin{macrocode}
+\def\HyColor@UseColor#1{%
+  \ifx#1\relax
+  \else
+    \ifx#1\@empty
+    \else
+      \expandafter\HyColor@@UseColor#1\@nil
+    \fi
+  \fi
+}
+\def\HyColor@@UseColor{%
+  \@ifnextchar[\HyColor@@@UseColor\HyColor@@@@UseColor
+}
+\def\HyColor@@@UseColor[#1]#2\@nil{%
+  \color[{#1}]{#2}%
+}
+\def\HyColor@@@@UseColor#1\@nil{%
+  \color{#1}%
+}
+%    \end{macrocode}
+%
+% \begin{procedure}
+%   \Param{value}{value of the option}
+%   \Param{cmd}{macro for result}
+%   \caption{HyperrefColor(value, cmd)}
+%   \BlankLine
+%   \Switch{\Var{value}}{
+%     \Case{empty}{
+%       \Var{cmd} \Gets no color\;
+%     }
+%     \Case{with model}{
+%       Call \cs{color} with model\;
+%     }
+%     \Case{without model}{
+%       Call \cs{color} without model\;
+%     }
+%   }
+% \end{procedure}
+%
+%    \begin{macrocode}
+\def\HyColor@HyperrefColor#1#2{%
+  \HyColor@IfModel{#1}{%
+    \edef#2{[{\HyColor@model}]{\HyColor@values}}%
+  }{%
+    \let#2\HyColor@values
+    \ifx#2\@empty
+      \let#2\relax
+    \fi
+  }%
+}
+%    \end{macrocode}
+%
+% \subsubsection{Generic algorithm}
+%
+% \begin{procedure}
+%   \small
+%   \Param{value}{value of the option}
+%   \Param{cmd}{macro for result}
+%   \Param{package}{package name for error message}
+%   \Param{option}{option name for error message}
+%   \caption{Algorithm X0134(value, cmd, package, option)}
+%   \BlankLine
+%   \Switch{\Var{value}}{
+%     \Case{empty}{
+%       \Var{cmd} \Gets no color\;
+%     }
+%     \Case{with model}{
+%       \Switch{\Var{model}}{
+%         \Case{empty}{
+%           \Var{cmd} \Gets ""\;
+%         }
+%         \Case{gray, rgb, cmyk}{
+%           \Var{cmd} \Gets \Var{output}()\;
+%         }
+%         \Case{Gray}{
+%           \eIf{with xcolor}{
+%             (\Var{model}, \Var{values}) \Gets convert to gray\;
+%           }{
+%             error(\Var{package}, \Var{option}, "Missing xcolor"),
+%             \Var{cmd} \Gets no color\;
+%           }
+%         }
+%         \Else{
+%           \eIf{with xcolor}{
+%             (\Var{model}, \Var{values}) \Gets convert to rgb\;
+%             \Var{cmd} \Gets \Var{output}()\;
+%           }{
+%             error(\Var{package}, \Var{option}, "Missing xcolor"),
+%             \Var{cmd} \Gets no color\;
+%           }
+%         }
+%       }
+%     }
+%     \Case{rgb values}{
+%       (\Var{model}, \Var{values}) \Gets ("rgb", (r,g,b))\;
+%       \Var{cmd} \Gets \Var{output}()\;
+%     }
+%     \Case{without model}{
+%       \eIf{with xcolor}{
+%         (\Var{model}, \Var{values}) \Gets
+%             get model and values(\Var{value})\;
+%         \Switch{\Var{model}}{
+%           \Case{gray, rgb, cmyk}{
+%             \Var{cmd} \Gets \Var{output}()\;
+%           }
+%           \Case{Gray}{
+%             (\Var{model}, \Var{values}) \Gets convert to gray\;
+%             \Var{cmd} \Gets \Var{output}()\;
+%           }
+%           \Else{
+%             (\Var{model}, \Var{values}) \Gets convert to rgb\;
+%             \Var{cmd} \Gets \Var{output}()\;
+%           }
+%         }
+%       }{
+%         error(\Var{package}, \Var{option}, "Missing xcolor"),
+%         \Var{cmd} \Gets no color\;
+%       }
+%     }
+%   }
+% \end{procedure}
+%
+%    \begin{macro}{\HyColor@XZeroOneThreeFour}
+%    \begin{macrocode}
+\def\HyColor@XZeroOneThreeFour#1#2#3#4{%
+  \HyColor@IfModel{#1}{%
+    \ifx\HyColor@model\HyColor@model@empty
+      \let#2\@empty
+    \else\ifx\HyColor@model\HyColor@model@gray
+      \expandafter\HyColor@NormalizeNum
+          \expandafter{\HyColor@values}#2%
+    \else\ifx\HyColor@model\HyColor@model@rgb
+      \expandafter\HyColor@NormalizeCommaRGB\HyColor@values\@nil#2%
+    \else\ifx\HyColor@model\HyColor@model@cmyk
+      \expandafter\HyColor@NormalizeCommaCMYK\HyColor@values\@nil#2%
+    \else\ifx\HyColor@model\HyColor@model@Gray
+      \HyColor@IfXcolor{%
+        \convertcolorspec\HyColor@model\HyColor@values
+                         \HyColor@model@gray#2%
+        \expandafter\HyColor@NormalizeNum\expandafter{#2}#2%
+        \let\HyColor@model\HyColor@model@gray
+      }{%
+        \let#2\relax
+        \HyColor@ErrorModelNoXcolor{#3}{#4}%
+      }%
+    \else
+      \HyColor@IfXcolor{%
+        \convertcolorspec\HyColor@model\HyColor@values
+                         \HyColor@model@rgb#2%
+        \expandafter\HyColor@NormalizeCommaRGB#2\@nil#2%
+        \let\HyColor@model\HyColor@model@rgb
+      }{%
+        \let#2\relax
+        \HyColor@ErrorModelNoXcolor{#3}{#4}%
+      }%
+    \fi\fi\fi\fi\fi
+  }{%
+    \let#2\HyColor@values
+    \ifx#2\@empty
+      \let#2\relax
+    \else
+      \expandafter\HyColor@IfRGB\expandafter{\HyColor@values}{%
+        \expandafter\HyColor@NormalizeCommaRGB\HyColor@values\@nil#2%
+      }{%
+        \HyColor@IfXcolor{%
+          \expandafter\extractcolorspec\expandafter{\HyColor@values}#2%
+          \edef\HyColor@model{\expandafter\@firstoftwo#2}%
+          \edef\HyColor@values{\expandafter\@secondoftwo#2}%
+          \ifx\HyColor@model\HyColor@model@gray
+            \expandafter\HyColor@NormalizeNum\expandafter
+                {\HyColor@values}#2%
+          \else\ifx\HyColor@model\HyColor@model@rgb
+            \expandafter\HyColor@NormalizeCommaRGB
+                \HyColor@values\@nil#2%
+          \else\ifx\HyColor@model\HyColor@model@cmyk
+            \expandafter\HyColor@NormalizeCommaCMYK
+                \HyColor@values\@nil#2%
+          \else\ifx\HyColor@model\HyColor@model@Gray
+            \convertcolorspec\HyColor@model\HyColor@values
+                \HyColor@model@gray#2%
+            \expandafter\HyColor@NormalizeNum\expandafter
+                {\HyColor@values}#2%
+            \let\HyColor@model\HyColor@model@gray
+          \else
+            \convertcolorspec\HyColor@model\HyColor@values
+                \HyColor@model@rgb#2%
+            \expandafter\HyColor@NormalizeCommaRGB#2\@nil#2%
+            \let\HyColor@model\HyColor@model@rgb
+          \fi\fi\fi\fi
+        }{%
+          \let#2\relax
+          \HyColor@ErrorSpecNoXcolor{#3}{#4}%
+        }%
+      }%
+    \fi
+  }%
+}
+%    \end{macrocode}
+%    \end{macro}
+%
+% \subsubsection{Field options}
+%
+%    \begin{macro}{\HyColor@FieldBColor}
+%    \begin{macrocode}
+\let\HyColor@FieldBColor\HyColor@XZeroOneThreeFour
+%    \end{macrocode}
+%    \end{macro}
+%
+%    \begin{macro}{\HyColor@FieldColor}
+%    \begin{macrocode}
+\def\HyColor@FieldColor#1#2#3#4{%
+  \let\HyColor@model\@empty
+  \HyColor@XZeroOneThreeFour{#1}{#2}{#3}{#4}%
+  \ifx#2\relax
+    \let#2\@empty
+  \else
+    \ifx#2\@empty
+    \else
+      \ifx\HyColor@model\HyColor@model@gray
+        \edef#2{#2 g}%
+      \else\ifx\HyColor@model\HyColor@model@rgb
+        \edef#2{#2 rg}%
+      \else\ifx\HyColor@model\HyColor@model@cmyk
+        \edef#2{#2 k}%
+      \else
+        \PackageError{#3}{Internal error: unsupported color model}\@ehc
+      \fi\fi\fi
+    \fi
+  \fi
+}
+%    \end{macrocode}
+%    \end{macro}
+%
+% \subsubsection{Detection for naked RGB values}
+%
+%    \begin{macro}{\HyColor@IfRGB}
+%    \begin{macrocode}
+\begingroup\expandafter\expandafter\expandafter\endgroup
+\expandafter\ifx\csname pdfmatch\endcsname\relax
+  \expandafter\@firstoftwo
+\else
+  \expandafter\@secondoftwo
+\fi
+{%
+  \newif\ifHyColor@result
+  \begingroup
+    \def\x#1{\endgroup
+      \def\HyColor@IfRGB##1{%
+        \HyColor@@IfRGB##1#1#1#1\@nil
+      }%
+    }%
+  \x{ }%
+  \edef\HyColor@TwoSpaces{\space\space}%
+  \def\HyColor@@IfRGB#1 #2 #3 #4\@nil{%
+    \HyColor@resulttrue
+    \def\HyColor@temp{#4}%
+    \ifx\HyColor@temp\HyColor@TwoSpaces
+      \HyColor@CheckNum{#1}%
+      \ifHyColor@result
+        \HyColor@CheckNum{#2}%
+        \ifHyColor@result
+          \HyColor@CheckNum{#3}%
+        \fi
+      \fi
+    \else
+      \HyColor@resultfalse
+    \fi
+    \ifHyColor@result
+      \let\HyColor@model\HyColor@model@rgb
+      \edef\HyColor@values{#1,#2,#3}%
+      \expandafter\@firstoftwo
+    \else
+      \expandafter\@secondoftwo
+    \fi
+  }%
+  \def\HyColor@zero{0}%
+  \def\HyColor@one{1}%
+  \def\HyColor@dot{.}%
+  \def\HyColor@CheckNum#1{%
+    \def\HyColor@temp{#1}%
+    \ifx\HyColor@temp\@empty
+      \HyColor@resultfalse
+    \else
+      \edef\HyColor@temp{\@car#1\@nil}%
+      \ifx\HyColor@temp\HyColor@zero
+      \else
+        \ifx\HyColor@temp\HyColor@one
+        \else
+          \ifx\HyColor@temp\HyColor@dot
+          \else
+            \HyColor@resultfalse
+          \fi
+        \fi
+      \fi
+    \fi
+  }%
+}{%
+  \def\HyColor@MatchNum{%
+    (0*1\string\.0*|0*1|0+\string\.?[0-9]*|\string\.[0-9]+)%
+  }%
+  \def\HyColor@IfRGB#1{%
+    \ifnum\pdfmatch{^\HyColor@MatchNum\space\HyColor@MatchNum
+        \space\HyColor@MatchNum$}{#1}>\z@
+      \let\HyColor@model\HyColor@model@rgb
+      \edef\HyColor@values{%
+        \expandafter\strip@prefix\pdflastmatch1,%
+        \expandafter\strip@prefix\pdflastmatch2,%
+        \expandafter\strip@prefix\pdflastmatch3%
+      }%
+      \expandafter\@firstoftwo
+    \else
+      \expandafter\@secondoftwo
+    \fi
+  }%
+}
+%    \end{macrocode}
+%    \end{macro}
+%
+% \subsubsection{Options \xoption{*bordercolor}}
+%
+% \begin{procedure}
+%   \Param{value}{value of the option}
+%   \Param{cmd}{macro for result}
+%   \Param{package, option}{package and option for error message}
+%   \caption{HyperrefBorderColor(value, cmd, output, package, option)}
+%   \BlankLine
+%   \Switch{\Var{value}}{
+%     \Case{empty}{
+%       \Var{cmd} \Gets no color\;
+%     }
+%     \Case{with model}{
+%       \eIf{with xcolor}{
+%         (\Var{model}, \Var{values}) \Gets convert to rgb\;
+%         \Var{cmd} \Gets output values\;
+%       }{
+%         \Switch{\Var{model}}{
+%           \Case{rgb, gray}{
+%             \Var{cmd} \Gets output values\;
+%           }
+%           \Else{
+%             error(\Var{package}, \Var{option}, "Missing xcolor")\;
+%             \Var{cmd} \Gets no color\;
+%           }
+%         }
+%       }
+%     }
+%     \Case{rgb values}{
+%       \Var{cmd} \Gets output values\;
+%     }
+%     \Case{without model}{
+%       \eIf{with xcolor}{
+%         (\Var{model}, \Var{values}) \Gets convert to rgb\;
+%         \Var{cmd} \Gets output values\;
+%       }{
+%         error(\Var{package}, \Var{option}, "Missing xcolor");
+%         \Var{cmd} \Gets no color\;
+%       }
+%     }
+%   }
+% \end{procedure}
+%
+%    \begin{macro}{\HyColor@HyperrefBorderColor}
+%    \begin{macrocode}
+\def\HyColor@HyperrefBorderColor#1#2#3#4{%
+  \HyColor@IfModel{#1}{%
+    \HyColor@IfXcolor{%
+      \convertcolorspec\HyColor@model\HyColor@values
+                       \HyColor@model@rgb#2%
+      \expandafter\HyColor@NormalizeCommaRGB#2\@nil#2%
+    }{%
+      \ifx\HyColor@model\HyColor@model@rgb
+        \expandafter\HyColor@NormalizeCommaRGB\HyColor@values\@nil#2%
+      \else
+        \ifx\HyColor@model\HyColor@model@gray
+          \expandafter\HyColor@NormalizeNum
+              \expandafter{\HyColor@values}#2%
+          \edef#2{#2 #2 #2}%
+        \else
+          \let#2\relax
+          \HyColor@ErrorModelNoXcolor{#3}{#4}%
+        \fi
+      \fi
+    }%
+  }{%
+    \let#2\HyColor@values
+    \ifx#2\@empty
+      \let#2\relax
+    \else
+      \expandafter\HyColor@IfRGB\expandafter{\HyColor@values}{%
+        \expandafter\HyColor@NormalizeCommaRGB\HyColor@values\@nil#2%
+      }{%
+        \HyColor@IfXcolor{%
+          \extractcolorspec{#1}#2%
+          \expandafter\convertcolorspec#2\HyColor@model@rgb#2%
+          \expandafter\HyColor@NormalizeCommaRGB#2\@nil#2%
+        }{%
+          \let#2\relax
+          \HyColor@ErrorSpecNoXcolor{#3}{#4}%
+        }%
+      }%
+    \fi
+  }%
+}
+%    \end{macrocode}
+%    \end{macro}
+%
+%    \begin{macrocode}
+%</package>
+%    \end{macrocode}
+%
+% \section{Test}]
+%
+%    \begin{macrocode}
+%<*test1>
+\ProvidesFile{hycolor-test1.tex}[2007/04/11 test file 1]
+%</test1>
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+%<*test2>
+\ProvidesFile{hycolor-test2.tex}[2007/04/11 test file 2]
+\let\pdfmatch\relax
+%</test2>
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+%<*test>
+%    \end{macrocode}
+%    \begin{macrocode}
+\documentclass{article}
+
+\usepackage{qstest}
+\IncludeTests{*}
+\LogTests{lgout}{*}{*}
+
+\makeatletter
+
+\newcommand*{\TestPackageName}{test-package}
+\newcommand*{\TestOptionName}{test-option}
+
+\newcommand\Message{}
+\def\Message#1#{\immediate\write16}
+
+\newcommand*{\ExpectError}[2]{%
+  \begingroup
+    \global\let\saved@errhelp\errhelp
+    \global\let\saved@errmessage\errmessage
+    \let\errhelp\@gobble
+    \def\errmessage##1{%
+      \xdef\@ExpectErrorMessage{##1}%
+    }%
+    \PackageError\TestPackageName{#1}\@ehc
+    \def\errhelp##1{%
+      \global\let\errhelp\saved@errhelp
+    }%
+    \global\let\@ResultErrorMessage\@empty
+    \def\errmessage##1{%
+      \xdef\@ResultErrorMessage{##1}%
+      \global\let\errmessage\saved@errmessage
+      % \Message{[ ##1}%
+      % \Message{] (ignored error)}%
+      % \Message{}%
+    }%
+    #2%
+  \endgroup
+  \Expect*{\@ResultErrorMessage}*{\@ExpectErrorMessage}%
+}
+
+\usepackage{hycolor}
+%</test>
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+%<*test1>
+\begin{qstest}{NumNormalize}{num, normalize}
+  \def\test#1#2{%
+    \HyColor@NormalizeNum{#1}\cmd
+    \Expect*{\cmd}{#2}%
+  }%
+  \test{0}{0}%
+  \test{000}{0}%
+  \test{-1}{0}%
+  \test{ 0 }{0}%
+  \test{1.1}{1}%
+  \test{100}{1}%
+  \test{00100}{1}%
+  \test{99.99}{1}%
+  \test{0.0}{0}%
+  \test{00.00}{0}%
+  \test{0.}{0}%
+  \test{.0}{0}%
+  \test{0.1}{.1}%
+  \test{0.10}{.1}%
+  \test{0.1000}{.1}%
+  \test{.1000}{.1}%
+  \test{0.01}{.01}%
+  \test{0.01010}{.0101}%
+  \test{.0000000001}{.0000000001}%
+  \test{.9999999999}{.9999999999}%
+\end{qstest}
+
+\begin{qstest}{BookmarkColor without xcolor}{bookmark, noxcolor}
+  \def\test#1#2{%
+    \HyColor@BookmarkColor{#1}\cmd\TestPackageName\TestOptionName
+    \Expect*{\cmd}{#2}%
+  }%
+  \test{[rgb]{1,0,0}}{1 0 0}%
+  \test{[gray]{0.10}}{.1 .1 .1}%
+  \test{}{}%
+  \test{[rgb]{ 1 , 1 , 0 }}{1 1 0}%
+  \def\errortest[#1]#2{%
+    \ExpectError{%
+      Color model `#1' is not supported\MessageBreak
+      without package `xcolor' in\MessageBreak
+      `\TestOptionName=[#1]{#2}'%
+    }{%
+      \test{[#1]{#2}}{}%
+    }%
+  }%
+  \errortest[cmyk]{1,0,0,0}%
+  \errortest[empty]{}%
+  \def\errortest#1{%
+    \ExpectError{%
+      This color specification is not supported\MessageBreak
+      without package `xcolor' in\MessageBreak
+      `\TestOptionName=#1'%
+    }{%
+      \test{#1}{}%
+    }%
+  }%
+\end{qstest}
+%</test1>
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+%<*test1|test2>
+\begin{qstest}{X0134 without xcolor}{X0134, noxcolor}
+  \def\test#1#2{%
+    \HyColor@XZeroOneThreeFour{#1}\cmd\TestPackageName\TestOptionName
+    \Expect*{\cmd}{#2}%
+  }%
+  \test{[empty]{}}{}%
+  \test{[rgb]{1,0,0}}{1 0 0}%
+  \test{[gray]{0.10}}{.1}%
+  \test{[cmyk]{0,1,0,0}}{0 1 0 0}%
+  \test{[rgb]{ 1 , 1 , 0 }}{1 1 0}%
+  \def\errortest[#1]#2{%
+    \ExpectError{%
+      Color model `#1' is not supported\MessageBreak
+      without package `xcolor' in\MessageBreak
+      `test-option=[#1]{#2}'%
+    }{%
+      \HyColor@XZeroOneThreeFour{[#1]{#2}}\cmd
+          \TestPackageName\TestOptionName
+      \Expect{true}*{\ifx\cmd\relax true\else false\fi}%
+    }%
+  }%
+  \errortest[Gray]{10}%
+  \errortest[cmy]{1,0,0}%
+  \def\errortest#1{%
+    \ExpectError{%
+      This color specification is not supported\MessageBreak
+      without package `xcolor' in\MessageBreak
+      `test-option=#1'%
+    }{%
+      \HyColor@XZeroOneThreeFour{#1}\cmd\TestPackageName\TestOptionName
+      \Expect{true}*{\ifx\cmd\relax true\else false\fi}%
+    }%
+  }%
+  \errortest{yellow}%
+\end{qstest}
+
+\begin{qstest}{HyperrefBorderColor without xcolor}%
+              {hyperef bordercolor, noxcolor}%
+  \def\test#1#2{%
+    \HyColor@HyperrefBorderColor{#1}\cmd\TestPackageName\TestOptionName
+    \Expect*{\cmd}{#2}%
+  }%
+  \test{[rgb]{1,0,0}}{1 0 0}%
+  \test{[gray]{0.10}}{.1 .1 .1}%
+  \test{[rgb]{ 1 , 1 , 0 }}{1 1 0}%
+  \def\errortest[#1]#2{%
+    \ExpectError{%
+      Color model `#1' is not supported\MessageBreak
+      without package `xcolor' in\MessageBreak
+      `test-option=[#1]{#2}'%
+    }{%
+      \HyColor@HyperrefBorderColor{[#1]{#2}}\cmd
+          \TestPackageName\TestOptionName
+      \Expect{true}*{\ifx\cmd\relax true\else false\fi}%
+    }%
+  }%
+  \errortest[Gray]{10}%
+  \errortest[cmy]{1,0,0}%
+  \errortest[cmyk]{0,1,0,0}%
+  \def\errortest#1{%
+    \ExpectError{%
+      This color specification is not supported\MessageBreak
+      without package `xcolor' in\MessageBreak
+      `test-option=#1'%
+    }{%
+      \HyColor@HyperrefBorderColor{#1}\cmd
+          \TestPackageName\TestOptionName
+      \Expect{true}*{\ifx\cmd\relax true\else false\fi}%
+    }%
+  }%
+  \errortest{yellow}%
+\end{qstest}
+%</test1|test2>
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+%<*test1|test2>
+\usepackage{xcolor}
+\definecolor[named]{MyGreen}{rgb}{0,0.7,0}
+\definecolor{mygreen}{named}{MyGreen}
+%</test1|test2>
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+%<*test1>
+\begin{qstest}{BookmarkColor with xcolor}{bookmark, xcolor}
+  \def\test#1#2{%
+    \HyColor@BookmarkColor{#1}\cmd\PackageName\OptionName
+    \Expect*{\cmd}{#2}%
+  }%
+  \test{[rgb]{1,0,0}}{1 0 0}%
+  \test{[gray]{0.10}}{.1 .1 .1}%
+  \test{}{}%
+  \test{[rgb]{ 1 , 1 , 0 }}{1 1 0}%
+  \test{[cmyk]{1,0,0,0}}{0 1 1}%
+  \test{red}{1 0 0}%
+  \test{cyan}{0 1 1}%
+  \test{red!40!blue}{.4 0 .6}%
+  \test{[Gray]{10}}{.66667 .66667 .66667}%
+  \test{[RGB]{100,200,50}}{.39217 .78432 .19609}%
+  \test{[wave]{363}}{.00316 0 .00316}%
+  \test{[wave]814}{.00797 0 0}%
+  \test{[HSB]{100,200,50}}{.03473 .20833 .12152}%
+  \test{[HTML]{A800FF}}{.65881 0 1}%
+  \test{[cmy]{.3,.5,.2}}{.7 .5 .8}%
+  \test{[cmyk]{.3,.5,.2,.1}}{.6 .4 .7}%
+  \test{[hsb]{.3,.5,.2}}{.12 .2 .1}%
+  \test{[Hsb]{120,.5,.2}}{.1 .2 .1}%
+  \test{[tHsb]{120,.5,.2}}{.2 .2 .1}%
+  \test{[named]{MyGreen}}{0 .7 0}%
+  \test{mygreen}{0 .7 0}%
+\end{qstest}
+
+\begin{qstest}{HyperrefColor}{hyperref, color}
+  \def\test#1#2{%
+    \HyColor@HyperrefColor{#1}\cmd
+    \Expect*{\cmd}{#2}%
+  }%
+  \test{red}{red}%
+  \test{[rgb]{1,0,0}}{[{rgb}]{1,0,0}}%
+  \HyColor@HyperrefColor{}\cmd
+  \Expect{true}*{\ifx\cmd\relax true\else false\fi}%
+\end{qstest}
+%</test1>
+%    \end{macrocode}
+%    \begin{macrocode}
+%<*test1|test2>
+\begin{qstest}{X0134 with xcolor}{hyperref, X0134, xcolor}
+  \def\test#1#2{%
+    \HyColor@XZeroOneThreeFour{#1}\cmd\PackageName\OptionName
+    \Expect*{\cmd}{#2}%
+  }%
+  \test{[empty]{}}{}%
+  \test{[gray]{0.1}}{.1}%
+  \test{[rgb]{1,0.5,0.0}}{1 .5 0}%
+  \test{[cmyk]{0,1,0,0.5}}{0 1 0 .5}%
+  \test{[Gray]{10}}{.66667}%
+  \test{red}{1 0 0}%
+  \test{1 0 0}{1 0 0}%
+  \test{001.0 .23 0}{1 .23 0}%
+  \test{[named]{MyGreen}}{0 .7 0}%
+  \test{mygreen}{0 .7 0}%
+  \HyColor@XZeroOneThreeFour{}\cmd\PackageName\OptionName
+  \Expect{true}*{\ifx\cmd\relax true\else false\fi}%
+\end{qstest}
+
+\begin{qstest}{FieldColor}{hyperref, field, FieldColor}
+  \def\test#1#2{%
+    \HyColor@FieldColor{#1}\cmd\PackageName\OptionName
+    \Expect*{\cmd}{#2}%
+  }%
+  \test{}{}%
+  \test{[gray]{0.7}}{.7 g}%
+  \test{[rgb]{1,0,0}}{1 0 0 rg}%
+  \test{[cmyk]{0,1,0,0}}{0 1 0 0 k}%
+  \test{[cmy]{.5,.4,.3}}{.5 .6 .7 rg}%
+\end{qstest}
+%</test1|test2>
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+%<*test>
+\begin{document}
+\end{document}
+%</test>
+%    \end{macrocode}
+% \section{Installation}
+%
+% \subsection{Download}
+%
+% \paragraph{Package.} This package is available on
+% CTAN\footnote{\url{ftp://ftp.ctan.org/tex-archive/}}:
+% \begin{description}
+% \item[\CTAN{macros/latex/contrib/oberdiek/hycolor.dtx}] The source file.
+% \item[\CTAN{macros/latex/contrib/oberdiek/hycolor.pdf}] Documentation.
+% \end{description}
+%
+%
+% \paragraph{Bundle.} All the packages of the bundle `oberdiek'
+% are also available in a TDS compliant ZIP archive. There
+% the packages are already unpacked and the documentation files
+% are generated. The files and directories obey the TDS standard.
+% \begin{description}
+% \item[\CTAN{macros/latex/contrib/oberdiek/oberdiek-tds.zip}]
+% \end{description}
+%
+% \subsection{Bundle installation}
+%
+% \paragraph{Unpacking.} Unpack the \xfile{oberdiek-tds.zip} in the
+% TDS tree (also known as \xfile{texmf} tree) of your choice.
+% Example (linux):
+% \begin{quote}
+%   |unzip oberdiek-tds.zip -d ~/texmf|
+% \end{quote}
+%
+% \paragraph{Script installation.}
+% Check the directory \xfile{TDS:scripts/oberdiek/} for
+% scripts that need further installation steps.
+% Package \xpackage{attachfile2} comes with the Perl script
+% \xfile{pdfatfi.pl} that should be installed in such a way
+% that it can be called as \texttt{pdfatfi}.
+% Example (linux):
+% \begin{quote}
+%   |chmod +x scripts/oberdiek/pdfatfi.pl|\\
+%   |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
+% \end{quote}
+%
+% \subsection{Package installation}
+%
+% \paragraph{Unpacking.} The \xfile{.dtx} file is a self-extracting
+% \docstrip\ archive. The files are extracted by running the
+% \xfile{.dtx} through \plainTeX:
+% \begin{quote}
+%   \verb|tex hycolor.dtx|
+% \end{quote}
+%
+% \paragraph{TDS.} Now the different files must be moved into
+% the different directories in your installation TDS tree
+% (also known as \xfile{texmf} tree):
+% \begin{quote}
+% \sbox0{^^A
+% \begin{tabular}{@{}>{\ttfamily}l@{$\quad\rightarrow\quad$}>{\ttfamily}l@{}}
+%   hycolor.sty & tex/latex/oberdiek/hycolor.sty\\
+%   hycolor.pdf & doc/latex/oberdiek/hycolor.pdf\\
+%   hycolor-test1.tex & doc/latex/oberdiek/hycolor-test1.tex\\
+%   hycolor-test2.tex & doc/latex/oberdiek/hycolor-test2.tex\\
+%   hycolor.dtx & source/latex/oberdiek/hycolor.dtx\\
+% \end{tabular}^^A
+% }%
+% \ifdim\wd0>\linewidth
+%   \mbox{}\nobreak\hskip0pt minus\leftmargin
+%   \usebox0
+%   \nobreak\hskip0pt minus\rightmargin
+% \else
+%   \usebox0
+% \fi
+% \end{quote}
+% If you have a \xfile{docstrip.cfg} that configures and enables \docstrip's
+% TDS installing feature, then some files can already be in the right
+% place, see the documentation of \docstrip.
+%
+% \subsection{Refresh file name databases}
+%
+% If your \TeX~distribution
+% (\teTeX, \mikTeX, \dots) relies on file name databases, you must refresh
+% these. For example, \teTeX\ users run \verb|texhash| or
+% \verb|mktexlsr|.
+%
+% \subsection{Some details for the interested}
+%
+% \paragraph{Attached source.}
+%
+% The PDF documentation on CTAN also includes the
+% \xfile{.dtx} source file. It can be extracted by
+% AcrobatReader 6 or higher. Another option is \textsf{pdftk},
+% e.g. unpack the file into the current directory:
+% \begin{quote}
+%   \verb|pdftk hycolor.pdf unpack_files output .|
+% \end{quote}
+%
+% \paragraph{Unpacking with \LaTeX.}
+% The \xfile{.dtx} chooses its action depending on the format:
+% \begin{description}
+% \item[\plainTeX:] Run \docstrip\ and extract the files.
+% \item[\LaTeX:] Generate the documentation.
+% \end{description}
+% If you insist on using \LaTeX\ for \docstrip\ (really,
+% \docstrip\ does not need \LaTeX), then inform the autodetect routine
+% about your intention:
+% \begin{quote}
+%   \verb|latex \let\install=y\input{hycolor.dtx}|
+% \end{quote}
+% Do not forget to quote the argument according to the demands
+% of your shell.
+%
+% \paragraph{Generating the documentation.}
+% You can use both the \xfile{.dtx} or the \xfile{.drv} to generate
+% the documentation. The process can be configured by the
+% configuration file \xfile{ltxdoc.cfg}. For instance, put this
+% line into this file, if you want to have A4 as paper format:
+% \begin{quote}
+%   \verb|\PassOptionsToClass{a4paper}{article}|
+% \end{quote}
+% An example follows how to generate the
+% documentation with pdf\LaTeX:
+% \begin{quote}
+%\begin{verbatim}
+%pdflatex hycolor.dtx
+%makeindex -s gind.ist hycolor.idx
+%pdflatex hycolor.dtx
+%makeindex -s gind.ist hycolor.idx
+%pdflatex hycolor.dtx
+%\end{verbatim}
+% \end{quote}
+%
+% \begin{History}
+%   \begin{Version}{2007/04/09 v1.0}
+%   \item
+%     First version.
+%   \end{Version}
+%   \begin{Version}{2007/04/11 v1.1}
+%   \item
+%     Line ends sanitized.
+%   \end{Version}
+% \end{History}
+%
+% \PrintIndex
+%
+% \Finale
+\endinput
diff --git a/Master/texmf-dist/source/latex/oberdiek/hypbmsec.dtx b/Master/texmf-dist/source/latex/oberdiek/hypbmsec.dtx
index cd24b09ef30..58d19605d92 100644
--- a/Master/texmf-dist/source/latex/oberdiek/hypbmsec.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/hypbmsec.dtx
@@ -56,7 +56,7 @@
 %
 %<*ignore>
 \begingroup
-  \def\x{LaTeX2e}
+  \def\x{LaTeX2e}%
 \expandafter\endgroup
 \ifcase 0\ifx\install y1\fi\expandafter
          \ifx\csname processbatchFile\endcsname\relax\else1\fi
@@ -67,7 +67,7 @@
 \input docstrip.tex
 \Msg{************************************************************************}
 \Msg{* Installation}
-\Msg{* Package: hypbmsec 2006/03/05 v2.3 Bookmarks in sectioning commands (HO)}
+\Msg{* Package: hypbmsec 2007/04/11 v2.4 Bookmarks in sectioning commands (HO)}
 \Msg{************************************************************************}
 
 \keepsilent
@@ -128,11 +128,11 @@ and the derived files
 %<*driver>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{hypbmsec.drv}%
-  [2006/03/05 v2.3 Bookmarks in sectioning commands (HO)]
+  [2007/04/11 v2.4 Bookmarks in sectioning commands (HO)]%
 \documentclass{ltxdoc}
 \usepackage{holtxdoc}
 \begin{document}
-  \DocInput{hypbmsec.dtx}
+  \DocInput{hypbmsec.dtx}%
 \end{document}
 %</driver>
 % \fi
@@ -158,7 +158,7 @@ and the derived files
 % \GetFileInfo{hypbmsec.drv}
 %
 % \title{The \xpackage{hypbmsec} package}
-% \date{2006/03/05 v2.3}
+% \date{2007/04/11 v2.4}
 % \author{Heiko Oberdiek\\\xemail{oberdiek@uni-freiburg.de}}
 %
 % \maketitle
@@ -363,14 +363,14 @@ and the derived files
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{hypbmsec}%
-  [2006/03/05 v2.3 Bookmarks in sectioning commands (HO)]
+  [2007/04/11 v2.4 Bookmarks in sectioning commands (HO)]
 %    \end{macrocode}
 %
 %    Because of redifining the sectioning commands, it is dangerous
 %    to reload the package several times.
 %    \begin{macrocode}
 \@ifundefined{hbs@do}{}{%
-  \PackageInfo{hypbmsec}{Package 'hypbmsec' is already loaded}
+  \PackageInfo{hypbmsec}{Package 'hypbmsec' is already loaded}%
   \endinput
 }
 %    \end{macrocode}
@@ -520,9 +520,9 @@ and the derived files
       \@ifpackageloaded{hyperref}{%
         \PackageInfo{hypbmsec}{%
           \ifx\hy@driver\@empty
-            Default driver
+            Default driver %
           \else
-            '\hy@driver'
+            '\hy@driver' %
           \fi
           of hyperref not supported,\MessageBreak
           bookmark parameters will be ignored%
@@ -554,16 +554,16 @@ and the derived files
   \let\hbs@subsubsection\subsubsection
   \let\hbs@paragraph    \paragraph
   \let\hbs@subparagraph \subparagraph
-  \renewcommand\part         {\hbs@do\hbs@part}
-  \renewcommand\section      {\hbs@do\hbs@section}
-  \renewcommand\subsection   {\hbs@do\hbs@subsection}
-  \renewcommand\subsubsection{\hbs@do\hbs@subsubsection}
-  \renewcommand\paragraph    {\hbs@do\hbs@paragraph}
-  \renewcommand\subparagraph {\hbs@do\hbs@subparagraph}
+  \renewcommand\part         {\hbs@do\hbs@part}%
+  \renewcommand\section      {\hbs@do\hbs@section}%
+  \renewcommand\subsection   {\hbs@do\hbs@subsection}%
+  \renewcommand\subsubsection{\hbs@do\hbs@subsubsection}%
+  \renewcommand\paragraph    {\hbs@do\hbs@paragraph}%
+  \renewcommand\subparagraph {\hbs@do\hbs@subparagraph}%
   \begingroup\expandafter\expandafter\expandafter\endgroup
   \expandafter\ifx\csname chapter\endcsname\relax\else
     \let\hbs@chapter    \chapter
-    \renewcommand\chapter    {\hbs@do\hbs@chapter}
+    \renewcommand\chapter    {\hbs@do\hbs@chapter}%
   \fi
 }
 %    \end{macrocode}
@@ -573,13 +573,47 @@ and the derived files
 %    \end{macrocode}
 % \section{Installation}
 %
-% \paragraph{CTAN.} This package is available on
+% \subsection{Download}
+%
+% \paragraph{Package.} This package is available on
 % CTAN\footnote{\url{ftp://ftp.ctan.org/tex-archive/}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/hypbmsec.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/hypbmsec.pdf}] Documentation.
 % \end{description}
 %
+%
+% \paragraph{Bundle.} All the packages of the bundle `oberdiek'
+% are also available in a TDS compliant ZIP archive. There
+% the packages are already unpacked and the documentation files
+% are generated. The files and directories obey the TDS standard.
+% \begin{description}
+% \item[\CTAN{macros/latex/contrib/oberdiek/oberdiek-tds.zip}]
+% \end{description}
+%
+% \subsection{Bundle installation}
+%
+% \paragraph{Unpacking.} Unpack the \xfile{oberdiek-tds.zip} in the
+% TDS tree (also known as \xfile{texmf} tree) of your choice.
+% Example (linux):
+% \begin{quote}
+%   |unzip oberdiek-tds.zip -d ~/texmf|
+% \end{quote}
+%
+% \paragraph{Script installation.}
+% Check the directory \xfile{TDS:scripts/oberdiek/} for
+% scripts that need further installation steps.
+% Package \xpackage{attachfile2} comes with the Perl script
+% \xfile{pdfatfi.pl} that should be installed in such a way
+% that it can be called as \texttt{pdfatfi}.
+% Example (linux):
+% \begin{quote}
+%   |chmod +x scripts/oberdiek/pdfatfi.pl|\\
+%   |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
+% \end{quote}
+%
+% \subsection{Package installation}
+%
 % \paragraph{Unpacking.} The \xfile{.dtx} file is a self-extracting
 % \docstrip\ archive. The files are extracted by running the
 % \xfile{.dtx} through \plainTeX:
@@ -610,8 +644,10 @@ and the derived files
 % TDS installing feature, then some files can already be in the right
 % place, see the documentation of \docstrip.
 %
-% \paragraph{Refresh file databases.} If your \TeX~distribution
-% (\teTeX, \mikTeX, \dots) rely on file databases, you must refresh
+% \subsection{Refresh file name databases}
+%
+% If your \TeX~distribution
+% (\teTeX, \mikTeX, \dots) relies on file name databases, you must refresh
 % these. For example, \teTeX\ users run \verb|texhash| or
 % \verb|mktexlsr|.
 %
@@ -703,6 +739,10 @@ and the derived files
 %     Bug fix: Expand \cs{hbs@tocstring} and \cs{hbs@bmstring} before
 %     calling \cs{hbs@seccmd}.
 %   \end{Version}
+%   \begin{Version}{2007/04/11 v2.4}
+%   \item
+%     Line ends sanitized.
+%   \end{Version}
 % \end{History}
 %
 % \PrintIndex
diff --git a/Master/texmf-dist/source/latex/oberdiek/hypcap.dtx b/Master/texmf-dist/source/latex/oberdiek/hypcap.dtx
index 0155d0457e2..169fa8f7045 100644
--- a/Master/texmf-dist/source/latex/oberdiek/hypcap.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/hypcap.dtx
@@ -56,7 +56,7 @@
 %
 %<*ignore>
 \begingroup
-  \def\x{LaTeX2e}
+  \def\x{LaTeX2e}%
 \expandafter\endgroup
 \ifcase 0\ifx\install y1\fi\expandafter
          \ifx\csname processbatchFile\endcsname\relax\else1\fi
@@ -67,7 +67,7 @@
 \input docstrip.tex
 \Msg{************************************************************************}
 \Msg{* Installation}
-\Msg{* Package: hypcap 2007/02/19 v1.6 Adjusting anchors of captions (HO)}
+\Msg{* Package: hypcap 2007/04/09 v1.7 Adjusting anchors of captions (HO)}
 \Msg{************************************************************************}
 
 \keepsilent
@@ -128,16 +128,16 @@ and the derived files
 %<*driver>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{hypcap.drv}%
-  [2007/02/19 v1.6 Adjusting anchors of captions (HO)]
+  [2007/04/09 v1.7 Adjusting anchors of captions (HO)]%
 \documentclass{ltxdoc}
 \usepackage{holtxdoc}
 \begin{document}
-  \DocInput{hypcap.dtx}
+  \DocInput{hypcap.dtx}%
 \end{document}
 %</driver>
 % \fi
 %
-% \CheckSum{144}
+% \CheckSum{164}
 %
 % \CharacterTable
 %  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -158,7 +158,7 @@ and the derived files
 % \GetFileInfo{hypcap.drv}
 %
 % \title{The \xpackage{hypcap} package}
-% \date{2007/02/19 v1.6}
+% \date{2007/04/09 v1.7}
 % \author{Heiko Oberdiek\\\xemail{oberdiek@uni-freiburg.de}}
 %
 % \maketitle
@@ -245,7 +245,6 @@ and the derived files
 %
 % \subsection{Limitations}
 %    \begin{itemize}
-%    \item Package \Package{subfigure} does not work.
 %    \item Packages that redefine \cmd{\caption} or
 %          \cmd{\@caption}.
 %    \end{itemize}
@@ -261,7 +260,7 @@ and the derived files
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{hypcap}%
-  [2007/02/19 v1.6 Adjusting anchors of captions (HO)]
+  [2007/04/09 v1.7 Adjusting anchors of captions (HO)]
 %    \end{macrocode}
 %
 %    For unique command names this package uses |hc@| as prefix
@@ -318,17 +317,27 @@ and the derived files
     \hyper@@anchor\@currentHref\relax
   \endgroup
   \vspace*{\hypcapspace}%
-  \let\caption\hc@caption
+  \hc@hyperref{\let\caption\hc@caption}%
   \global\@capstarttrue
+  \global\advance\csname c@\@captype\endcsname\m@ne
 }
 %    \end{macrocode}
 %    \end{macro}
 %
+%    \begin{macrocode}
+\@ifpackagelater{hyperref}{2007/04/09}{%
+  \let\hc@hyperref\@gobble
+}{%
+  \let\hc@hyperref\@firstofone
+}
+%    \end{macrocode}
+%
 %    \begin{macro}{\hc@caption}
 %    The new \cmd{\caption} command without the first part
 %    is defined in the macro \cmd{\hc@caption}.
 %    \begin{macrocode}
 \def\hc@caption{%
+  \global\advance\csname c@\@captype\endcsname\@ne
   \@dblarg{\hc@@caption\@captype}%
 }
 %    \end{macrocode}
@@ -428,13 +437,47 @@ and the derived files
 %    \end{macrocode}
 % \section{Installation}
 %
-% \paragraph{CTAN.} This package is available on
+% \subsection{Download}
+%
+% \paragraph{Package.} This package is available on
 % CTAN\footnote{\url{ftp://ftp.ctan.org/tex-archive/}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/hypcap.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/hypcap.pdf}] Documentation.
 % \end{description}
 %
+%
+% \paragraph{Bundle.} All the packages of the bundle `oberdiek'
+% are also available in a TDS compliant ZIP archive. There
+% the packages are already unpacked and the documentation files
+% are generated. The files and directories obey the TDS standard.
+% \begin{description}
+% \item[\CTAN{macros/latex/contrib/oberdiek/oberdiek-tds.zip}]
+% \end{description}
+%
+% \subsection{Bundle installation}
+%
+% \paragraph{Unpacking.} Unpack the \xfile{oberdiek-tds.zip} in the
+% TDS tree (also known as \xfile{texmf} tree) of your choice.
+% Example (linux):
+% \begin{quote}
+%   |unzip oberdiek-tds.zip -d ~/texmf|
+% \end{quote}
+%
+% \paragraph{Script installation.}
+% Check the directory \xfile{TDS:scripts/oberdiek/} for
+% scripts that need further installation steps.
+% Package \xpackage{attachfile2} comes with the Perl script
+% \xfile{pdfatfi.pl} that should be installed in such a way
+% that it can be called as \texttt{pdfatfi}.
+% Example (linux):
+% \begin{quote}
+%   |chmod +x scripts/oberdiek/pdfatfi.pl|\\
+%   |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
+% \end{quote}
+%
+% \subsection{Package installation}
+%
 % \paragraph{Unpacking.} The \xfile{.dtx} file is a self-extracting
 % \docstrip\ archive. The files are extracted by running the
 % \xfile{.dtx} through \plainTeX:
@@ -465,8 +508,10 @@ and the derived files
 % TDS installing feature, then some files can already be in the right
 % place, see the documentation of \docstrip.
 %
-% \paragraph{Refresh file databases.} If your \TeX~distribution
-% (\teTeX, \mikTeX, \dots) rely on file databases, you must refresh
+% \subsection{Refresh file name databases}
+%
+% If your \TeX~distribution
+% (\teTeX, \mikTeX, \dots) relies on file name databases, you must refresh
 % these. For example, \teTeX\ users run \verb|texhash| or
 % \verb|mktexlsr|.
 %
@@ -553,6 +598,14 @@ and the derived files
 %   \item
 %     Fix for hypertexnames=false.
 %   \end{Version}
+%   \begin{Version}{2007/04/09 v1.7}
+%   \item
+%     Stuff in \cs{caption} moved to \xpackage{hyperref}.
+%     This avoids redefinitions of \cs{caption} and \cs{@caption}
+%     (idea of Axel Sommerfeldt).
+%   \item
+%     Fix for subfigure (Marco Kuhlmann, Amilcar do Carmo Lucas).
+%   \end{Version}
 % \end{History}
 %
 % \PrintIndex
diff --git a/Master/texmf-dist/source/latex/oberdiek/hypdestopt.dtx b/Master/texmf-dist/source/latex/oberdiek/hypdestopt.dtx
index 9d3c25b7aa9..11e5d630508 100644
--- a/Master/texmf-dist/source/latex/oberdiek/hypdestopt.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/hypdestopt.dtx
@@ -55,7 +55,7 @@
 %
 %<*ignore>
 \begingroup
-  \def\x{LaTeX2e}
+  \def\x{LaTeX2e}%
 \expandafter\endgroup
 \ifcase 0\ifx\install y1\fi\expandafter
          \ifx\csname processbatchFile\endcsname\relax\else1\fi
@@ -126,11 +126,11 @@ and the derived files
 %<*driver>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{hypdestopt.drv}%
-  [2006/06/01 v2.0 Hyperref destination optimizer (HO)]
+  [2006/06/01 v2.0 Hyperref destination optimizer (HO)]%
 \documentclass{ltxdoc}
 \usepackage{holtxdoc}
 \begin{document}
-  \DocInput{hypdestopt.dtx}
+  \DocInput{hypdestopt.dtx}%
 \end{document}
 %</driver>
 % \fi
@@ -278,7 +278,7 @@ and the derived files
 %<*package>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{hypdestopt}%
-  [2006/06/01 v2.0 Hyperref destination optimizer (HO)]
+  [2006/06/01 v2.0 Hyperref destination optimizer (HO)]%
 %    \end{macrocode}
 %
 % \subsection{Options}
@@ -354,7 +354,7 @@ and the derived files
 %    version 2006/05/30 v1.4.
 %    \begin{macrocode}
 \ifHypDest@name
-  \RequirePackage{alphalph}[2006/05/30]
+  \RequirePackage{alphalph}[2006/05/30]%
 \fi
 %    \end{macrocode}
 %    \begin{macrocode}
@@ -687,13 +687,47 @@ and the derived files
 %    \end{macrocode}
 % \section{Installation}
 %
-% \paragraph{CTAN.} This package is available on
+% \subsection{Download}
+%
+% \paragraph{Package.} This package is available on
 % CTAN\footnote{\url{ftp://ftp.ctan.org/tex-archive/}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/hypdestopt.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/hypdestopt.pdf}] Documentation.
 % \end{description}
 %
+%
+% \paragraph{Bundle.} All the packages of the bundle `oberdiek'
+% are also available in a TDS compliant ZIP archive. There
+% the packages are already unpacked and the documentation files
+% are generated. The files and directories obey the TDS standard.
+% \begin{description}
+% \item[\CTAN{macros/latex/contrib/oberdiek/oberdiek-tds.zip}]
+% \end{description}
+%
+% \subsection{Bundle installation}
+%
+% \paragraph{Unpacking.} Unpack the \xfile{oberdiek-tds.zip} in the
+% TDS tree (also known as \xfile{texmf} tree) of your choice.
+% Example (linux):
+% \begin{quote}
+%   |unzip oberdiek-tds.zip -d ~/texmf|
+% \end{quote}
+%
+% \paragraph{Script installation.}
+% Check the directory \xfile{TDS:scripts/oberdiek/} for
+% scripts that need further installation steps.
+% Package \xpackage{attachfile2} comes with the Perl script
+% \xfile{pdfatfi.pl} that should be installed in such a way
+% that it can be called as \texttt{pdfatfi}.
+% Example (linux):
+% \begin{quote}
+%   |chmod +x scripts/oberdiek/pdfatfi.pl|\\
+%   |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
+% \end{quote}
+%
+% \subsection{Package installation}
+%
 % \paragraph{Unpacking.} The \xfile{.dtx} file is a self-extracting
 % \docstrip\ archive. The files are extracted by running the
 % \xfile{.dtx} through \plainTeX:
@@ -724,8 +758,10 @@ and the derived files
 % TDS installing feature, then some files can already be in the right
 % place, see the documentation of \docstrip.
 %
-% \paragraph{Refresh file databases.} If your \TeX~distribution
-% (\teTeX, \mikTeX, \dots) rely on file databases, you must refresh
+% \subsection{Refresh file name databases}
+%
+% If your \TeX~distribution
+% (\teTeX, \mikTeX, \dots) relies on file name databases, you must refresh
 % these. For example, \teTeX\ users run \verb|texhash| or
 % \verb|mktexlsr|.
 %
diff --git a/Master/texmf-dist/source/latex/oberdiek/hypdoc.dtx b/Master/texmf-dist/source/latex/oberdiek/hypdoc.dtx
index 82911374ef5..deaf1add3da 100644
--- a/Master/texmf-dist/source/latex/oberdiek/hypdoc.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/hypdoc.dtx
@@ -1,6 +1,7 @@
 % \iffalse meta-comment
 %
-% Copyright (C) 2002, 2006 by Heiko Oberdiek <oberdiek@uni-freiburg.de>
+% Copyright (C) 2002, 2006, 2007 by
+%    Heiko Oberdiek <oberdiek@uni-freiburg.de>
 %
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either
@@ -55,7 +56,7 @@
 %
 %<*ignore>
 \begingroup
-  \def\x{LaTeX2e}
+  \def\x{LaTeX2e}%
 \expandafter\endgroup
 \ifcase 0\ifx\install y1\fi\expandafter
          \ifx\csname processbatchFile\endcsname\relax\else1\fi
@@ -66,7 +67,7 @@
 \input docstrip.tex
 \Msg{************************************************************************}
 \Msg{* Installation}
-\Msg{* Package: hypdoc 2006/06/02 v1.4 Hyper extensions for doc.sty (HO)}
+\Msg{* Package: hypdoc 2007/04/11 v1.5 Hyper extensions for doc.sty (HO)}
 \Msg{************************************************************************}
 
 \keepsilent
@@ -76,7 +77,8 @@
 
 This is a generated file.
 
-Copyright (C) 2002, 2006 by Heiko Oberdiek <oberdiek@uni-freiburg.de>
+Copyright (C) 2002, 2006, 2007 by
+   Heiko Oberdiek <oberdiek@uni-freiburg.de>
 
 This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either
@@ -126,11 +128,11 @@ and the derived files
 %<*driver>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{hypdoc.drv}%
-  [2006/06/02 v1.4 Hyper extensions for doc.sty (HO)]
+  [2007/04/11 v1.5 Hyper extensions for doc.sty (HO)]%
 \documentclass{ltxdoc}
 \usepackage{holtxdoc}
 \begin{document}
-  \DocInput{hypdoc.dtx}
+  \DocInput{hypdoc.dtx}%
 \end{document}
 %</driver>
 % \fi
@@ -156,7 +158,7 @@ and the derived files
 % \GetFileInfo{hypdoc.drv}
 %
 % \title{The \xpackage{hypdoc} package}
-% \date{2006/06/02 v1.4}
+% \date{2007/04/11 v1.5}
 % \author{Heiko Oberdiek\\\xemail{oberdiek@uni-freiburg.de}}
 %
 % \maketitle
@@ -333,7 +335,7 @@ and the derived files
 %<*package>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{hypdoc}%
-  [2006/06/02 v1.4 Hyper extensions for doc.sty (HO)]
+  [2007/04/11 v1.5 Hyper extensions for doc.sty (HO)]%
 %    \end{macrocode}
 %    The package identification is done at the top of the |.dtx| file
 %    in order to use only one identification string.
@@ -349,7 +351,7 @@ and the derived files
 \RequirePackage{doc}
 
 \ifx\numexpr\@undefined
-  \RequirePackage{calc}
+  \RequirePackage{calc}%
 \fi
 \RequirePackage[%
   hyperindex=false,%
@@ -434,14 +436,14 @@ and the derived files
   \expandafter\endgroup
   \ifcase\c@section
     \stepcounter{HD@unique}%
-    \pdfbookmark[\HD@guesstoclevel{\HDorg@tableofcontents}]
+    \pdfbookmark[\HD@guesstoclevel{\HDorg@tableofcontents}]%
         {\contentsname}{toc\theHD@unique}%
     \HDorg@tableofcontents
   \else
     \ifHD@numbered
     \else
       \stepcounter{HD@unique}%
-      \pdfbookmark[\HD@guesstoclevel{\HDorg@tableofcontents}]
+      \pdfbookmark[\HD@guesstoclevel{\HDorg@tableofcontents}]%
           {\contentsname}{toc\theHD@unique}%
     \fi
     \begingroup
@@ -456,7 +458,7 @@ and the derived files
   \ifHD@numbered
   \else
     \stepcounter{HD@unique}%
-    \pdfbookmark[\HD@guesstoclevel{\HDorg@listoffigures}]
+    \pdfbookmark[\HD@guesstoclevel{\HDorg@listoffigures}]%
         {\contentsname}{toc\theHd@unique}%
   \fi
   \begingroup
@@ -470,7 +472,7 @@ and the derived files
   \ifHD@numbered
   \else
     \stepcounter{HD@unique}%
-    \pdfbookmark[\HD@guesstoclevel{\HDorg@listoftables}]
+    \pdfbookmark[\HD@guesstoclevel{\HDorg@listoftables}]%
         {\contentsname}{toc\theHD@unique}%
   \fi
   \begingroup
@@ -484,7 +486,7 @@ and the derived files
   \ifHD@numbered
   \else
     \stepcounter{HD@unique}%
-    \pdfbookmark[\HD@guesstoclevel{\HDorg@thebibliography}]
+    \pdfbookmark[\HD@guesstoclevel{\HDorg@thebibliography}]%
       {\@ifundefined{chapter}{\refname}{\bibname}}{bib\theHD@unique}%
   \fi
   \HD@sectionpatch
@@ -555,7 +557,7 @@ and the derived files
       \begingroup
         \let\Hy@writebookmark\HDorg@writebookmark
         \stepcounter{HD@unique}%
-        \pdfbookmark[\HD@guesstoclevel{\HDorg@glossary@prologue}]
+        \pdfbookmark[\HD@guesstoclevel{\HDorg@glossary@prologue}]%
             {\glossaryname}{glossary\theHD@unique}%
       \endgroup
     \fi
@@ -750,7 +752,7 @@ and the derived files
       \HDorg@autoindex{#1}%
     \endgroup
     \@esphack
-  }
+  }%
 \fi
 
 \let\HDorg@SpecialEnvIndex\SpecialEnvIndex
@@ -813,13 +815,47 @@ and the derived files
 %    \end{macrocode}
 % \section{Installation}
 %
-% \paragraph{CTAN.} This package is available on
+% \subsection{Download}
+%
+% \paragraph{Package.} This package is available on
 % CTAN\footnote{\url{ftp://ftp.ctan.org/tex-archive/}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/hypdoc.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/hypdoc.pdf}] Documentation.
 % \end{description}
 %
+%
+% \paragraph{Bundle.} All the packages of the bundle `oberdiek'
+% are also available in a TDS compliant ZIP archive. There
+% the packages are already unpacked and the documentation files
+% are generated. The files and directories obey the TDS standard.
+% \begin{description}
+% \item[\CTAN{macros/latex/contrib/oberdiek/oberdiek-tds.zip}]
+% \end{description}
+%
+% \subsection{Bundle installation}
+%
+% \paragraph{Unpacking.} Unpack the \xfile{oberdiek-tds.zip} in the
+% TDS tree (also known as \xfile{texmf} tree) of your choice.
+% Example (linux):
+% \begin{quote}
+%   |unzip oberdiek-tds.zip -d ~/texmf|
+% \end{quote}
+%
+% \paragraph{Script installation.}
+% Check the directory \xfile{TDS:scripts/oberdiek/} for
+% scripts that need further installation steps.
+% Package \xpackage{attachfile2} comes with the Perl script
+% \xfile{pdfatfi.pl} that should be installed in such a way
+% that it can be called as \texttt{pdfatfi}.
+% Example (linux):
+% \begin{quote}
+%   |chmod +x scripts/oberdiek/pdfatfi.pl|\\
+%   |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
+% \end{quote}
+%
+% \subsection{Package installation}
+%
 % \paragraph{Unpacking.} The \xfile{.dtx} file is a self-extracting
 % \docstrip\ archive. The files are extracted by running the
 % \xfile{.dtx} through \plainTeX:
@@ -850,8 +886,10 @@ and the derived files
 % TDS installing feature, then some files can already be in the right
 % place, see the documentation of \docstrip.
 %
-% \paragraph{Refresh file databases.} If your \TeX~distribution
-% (\teTeX, \mikTeX, \dots) rely on file databases, you must refresh
+% \subsection{Refresh file name databases}
+%
+% If your \TeX~distribution
+% (\teTeX, \mikTeX, \dots) relies on file name databases, you must refresh
 % these. For example, \teTeX\ users run \verb|texhash| or
 % \verb|mktexlsr|.
 %
@@ -933,6 +971,10 @@ and the derived files
 %     Bookmark fixed if there are several table of contents,
 %     bibliographies, glossaries, \dots
 %   \end{Version}
+%   \begin{Version}{2007/04/11 v1.5}
+%   \item
+%     Line ends sanitized.
+%   \end{Version}
 % \end{History}
 %
 % \PrintIndex
diff --git a/Master/texmf-dist/source/latex/oberdiek/ifdraft.dtx b/Master/texmf-dist/source/latex/oberdiek/ifdraft.dtx
index 772bb86286e..2463188e5d7 100644
--- a/Master/texmf-dist/source/latex/oberdiek/ifdraft.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/ifdraft.dtx
@@ -56,7 +56,7 @@
 %
 %<*ignore>
 \begingroup
-  \def\x{LaTeX2e}
+  \def\x{LaTeX2e}%
 \expandafter\endgroup
 \ifcase 0\ifx\install y1\fi\expandafter
          \ifx\csname processbatchFile\endcsname\relax\else1\fi
@@ -128,11 +128,11 @@ and the derived files
 %<*driver>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{ifdraft.drv}%
-  [2006/02/20 v1.2 Switch for option draft (HO)]
+  [2006/02/20 v1.2 Switch for option draft (HO)]%
 \documentclass{ltxdoc}
 \usepackage{holtxdoc}
 \begin{document}
-  \DocInput{ifdraft.dtx}
+  \DocInput{ifdraft.dtx}%
 \end{document}
 %</driver>
 % \fi
@@ -310,13 +310,47 @@ and the derived files
 %    \end{macrocode}
 % \section{Installation}
 %
-% \paragraph{CTAN.} This package is available on
+% \subsection{Download}
+%
+% \paragraph{Package.} This package is available on
 % CTAN\footnote{\url{ftp://ftp.ctan.org/tex-archive/}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/ifdraft.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/ifdraft.pdf}] Documentation.
 % \end{description}
 %
+%
+% \paragraph{Bundle.} All the packages of the bundle `oberdiek'
+% are also available in a TDS compliant ZIP archive. There
+% the packages are already unpacked and the documentation files
+% are generated. The files and directories obey the TDS standard.
+% \begin{description}
+% \item[\CTAN{macros/latex/contrib/oberdiek/oberdiek-tds.zip}]
+% \end{description}
+%
+% \subsection{Bundle installation}
+%
+% \paragraph{Unpacking.} Unpack the \xfile{oberdiek-tds.zip} in the
+% TDS tree (also known as \xfile{texmf} tree) of your choice.
+% Example (linux):
+% \begin{quote}
+%   |unzip oberdiek-tds.zip -d ~/texmf|
+% \end{quote}
+%
+% \paragraph{Script installation.}
+% Check the directory \xfile{TDS:scripts/oberdiek/} for
+% scripts that need further installation steps.
+% Package \xpackage{attachfile2} comes with the Perl script
+% \xfile{pdfatfi.pl} that should be installed in such a way
+% that it can be called as \texttt{pdfatfi}.
+% Example (linux):
+% \begin{quote}
+%   |chmod +x scripts/oberdiek/pdfatfi.pl|\\
+%   |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
+% \end{quote}
+%
+% \subsection{Package installation}
+%
 % \paragraph{Unpacking.} The \xfile{.dtx} file is a self-extracting
 % \docstrip\ archive. The files are extracted by running the
 % \xfile{.dtx} through \plainTeX:
@@ -347,8 +381,10 @@ and the derived files
 % TDS installing feature, then some files can already be in the right
 % place, see the documentation of \docstrip.
 %
-% \paragraph{Refresh file databases.} If your \TeX~distribution
-% (\teTeX, \mikTeX, \dots) rely on file databases, you must refresh
+% \subsection{Refresh file name databases}
+%
+% If your \TeX~distribution
+% (\teTeX, \mikTeX, \dots) relies on file name databases, you must refresh
 % these. For example, \teTeX\ users run \verb|texhash| or
 % \verb|mktexlsr|.
 %
diff --git a/Master/texmf-dist/source/latex/oberdiek/iflang.dtx b/Master/texmf-dist/source/latex/oberdiek/iflang.dtx
new file mode 100644
index 00000000000..d946a52587c
--- /dev/null
+++ b/Master/texmf-dist/source/latex/oberdiek/iflang.dtx
@@ -0,0 +1,953 @@
+% \iffalse meta-comment
+%
+% Copyright (C) 2007 by Heiko Oberdiek <oberdiek@uni-freiburg.de>
+%
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either
+% version 1.3 of this license or (at your option) any later
+% version. 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.
+%
+% This work consists of the main source file iflang.dtx
+% and the derived files
+%    iflang.sty, iflang.pdf, iflang.ins, iflang.drv,
+%    iflang-test1.tex, iflang-test2.tex, iflang-test3.tex.
+%
+% Distribution:
+%    CTAN:macros/latex/contrib/oberdiek/iflang.dtx
+%    CTAN:macros/latex/contrib/oberdiek/iflang.pdf
+%
+% Unpacking:
+%    (a) If iflang.ins is present:
+%           tex iflang.ins
+%    (b) Without iflang.ins:
+%           tex iflang.dtx
+%    (c) If you insist on using LaTeX
+%           latex \let\install=y\input{iflang.dtx}
+%        (quote the arguments according to the demands of your shell)
+%
+% Documentation:
+%    (a) If iflang.drv is present:
+%           latex iflang.drv
+%    (b) Without iflang.drv:
+%           latex iflang.dtx; ...
+%    The class ltxdoc loads the configuration file ltxdoc.cfg
+%    if available. Here you can specify further options, e.g.
+%    use A4 as paper format:
+%       \PassOptionsToClass{a4paper}{article}
+%
+%    Programm calls to get the documentation (example):
+%       pdflatex iflang.dtx
+%       makeindex -s gind.ist iflang.idx
+%       pdflatex iflang.dtx
+%       makeindex -s gind.ist iflang.idx
+%       pdflatex iflang.dtx
+%
+% Installation:
+%    TDS:tex/generic/oberdiek/iflang.sty
+%    TDS:doc/latex/oberdiek/iflang.pdf
+%    TDS:doc/latex/oberdiek/iflang-test1.tex
+%    TDS:doc/latex/oberdiek/iflang-test2.tex
+%    TDS:doc/latex/oberdiek/iflang-test3.tex
+%    TDS:source/latex/oberdiek/iflang.dtx
+%
+%<*ignore>
+\begingroup
+  \def\x{LaTeX2e}%
+\expandafter\endgroup
+\ifcase 0\ifx\install y1\fi\expandafter
+         \ifx\csname processbatchFile\endcsname\relax\else1\fi
+         \ifx\fmtname\x\else 1\fi\relax
+\else\csname fi\endcsname
+%</ignore>
+%<*install>
+\input docstrip.tex
+\Msg{************************************************************************}
+\Msg{* Installation}
+\Msg{* Package: iflang 2007/04/12 v1.2 Language checks (HO)}
+\Msg{************************************************************************}
+
+\keepsilent
+\askforoverwritefalse
+
+\preamble
+
+This is a generated file.
+
+Copyright (C) 2007 by Heiko Oberdiek <oberdiek@uni-freiburg.de>
+
+This work may be distributed and/or modified under the
+conditions of the LaTeX Project Public License, either
+version 1.3 of this license or (at your option) any later
+version. 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.
+
+This work consists of the main source file iflang.dtx
+and the derived files
+   iflang.sty, iflang.pdf, iflang.ins, iflang.drv,
+   iflang-test1.tex, iflang-test2.tex, iflang-test3.tex.
+
+\endpreamble
+
+\generate{%
+  \file{iflang.ins}{\from{iflang.dtx}{install}}%
+  \file{iflang.drv}{\from{iflang.dtx}{driver}}%
+  \usedir{tex/generic/oberdiek}%
+  \file{iflang.sty}{\from{iflang.dtx}{package}}%
+  \usedir{doc/latex/oberdiek}%
+  \file{iflang-test1.tex}{\from{iflang.dtx}{test1}}%
+  \file{iflang-test2.tex}{\from{iflang.dtx}{test2}}%
+  \file{iflang-test3.tex}{\from{iflang.dtx}{test3}}%
+}
+
+\obeyspaces
+\Msg{************************************************************************}
+\Msg{*}
+\Msg{* To finish the installation you have to move the following}
+\Msg{* file into a directory searched by TeX:}
+\Msg{*}
+\Msg{*     iflang.sty}
+\Msg{*}
+\Msg{* To produce the documentation run the file `iflang.drv'}
+\Msg{* through LaTeX.}
+\Msg{*}
+\Msg{* Happy TeXing!}
+\Msg{*}
+\Msg{************************************************************************}
+
+\endbatchfile
+%</install>
+%<*ignore>
+\fi
+%</ignore>
+%<*driver>
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesFile{iflang.drv}%
+  [2007/04/12 v1.2 Language checks (HO)]%
+\documentclass{ltxdoc}
+\usepackage{holtxdoc}
+\begin{document}
+  \DocInput{iflang.dtx}%
+\end{document}
+%</driver>
+% \fi
+%
+% \CheckSum{676}
+%
+% \CharacterTable
+%  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
+%   Lower-case    \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
+%   Digits        \0\1\2\3\4\5\6\7\8\9
+%   Exclamation   \!     Double quote  \"     Hash (number) \#
+%   Dollar        \$     Percent       \%     Ampersand     \&
+%   Acute accent  \'     Left paren    \(     Right paren   \)
+%   Asterisk      \*     Plus          \+     Comma         \,
+%   Minus         \-     Point         \.     Solidus       \/
+%   Colon         \:     Semicolon     \;     Less than     \<
+%   Equals        \=     Greater than  \>     Question mark \?
+%   Commercial at \@     Left bracket  \[     Backslash     \\
+%   Right bracket \]     Circumflex    \^     Underscore    \_
+%   Grave accent  \`     Left brace    \{     Vertical bar  \|
+%   Right brace   \}     Tilde         \~}
+%
+% \GetFileInfo{iflang.drv}
+%
+% \title{The \xpackage{iflang} package}
+% \date{2007/04/12 v1.2}
+% \author{Heiko Oberdiek\\\xemail{oberdiek@uni-freiburg.de}}
+%
+% \maketitle
+%
+% \begin{abstract}
+% This package provides expandible checks for the current language
+% based on macro \cs{languagename} or hyphenation patterns.
+% \end{abstract}
+%
+% \tableofcontents
+%
+% \section{Documentation}
+%
+% Package \xpackage{babel} defines \cs{iflanguagename}. As first
+% argument it takes a language name and executes the second or
+% third argument depending on the current language. This
+% language test is based on hypenation patterns. However, it
+% is possible that different languages or dialects share the
+% same patterns. In such cases \cs{iflanguagename} fails.
+%
+% However, package \xpackage{babel} and some other packages
+% such as \xpackage{german} or \xpackage{ngerman} store
+% the language name in the macro \cs{languagename} if
+% \cs{selectlanguage} is called.
+%
+% \begin{declcs}{IfLanguageName} \M{lang} \M{then} \M{else}
+% \end{declcs}
+% Makro \cs{IfLanguageName} compares language \meta{lang} with
+% the current setting of macro \cs{languagename}. If both
+% contains the same name then the \meta{then} part is called,
+% otherwise the \meta{else} part.
+%
+% The macro is expandable. Thus it can be safely used inside \cs{edef}
+% or \cs{csname}. If case of errors like an undefined \cs{languagename}
+% the \meta{else} part is executed.
+%
+% Note: Macro \cs{IfLanguageName} relies on the fact, that
+% \cs{languagename} is set correctly:
+% \begin{description}
+% \item[Package \xpackage{babel}:]
+%    \mbox{}\\
+%    Full support of \cs{languagename} in its language switching commands.
+% \item[Format based on \xpackage{babel} (\xfile{language.dat}):]
+%    \mbox{}\\
+%    If package \xpackage{babel} is not used (or not yet loaded),
+%    then \xpackage{babel}'s
+%    \xfile{hyphen.cfg} has set \cs{languagename} to the last
+%    language in \xfile{language.dat}, but \cs{language} (current
+%    patterns) is zero and points to the first language.
+%    Thus the value of \cs{languagename} is basically garbage.
+%    Package \xpackage{iflang} warns if \cs{languagename} and
+%    \cs{language} do not fit.
+%    This can be fixed by loading package \xpackage{babel} previously.
+% \item[Format based on \eTeX's \xfile{etex.src} (\xfile{language.def}):]
+%    \mbox{}\\
+%    Unhappily it does not support
+%    \cs{languagename}. Thus this package hooks into \cs{uselanguage}
+%    to get \cs{languagename} defined and updated there.
+%    At package loading time the changed \cs{uselanguage} has not
+%    been called yet. Thus package \xpackage{iflang} tries
+%    |USenglish|. This is the definite default language of \xfile{etex.src}.
+%    If the current patterns suit this default language, an
+%    undefined \cs{languagename} is set to this language. Otherwise
+%    a \cs{languagename} remains undefined and a warning is given.
+% \end{description}
+%
+% \begin{declcs}{IfLanguagePatterns} \M{lang} \M{then} \M{else}
+% \end{declcs}
+% This macro behaves similar to \cs{IfLanguageName}. But the
+% language test is based on the current pattern in force (\cs{language}).
+% Also this macro is expandable, in case of errors the \meta{else} part
+% is called.
+%
+% The following naming convention for the pattern are supported:
+% \begin{description}
+% \item[\xpackage{babel}/\xfile{language.dat}]:
+%    \cs{l@}\meta{language}
+% \item[\xpackage{etex.src}/\xfile{language.def}]:
+%    \cs{lang@}\meta{language}
+% \end{description}
+% Package \xpackage{iflang} looks for \cs{uselanguage} (defined in
+% \xfile{etex.src}) to find out the naming convention in use.
+%
+% \StopEventually{
+% }
+%
+% \section{Implementation}
+%
+%    \begin{macrocode}
+%<*package>
+%    \end{macrocode}
+%
+% \subsection{Reload check and package identification}
+%    Reload check, especially if the package is not used with \LaTeX.
+%    \begin{macrocode}
+\begingroup
+  \expandafter\let\expandafter\x\csname ver@iflang.sty\endcsname
+  \ifcase 0%
+    \ifx\x\relax % plain
+    \else
+      \ifx\x\empty % LaTeX
+      \else
+        1%
+      \fi
+    \fi
+  \else
+    \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{iflang}{The package is already loaded}%
+    \endgroup
+    \expandafter\endinput
+  \fi
+\endgroup
+%    \end{macrocode}
+%    Package identification:
+%    \begin{macrocode}
+\begingroup
+  \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\relax
+        \xdef#1{#3}%
+      \fi
+    }%
+  \fi
+\expandafter\x\csname ver@iflang.sty\endcsname
+\ProvidesPackage{iflang}%
+  [2007/04/12 v1.2 Language checks (HO)]
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+\expandafter\edef\csname IfLang@endinput\endcsname{%
+  \catcode39 \the\catcode39\relax % '
+  \catcode40 \the\catcode40\relax % (
+  \catcode41 \the\catcode41\relax % )
+  \catcode61 \the\catcode61\relax % =
+  \catcode64 \the\catcode64\relax % @
+  \noexpand\endinput
+}
+\catcode39 12\relax % '
+\catcode40 12\relax % (
+\catcode41 12\relax % )
+\catcode61 12\relax % =
+\catcode64 11\relax % @
+%    \end{macrocode}
+%
+% \subsection{Tools}
+%
+% \subsubsection{Provide some basic macros of \LaTeX}
+%
+%    \begin{macro}{\@firstoftwo}
+%    \begin{macrocode}
+\expandafter\ifx\csname @firstoftwo\endcsname\relax
+  \long\def\@firstoftwo#1#2{#1}%
+\fi
+%    \end{macrocode}
+%    \end{macro}
+%    \begin{macro}{\@secondoftwo}
+%    \begin{macrocode}
+\expandafter\ifx\csname @secondoftwo\endcsname\relax
+  \long\def\@secondoftwo#1#2{#2}%
+\fi
+%    \end{macrocode}
+%    \end{macro}
+%
+% \subsubsection{Expandible existence check for macros}
+%
+%    \begin{macro}{\IfLang@IfDefined}
+%    \begin{macrocode}
+\begingroup\expandafter\expandafter\expandafter\endgroup
+\expandafter\ifx\csname ifcsname\endcsname\relax
+  \expandafter\@firstoftwo
+\else
+  \expandafter\@secondoftwo
+\fi
+{%
+  \def\IfLang@IfDefined#1{%
+    \expandafter\ifx\csname#1\endcsname\relax
+      \expandafter\@secondoftwo
+    \else
+      \expandafter\@firstoftwo
+    \fi
+  }%
+}{%
+  \def\IfLang@IfDefined#1{%
+    \ifnum\ifcsname#1\endcsname
+            \expandafter\ifx\csname#1\endcsname\relax
+              1%
+            \else
+              0%
+            \fi
+          \else
+            1%
+          \fi
+          =0 %
+      \expandafter\@firstoftwo
+    \else
+      \expandafter\@secondoftwo
+    \fi
+  }%
+}
+%    \end{macrocode}
+%    \end{macro}
+%
+% \subsubsection{Macros for messages}
+%
+%    \begin{macrocode}
+\begingroup
+\ifnum\expandafter\ifx\csname PackageInfo\endcsname\relax
+        1%
+      \fi
+      \expandafter\ifx\csname PackageWarningNoLine\endcsname\relax
+        1%
+      \fi
+      0=0 %
+  \endgroup
+  \expandafter\@secondoftwo
+\else
+  \endgroup
+  \expandafter\@firstoftwo
+\fi
+{%
+  \def\IfLang@GenericMessage#1#2#3{%
+    \begingroup
+      \newlinechar=10 %
+      \def\@spaces{\space\space\space\space}%
+      \ifcase#1 %
+        \def\MessageBreak{%
+          ^^J(iflang) \@spaces\@spaces\@spaces\@spaces
+        }%
+      \or
+        \def\MessageBreak{%
+          ^^J(iflang)\@spaces\@spaces\@spaces\@spaces
+        }%
+      \or
+        \def\MessageBreak{%
+          ^^J(iflang) \space\@spaces\@spaces\@spaces
+        }%
+      \fi
+      \expandafter\ifx\csname if#3\expandafter\endcsname
+                      \csname iftrue\endcsname
+        \def\on@line{ on input line \the\inputlineno}%
+      \else
+        \def\on@line{}%
+      \fi
+      \immediate\write\ifcase#1 -1\or 16\fi{%
+        ^^JPackage iflang %
+        \ifcase#1 Info\or Warning\or Error\fi
+        : #2\on@line.^^J%
+      }%
+    \endgroup
+  }%
+  \def\IfLang@Info#1{%
+    \IfLang@GenericMessage{0}{#1}{false}%
+  }%
+  \def\IfLang@Warning#1{%
+    \IfLang@GenericMessage{1}{#1}{false}%
+  }%
+}{%
+  \def\IfLang@Info#1{%
+    \begingroup
+      \def\on@line{}%
+      \PackageInfo{iflang}{#1}%
+    \endgroup
+  }%
+  \def\IfLang@Warning#1{%
+    \PackageWarningNoLine{iflang}{#1}%
+  }%
+}
+%    \end{macrocode}
+%
+% \subsubsection{Support for \xfile{etex.src}}
+%
+%    \begin{macro}{\IfLang@prefix}
+%    \begin{macrocode}
+\begingroup\expandafter\expandafter\expandafter\endgroup
+\expandafter\ifx\csname uselanguage\endcsname\relax
+  \IfLang@Info{Naming convention for patterns: babel}%
+  \def\IfLang@prefix{l@}%
+\else
+  \IfLang@Info{Naming convention for patterns: etex.src}%
+  \def\IfLang@prefix{lang@}%
+  \let\IfLang@OrgUseLanguage\uselanguage
+  \def\uselanguage#1{%
+    \edef\languagename{#1}%
+    \IfLang@OrgUseLanguage{#1}%
+  }%
+%    \end{macrocode}
+%    \end{macro}
+%    The first \cs{uselanguage} that is executed as last
+%    line in \xfile{language.def} cannot patched this way.
+%    However, \xfile{language.def} is very strict. It forces
+%    the first added and used language to be |USenglish|.
+%    Thus, if \cs{languagename} is not defined, we can
+%    quite safely assume |USenglish|. As additional
+%    safety precaution the actual used patterns are checked.
+%    \begin{macrocode}
+  \begingroup\expandafter\expandafter\expandafter\endgroup
+  \expandafter\ifx\csname languagename\endcsname\relax
+    \begingroup\expandafter\expandafter\expandafter\endgroup
+    \expandafter\ifx\csname lang@USenglish\endcsname\relax
+      \IfLang@Warning{\string\lang@USenglish\space is missing}%
+    \else
+      \ifnum\lang@USenglish=\language
+        \def\languagename{USenglish}%
+      \else
+        \IfLang@Warning{%
+          \string\languagename\space is not set,\MessageBreak
+          current language is unknown%
+        }%
+      \fi
+    \fi
+  \fi
+\fi
+\begingroup\expandafter\expandafter\expandafter\endgroup
+\expandafter\ifx\csname languagename\endcsname\relax
+  \IfLang@Info{\string\languagename\space is not set}%
+\fi
+%    \end{macrocode}
+%
+% \subsection{\cs{IfLanguagePatterns}}
+%
+%    \begin{macro}{\IfLanguagePatterns}
+%    \begin{macrocode}
+\def\IfLanguagePatterns#1{%
+  \ifnum\IfLang@IfDefined{\IfLang@prefix#1}{%
+          \ifnum\csname\IfLang@prefix#1\endcsname=\language
+            0%
+          \else
+            1%
+          \fi
+        }{1}=0 %
+    \expandafter\@firstoftwo
+  \else
+    \expandafter\@secondoftwo
+  \fi
+}
+%    \end{macrocode}
+%    \end{macro}
+%
+% \subsection{\cs{IfLanguageName}}
+%
+%    \begin{macrocode}
+\begingroup\expandafter\expandafter\expandafter\endgroup
+\expandafter\ifx\csname pdfstrcmp\endcsname\relax
+  \expandafter\@firstoftwo
+\else
+  \expandafter\@secondoftwo
+\fi
+{%
+%    \end{macrocode}
+%    We do not have \cs{pdfstrcmp}. Thus we must define
+%    our own expandable string comparison. The following
+%    implementation is based on a \TeX\ pearl from David Kastrup, presented
+%    at the conference Bacho\TeX~2005:
+%    \url{http://www-stary.gust.org.pl/pearls/2005/david-kastrup/bachotex2005-david-kastrup-pearl1.pdf}
+%
+%    The orignal code allows macros inside the second string.
+%    Because also \cs{languagename} might consists of further
+%    macros, we need a variant that allows macros in the first
+%    string, too.
+%    \begin{macrocode}
+  \def\IfLang@StrNil{\relax}%
+  \def\IfLang@StrEqual#1{%
+    \number\IfLang@StrEqualStart{}{}#1\IfLang@StrNil
+  }%
+  \def\IfLang@StrEqualStart#1#2#3{%
+    \ifx#3\IfLang@StrNil
+      \IfLang@StrEqualStop
+    \fi
+    \ifcat\noexpand#3\relax
+      \IfLang@StrExpand{#1}{#2}#3%
+    \fi
+    \IfLang@StrEqualStart{\if#3#1}{#2\fi}%
+  }%
+  \def\IfLang@StrEqualStop\fi#1\IfLang@StrEqualStart#2#3#4{%
+    \fi
+    #2#4\relax'#313 %
+  }%
+  \def\IfLang@StrExpand#1#2#3\fi\IfLang@StrEqualStart#4#5{%
+    \fi
+    \IfLang@@StrExpand{#1}{#2}#3%
+  }%
+  \def\IfLang@@StrExpand#1#2#3\IfLang@StrNil{%
+    \expandafter\IfLang@@@StrExpand#3\IfLang@StrNil{#1}{#2}%
+  }%
+  \def\IfLang@@@StrExpand#1\IfLang@StrNil#2#3{%
+    \IfLang@StrEqualStart{#2}{#3}#1\IfLang@StrNil
+  }%
+%    \end{macrocode}
+%    \begin{macro}{\IfLanguageName}
+%    \begin{macrocode}
+  \def\IfLanguageName#1{%
+    \ifnum\IfLang@IfDefined{languagename}{%
+            \if\expandafter\IfLang@strequal\expandafter%
+                           {\languagename}{#1}%
+              0%
+            \else
+              1%
+            \fi
+          }{1}=0 %
+      \expandafter\@firstoftwo
+    \else
+      \expandafter\@secondoftwo
+    \fi
+  }%
+%    \end{macrocode}
+%    \end{macro}
+%    \begin{macrocode}
+}{%
+%    \end{macrocode}
+%    \begin{macro}{\IfLanguageName}
+%    \begin{macrocode}
+  \def\IfLanguageName#1{%
+    \ifnum\IfLang@IfDefined{languagename}{%
+            \pdfstrcmp{#1}{\languagename}%
+          }{1}=0 %
+      \expandafter\@firstoftwo
+    \else
+      \expandafter\@secondoftwo
+    \fi
+  }%
+%    \end{macrocode}
+%    \end{macro}
+%    \begin{macrocode}
+}
+%    \end{macrocode}
+%
+% \subsection{Check plausibility of \cs{languagename}}
+%
+%    \begin{macrocode}
+\begingroup\expandafter\expandafter\expandafter\endgroup
+\expandafter\ifx\csname languagename\endcsname\relax
+\else
+  \IfLanguagePatterns{\languagename}{}{%
+    \IfLang@Warning{%
+      Mismatch between \string\language\space
+      (patterns)\MessageBreak
+      and setting of \string\languagename
+    }%
+  }%
+\fi
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+\IfLang@endinput
+%</package>
+%    \end{macrocode}
+%
+% \section{Test}
+%
+% \subsection{Test with \LaTeX}
+%
+%    \begin{macrocode}
+%<*test1>
+%    \end{macrocode}
+%    \begin{macrocode}
+\NeedsTeXFormat{LaTeX2e}
+\nofiles
+\documentclass{minimal}
+\usepackage{qstest}
+\IncludeTests{*}
+\LogTests{lgout}{*}{*}
+\usepackage[english,naustrian,ngerman]{babel}
+\usepackage{iflang}
+\begin{document}
+\begin{qstest}{IfLanguagePatterns}{language, pattern}
+  \def\test#1#2{%
+    \Expect*{\IfLanguagePatterns{#1}{true}{false}}{#2}%
+  }%
+  \test{ngerman}{true}%
+  \test{naustrian}{true}%
+  \test{english}{false}%
+  \test{foobar}{false}%
+\end{qstest}
+\begin{qstest}{IfLanguageName}{language, name}
+  \def\test#1#2{%
+    \Expect*{\IfLanguageName{#1}{true}{false}}{#2}%
+  }%
+  \test{ngerman}{true}%
+  \test{naustrian}{false}%
+  \selectlanguage{naustrian}%
+  \test{ngerman}{false}%
+  \test{naustrian}{true}%
+  \test{foobar}{false}%
+\end{qstest}
+\begin{qstest}{IfDefined}{defined}
+  \makeatletter
+  \let\foobar\relax
+  \Expect*{\IfLang@IfDefined{foobar}{true}{false}}{false}%
+  \Expect*{\ifx\foobar\relax true\else false\fi}{true}%
+  \let\foobar\UNDEFINED
+  \Expect*{\IfLang@IfDefined{foobar}{true}{false}}{false}%
+  \Expect*{\ifx\foobar\relax true\else false\fi}{false}%
+  \Expect*{\ifx\foobar\UNDEFINED true\else false\fi}{true}%
+\end{qstest}
+\end{document}
+%    \end{macrocode}
+%    \begin{macrocode}
+%</test1>
+%    \end{macrocode}
+%
+% \subsection{Test with \plainTeX\ and \eTeX}
+%
+%    \begin{macrocode}
+%<*test2>
+%    \end{macrocode}
+%    \begin{macrocode}
+%% Format `etex' based on `language.def'
+\input iflang.sty
+\catcode64=12
+
+\def\TestGeneric#1#2#3{%
+  \begingroup
+    \edef\x{#1{#2}{true}{false}}%
+    \edef\y{#3}%
+    \ifx\x\y
+    \else
+      \errmessage{Failed test: \string#1{#2} <> #3}%
+    \fi
+  \endgroup
+}
+\def\TestPatterns{\TestGeneric\IfLanguagePatterns}
+\def\TestName{\TestGeneric\IfLanguageName}
+
+\TestPatterns{USenglish}{true}
+\TestPatterns{ngerman}{false}
+
+\TestName{USenglish}{true}
+\TestName{ngerman}{false}
+
+\uselanguage{ngerman}
+
+\TestPatterns{USenglish}{false}
+\TestPatterns{ngerman}{true}
+
+\TestName{USenglish}{false}
+\TestName{ngerman}{true}
+
+\csname @@end\endcsname
+\end
+%    \end{macrocode}
+%    \begin{macrocode}
+%</test2>
+%    \end{macrocode}
+%
+% \subsection{Test with \plainTeX\ and without \eTeX/\pdfTeX}
+%
+%    \begin{macrocode}
+%<*test3>
+%    \end{macrocode}
+%    \begin{macrocode}
+%% Format `tex' (vanilla plain-TeX)
+\let\ifcsname\UNDEFINED
+\let\pdfstrcmp\UNDEFINED
+\input iflang.sty
+\catcode64=11
+
+\def\TestDefined#1{%
+  \IfLang@IfDefined{foobar}{}{}%
+  \ifx\foobar#1%
+  \else
+    \errmessage{Failed test: \string\foobar <> \string#1}%
+  \fi
+}
+\let\foobar\relax
+\TestDefined\relax
+\let\foobar\UNDEFINED
+\TestDefined\relax
+
+\def\strip@prefix#1>{}
+\def\@onelevel@sanitize#1{%
+  \edef#1{\expandafter\strip@prefix\meaning#1}%
+}
+\def\TestCompare#1#2#3{%
+  \begingroup
+    \edef\x{%
+      \if\IfLang@StrEqual{#1}{#2}%
+        true%
+      \else
+        false%
+      \fi
+    }%
+    \def\expect{#3}%
+    \ifx\x\expect
+    \else
+      \def\a{#1}%
+      \@onelevel@sanitize\a
+      \def\b{#2}%
+      \@onelevel@sanitize\b
+      \errmessage{Failed test: `\a'='\b' <> \expect}%
+    \fi
+  \endgroup
+}
+\TestCompare{junk}{junk}{true}
+\TestCompare{}{}{true}
+\TestCompare{a}{b}{false}
+\TestCompare{aa}{bb}{false}
+\def\a{ax}
+\def\b{bx}
+\def\c{\a\b}
+\def\d{\c\b}
+\def\exch#1#2{#2#1}
+\def\gobble#1{}
+\TestCompare{\gobble a}{}{true}
+\TestCompare{}{\gobble a}{true}
+\TestCompare{a\exch xyb}{ayxb}{true}
+\TestCompare{\c}{\c}{true}
+\TestCompare{\d}{\c\b}{true}
+
+\csname @@end\endcsname
+\end
+%    \end{macrocode}
+%    \begin{macrocode}
+%</test3>
+%    \end{macrocode}
+% \section{Installation}
+%
+% \subsection{Download}
+%
+% \paragraph{Package.} This package is available on
+% CTAN\footnote{\url{ftp://ftp.ctan.org/tex-archive/}}:
+% \begin{description}
+% \item[\CTAN{macros/latex/contrib/oberdiek/iflang.dtx}] The source file.
+% \item[\CTAN{macros/latex/contrib/oberdiek/iflang.pdf}] Documentation.
+% \end{description}
+%
+%
+% \paragraph{Bundle.} All the packages of the bundle `oberdiek'
+% are also available in a TDS compliant ZIP archive. There
+% the packages are already unpacked and the documentation files
+% are generated. The files and directories obey the TDS standard.
+% \begin{description}
+% \item[\CTAN{macros/latex/contrib/oberdiek/oberdiek-tds.zip}]
+% \end{description}
+%
+% \subsection{Bundle installation}
+%
+% \paragraph{Unpacking.} Unpack the \xfile{oberdiek-tds.zip} in the
+% TDS tree (also known as \xfile{texmf} tree) of your choice.
+% Example (linux):
+% \begin{quote}
+%   |unzip oberdiek-tds.zip -d ~/texmf|
+% \end{quote}
+%
+% \paragraph{Script installation.}
+% Check the directory \xfile{TDS:scripts/oberdiek/} for
+% scripts that need further installation steps.
+% Package \xpackage{attachfile2} comes with the Perl script
+% \xfile{pdfatfi.pl} that should be installed in such a way
+% that it can be called as \texttt{pdfatfi}.
+% Example (linux):
+% \begin{quote}
+%   |chmod +x scripts/oberdiek/pdfatfi.pl|\\
+%   |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
+% \end{quote}
+%
+% \subsection{Package installation}
+%
+% \paragraph{Unpacking.} The \xfile{.dtx} file is a self-extracting
+% \docstrip\ archive. The files are extracted by running the
+% \xfile{.dtx} through \plainTeX:
+% \begin{quote}
+%   \verb|tex iflang.dtx|
+% \end{quote}
+%
+% \paragraph{TDS.} Now the different files must be moved into
+% the different directories in your installation TDS tree
+% (also known as \xfile{texmf} tree):
+% \begin{quote}
+% \sbox0{^^A
+% \begin{tabular}{@{}>{\ttfamily}l@{$\quad\rightarrow\quad$}>{\ttfamily}l@{}}
+%   iflang.sty & tex/generic/oberdiek/iflang.sty\\
+%   iflang.pdf & doc/latex/oberdiek/iflang.pdf\\
+%   iflang-test1.tex & doc/latex/oberdiek/iflang-test1.tex\\
+%   iflang-test2.tex & doc/latex/oberdiek/iflang-test2.tex\\
+%   iflang-test3.tex & doc/latex/oberdiek/iflang-test3.tex\\
+%   iflang.dtx & source/latex/oberdiek/iflang.dtx\\
+% \end{tabular}^^A
+% }%
+% \ifdim\wd0>\linewidth
+%   \mbox{}\nobreak\hskip0pt minus\leftmargin
+%   \usebox0
+%   \nobreak\hskip0pt minus\rightmargin
+% \else
+%   \usebox0
+% \fi
+% \end{quote}
+% If you have a \xfile{docstrip.cfg} that configures and enables \docstrip's
+% TDS installing feature, then some files can already be in the right
+% place, see the documentation of \docstrip.
+%
+% \subsection{Refresh file name databases}
+%
+% If your \TeX~distribution
+% (\teTeX, \mikTeX, \dots) relies on file name databases, you must refresh
+% these. For example, \teTeX\ users run \verb|texhash| or
+% \verb|mktexlsr|.
+%
+% \subsection{Some details for the interested}
+%
+% \paragraph{Attached source.}
+%
+% The PDF documentation on CTAN also includes the
+% \xfile{.dtx} source file. It can be extracted by
+% AcrobatReader 6 or higher. Another option is \textsf{pdftk},
+% e.g. unpack the file into the current directory:
+% \begin{quote}
+%   \verb|pdftk iflang.pdf unpack_files output .|
+% \end{quote}
+%
+% \paragraph{Unpacking with \LaTeX.}
+% The \xfile{.dtx} chooses its action depending on the format:
+% \begin{description}
+% \item[\plainTeX:] Run \docstrip\ and extract the files.
+% \item[\LaTeX:] Generate the documentation.
+% \end{description}
+% If you insist on using \LaTeX\ for \docstrip\ (really,
+% \docstrip\ does not need \LaTeX), then inform the autodetect routine
+% about your intention:
+% \begin{quote}
+%   \verb|latex \let\install=y\input{iflang.dtx}|
+% \end{quote}
+% Do not forget to quote the argument according to the demands
+% of your shell.
+%
+% \paragraph{Generating the documentation.}
+% You can use both the \xfile{.dtx} or the \xfile{.drv} to generate
+% the documentation. The process can be configured by the
+% configuration file \xfile{ltxdoc.cfg}. For instance, put this
+% line into this file, if you want to have A4 as paper format:
+% \begin{quote}
+%   \verb|\PassOptionsToClass{a4paper}{article}|
+% \end{quote}
+% An example follows how to generate the
+% documentation with pdf\LaTeX:
+% \begin{quote}
+%\begin{verbatim}
+%pdflatex iflang.dtx
+%makeindex -s gind.ist iflang.idx
+%pdflatex iflang.dtx
+%makeindex -s gind.ist iflang.idx
+%pdflatex iflang.dtx
+%\end{verbatim}
+% \end{quote}
+%
+% \section{Acknowledgement}
+% I wish to thank:
+% \begin{description}
+% \item[Markus Kohm] Useful hints for version 1.2.
+% \end{description}
+%
+% \begin{History}
+%   \begin{Version}{2007/04/10 v1.0}
+%   \item
+%     First public version.
+%   \end{Version}
+%   \begin{Version}{2007/04/11 v1.1}
+%   \item
+%     Line ends sanitized.
+%   \end{Version}
+%   \begin{Version}{2007/04/12 v1.2}
+%   \item
+%     Initialization of \cs{languagename} in case of \xfile{etex.src}.
+%   \item
+%     Some sanity tests added.
+%   \item
+%     Documentation improved.
+%   \end{Version}
+% \end{History}
+%
+% \PrintIndex
+%
+% \Finale
+\endinput
diff --git a/Master/texmf-dist/source/latex/oberdiek/ifpdf.dtx b/Master/texmf-dist/source/latex/oberdiek/ifpdf.dtx
index cfe919f8a15..cf4d584e148 100644
--- a/Master/texmf-dist/source/latex/oberdiek/ifpdf.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/ifpdf.dtx
@@ -56,7 +56,7 @@
 %
 %<*ignore>
 \begingroup
-  \def\x{LaTeX2e}
+  \def\x{LaTeX2e}%
 \expandafter\endgroup
 \ifcase 0\ifx\install y1\fi\expandafter
          \ifx\csname processbatchFile\endcsname\relax\else1\fi
@@ -128,11 +128,11 @@ and the derived files
 %<*driver>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{ifpdf.drv}%
-  [2006/02/20 v1.4 Provides the ifpdf switch (HO)]
+  [2006/02/20 v1.4 Provides the ifpdf switch (HO)]%
 \documentclass{ltxdoc}
 \usepackage{holtxdoc}
 \begin{document}
-  \DocInput{ifpdf.dtx}
+  \DocInput{ifpdf.dtx}%
 \end{document}
 %</driver>
 % \fi
@@ -370,7 +370,7 @@ and the derived files
         \errmessage{Package ifpdf Error: #1}%
       }%
       \def\y{^^J}%
-      \newlinechar=10
+      \newlinechar=10 %
     \else
       \def\x#1#2{%
         \PackageError{ifpdf}{#1}{#2}%
@@ -436,13 +436,47 @@ and the derived files
 %    \end{macrocode}
 % \section{Installation}
 %
-% \paragraph{CTAN.} This package is available on
+% \subsection{Download}
+%
+% \paragraph{Package.} This package is available on
 % CTAN\footnote{\url{ftp://ftp.ctan.org/tex-archive/}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/ifpdf.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/ifpdf.pdf}] Documentation.
 % \end{description}
 %
+%
+% \paragraph{Bundle.} All the packages of the bundle `oberdiek'
+% are also available in a TDS compliant ZIP archive. There
+% the packages are already unpacked and the documentation files
+% are generated. The files and directories obey the TDS standard.
+% \begin{description}
+% \item[\CTAN{macros/latex/contrib/oberdiek/oberdiek-tds.zip}]
+% \end{description}
+%
+% \subsection{Bundle installation}
+%
+% \paragraph{Unpacking.} Unpack the \xfile{oberdiek-tds.zip} in the
+% TDS tree (also known as \xfile{texmf} tree) of your choice.
+% Example (linux):
+% \begin{quote}
+%   |unzip oberdiek-tds.zip -d ~/texmf|
+% \end{quote}
+%
+% \paragraph{Script installation.}
+% Check the directory \xfile{TDS:scripts/oberdiek/} for
+% scripts that need further installation steps.
+% Package \xpackage{attachfile2} comes with the Perl script
+% \xfile{pdfatfi.pl} that should be installed in such a way
+% that it can be called as \texttt{pdfatfi}.
+% Example (linux):
+% \begin{quote}
+%   |chmod +x scripts/oberdiek/pdfatfi.pl|\\
+%   |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
+% \end{quote}
+%
+% \subsection{Package installation}
+%
 % \paragraph{Unpacking.} The \xfile{.dtx} file is a self-extracting
 % \docstrip\ archive. The files are extracted by running the
 % \xfile{.dtx} through \plainTeX:
@@ -473,8 +507,10 @@ and the derived files
 % TDS installing feature, then some files can already be in the right
 % place, see the documentation of \docstrip.
 %
-% \paragraph{Refresh file databases.} If your \TeX~distribution
-% (\teTeX, \mikTeX, \dots) rely on file databases, you must refresh
+% \subsection{Refresh file name databases}
+%
+% If your \TeX~distribution
+% (\teTeX, \mikTeX, \dots) relies on file name databases, you must refresh
 % these. For example, \teTeX\ users run \verb|texhash| or
 % \verb|mktexlsr|.
 %
@@ -528,7 +564,7 @@ and the derived files
 % \begin{History}
 %   \begin{Version}{2001/06/14 v1.0}
 %   \item
-%     First public version,
+%     First public version.
 %   \end{Version}
 %   \begin{Version}{2001/07/14 v1.1}
 %   \item
diff --git a/Master/texmf-dist/source/latex/oberdiek/ifvtex.dtx b/Master/texmf-dist/source/latex/oberdiek/ifvtex.dtx
index 64d0e69f271..3db185974c8 100644
--- a/Master/texmf-dist/source/latex/oberdiek/ifvtex.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/ifvtex.dtx
@@ -56,7 +56,7 @@
 %
 %<*ignore>
 \begingroup
-  \def\x{LaTeX2e}
+  \def\x{LaTeX2e}%
 \expandafter\endgroup
 \ifcase 0\ifx\install y1\fi\expandafter
          \ifx\csname processbatchFile\endcsname\relax\else1\fi
@@ -128,11 +128,11 @@ and the derived files
 %<*driver>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{ifvtex.drv}%
-  [2007/01/10 v1.2 Switches for detecting VTeX and its modes (HO)]
+  [2007/01/10 v1.2 Switches for detecting VTeX and its modes (HO)]%
 \documentclass{ltxdoc}
 \usepackage{holtxdoc}
 \begin{document}
-  \DocInput{ifvtex.dtx}
+  \DocInput{ifvtex.dtx}%
 \end{document}
 %</driver>
 % \fi
@@ -282,7 +282,7 @@ and the derived files
         \errmessage{Package ifvtex Error: #1}%
       }%
       \def\y{^^J}%
-      \newlinechar=10
+      \newlinechar=10 %
     \else
       \def\x#1#2{%
         \PackageError{ifvtex}{#1}{#2}%
@@ -385,13 +385,47 @@ and the derived files
 %    \end{macrocode}
 % \section{Installation}
 %
-% \paragraph{CTAN.} This package is available on
+% \subsection{Download}
+%
+% \paragraph{Package.} This package is available on
 % CTAN\footnote{\url{ftp://ftp.ctan.org/tex-archive/}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/ifvtex.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/ifvtex.pdf}] Documentation.
 % \end{description}
 %
+%
+% \paragraph{Bundle.} All the packages of the bundle `oberdiek'
+% are also available in a TDS compliant ZIP archive. There
+% the packages are already unpacked and the documentation files
+% are generated. The files and directories obey the TDS standard.
+% \begin{description}
+% \item[\CTAN{macros/latex/contrib/oberdiek/oberdiek-tds.zip}]
+% \end{description}
+%
+% \subsection{Bundle installation}
+%
+% \paragraph{Unpacking.} Unpack the \xfile{oberdiek-tds.zip} in the
+% TDS tree (also known as \xfile{texmf} tree) of your choice.
+% Example (linux):
+% \begin{quote}
+%   |unzip oberdiek-tds.zip -d ~/texmf|
+% \end{quote}
+%
+% \paragraph{Script installation.}
+% Check the directory \xfile{TDS:scripts/oberdiek/} for
+% scripts that need further installation steps.
+% Package \xpackage{attachfile2} comes with the Perl script
+% \xfile{pdfatfi.pl} that should be installed in such a way
+% that it can be called as \texttt{pdfatfi}.
+% Example (linux):
+% \begin{quote}
+%   |chmod +x scripts/oberdiek/pdfatfi.pl|\\
+%   |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
+% \end{quote}
+%
+% \subsection{Package installation}
+%
 % \paragraph{Unpacking.} The \xfile{.dtx} file is a self-extracting
 % \docstrip\ archive. The files are extracted by running the
 % \xfile{.dtx} through \plainTeX:
@@ -422,8 +456,10 @@ and the derived files
 % TDS installing feature, then some files can already be in the right
 % place, see the documentation of \docstrip.
 %
-% \paragraph{Refresh file databases.} If your \TeX~distribution
-% (\teTeX, \mikTeX, \dots) rely on file databases, you must refresh
+% \subsection{Refresh file name databases}
+%
+% If your \TeX~distribution
+% (\teTeX, \mikTeX, \dots) relies on file name databases, you must refresh
 % these. For example, \teTeX\ users run \verb|texhash| or
 % \verb|mktexlsr|.
 %
diff --git a/Master/texmf-dist/source/latex/oberdiek/inputenx.dtx b/Master/texmf-dist/source/latex/oberdiek/inputenx.dtx
index 091af0fbacd..2d1e36302c3 100644
--- a/Master/texmf-dist/source/latex/oberdiek/inputenx.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/inputenx.dtx
@@ -1,6 +1,6 @@
 % \iffalse meta-comment
 %
-% Copyright (C) 2006 by Heiko Oberdiek <oberdiek@uni-freiburg.de>
+% Copyright (C) 2006, 2007 by Heiko Oberdiek <oberdiek@uni-freiburg.de>
 %
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either
@@ -20,12 +20,14 @@
 %    ix-alias.def, ix-math.def, ix-name.def, ix-slot.def,
 %    ix-uc.def, ix-utf8enc.dfu, x-ascii.def, x-iso-8859-1.def,
 %    x-iso-8859-2.def, x-iso-8859-3.def, x-iso-8859-4.def,
-%    x-iso-8859-9.def, x-iso-8859-10.def, x-iso-8859-13.def,
-%    x-iso-8859-14.def, x-iso-8859-15.def, x-iso-8859-16.def,
-%    x-cp437.def, x-cp850.def, x-cp852.def, x-cp858.def,
-%    x-cp865.def, x-cp1250.def, x-cp1252.def, x-cp1257.def,
-%    x-mac-roman.def, x-mac-ce.def, x-nextstep.def,
-%    x-dec-mcs.def, inputenx-licrcmds.txt, inputenx-utf8enc.txt.
+%    x-iso-8859-5.def, x-iso-8859-9.def, x-iso-8859-10.def,
+%    x-iso-8859-13.def, x-iso-8859-14.def, x-iso-8859-15.def,
+%    x-iso-8859-16.def, x-cp437.def, x-cp850.def, x-cp852.def,
+%    x-cp855.def, x-cp858.def, x-cp865.def, x-cp866.def,
+%    x-cp1250.def, x-cp1251.def, x-cp1252.def, x-cp1257.def,
+%    x-dec-mcs.def, x-koi8-r.def, x-mac-centeuro.def,
+%    x-mac-cyrillic.def, x-mac-roman.def, x-nextstep.def,
+%    inputenx-licrcmds.txt, inputenx-utf8enc.txt.
 %
 % Distribution:
 %    CTAN:macros/latex/contrib/oberdiek/inputenx.dtx
@@ -70,6 +72,7 @@
 %    TDS:tex/latex/oberdiek/x-iso-8859-2.def
 %    TDS:tex/latex/oberdiek/x-iso-8859-3.def
 %    TDS:tex/latex/oberdiek/x-iso-8859-4.def
+%    TDS:tex/latex/oberdiek/x-iso-8859-5.def
 %    TDS:tex/latex/oberdiek/x-iso-8859-9.def
 %    TDS:tex/latex/oberdiek/x-iso-8859-10.def
 %    TDS:tex/latex/oberdiek/x-iso-8859-13.def
@@ -79,15 +82,20 @@
 %    TDS:tex/latex/oberdiek/x-cp437.def
 %    TDS:tex/latex/oberdiek/x-cp850.def
 %    TDS:tex/latex/oberdiek/x-cp852.def
+%    TDS:tex/latex/oberdiek/x-cp855.def
 %    TDS:tex/latex/oberdiek/x-cp858.def
 %    TDS:tex/latex/oberdiek/x-cp865.def
+%    TDS:tex/latex/oberdiek/x-cp866.def
 %    TDS:tex/latex/oberdiek/x-cp1250.def
+%    TDS:tex/latex/oberdiek/x-cp1251.def
 %    TDS:tex/latex/oberdiek/x-cp1252.def
 %    TDS:tex/latex/oberdiek/x-cp1257.def
+%    TDS:tex/latex/oberdiek/x-dec-mcs.def
+%    TDS:tex/latex/oberdiek/x-koi8-r.def
+%    TDS:tex/latex/oberdiek/x-mac-centeuro.def
+%    TDS:tex/latex/oberdiek/x-mac-cyrillic.def
 %    TDS:tex/latex/oberdiek/x-mac-roman.def
-%    TDS:tex/latex/oberdiek/x-mac-ce.def
 %    TDS:tex/latex/oberdiek/x-nextstep.def
-%    TDS:tex/latex/oberdiek/x-dec-mcs.def
 %    TDS:doc/latex/oberdiek/inputenx.pdf
 %    TDS:doc/latex/oberdiek/inputenx-licrcmds.txt
 %    TDS:doc/latex/oberdiek/inputenx-utf8enc.txt
@@ -95,7 +103,7 @@
 %
 %<*ignore>
 \begingroup
-  \def\x{LaTeX2e}
+  \def\x{LaTeX2e}%
 \expandafter\endgroup
 \ifcase 0\ifx\install y1\fi\expandafter
          \ifx\csname processbatchFile\endcsname\relax\else1\fi
@@ -106,7 +114,7 @@
 \input docstrip.tex
 \Msg{************************************************************************}
 \Msg{* Installation}
-\Msg{* Package: inputenx 2006/08/24 v1.0 Enhanced input encoding handling (HO)}
+\Msg{* Package: inputenx 2007/04/11 v1.1 Enhanced input encoding handling (HO)}
 \Msg{************************************************************************}
 
 \keepsilent
@@ -116,7 +124,7 @@
 
 This is a generated file.
 
-Copyright (C) 2006 by Heiko Oberdiek <oberdiek@uni-freiburg.de>
+Copyright (C) 2006, 2007 by Heiko Oberdiek <oberdiek@uni-freiburg.de>
 
 This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either
@@ -136,12 +144,14 @@ and the derived files
    ix-alias.def, ix-math.def, ix-name.def, ix-slot.def,
    ix-uc.def, ix-utf8enc.dfu, x-ascii.def, x-iso-8859-1.def,
    x-iso-8859-2.def, x-iso-8859-3.def, x-iso-8859-4.def,
-   x-iso-8859-9.def, x-iso-8859-10.def, x-iso-8859-13.def,
-   x-iso-8859-14.def, x-iso-8859-15.def, x-iso-8859-16.def,
-   x-cp437.def, x-cp850.def, x-cp852.def, x-cp858.def,
-   x-cp865.def, x-cp1250.def, x-cp1252.def, x-cp1257.def,
-   x-mac-roman.def, x-mac-ce.def, x-nextstep.def,
-   x-dec-mcs.def, inputenx-licrcmds.txt, inputenx-utf8enc.txt.
+   x-iso-8859-5.def, x-iso-8859-9.def, x-iso-8859-10.def,
+   x-iso-8859-13.def, x-iso-8859-14.def, x-iso-8859-15.def,
+   x-iso-8859-16.def, x-cp437.def, x-cp850.def, x-cp852.def,
+   x-cp855.def, x-cp858.def, x-cp865.def, x-cp866.def,
+   x-cp1250.def, x-cp1251.def, x-cp1252.def, x-cp1257.def,
+   x-dec-mcs.def, x-koi8-r.def, x-mac-centeuro.def,
+   x-mac-cyrillic.def, x-mac-roman.def, x-nextstep.def,
+   inputenx-licrcmds.txt, inputenx-utf8enc.txt.
 
 \endpreamble
 
@@ -161,6 +171,7 @@ and the derived files
   \file{x-iso-8859-2.def}{\from{inputenx.dtx}{iso-8859-2}}%
   \file{x-iso-8859-3.def}{\from{inputenx.dtx}{iso-8859-3}}%
   \file{x-iso-8859-4.def}{\from{inputenx.dtx}{iso-8859-4}}%
+  \file{x-iso-8859-5.def}{\from{inputenx.dtx}{iso-8859-5}}%
   \file{x-iso-8859-9.def}{\from{inputenx.dtx}{iso-8859-9}}%
   \file{x-iso-8859-10.def}{\from{inputenx.dtx}{iso-8859-10}}%
   \file{x-iso-8859-13.def}{\from{inputenx.dtx}{iso-8859-13}}%
@@ -170,15 +181,20 @@ and the derived files
   \file{x-cp437.def}{\from{inputenx.dtx}{cp437}}%
   \file{x-cp850.def}{\from{inputenx.dtx}{cp850}}%
   \file{x-cp852.def}{\from{inputenx.dtx}{cp852}}%
+  \file{x-cp855.def}{\from{inputenx.dtx}{cp855}}%
   \file{x-cp858.def}{\from{inputenx.dtx}{cp858}}%
   \file{x-cp865.def}{\from{inputenx.dtx}{cp865}}%
+  \file{x-cp866.def}{\from{inputenx.dtx}{cp866}}%
   \file{x-cp1250.def}{\from{inputenx.dtx}{cp1250}}%
+  \file{x-cp1251.def}{\from{inputenx.dtx}{cp1251}}%
   \file{x-cp1252.def}{\from{inputenx.dtx}{cp1252}}%
   \file{x-cp1257.def}{\from{inputenx.dtx}{cp1257}}%
+  \file{x-dec-mcs.def}{\from{inputenx.dtx}{dec-mcs}}%
+  \file{x-koi8-r.def}{\from{inputenx.dtx}{koi8-r}}%
+  \file{x-mac-centeuro.def}{\from{inputenx.dtx}{mac-centeuro}}%
+  \file{x-mac-cyrillic.def}{\from{inputenx.dtx}{mac-cyrillic}}%
   \file{x-mac-roman.def}{\from{inputenx.dtx}{mac-roman}}%
-  \file{x-mac-ce.def}{\from{inputenx.dtx}{mac-ce}}%
   \file{x-nextstep.def}{\from{inputenx.dtx}{nextstep}}%
-  \file{x-dec-mcs.def}{\from{inputenx.dtx}{dec-mcs}}%
   \usedir{doc/latex/oberdiek}%
   \file{inputenx-licrcmds.txt}{\from{inputenx.dtx}{licrcmds}}%
   \file{inputenx-utf8enc.txt}{\from{inputenx.dtx}{dfudoc}}%
@@ -193,12 +209,14 @@ and the derived files
 \Msg{*     inputenx.sty, ix-alias.def, ix-math.def, ix-name.def,}
 \Msg{*     ix-slot.def, ix-uc.def, ix-utf8enc.dfu, x-ascii.def,}
 \Msg{*     x-iso-8859-1.def, x-iso-8859-2.def, x-iso-8859-3.def,}
-\Msg{*     x-iso-8859-4.def, x-iso-8859-9.def, x-iso-8859-10.def,}
-\Msg{*     x-iso-8859-13.def, x-iso-8859-14.def, x-iso-8859-15.def,}
-\Msg{*     x-iso-8859-16.def, x-cp437.def, x-cp850.def, x-cp852.def,}
-\Msg{*     x-cp858.def, x-cp865.def, x-cp1250.def, x-cp1252.def,}
-\Msg{*     x-cp1257.def, x-mac-roman.def, x-mac-ce.def, x-nextstep.def,}
-\Msg{*     x-dec-mcs.def}
+\Msg{*     x-iso-8859-4.def, x-iso-8859-5.def, x-iso-8859-9.def,}
+\Msg{*     x-iso-8859-10.def, x-iso-8859-13.def, x-iso-8859-14.def,}
+\Msg{*     x-iso-8859-15.def, x-iso-8859-16.def, x-cp437.def,}
+\Msg{*     x-cp850.def, x-cp852.def, x-cp855.def, x-cp858.def,}
+\Msg{*     x-cp865.def, x-cp866.def, x-cp1250.def, x-cp1251.def,}
+\Msg{*     x-cp1252.def, x-cp1257.def, x-dec-mcs.def, x-koi8-r.def,}
+\Msg{*     x-mac-centeuro.def, x-mac-cyrillic.def, x-mac-roman.def,}
+\Msg{*     x-nextstep.def}
 \Msg{*}
 \Msg{* To produce the documentation run the file `inputenx.drv'}
 \Msg{* through LaTeX.}
@@ -215,17 +233,17 @@ and the derived files
 %<*driver>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{inputenx.drv}%
-  [2006/08/24 v1.0 Enhanced input encoding handling (HO)]
+  [2007/04/11 v1.1 Enhanced input encoding handling (HO)]%
 \documentclass{ltxdoc}
 \usepackage{holtxdoc}
 \usepackage{longtable}
 \begin{document}
-  \DocInput{inputenx.dtx}
+  \DocInput{inputenx.dtx}%
 \end{document}
 %</driver>
 % \fi
 %
-% \CheckSum{7200}
+% \CheckSum{8933}
 %
 % \CharacterTable
 %  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -246,7 +264,7 @@ and the derived files
 % \GetFileInfo{inputenx.drv}
 %
 % \title{The \xpackage{inputenx} package}
-% \date{2006/08/24 v1.0}
+% \date{2007/04/11 v1.1}
 % \author{Heiko Oberdiek\\\xemail{oberdiek@uni-freiburg.de}}
 %
 % \maketitle
@@ -287,27 +305,36 @@ and the derived files
 % The following definition files are available. The second column
 % lists alternative option names for \xpackage{inputenx}:
 % \begin{longtable}{@{}lll@{}}
-%   \xfile{x-ascii.def} & \xoption{ascii}, \xoption{us-ascii} & ASCII encoding, 8bit characters disabled\\
+%   \xfile{x-ascii.def} & \xoption{ascii}, \xoption{us-ascii} & ASCII encoding,\\
+%                       &                                     & 8bit characters disabled\\
 %   \xfile{x-cp437.def} & \xoption{cp437}, \xoption{cp437de} & Code page 437\\
 %   \xfile{x-cp850.def} & \xoption{cp850} & Code page 850\\
 %   \xfile{x-cp852.def} & \xoption{cp852} & Code page 852\\
+%   \xfile{x-cp855.def} & \xoption{cp855} & Code page 855\\
 %   \xfile{x-cp858.def} & \xoption{cp858} & Code page 858\\
 %   \xfile{x-cp865.def} & \xoption{cp865} & Code page 865\\
+%   \xfile{x-cp866.def} & \xoption{cp866} & Code page 866\\
 %   \xfile{x-cp1250.def} & \xoption{cp1250} & Code page 1250\\
+%   \xfile{x-cp1251.def} & \xoption{cp1251} & Code page 1251\\
 %   \xfile{x-cp1252.def} & \xoption{cp1252}, \xoption{ansinew} & Code page 1252\\
 %   \xfile{x-cp1257.def} & \xoption{cp1257} & Code page 1257\\
 %   \xfile{x-dec-mcs.def} & \xoption{dec-mcs}, \xoption{decmulti} & DEC Multinational\\
+%   \xfile{x-koi8-r.def} & \xoption{koi8-r} & KOI8-R (RFC1489)\\
 %   \xfile{x-iso-8859-1.def} & \xoption{iso-8859-1}, \xoption{latin1} & ISO-8859-1\\
 %   \xfile{x-iso-8859-2.def} & \xoption{iso-8859-2}, \xoption{latin2} & ISO-8859-2\\
 %   \xfile{x-iso-8859-3.def} & \xoption{iso-8859-3}, \xoption{latin3} & ISO-8859-3\\
 %   \xfile{x-iso-8859-4.def} & \xoption{iso-8859-4}, \xoption{latin4} & ISO-8859-4\\
+%   \xfile{x-iso-8859-5.def} & \xoption{iso-8859-5}, \xoption{iso88595} & ISO-8859-5\\
 %   \xfile{x-iso-8859-9.def} & \xoption{iso-8859-9}, \xoption{latin5} & ISO-8859-9\\
 %   \xfile{x-iso-8859-10.def} & \xoption{iso-8859-10}, \xoption{latin6} & ISO-8859-10\\
 %   \xfile{x-iso-8859-13.def} & \xoption{iso-8859-13}, \xoption{latin7} & ISO-8859-13\\
 %   \xfile{x-iso-8859-14.def} & \xoption{iso-8859-14}, \xoption{latin8} & ISO-8859-14\\
 %   \xfile{x-iso-8859-15.def} & \xoption{iso-8859-15}, \xoption{latin9} & ISO-8859-15\\
 %   \xfile{x-iso-8859-16.def} & \xoption{iso-8859-16}, \xoption{latin10} & ISO-8859-16\\
-%   \xfile{x-mac-ce.def} & \xoption{mac-ce}, \xoption{macce} & MAC OS Central European\\
+%   \xfile{x-mac-centeuro.def} & \xoption{mac-centeuro}, \xoption{mac-ce}, & MAC OS Central European\\
+%                              & \xoption{macce} & \\
+%   \xfile{x-mac-cyrillic.def} & \xoption{mac-cyrillic}, \xoption{maccyr}, & MAC OS Cyrillic\\
+%                              & \xoption{mac-ukrainian}, \xoption{macukr} &\\
 %   \xfile{x-mac-roman.def} & \xoption{mac-roman}, \xoption{applemac} & MAC OS Roman\\
 %   \xfile{x-nextstep} & \xoption{nextstep}, \xoption{next} & NextStep Encoding\\
 % \end{longtable}
@@ -380,7 +407,7 @@ and the derived files
 %<*package>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{inputenx}%
-  [2006/08/24 v1.0 Enhanced input encoding handling (HO)]
+  [2007/04/11 v1.1 Enhanced input encoding handling (HO)]%
 %    \end{macrocode}
 %
 % \subsection{Encoding names}
@@ -416,7 +443,8 @@ and the derived files
   }%
   \ifx\CurrentInputEncodingOption\@empty
     \PackageWarning{inputenx}{%
-      Encoding `\CurrentInputEncodingName' is not available\MessageBreak
+      Encoding `\CurrentInputEncodingName' is not available%
+      \MessageBreak
       and therefore ignored%
     }%
   \else
@@ -469,7 +497,8 @@ and the derived files
     }{%
       \PackageWarning{inputenx}{%
         Missing encoding file `\IEX@temp.def'\MessageBreak
-        for encoding `\CurrentInputEncodingName', continuing\MessageBreak
+        for encoding `\CurrentInputEncodingName', continuing%
+        \MessageBreak
         with lookup search%
       }%
     }%
@@ -540,7 +569,7 @@ and the derived files
 %
 %    \begin{macrocode}
 \ifIEX@math
-  \RequirePackage{inpmath}
+  \RequirePackage{inpmath}%
   \IfFileExists{ix-math.cfg}{%
     \input{ix-math.cfg}%
   }{%
@@ -557,7 +586,7 @@ and the derived files
 %
 %    \begin{macrocode}
 %<*alias>
-\ProvidesFile{ix-alias.def}[2006/08/24 v1.0 Alias list (inputenx)]
+\ProvidesFile{ix-alias.def}[2007/04/11 v1.1 Alias list (inputenx)]
 %    \end{macrocode}
 %    The alias mechanism is also used to hide the prefix |x-|:
 %    \begin{macrocode}
@@ -566,6 +595,7 @@ and the derived files
 \InputenxAlias{iso-8859-2}{x-iso-8859-2}
 \InputenxAlias{iso-8859-3}{x-iso-8859-3}
 \InputenxAlias{iso-8859-4}{x-iso-8859-4}
+\InputenxAlias{iso-8859-5}{x-iso-8859-5}
 \InputenxAlias{iso-8859-9}{x-iso-8859-9}
 \InputenxAlias{iso-8859-10}{x-iso-8859-10}
 \InputenxAlias{iso-8859-13}{x-iso-8859-13}
@@ -575,15 +605,20 @@ and the derived files
 \InputenxAlias{cp437}{x-cp437}
 \InputenxAlias{cp850}{x-cp850}
 \InputenxAlias{cp852}{x-cp852}
+\InputenxAlias{cp855}{x-cp855}
 \InputenxAlias{cp858}{x-cp858}
 \InputenxAlias{cp865}{x-cp865}
+\InputenxAlias{cp866}{x-cp866}
 \InputenxAlias{cp1250}{x-cp1250}
+\InputenxAlias{cp1251}{x-cp1251}
 \InputenxAlias{cp1252}{x-cp1252}
 \InputenxAlias{cp1257}{x-cp1257}
+\InputenxAlias{dec-mcs}{x-dec-mcs}
+\InputenxAlias{koi8-r}{x-koi8-r}
+\InputenxAlias{mac-centeuro}{x-mac-centeuro}
+\InputenxAlias{mac-cyrillic}{x-mac-cyrillic}
 \InputenxAlias{mac-roman}{x-mac-roman}
-\InputenxAlias{mac-ce}{x-mac-ce}
 \InputenxAlias{nextstep}{x-nextstep}
-\InputenxAlias{dec-mcs}{x-dec-mcs}
 %    \end{macrocode}
 %    Now the real aliases start:
 %    \begin{macrocode}
@@ -591,6 +626,7 @@ and the derived files
 \InputenxAlias{applemac}{x-mac-roman}
 \InputenxAlias{cp437de}{x-cp437}
 \InputenxAlias{decmulti}{x-dec-mcs}
+\InputenxAlias{iso88595}{x-iso-8859-5}
 \InputenxAlias{latin1}{x-iso-8859-1}
 \InputenxAlias{latin10}{x-iso-8859-16}
 \InputenxAlias{latin2}{x-iso-8859-2}
@@ -601,7 +637,11 @@ and the derived files
 \InputenxAlias{latin7}{x-iso-8859-13}
 \InputenxAlias{latin8}{x-iso-8859-14}
 \InputenxAlias{latin9}{x-iso-8859-15}
-\InputenxAlias{macce}{x-mac-ce}
+\InputenxAlias{mac-ce}{x-mac-centeuro}
+\InputenxAlias{mac-ukrainian}{x-mac-cyrillic}
+\InputenxAlias{macce}{x-mac-centeuro}
+\InputenxAlias{maccyr}{x-mac-cyrillic}
+\InputenxAlias{macukr}{x-mac-cyrillic}
 \InputenxAlias{next}{x-nextstep}
 \InputenxAlias{us-ascii}{x-ascii}
 %    \end{macrocode}
@@ -620,7 +660,7 @@ and the derived files
 %    \begin{macrocode}
 %<*ascii>
 \ProvidesFile{x-ascii.def}%
-  [2006/08/24 v1.0 Input encoding ascii (inputenx)]
+  [2007/04/11 v1.1 Input encoding ascii (inputenx)]%
 \@inpenc@test
 %</ascii>
 %    \end{macrocode}
@@ -630,7 +670,7 @@ and the derived files
 %    \begin{macrocode}
 %<*iso-8859-1>
 \ProvidesFile{x-iso-8859-1.def}%
-  [2006/08/24 v1.0 Input encoding iso-8859-1 (inputenx)]
+  [2007/04/11 v1.1 Input encoding iso-8859-1 (inputenx)]%
 \ProvideTextCommandDefault{\textasciiacute}{%
   \@tabacckludge'{}%
 }
@@ -785,14 +825,14 @@ and the derived files
 \DeclareInputText{254}{\th}
 \DeclareInputText{255}{\"y}
 %</iso-8859-1>
-%    \end{macrocode} 
+%    \end{macrocode}
 %
 % \subsubsection{Encoding iso-8859-2}
 %
 %    \begin{macrocode}
 %<*iso-8859-2>
 \ProvidesFile{x-iso-8859-2.def}%
-  [2006/08/24 v1.0 Input encoding iso-8859-2 (inputenx)]
+  [2007/04/11 v1.1 Input encoding iso-8859-2 (inputenx)]%
 \ProvideTextCommandDefault{\textacutedbl}{%
   \H{}%
 }
@@ -917,14 +957,14 @@ and the derived files
 \DeclareInputText{254}{\c t}
 \DeclareInputText{255}{\.{}}
 %</iso-8859-2>
-%    \end{macrocode} 
+%    \end{macrocode}
 %
 % \subsubsection{Encoding iso-8859-3}
 %
 %    \begin{macrocode}
 %<*iso-8859-3>
 \ProvidesFile{x-iso-8859-3.def}%
-  [2006/08/24 v1.0 Input encoding iso-8859-3 (inputenx)]
+  [2007/04/11 v1.1 Input encoding iso-8859-3 (inputenx)]%
 \ProvideTextCommandDefault{\textasciiacute}{%
   \@tabacckludge'{}%
 }
@@ -1054,14 +1094,14 @@ and the derived files
 \DeclareInputText{254}{\^s}
 \DeclareInputText{255}{\.{}}
 %</iso-8859-3>
-%    \end{macrocode} 
+%    \end{macrocode}
 %
 % \subsubsection{Encoding iso-8859-4}
 %
 %    \begin{macrocode}
 %<*iso-8859-4>
 \ProvidesFile{x-iso-8859-4.def}%
-  [2006/08/24 v1.0 Input encoding iso-8859-4 (inputenx)]
+  [2007/04/11 v1.1 Input encoding iso-8859-4 (inputenx)]%
 \ProvideTextCommandDefault{\textTstroke}{%
   \TextSymbolUnavailable\textTstroke
 }
@@ -1192,14 +1232,133 @@ and the derived files
 \DeclareInputText{254}{\@tabacckludge=u}
 \DeclareInputText{255}{\.{}}
 %</iso-8859-4>
-%    \end{macrocode} 
+%    \end{macrocode}
+%
+% \subsubsection{Encoding iso-8859-5}
+%
+%    \begin{macrocode}
+%<*iso-8859-5>
+\ProvidesFile{x-iso-8859-5.def}%
+  [2007/04/11 v1.1 Input encoding iso-8859-5 (inputenx)]%
+\ProvideTextCommandDefault{\textnumero}{%
+  N%
+  \bgroup
+    \check@mathfonts
+    \fontsize\sf@size\z@
+    \math@fontsfalse
+    \selectfont
+    \ooalign{%
+      \raise0.5ex\hbox{o}%
+      \crcr
+      \hline
+    }%
+  \egroup
+}
+\DeclareInputText{160}{\nobreakspace}
+\DeclareInputText{161}{\CYRYO}
+\DeclareInputText{162}{\CYRDJE}
+\DeclareInputText{163}{\@tabacckludge'\CYRG}
+\DeclareInputText{164}{\CYRIE}
+\DeclareInputText{165}{\CYRDZE}
+\DeclareInputText{166}{\CYRII}
+\DeclareInputText{167}{\CYRYI}
+\DeclareInputText{168}{\CYRJE}
+\DeclareInputText{169}{\CYRLJE}
+\DeclareInputText{170}{\CYRNJE}
+\DeclareInputText{171}{\CYRTSHE}
+\DeclareInputText{172}{\@tabacckludge'\CYRK}
+\DeclareInputText{173}{\-}
+\DeclareInputText{174}{\CYRUSHRT}
+\DeclareInputText{175}{\CYRDZHE}
+\DeclareInputText{176}{\CYRA}
+\DeclareInputText{177}{\CYRB}
+\DeclareInputText{178}{\CYRV}
+\DeclareInputText{179}{\CYRG}
+\DeclareInputText{180}{\CYRD}
+\DeclareInputText{181}{\CYRE}
+\DeclareInputText{182}{\CYRZH}
+\DeclareInputText{183}{\CYRZ}
+\DeclareInputText{184}{\CYRI}
+\DeclareInputText{185}{\CYRISHRT}
+\DeclareInputText{186}{\CYRK}
+\DeclareInputText{187}{\CYRL}
+\DeclareInputText{188}{\CYRM}
+\DeclareInputText{189}{\CYRN}
+\DeclareInputText{190}{\CYRO}
+\DeclareInputText{191}{\CYRP}
+\DeclareInputText{192}{\CYRR}
+\DeclareInputText{193}{\CYRS}
+\DeclareInputText{194}{\CYRT}
+\DeclareInputText{195}{\CYRU}
+\DeclareInputText{196}{\CYRF}
+\DeclareInputText{197}{\CYRH}
+\DeclareInputText{198}{\CYRC}
+\DeclareInputText{199}{\CYRCH}
+\DeclareInputText{200}{\CYRSH}
+\DeclareInputText{201}{\CYRSHCH}
+\DeclareInputText{202}{\CYRHRDSN}
+\DeclareInputText{203}{\CYRERY}
+\DeclareInputText{204}{\CYRSFTSN}
+\DeclareInputText{205}{\CYREREV}
+\DeclareInputText{206}{\CYRYU}
+\DeclareInputText{207}{\CYRYA}
+\DeclareInputText{208}{\cyra}
+\DeclareInputText{209}{\cyrb}
+\DeclareInputText{210}{\cyrv}
+\DeclareInputText{211}{\cyrg}
+\DeclareInputText{212}{\cyrd}
+\DeclareInputText{213}{\cyre}
+\DeclareInputText{214}{\cyrzh}
+\DeclareInputText{215}{\cyrz}
+\DeclareInputText{216}{\cyri}
+\DeclareInputText{217}{\cyrishrt}
+\DeclareInputText{218}{\cyrk}
+\DeclareInputText{219}{\cyrl}
+\DeclareInputText{220}{\cyrm}
+\DeclareInputText{221}{\cyrn}
+\DeclareInputText{222}{\cyro}
+\DeclareInputText{223}{\cyrp}
+\DeclareInputText{224}{\cyrr}
+\DeclareInputText{225}{\cyrs}
+\DeclareInputText{226}{\cyrt}
+\DeclareInputText{227}{\cyru}
+\DeclareInputText{228}{\cyrf}
+\DeclareInputText{229}{\cyrh}
+\DeclareInputText{230}{\cyrc}
+\DeclareInputText{231}{\cyrch}
+\DeclareInputText{232}{\cyrsh}
+\DeclareInputText{233}{\cyrshch}
+\DeclareInputText{234}{\cyrhrdsn}
+\DeclareInputText{235}{\cyrery}
+\DeclareInputText{236}{\cyrsftsn}
+\DeclareInputText{237}{\cyrerev}
+\DeclareInputText{238}{\cyryu}
+\DeclareInputText{239}{\cyrya}
+\DeclareInputText{240}{\textnumero}
+\DeclareInputText{241}{\cyryo}
+\DeclareInputText{242}{\cyrdje}
+\DeclareInputText{243}{\@tabacckludge'\cyrg}
+\DeclareInputText{244}{\cyrie}
+\DeclareInputText{245}{\cyrdze}
+\DeclareInputText{246}{\cyrii}
+\DeclareInputText{247}{\cyryi}
+\DeclareInputText{248}{\cyrje}
+\DeclareInputText{249}{\cyrlje}
+\DeclareInputText{250}{\cyrnje}
+\DeclareInputText{251}{\cyrtshe}
+\DeclareInputText{252}{\@tabacckludge'\cyrk}
+\DeclareInputText{253}{\textsection}
+\DeclareInputText{254}{\cyrushrt}
+\DeclareInputText{255}{\cyrdzhe}
+%</iso-8859-5>
+%    \end{macrocode}
 %
 % \subsubsection{Encoding iso-8859-9}
 %
 %    \begin{macrocode}
 %<*iso-8859-9>
 \ProvidesFile{x-iso-8859-9.def}%
-  [2006/08/24 v1.0 Input encoding iso-8859-9 (inputenx)]
+  [2007/04/11 v1.1 Input encoding iso-8859-9 (inputenx)]%
 \ProvideTextCommandDefault{\textasciiacute}{%
   \@tabacckludge'{}%
 }
@@ -1354,14 +1513,14 @@ and the derived files
 \DeclareInputText{254}{\c s}
 \DeclareInputText{255}{\"y}
 %</iso-8859-9>
-%    \end{macrocode} 
+%    \end{macrocode}
 %
 % \subsubsection{Encoding iso-8859-10}
 %
 %    \begin{macrocode}
 %<*iso-8859-10>
 \ProvidesFile{x-iso-8859-10.def}%
-  [2006/08/24 v1.0 Input encoding iso-8859-10 (inputenx)]
+  [2007/04/11 v1.1 Input encoding iso-8859-10 (inputenx)]%
 \ProvideTextCommandDefault{\textTstroke}{%
   \TextSymbolUnavailable\textTstroke
 }
@@ -1470,14 +1629,14 @@ and the derived files
 \DeclareInputText{254}{\th}
 \DeclareInputText{255}{\textkra}
 %</iso-8859-10>
-%    \end{macrocode} 
+%    \end{macrocode}
 %
 % \subsubsection{Encoding iso-8859-13}
 %
 %    \begin{macrocode}
 %<*iso-8859-13>
 \ProvidesFile{x-iso-8859-13.def}%
-  [2006/08/24 v1.0 Input encoding iso-8859-13 (inputenx)]
+  [2007/04/11 v1.1 Input encoding iso-8859-13 (inputenx)]%
 \ProvideTextCommandDefault{\textbrokenbar}{%
   \TextSymbolUnavailable\textbrokenbar
 }
@@ -1620,14 +1779,14 @@ and the derived files
 \DeclareInputText{254}{\v z}
 \DeclareInputText{255}{\textquoteright}
 %</iso-8859-13>
-%    \end{macrocode} 
+%    \end{macrocode}
 %
 % \subsubsection{Encoding iso-8859-14}
 %
 %    \begin{macrocode}
 %<*iso-8859-14>
 \ProvidesFile{x-iso-8859-14.def}%
-  [2006/08/24 v1.0 Input encoding iso-8859-14 (inputenx)]
+  [2007/04/11 v1.1 Input encoding iso-8859-14 (inputenx)]%
 \DeclareInputText{160}{\nobreakspace}
 \DeclareInputText{161}{\.B}
 \DeclareInputText{162}{\.b}
@@ -1725,14 +1884,14 @@ and the derived files
 \DeclareInputText{254}{\^y}
 \DeclareInputText{255}{\"y}
 %</iso-8859-14>
-%    \end{macrocode} 
+%    \end{macrocode}
 %
 % \subsubsection{Encoding iso-8859-15}
 %
 %    \begin{macrocode}
 %<*iso-8859-15>
 \ProvidesFile{x-iso-8859-15.def}%
-  [2006/08/24 v1.0 Input encoding iso-8859-15 (inputenx)]
+  [2007/04/11 v1.1 Input encoding iso-8859-15 (inputenx)]%
 \ProvideTextCommandDefault{\textasciimacron}{%
   \@tabacckludge={}%
 }
@@ -1869,14 +2028,14 @@ and the derived files
 \DeclareInputText{254}{\th}
 \DeclareInputText{255}{\"y}
 %</iso-8859-15>
-%    \end{macrocode} 
+%    \end{macrocode}
 %
 % \subsubsection{Encoding iso-8859-16}
 %
 %    \begin{macrocode}
 %<*iso-8859-16>
 \ProvidesFile{x-iso-8859-16.def}%
-  [2006/08/24 v1.0 Input encoding iso-8859-16 (inputenx)]
+  [2007/04/11 v1.1 Input encoding iso-8859-16 (inputenx)]%
 \ProvideTextCommandDefault{\textcommabelow}[1]{%
   \hmode@bgroup
     \ooalign{%
@@ -1997,14 +2156,14 @@ and the derived files
 \DeclareInputText{254}{\textcommabelow t}
 \DeclareInputText{255}{\"y}
 %</iso-8859-16>
-%    \end{macrocode} 
+%    \end{macrocode}
 %
 % \subsubsection{Encoding cp437}
 %
 %    \begin{macrocode}
 %<*cp437>
 \ProvidesFile{x-cp437.def}%
-  [2006/08/24 v1.0 Input encoding cp437 (inputenx)]
+  [2007/04/11 v1.1 Input encoding cp437 (inputenx)]%
 \ProvideTextCommandDefault{\textGamma}{%
   \ensuremath\Gamma
 }
@@ -2230,14 +2389,14 @@ and the derived files
 \DeclareInputText{254}{\textblacksquare}
 \DeclareInputText{255}{\nobreakspace}
 %</cp437>
-%    \end{macrocode} 
+%    \end{macrocode}
 %
 % \subsubsection{Encoding cp850}
 %
 %    \begin{macrocode}
 %<*cp850>
 \ProvidesFile{x-cp850.def}%
-  [2006/08/24 v1.0 Input encoding cp850 (inputenx)]
+  [2007/04/11 v1.1 Input encoding cp850 (inputenx)]%
 \ProvideTextCommandDefault{\textasciiacute}{%
   \@tabacckludge'{}%
 }
@@ -2429,14 +2588,14 @@ and the derived files
 \DeclareInputText{254}{\textblacksquare}
 \DeclareInputText{255}{\nobreakspace}
 %</cp850>
-%    \end{macrocode} 
+%    \end{macrocode}
 %
 % \subsubsection{Encoding cp852}
 %
 %    \begin{macrocode}
 %<*cp852>
 \ProvidesFile{x-cp852.def}%
-  [2006/08/24 v1.0 Input encoding cp852 (inputenx)]
+  [2007/04/11 v1.1 Input encoding cp852 (inputenx)]%
 \ProvideTextCommandDefault{\textacutedbl}{%
   \H{}%
 }
@@ -2599,14 +2758,171 @@ and the derived files
 \DeclareInputText{254}{\textblacksquare}
 \DeclareInputText{255}{\nobreakspace}
 %</cp852>
-%    \end{macrocode} 
+%    \end{macrocode}
+%
+% \subsubsection{Encoding cp855}
+%
+%    \begin{macrocode}
+%<*cp855>
+\ProvidesFile{x-cp855.def}%
+  [2007/04/11 v1.1 Input encoding cp855 (inputenx)]%
+\ProvideTextCommandDefault{\textblacksquare}{%
+  \vrule \@width .3em \@height .4em \@depth -.1em\relax
+}
+\ProvideTextCommandDefault{\textcurrency}{%
+  \TextSymbolUnavailable\textcurrency
+}
+\ProvideTextCommandDefault{\textnumero}{%
+  N%
+  \bgroup
+    \check@mathfonts
+    \fontsize\sf@size\z@
+    \math@fontsfalse
+    \selectfont
+    \ooalign{%
+      \raise0.5ex\hbox{o}%
+      \crcr
+      \hline
+    }%
+  \egroup
+}
+\DeclareInputText{128}{\cyrdje}
+\DeclareInputText{129}{\CYRDJE}
+\DeclareInputText{130}{\@tabacckludge'\cyrg}
+\DeclareInputText{131}{\@tabacckludge'\CYRG}
+\DeclareInputText{132}{\cyryo}
+\DeclareInputText{133}{\CYRYO}
+\DeclareInputText{134}{\cyrie}
+\DeclareInputText{135}{\CYRIE}
+\DeclareInputText{136}{\cyrdze}
+\DeclareInputText{137}{\CYRDZE}
+\DeclareInputText{138}{\cyrii}
+\DeclareInputText{139}{\CYRII}
+\DeclareInputText{140}{\cyryi}
+\DeclareInputText{141}{\CYRYI}
+\DeclareInputText{142}{\cyrje}
+\DeclareInputText{143}{\CYRJE}
+\DeclareInputText{144}{\cyrlje}
+\DeclareInputText{145}{\CYRLJE}
+\DeclareInputText{146}{\cyrnje}
+\DeclareInputText{147}{\CYRNJE}
+\DeclareInputText{148}{\cyrtshe}
+\DeclareInputText{149}{\CYRTSHE}
+\DeclareInputText{150}{\@tabacckludge'\cyrk}
+\DeclareInputText{151}{\@tabacckludge'\CYRK}
+\DeclareInputText{152}{\cyrushrt}
+\DeclareInputText{153}{\CYRUSHRT}
+\DeclareInputText{154}{\cyrdzhe}
+\DeclareInputText{155}{\CYRDZHE}
+\DeclareInputText{156}{\cyryu}
+\DeclareInputText{157}{\CYRYU}
+\DeclareInputText{158}{\cyrhrdsn}
+\DeclareInputText{159}{\CYRHRDSN}
+\DeclareInputText{160}{\cyra}
+\DeclareInputText{161}{\CYRA}
+\DeclareInputText{162}{\cyrb}
+\DeclareInputText{163}{\CYRB}
+\DeclareInputText{164}{\cyrc}
+\DeclareInputText{165}{\CYRC}
+\DeclareInputText{166}{\cyrd}
+\DeclareInputText{167}{\CYRD}
+\DeclareInputText{168}{\cyre}
+\DeclareInputText{169}{\CYRE}
+\DeclareInputText{170}{\cyrf}
+\DeclareInputText{171}{\CYRF}
+\DeclareInputText{172}{\cyrg}
+\DeclareInputText{173}{\CYRG}
+\DeclareInputText{174}{\guillemotleft}
+\DeclareInputText{175}{\guillemotright}
+\DeclareInputText{176}{\textltshade}
+\DeclareInputText{177}{\textshade}
+\DeclareInputText{178}{\textdkshade}
+\DeclareInputText{179}{\textSFxi}
+\DeclareInputText{180}{\textSFix}
+\DeclareInputText{181}{\cyrh}
+\DeclareInputText{182}{\CYRH}
+\DeclareInputText{183}{\cyri}
+\DeclareInputText{184}{\CYRI}
+\DeclareInputText{185}{\textSFxxiii}
+\DeclareInputText{186}{\textSFxxiv}
+\DeclareInputText{187}{\textSFxxv}
+\DeclareInputText{188}{\textSFxxvi}
+\DeclareInputText{189}{\cyrishrt}
+\DeclareInputText{190}{\CYRISHRT}
+\DeclareInputText{191}{\textSFiii}
+\DeclareInputText{192}{\textSFii}
+\DeclareInputText{193}{\textSFvii}
+\DeclareInputText{194}{\textSFvi}
+\DeclareInputText{195}{\textSFviii}
+\DeclareInputText{196}{\textSFx}
+\DeclareInputText{197}{\textSFv}
+\DeclareInputText{198}{\cyrk}
+\DeclareInputText{199}{\CYRK}
+\DeclareInputText{200}{\textSFxxxviii}
+\DeclareInputText{201}{\textSFxxxix}
+\DeclareInputText{202}{\textSFxl}
+\DeclareInputText{203}{\textSFxli}
+\DeclareInputText{204}{\textSFxlii}
+\DeclareInputText{205}{\textSFxliii}
+\DeclareInputText{206}{\textSFxliv}
+\DeclareInputText{207}{\textcurrency}
+\DeclareInputText{208}{\cyrl}
+\DeclareInputText{209}{\CYRL}
+\DeclareInputText{210}{\cyrm}
+\DeclareInputText{211}{\CYRM}
+\DeclareInputText{212}{\cyrn}
+\DeclareInputText{213}{\CYRN}
+\DeclareInputText{214}{\cyro}
+\DeclareInputText{215}{\CYRO}
+\DeclareInputText{216}{\cyrp}
+\DeclareInputText{217}{\textSFiv}
+\DeclareInputText{218}{\textSFi}
+\DeclareInputText{219}{\textblock}
+\DeclareInputText{220}{\textdnblock}
+\DeclareInputText{221}{\CYRP}
+\DeclareInputText{222}{\cyrya}
+\DeclareInputText{223}{\textupblock}
+\DeclareInputText{224}{\CYRYA}
+\DeclareInputText{225}{\cyrr}
+\DeclareInputText{226}{\CYRR}
+\DeclareInputText{227}{\cyrs}
+\DeclareInputText{228}{\CYRS}
+\DeclareInputText{229}{\cyrt}
+\DeclareInputText{230}{\CYRT}
+\DeclareInputText{231}{\cyru}
+\DeclareInputText{232}{\CYRU}
+\DeclareInputText{233}{\cyrzh}
+\DeclareInputText{234}{\CYRZH}
+\DeclareInputText{235}{\cyrv}
+\DeclareInputText{236}{\CYRV}
+\DeclareInputText{237}{\cyrsftsn}
+\DeclareInputText{238}{\CYRSFTSN}
+\DeclareInputText{239}{\textnumero}
+\DeclareInputText{240}{\-}
+\DeclareInputText{241}{\cyrery}
+\DeclareInputText{242}{\CYRERY}
+\DeclareInputText{243}{\cyrz}
+\DeclareInputText{244}{\CYRZ}
+\DeclareInputText{245}{\cyrsh}
+\DeclareInputText{246}{\CYRSH}
+\DeclareInputText{247}{\cyrerev}
+\DeclareInputText{248}{\CYREREV}
+\DeclareInputText{249}{\cyrshch}
+\DeclareInputText{250}{\CYRSHCH}
+\DeclareInputText{251}{\cyrch}
+\DeclareInputText{252}{\CYRCH}
+\DeclareInputText{253}{\textsection}
+\DeclareInputText{254}{\textblacksquare}
+\DeclareInputText{255}{\nobreakspace}
+%</cp855>
+%    \end{macrocode}
 %
 % \subsubsection{Encoding cp858}
 %
 %    \begin{macrocode}
 %<*cp858>
 \ProvidesFile{x-cp858.def}%
-  [2006/08/24 v1.0 Input encoding cp858 (inputenx)]
+  [2007/04/11 v1.1 Input encoding cp858 (inputenx)]%
 \ProvideTextCommandDefault{\textasciiacute}{%
   \@tabacckludge'{}%
 }
@@ -2801,14 +3117,14 @@ and the derived files
 \DeclareInputText{254}{\textblacksquare}
 \DeclareInputText{255}{\nobreakspace}
 %</cp858>
-%    \end{macrocode} 
+%    \end{macrocode}
 %
 % \subsubsection{Encoding cp865}
 %
 %    \begin{macrocode}
 %<*cp865>
 \ProvidesFile{x-cp865.def}%
-  [2006/08/24 v1.0 Input encoding cp865 (inputenx)]
+  [2007/04/11 v1.1 Input encoding cp865 (inputenx)]%
 \ProvideTextCommandDefault{\textGamma}{%
   \ensuremath\Gamma
 }
@@ -3031,14 +3347,177 @@ and the derived files
 \DeclareInputText{254}{\textblacksquare}
 \DeclareInputText{255}{\nobreakspace}
 %</cp865>
-%    \end{macrocode} 
+%    \end{macrocode}
+%
+% \subsubsection{Encoding cp866}
+%
+%    \begin{macrocode}
+%<*cp866>
+\ProvidesFile{x-cp866.def}%
+  [2007/04/11 v1.1 Input encoding cp866 (inputenx)]%
+\ProvideTextCommandDefault{\textblacksquare}{%
+  \vrule \@width .3em \@height .4em \@depth -.1em\relax
+}
+\ProvideTextCommandDefault{\textcurrency}{%
+  \TextSymbolUnavailable\textcurrency
+}
+\ProvideTextCommandDefault{\textdegree}{%
+  \ensuremath{{^\circ}}%
+}
+\ProvideTextCommandDefault{\textnumero}{%
+  N%
+  \bgroup
+    \check@mathfonts
+    \fontsize\sf@size\z@
+    \math@fontsfalse
+    \selectfont
+    \ooalign{%
+      \raise0.5ex\hbox{o}%
+      \crcr
+      \hline
+    }%
+  \egroup
+}
+\ProvideTextCommandDefault{\textsurd}{%
+  \ensuremath\surd
+}
+\DeclareInputText{128}{\CYRA}
+\DeclareInputText{129}{\CYRB}
+\DeclareInputText{130}{\CYRV}
+\DeclareInputText{131}{\CYRG}
+\DeclareInputText{132}{\CYRD}
+\DeclareInputText{133}{\CYRE}
+\DeclareInputText{134}{\CYRZH}
+\DeclareInputText{135}{\CYRZ}
+\DeclareInputText{136}{\CYRI}
+\DeclareInputText{137}{\CYRISHRT}
+\DeclareInputText{138}{\CYRK}
+\DeclareInputText{139}{\CYRL}
+\DeclareInputText{140}{\CYRM}
+\DeclareInputText{141}{\CYRN}
+\DeclareInputText{142}{\CYRO}
+\DeclareInputText{143}{\CYRP}
+\DeclareInputText{144}{\CYRR}
+\DeclareInputText{145}{\CYRS}
+\DeclareInputText{146}{\CYRT}
+\DeclareInputText{147}{\CYRU}
+\DeclareInputText{148}{\CYRF}
+\DeclareInputText{149}{\CYRH}
+\DeclareInputText{150}{\CYRC}
+\DeclareInputText{151}{\CYRCH}
+\DeclareInputText{152}{\CYRSH}
+\DeclareInputText{153}{\CYRSHCH}
+\DeclareInputText{154}{\CYRHRDSN}
+\DeclareInputText{155}{\CYRERY}
+\DeclareInputText{156}{\CYRSFTSN}
+\DeclareInputText{157}{\CYREREV}
+\DeclareInputText{158}{\CYRYU}
+\DeclareInputText{159}{\CYRYA}
+\DeclareInputText{160}{\cyra}
+\DeclareInputText{161}{\cyrb}
+\DeclareInputText{162}{\cyrv}
+\DeclareInputText{163}{\cyrg}
+\DeclareInputText{164}{\cyrd}
+\DeclareInputText{165}{\cyre}
+\DeclareInputText{166}{\cyrzh}
+\DeclareInputText{167}{\cyrz}
+\DeclareInputText{168}{\cyri}
+\DeclareInputText{169}{\cyrishrt}
+\DeclareInputText{170}{\cyrk}
+\DeclareInputText{171}{\cyrl}
+\DeclareInputText{172}{\cyrm}
+\DeclareInputText{173}{\cyrn}
+\DeclareInputText{174}{\cyro}
+\DeclareInputText{175}{\cyrp}
+\DeclareInputText{176}{\textltshade}
+\DeclareInputText{177}{\textshade}
+\DeclareInputText{178}{\textdkshade}
+\DeclareInputText{179}{\textSFxi}
+\DeclareInputText{180}{\textSFix}
+\DeclareInputText{181}{\textSFxix}
+\DeclareInputText{182}{\textSFxx}
+\DeclareInputText{183}{\textSFxxi}
+\DeclareInputText{184}{\textSFxxii}
+\DeclareInputText{185}{\textSFxxiii}
+\DeclareInputText{186}{\textSFxxiv}
+\DeclareInputText{187}{\textSFxxv}
+\DeclareInputText{188}{\textSFxxvi}
+\DeclareInputText{189}{\textSFxxvii}
+\DeclareInputText{190}{\textSFxxviii}
+\DeclareInputText{191}{\textSFiii}
+\DeclareInputText{192}{\textSFii}
+\DeclareInputText{193}{\textSFvii}
+\DeclareInputText{194}{\textSFvi}
+\DeclareInputText{195}{\textSFviii}
+\DeclareInputText{196}{\textSFx}
+\DeclareInputText{197}{\textSFv}
+\DeclareInputText{198}{\textSFxxxvi}
+\DeclareInputText{199}{\textSFxxxvii}
+\DeclareInputText{200}{\textSFxxxviii}
+\DeclareInputText{201}{\textSFxxxix}
+\DeclareInputText{202}{\textSFxl}
+\DeclareInputText{203}{\textSFxli}
+\DeclareInputText{204}{\textSFxlii}
+\DeclareInputText{205}{\textSFxliii}
+\DeclareInputText{206}{\textSFxliv}
+\DeclareInputText{207}{\textSFxlv}
+\DeclareInputText{208}{\textSFxlvi}
+\DeclareInputText{209}{\textSFxlvii}
+\DeclareInputText{210}{\textSFxlviii}
+\DeclareInputText{211}{\textSFxlix}
+\DeclareInputText{212}{\textSFl}
+\DeclareInputText{213}{\textSFli}
+\DeclareInputText{214}{\textSFlii}
+\DeclareInputText{215}{\textSFliii}
+\DeclareInputText{216}{\textSFliv}
+\DeclareInputText{217}{\textSFiv}
+\DeclareInputText{218}{\textSFi}
+\DeclareInputText{219}{\textblock}
+\DeclareInputText{220}{\textdnblock}
+\DeclareInputText{221}{\textlfblock}
+\DeclareInputText{222}{\textrtblock}
+\DeclareInputText{223}{\textupblock}
+\DeclareInputText{224}{\cyrr}
+\DeclareInputText{225}{\cyrs}
+\DeclareInputText{226}{\cyrt}
+\DeclareInputText{227}{\cyru}
+\DeclareInputText{228}{\cyrf}
+\DeclareInputText{229}{\cyrh}
+\DeclareInputText{230}{\cyrc}
+\DeclareInputText{231}{\cyrch}
+\DeclareInputText{232}{\cyrsh}
+\DeclareInputText{233}{\cyrshch}
+\DeclareInputText{234}{\cyrhrdsn}
+\DeclareInputText{235}{\cyrery}
+\DeclareInputText{236}{\cyrsftsn}
+\DeclareInputText{237}{\cyrerev}
+\DeclareInputText{238}{\cyryu}
+\DeclareInputText{239}{\cyrya}
+\DeclareInputText{240}{\CYRYO}
+\DeclareInputText{241}{\cyryo}
+\DeclareInputText{242}{\CYRIE}
+\DeclareInputText{243}{\cyrie}
+\DeclareInputText{244}{\CYRYI}
+\DeclareInputText{245}{\cyryi}
+\DeclareInputText{246}{\CYRUSHRT}
+\DeclareInputText{247}{\cyrushrt}
+\DeclareInputText{248}{\textdegree}
+\DeclareInputText{249}{\textbullet}
+\DeclareInputText{250}{\textperiodcentered}
+\DeclareInputText{251}{\textsurd}
+\DeclareInputText{252}{\textnumero}
+\DeclareInputText{253}{\textcurrency}
+\DeclareInputText{254}{\textblacksquare}
+\DeclareInputText{255}{\nobreakspace}
+%</cp866>
+%    \end{macrocode}
 %
 % \subsubsection{Encoding cp1250}
 %
 %    \begin{macrocode}
 %<*cp1250>
 \ProvidesFile{x-cp1250.def}%
-  [2006/08/24 v1.0 Input encoding cp1250 (inputenx)]
+  [2007/04/11 v1.1 Input encoding cp1250 (inputenx)]%
 \ProvideTextCommandDefault{\textacutedbl}{%
   \H{}%
 }
@@ -3205,14 +3684,185 @@ and the derived files
 \DeclareInputText{254}{\c t}
 \DeclareInputText{255}{\.{}}
 %</cp1250>
-%    \end{macrocode} 
+%    \end{macrocode}
+%
+% \subsubsection{Encoding cp1251}
+%
+%    \begin{macrocode}
+%<*cp1251>
+\ProvidesFile{x-cp1251.def}%
+  [2007/04/11 v1.1 Input encoding cp1251 (inputenx)]%
+\ProvideTextCommandDefault{\textbrokenbar}{%
+  \TextSymbolUnavailable\textbrokenbar
+}
+\ProvideTextCommandDefault{\textcurrency}{%
+  \TextSymbolUnavailable\textcurrency
+}
+\ProvideTextCommandDefault{\textdegree}{%
+  \ensuremath{{^\circ}}%
+}
+\ProvideTextCommandDefault{\texteuro}{%
+  \TextSymbolUnavailable\texteuro
+}
+\ProvideTextCommandDefault{\textlnot}{%
+  \ensuremath\lnot
+}
+\ProvideTextCommandDefault{\textmu}{%
+  \ensuremath\mu
+}
+\ProvideTextCommandDefault{\textnumero}{%
+  N%
+  \bgroup
+    \check@mathfonts
+    \fontsize\sf@size\z@
+    \math@fontsfalse
+    \selectfont
+    \ooalign{%
+      \raise0.5ex\hbox{o}%
+      \crcr
+      \hline
+    }%
+  \egroup
+}
+\ProvideTextCommandDefault{\textpm}{%
+  \ensuremath\pm
+}
+\DeclareInputText{128}{\CYRDJE}
+\DeclareInputText{129}{\@tabacckludge'\CYRG}
+\DeclareInputText{130}{\quotesinglbase}
+\DeclareInputText{131}{\@tabacckludge'\cyrg}
+\DeclareInputText{132}{\quotedblbase}
+\DeclareInputText{133}{\textellipsis}
+\DeclareInputText{134}{\textdagger}
+\DeclareInputText{135}{\textdaggerdbl}
+\DeclareInputText{136}{\texteuro}
+\DeclareInputText{137}{\textperthousand}
+\DeclareInputText{138}{\CYRLJE}
+\DeclareInputText{139}{\guilsinglleft}
+\DeclareInputText{140}{\CYRNJE}
+\DeclareInputText{141}{\@tabacckludge'\CYRK}
+\DeclareInputText{142}{\CYRTSHE}
+\DeclareInputText{143}{\CYRDZHE}
+\DeclareInputText{144}{\cyrdje}
+\DeclareInputText{145}{\textquoteleft}
+\DeclareInputText{146}{\textquoteright}
+\DeclareInputText{147}{\textquotedblleft}
+\DeclareInputText{148}{\textquotedblright}
+\DeclareInputText{149}{\textbullet}
+\DeclareInputText{150}{\textendash}
+\DeclareInputText{151}{\textemdash}
+\DeclareInputText{153}{\texttrademark}
+\DeclareInputText{154}{\cyrlje}
+\DeclareInputText{155}{\guilsinglright}
+\DeclareInputText{156}{\cyrnje}
+\DeclareInputText{157}{\@tabacckludge'\cyrk}
+\DeclareInputText{158}{\cyrtshe}
+\DeclareInputText{159}{\cyrdzhe}
+\DeclareInputText{160}{\nobreakspace}
+\DeclareInputText{161}{\CYRUSHRT}
+\DeclareInputText{162}{\cyrushrt}
+\DeclareInputText{163}{\CYRJE}
+\DeclareInputText{164}{\textcurrency}
+\DeclareInputText{165}{\CYRGUP}
+\DeclareInputText{166}{\textbrokenbar}
+\DeclareInputText{167}{\textsection}
+\DeclareInputText{168}{\CYRYO}
+\DeclareInputText{169}{\textcopyright}
+\DeclareInputText{170}{\CYRIE}
+\DeclareInputText{171}{\guillemotleft}
+\DeclareInputText{172}{\textlnot}
+\DeclareInputText{173}{\-}
+\DeclareInputText{174}{\textregistered}
+\DeclareInputText{175}{\CYRYI}
+\DeclareInputText{176}{\textdegree}
+\DeclareInputText{177}{\textpm}
+\DeclareInputText{178}{\CYRII}
+\DeclareInputText{179}{\cyrii}
+\DeclareInputText{180}{\cyrgup}
+\DeclareInputText{181}{\textmu}
+\DeclareInputText{182}{\textparagraph}
+\DeclareInputText{183}{\textperiodcentered}
+\DeclareInputText{184}{\cyryo}
+\DeclareInputText{185}{\textnumero}
+\DeclareInputText{186}{\cyrie}
+\DeclareInputText{187}{\guillemotright}
+\DeclareInputText{188}{\cyrje}
+\DeclareInputText{189}{\CYRDZE}
+\DeclareInputText{190}{\cyrdze}
+\DeclareInputText{191}{\cyryi}
+\DeclareInputText{192}{\CYRA}
+\DeclareInputText{193}{\CYRB}
+\DeclareInputText{194}{\CYRV}
+\DeclareInputText{195}{\CYRG}
+\DeclareInputText{196}{\CYRD}
+\DeclareInputText{197}{\CYRE}
+\DeclareInputText{198}{\CYRZH}
+\DeclareInputText{199}{\CYRZ}
+\DeclareInputText{200}{\CYRI}
+\DeclareInputText{201}{\CYRISHRT}
+\DeclareInputText{202}{\CYRK}
+\DeclareInputText{203}{\CYRL}
+\DeclareInputText{204}{\CYRM}
+\DeclareInputText{205}{\CYRN}
+\DeclareInputText{206}{\CYRO}
+\DeclareInputText{207}{\CYRP}
+\DeclareInputText{208}{\CYRR}
+\DeclareInputText{209}{\CYRS}
+\DeclareInputText{210}{\CYRT}
+\DeclareInputText{211}{\CYRU}
+\DeclareInputText{212}{\CYRF}
+\DeclareInputText{213}{\CYRH}
+\DeclareInputText{214}{\CYRC}
+\DeclareInputText{215}{\CYRCH}
+\DeclareInputText{216}{\CYRSH}
+\DeclareInputText{217}{\CYRSHCH}
+\DeclareInputText{218}{\CYRHRDSN}
+\DeclareInputText{219}{\CYRERY}
+\DeclareInputText{220}{\CYRSFTSN}
+\DeclareInputText{221}{\CYREREV}
+\DeclareInputText{222}{\CYRYU}
+\DeclareInputText{223}{\CYRYA}
+\DeclareInputText{224}{\cyra}
+\DeclareInputText{225}{\cyrb}
+\DeclareInputText{226}{\cyrv}
+\DeclareInputText{227}{\cyrg}
+\DeclareInputText{228}{\cyrd}
+\DeclareInputText{229}{\cyre}
+\DeclareInputText{230}{\cyrzh}
+\DeclareInputText{231}{\cyrz}
+\DeclareInputText{232}{\cyri}
+\DeclareInputText{233}{\cyrishrt}
+\DeclareInputText{234}{\cyrk}
+\DeclareInputText{235}{\cyrl}
+\DeclareInputText{236}{\cyrm}
+\DeclareInputText{237}{\cyrn}
+\DeclareInputText{238}{\cyro}
+\DeclareInputText{239}{\cyrp}
+\DeclareInputText{240}{\cyrr}
+\DeclareInputText{241}{\cyrs}
+\DeclareInputText{242}{\cyrt}
+\DeclareInputText{243}{\cyru}
+\DeclareInputText{244}{\cyrf}
+\DeclareInputText{245}{\cyrh}
+\DeclareInputText{246}{\cyrc}
+\DeclareInputText{247}{\cyrch}
+\DeclareInputText{248}{\cyrsh}
+\DeclareInputText{249}{\cyrshch}
+\DeclareInputText{250}{\cyrhrdsn}
+\DeclareInputText{251}{\cyrery}
+\DeclareInputText{252}{\cyrsftsn}
+\DeclareInputText{253}{\cyrerev}
+\DeclareInputText{254}{\cyryu}
+\DeclareInputText{255}{\cyrya}
+%</cp1251>
+%    \end{macrocode}
 %
 % \subsubsection{Encoding cp1252}
 %
 %    \begin{macrocode}
 %<*cp1252>
 \ProvidesFile{x-cp1252.def}%
-  [2006/08/24 v1.0 Input encoding cp1252 (inputenx)]
+  [2007/04/11 v1.1 Input encoding cp1252 (inputenx)]%
 \ProvideTextCommandDefault{\textasciiacute}{%
   \@tabacckludge'{}%
 }
@@ -3400,14 +4050,14 @@ and the derived files
 \DeclareInputText{254}{\th}
 \DeclareInputText{255}{\"y}
 %</cp1252>
-%    \end{macrocode} 
+%    \end{macrocode}
 %
 % \subsubsection{Encoding cp1257}
 %
 %    \begin{macrocode}
 %<*cp1257>
 \ProvidesFile{x-cp1257.def}%
-  [2006/08/24 v1.0 Input encoding cp1257 (inputenx)]
+  [2007/04/11 v1.1 Input encoding cp1257 (inputenx)]%
 \ProvideTextCommandDefault{\textasciiacute}{%
   \@tabacckludge'{}%
 }
@@ -3585,14 +4235,665 @@ and the derived files
 \DeclareInputText{254}{\v z}
 \DeclareInputText{255}{\.{}}
 %</cp1257>
-%    \end{macrocode} 
+%    \end{macrocode}
+%
+% \subsubsection{Encoding dec-mcs}
+%
+%    \begin{macrocode}
+%<*dec-mcs>
+\ProvidesFile{x-dec-mcs.def}%
+  [2007/04/11 v1.1 Input encoding dec-mcs (inputenx)]%
+\ProvideTextCommandDefault{\textcent}{%
+  \TextSymbolUnavailable\textcent
+}
+\ProvideTextCommandDefault{\textcurrency}{%
+  \TextSymbolUnavailable\textcurrency
+}
+\ProvideTextCommandDefault{\textdegree}{%
+  \ensuremath{{^\circ}}%
+}
+\ProvideTextCommandDefault{\textmu}{%
+  \ensuremath\mu
+}
+\ProvideTextCommandDefault{\textonehalf}{%
+  \ensuremath{\frac12}%
+}
+\ProvideTextCommandDefault{\textonequarter}{%
+  \ensuremath{\frac14}%
+}
+\ProvideTextCommandDefault{\textonesuperior}{%
+  \ensuremath{{^1}}%
+}
+\ProvideTextCommandDefault{\textpm}{%
+  \ensuremath\pm
+}
+\ProvideTextCommandDefault{\textthreesuperior}{%
+  \ensuremath{{^3}}%
+}
+\ProvideTextCommandDefault{\texttwosuperior}{%
+  \ensuremath{{^2}}%
+}
+\ProvideTextCommandDefault{\textyen}{%
+  \TextSymbolUnavailable\textyen
+}
+\DeclareInputText{161}{\textexclamdown}
+\DeclareInputText{162}{\textcent}
+\DeclareInputText{163}{\textsterling}
+\DeclareInputText{165}{\textyen}
+\DeclareInputText{167}{\textsection}
+\DeclareInputText{168}{\textcurrency}
+\DeclareInputText{169}{\textcopyright}
+\DeclareInputText{170}{\textordfeminine}
+\DeclareInputText{171}{\guillemotleft}
+\DeclareInputText{176}{\textdegree}
+\DeclareInputText{177}{\textpm}
+\DeclareInputText{178}{\texttwosuperior}
+\DeclareInputText{179}{\textthreesuperior}
+\DeclareInputText{181}{\textmu}
+\DeclareInputText{182}{\textparagraph}
+\DeclareInputText{183}{\textperiodcentered}
+\DeclareInputText{185}{\textonesuperior}
+\DeclareInputText{186}{\textordmasculine}
+\DeclareInputText{187}{\guillemotright}
+\DeclareInputText{188}{\textonequarter}
+\DeclareInputText{189}{\textonehalf}
+\DeclareInputText{191}{\textquestiondown}
+\DeclareInputText{192}{\@tabacckludge`A}
+\DeclareInputText{193}{\@tabacckludge'A}
+\DeclareInputText{194}{\^A}
+\DeclareInputText{195}{\~A}
+\DeclareInputText{196}{\"A}
+\DeclareInputText{197}{\r A}
+\DeclareInputText{198}{\AE}
+\DeclareInputText{199}{\c C}
+\DeclareInputText{200}{\@tabacckludge`E}
+\DeclareInputText{201}{\@tabacckludge'E}
+\DeclareInputText{202}{\^E}
+\DeclareInputText{203}{\"E}
+\DeclareInputText{204}{\@tabacckludge`I}
+\DeclareInputText{205}{\@tabacckludge'I}
+\DeclareInputText{206}{\^I}
+\DeclareInputText{207}{\"I}
+\DeclareInputText{209}{\~N}
+\DeclareInputText{210}{\@tabacckludge`O}
+\DeclareInputText{211}{\@tabacckludge'O}
+\DeclareInputText{212}{\^O}
+\DeclareInputText{213}{\~O}
+\DeclareInputText{214}{\"O}
+\DeclareInputText{215}{\OE}
+\DeclareInputText{216}{\O}
+\DeclareInputText{217}{\@tabacckludge`U}
+\DeclareInputText{218}{\@tabacckludge'U}
+\DeclareInputText{219}{\^U}
+\DeclareInputText{220}{\"U}
+\DeclareInputText{221}{\"Y}
+\DeclareInputText{223}{\ss}
+\DeclareInputText{224}{\@tabacckludge`a}
+\DeclareInputText{225}{\@tabacckludge'a}
+\DeclareInputText{226}{\^a}
+\DeclareInputText{227}{\~a}
+\DeclareInputText{228}{\"a}
+\DeclareInputText{229}{\r a}
+\DeclareInputText{230}{\ae}
+\DeclareInputText{231}{\c c}
+\DeclareInputText{232}{\@tabacckludge`e}
+\DeclareInputText{233}{\@tabacckludge'e}
+\DeclareInputText{234}{\^e}
+\DeclareInputText{235}{\"e}
+\DeclareInputText{236}{\@tabacckludge`\i}
+\DeclareInputText{237}{\@tabacckludge'\i}
+\DeclareInputText{238}{\^\i}
+\DeclareInputText{239}{\"\i}
+\DeclareInputText{241}{\~n}
+\DeclareInputText{242}{\@tabacckludge`o}
+\DeclareInputText{243}{\@tabacckludge'o}
+\DeclareInputText{244}{\^o}
+\DeclareInputText{245}{\~o}
+\DeclareInputText{246}{\"o}
+\DeclareInputText{247}{\oe}
+\DeclareInputText{248}{\o}
+\DeclareInputText{249}{\@tabacckludge`u}
+\DeclareInputText{250}{\@tabacckludge'u}
+\DeclareInputText{251}{\^u}
+\DeclareInputText{252}{\"u}
+\DeclareInputText{253}{\"y}
+%</dec-mcs>
+%    \end{macrocode}
+%
+% \subsubsection{Encoding koi8-r}
+%
+%    \begin{macrocode}
+%<*koi8-r>
+\ProvidesFile{x-koi8-r.def}%
+  [2007/04/11 v1.1 Input encoding koi8-r (inputenx)]%
+\ProvideTextCommandDefault{\textapproxequal}{%
+  \ensuremath\approx
+}
+\ProvideTextCommandDefault{\textblacksquare}{%
+  \vrule \@width .3em \@height .4em \@depth -.1em\relax
+}
+\ProvideTextCommandDefault{\textdegree}{%
+  \ensuremath{{^\circ}}%
+}
+\ProvideTextCommandDefault{\textdiv}{%
+  \TextSymbolUnavailable\textdiv
+}
+\ProvideTextCommandDefault{\textgreaterequal}{%
+  \ensuremath\geq
+}
+\ProvideTextCommandDefault{\textlessequal}{%
+  \ensuremath\leq
+}
+\ProvideTextCommandDefault{\textsurd}{%
+  \ensuremath\surd
+}
+\ProvideTextCommandDefault{\texttwosuperior}{%
+  \ensuremath{{^2}}%
+}
+\DeclareInputText{128}{\textSFx}
+\DeclareInputText{129}{\textSFxi}
+\DeclareInputText{130}{\textSFi}
+\DeclareInputText{131}{\textSFiii}
+\DeclareInputText{132}{\textSFii}
+\DeclareInputText{133}{\textSFiv}
+\DeclareInputText{134}{\textSFviii}
+\DeclareInputText{135}{\textSFix}
+\DeclareInputText{136}{\textSFvi}
+\DeclareInputText{137}{\textSFvii}
+\DeclareInputText{138}{\textSFv}
+\DeclareInputText{139}{\textupblock}
+\DeclareInputText{140}{\textdnblock}
+\DeclareInputText{141}{\textblock}
+\DeclareInputText{142}{\textlfblock}
+\DeclareInputText{143}{\textrtblock}
+\DeclareInputText{144}{\textltshade}
+\DeclareInputText{145}{\textshade}
+\DeclareInputText{146}{\textdkshade}
+\DeclareInputText{148}{\textblacksquare}
+\DeclareInputText{149}{\textbullet}
+\DeclareInputText{150}{\textsurd}
+\DeclareInputText{151}{\textapproxequal}
+\DeclareInputText{152}{\textlessequal}
+\DeclareInputText{153}{\textgreaterequal}
+\DeclareInputText{154}{\nobreakspace}
+\DeclareInputText{156}{\textdegree}
+\DeclareInputText{157}{\texttwosuperior}
+\DeclareInputText{158}{\textperiodcentered}
+\DeclareInputText{159}{\textdiv}
+\DeclareInputText{160}{\textSFxliii}
+\DeclareInputText{161}{\textSFxxiv}
+\DeclareInputText{162}{\textSFli}
+\DeclareInputText{163}{\cyryo}
+\DeclareInputText{164}{\textSFlii}
+\DeclareInputText{165}{\textSFxxxix}
+\DeclareInputText{166}{\textSFxxii}
+\DeclareInputText{167}{\textSFxxi}
+\DeclareInputText{168}{\textSFxxv}
+\DeclareInputText{169}{\textSFl}
+\DeclareInputText{170}{\textSFxlix}
+\DeclareInputText{171}{\textSFxxxviii}
+\DeclareInputText{172}{\textSFxxviii}
+\DeclareInputText{173}{\textSFxxvii}
+\DeclareInputText{174}{\textSFxxvi}
+\DeclareInputText{175}{\textSFxxxvi}
+\DeclareInputText{176}{\textSFxxxvii}
+\DeclareInputText{177}{\textSFxlii}
+\DeclareInputText{178}{\textSFxix}
+\DeclareInputText{179}{\CYRYO}
+\DeclareInputText{180}{\textSFxx}
+\DeclareInputText{181}{\textSFxxiii}
+\DeclareInputText{182}{\textSFxlvii}
+\DeclareInputText{183}{\textSFxlviii}
+\DeclareInputText{184}{\textSFxli}
+\DeclareInputText{185}{\textSFxlv}
+\DeclareInputText{186}{\textSFxlvi}
+\DeclareInputText{187}{\textSFxl}
+\DeclareInputText{188}{\textSFliv}
+\DeclareInputText{189}{\textSFliii}
+\DeclareInputText{190}{\textSFxliv}
+\DeclareInputText{191}{\textcopyright}
+\DeclareInputText{192}{\cyryu}
+\DeclareInputText{193}{\cyra}
+\DeclareInputText{194}{\cyrb}
+\DeclareInputText{195}{\cyrc}
+\DeclareInputText{196}{\cyrd}
+\DeclareInputText{197}{\cyre}
+\DeclareInputText{198}{\cyrf}
+\DeclareInputText{199}{\cyrg}
+\DeclareInputText{200}{\cyrh}
+\DeclareInputText{201}{\cyri}
+\DeclareInputText{202}{\cyrishrt}
+\DeclareInputText{203}{\cyrk}
+\DeclareInputText{204}{\cyrl}
+\DeclareInputText{205}{\cyrm}
+\DeclareInputText{206}{\cyrn}
+\DeclareInputText{207}{\cyro}
+\DeclareInputText{208}{\cyrp}
+\DeclareInputText{209}{\cyrya}
+\DeclareInputText{210}{\cyrr}
+\DeclareInputText{211}{\cyrs}
+\DeclareInputText{212}{\cyrt}
+\DeclareInputText{213}{\cyru}
+\DeclareInputText{214}{\cyrzh}
+\DeclareInputText{215}{\cyrv}
+\DeclareInputText{216}{\cyrsftsn}
+\DeclareInputText{217}{\cyrery}
+\DeclareInputText{218}{\cyrz}
+\DeclareInputText{219}{\cyrsh}
+\DeclareInputText{220}{\cyrerev}
+\DeclareInputText{221}{\cyrshch}
+\DeclareInputText{222}{\cyrch}
+\DeclareInputText{223}{\cyrhrdsn}
+\DeclareInputText{224}{\CYRYU}
+\DeclareInputText{225}{\CYRA}
+\DeclareInputText{226}{\CYRB}
+\DeclareInputText{227}{\CYRC}
+\DeclareInputText{228}{\CYRD}
+\DeclareInputText{229}{\CYRE}
+\DeclareInputText{230}{\CYRF}
+\DeclareInputText{231}{\CYRG}
+\DeclareInputText{232}{\CYRH}
+\DeclareInputText{233}{\CYRI}
+\DeclareInputText{234}{\CYRISHRT}
+\DeclareInputText{235}{\CYRK}
+\DeclareInputText{236}{\CYRL}
+\DeclareInputText{237}{\CYRM}
+\DeclareInputText{238}{\CYRN}
+\DeclareInputText{239}{\CYRO}
+\DeclareInputText{240}{\CYRP}
+\DeclareInputText{241}{\CYRYA}
+\DeclareInputText{242}{\CYRR}
+\DeclareInputText{243}{\CYRS}
+\DeclareInputText{244}{\CYRT}
+\DeclareInputText{245}{\CYRU}
+\DeclareInputText{246}{\CYRZH}
+\DeclareInputText{247}{\CYRV}
+\DeclareInputText{248}{\CYRSFTSN}
+\DeclareInputText{249}{\CYRERY}
+\DeclareInputText{250}{\CYRZ}
+\DeclareInputText{251}{\CYRSH}
+\DeclareInputText{252}{\CYREREV}
+\DeclareInputText{253}{\CYRSHCH}
+\DeclareInputText{254}{\CYRCH}
+\DeclareInputText{255}{\CYRHRDSN}
+%</koi8-r>
+%    \end{macrocode}
+%
+% \subsubsection{Encoding mac-centeuro}
+%
+%    \begin{macrocode}
+%<*mac-centeuro>
+\ProvidesFile{x-mac-centeuro.def}%
+  [2007/04/11 v1.1 Input encoding mac-centeuro (inputenx)]%
+\ProvideTextCommandDefault{\textasciicaron}{%
+  \v{}%
+}
+\ProvideTextCommandDefault{\textasciidieresis}{%
+  \"{}%
+}
+\ProvideTextCommandDefault{\textdegree}{%
+  \ensuremath{{^\circ}}%
+}
+\ProvideTextCommandDefault{\textdiv}{%
+  \TextSymbolUnavailable\textdiv
+}
+\ProvideTextCommandDefault{\textgreaterequal}{%
+  \ensuremath\geq
+}
+\ProvideTextCommandDefault{\textincrement}{%
+  \ensuremath\Delta
+}
+\ProvideTextCommandDefault{\textlessequal}{%
+  \ensuremath\leq
+}
+\ProvideTextCommandDefault{\textlnot}{%
+  \ensuremath\lnot
+}
+\ProvideTextCommandDefault{\textlozenge}{%
+  \ensuremath\diamond
+}
+\ProvideTextCommandDefault{\textnotequal}{%
+  \ensuremath\neq
+}
+\ProvideTextCommandDefault{\textpartial}{%
+  \ensuremath\partial
+}
+\ProvideTextCommandDefault{\textsummation}{%
+  \ensuremath\Sigma
+}
+\ProvideTextCommandDefault{\textsurd}{%
+  \ensuremath\surd
+}
+\DeclareInputText{128}{\"A}
+\DeclareInputText{129}{\@tabacckludge=A}
+\DeclareInputText{130}{\@tabacckludge=a}
+\DeclareInputText{131}{\@tabacckludge'E}
+\DeclareInputText{132}{\k A}
+\DeclareInputText{133}{\"O}
+\DeclareInputText{134}{\"U}
+\DeclareInputText{135}{\@tabacckludge'a}
+\DeclareInputText{136}{\k a}
+\DeclareInputText{137}{\v C}
+\DeclareInputText{138}{\"a}
+\DeclareInputText{139}{\v c}
+\DeclareInputText{140}{\@tabacckludge'C}
+\DeclareInputText{141}{\@tabacckludge'c}
+\DeclareInputText{142}{\@tabacckludge'e}
+\DeclareInputText{143}{\@tabacckludge'Z}
+\DeclareInputText{144}{\@tabacckludge'z}
+\DeclareInputText{145}{\v D}
+\DeclareInputText{146}{\@tabacckludge'\i}
+\DeclareInputText{147}{\v d}
+\DeclareInputText{148}{\@tabacckludge=E}
+\DeclareInputText{149}{\@tabacckludge=e}
+\DeclareInputText{150}{\.E}
+\DeclareInputText{151}{\@tabacckludge'o}
+\DeclareInputText{152}{\.e}
+\DeclareInputText{153}{\^o}
+\DeclareInputText{154}{\"o}
+\DeclareInputText{155}{\~o}
+\DeclareInputText{156}{\@tabacckludge'u}
+\DeclareInputText{157}{\v E}
+\DeclareInputText{158}{\v e}
+\DeclareInputText{159}{\"u}
+\DeclareInputText{160}{\textdagger}
+\DeclareInputText{161}{\textdegree}
+\DeclareInputText{162}{\k E}
+\DeclareInputText{163}{\textsterling}
+\DeclareInputText{164}{\textsection}
+\DeclareInputText{165}{\textbullet}
+\DeclareInputText{166}{\textparagraph}
+\DeclareInputText{167}{\ss}
+\DeclareInputText{168}{\textregistered}
+\DeclareInputText{169}{\textcopyright}
+\DeclareInputText{170}{\texttrademark}
+\DeclareInputText{171}{\k e}
+\DeclareInputText{172}{\textasciidieresis}
+\DeclareInputText{173}{\textnotequal}
+\DeclareInputText{174}{\c g}
+\DeclareInputText{175}{\k I}
+\DeclareInputText{176}{\k i}
+\DeclareInputText{177}{\@tabacckludge=I}
+\DeclareInputText{178}{\textlessequal}
+\DeclareInputText{179}{\textgreaterequal}
+\DeclareInputText{180}{\@tabacckludge=\i}
+\DeclareInputText{181}{\c K}
+\DeclareInputText{182}{\textpartial}
+\DeclareInputText{183}{\textsummation}
+\DeclareInputText{184}{\l}
+\DeclareInputText{185}{\c L}
+\DeclareInputText{186}{\c l}
+\DeclareInputText{187}{\v L}
+\DeclareInputText{188}{\v l}
+\DeclareInputText{189}{\@tabacckludge'L}
+\DeclareInputText{190}{\@tabacckludge'l}
+\DeclareInputText{191}{\c N}
+\DeclareInputText{192}{\c n}
+\DeclareInputText{193}{\@tabacckludge'N}
+\DeclareInputText{194}{\textlnot}
+\DeclareInputText{195}{\textsurd}
+\DeclareInputText{196}{\@tabacckludge'n}
+\DeclareInputText{197}{\v N}
+\DeclareInputText{198}{\textincrement}
+\DeclareInputText{199}{\guillemotleft}
+\DeclareInputText{200}{\guillemotright}
+\DeclareInputText{201}{\textellipsis}
+\DeclareInputText{202}{\nobreakspace}
+\DeclareInputText{203}{\v n}
+\DeclareInputText{204}{\H O}
+\DeclareInputText{205}{\~O}
+\DeclareInputText{206}{\H o}
+\DeclareInputText{207}{\@tabacckludge=O}
+\DeclareInputText{208}{\textendash}
+\DeclareInputText{209}{\textemdash}
+\DeclareInputText{210}{\textquotedblleft}
+\DeclareInputText{211}{\textquotedblright}
+\DeclareInputText{212}{\textquoteleft}
+\DeclareInputText{213}{\textquoteright}
+\DeclareInputText{214}{\textdiv}
+\DeclareInputText{215}{\textlozenge}
+\DeclareInputText{216}{\@tabacckludge=o}
+\DeclareInputText{217}{\@tabacckludge'R}
+\DeclareInputText{218}{\@tabacckludge'r}
+\DeclareInputText{219}{\v R}
+\DeclareInputText{220}{\guilsinglleft}
+\DeclareInputText{221}{\guilsinglright}
+\DeclareInputText{222}{\v r}
+\DeclareInputText{223}{\c R}
+\DeclareInputText{224}{\c r}
+\DeclareInputText{225}{\v S}
+\DeclareInputText{226}{\quotesinglbase}
+\DeclareInputText{227}{\quotedblbase}
+\DeclareInputText{228}{\v s}
+\DeclareInputText{229}{\@tabacckludge'S}
+\DeclareInputText{230}{\@tabacckludge's}
+\DeclareInputText{231}{\@tabacckludge'A}
+\DeclareInputText{232}{\v T}
+\DeclareInputText{233}{\v t}
+\DeclareInputText{234}{\@tabacckludge'I}
+\DeclareInputText{235}{\v Z}
+\DeclareInputText{236}{\v z}
+\DeclareInputText{237}{\@tabacckludge=U}
+\DeclareInputText{238}{\@tabacckludge'O}
+\DeclareInputText{239}{\^O}
+\DeclareInputText{240}{\@tabacckludge=u}
+\DeclareInputText{241}{\r U}
+\DeclareInputText{242}{\@tabacckludge'U}
+\DeclareInputText{243}{\r u}
+\DeclareInputText{244}{\H U}
+\DeclareInputText{245}{\H u}
+\DeclareInputText{246}{\k U}
+\DeclareInputText{247}{\k u}
+\DeclareInputText{248}{\@tabacckludge'Y}
+\DeclareInputText{249}{\@tabacckludge'y}
+\DeclareInputText{250}{\c k}
+\DeclareInputText{251}{\.Z}
+\DeclareInputText{252}{\L}
+\DeclareInputText{253}{\.z}
+\DeclareInputText{254}{\c G}
+\DeclareInputText{255}{\textasciicaron}
+%</mac-centeuro>
+%    \end{macrocode}
+%
+% \subsubsection{Encoding mac-cyrillic}
+%
+%    \begin{macrocode}
+%<*mac-cyrillic>
+\ProvidesFile{x-mac-cyrillic.def}%
+  [2007/04/11 v1.1 Input encoding mac-cyrillic (inputenx)]%
+\ProvideTextCommandDefault{\textapproxequal}{%
+  \ensuremath\approx
+}
+\ProvideTextCommandDefault{\textdegree}{%
+  \ensuremath{{^\circ}}%
+}
+\ProvideTextCommandDefault{\textdiv}{%
+  \TextSymbolUnavailable\textdiv
+}
+\ProvideTextCommandDefault{\texteuro}{%
+  \TextSymbolUnavailable\texteuro
+}
+\ProvideTextCommandDefault{\textflorin}{%
+  \textit{f}%
+}
+\ProvideTextCommandDefault{\textgreaterequal}{%
+  \ensuremath\geq
+}
+\ProvideTextCommandDefault{\textincrement}{%
+  \ensuremath\Delta
+}
+\ProvideTextCommandDefault{\textinfinity}{%
+  \ensuremath\infty
+}
+\ProvideTextCommandDefault{\textlessequal}{%
+  \ensuremath\leq
+}
+\ProvideTextCommandDefault{\textlnot}{%
+  \ensuremath\lnot
+}
+\ProvideTextCommandDefault{\textmu}{%
+  \ensuremath\mu
+}
+\ProvideTextCommandDefault{\textnotequal}{%
+  \ensuremath\neq
+}
+\ProvideTextCommandDefault{\textnumero}{%
+  N%
+  \bgroup
+    \check@mathfonts
+    \fontsize\sf@size\z@
+    \math@fontsfalse
+    \selectfont
+    \ooalign{%
+      \raise0.5ex\hbox{o}%
+      \crcr
+      \hline
+    }%
+  \egroup
+}
+\ProvideTextCommandDefault{\textpm}{%
+  \ensuremath\pm
+}
+\ProvideTextCommandDefault{\textsurd}{%
+  \ensuremath\surd
+}
+\DeclareInputText{128}{\CYRA}
+\DeclareInputText{129}{\CYRB}
+\DeclareInputText{130}{\CYRV}
+\DeclareInputText{131}{\CYRG}
+\DeclareInputText{132}{\CYRD}
+\DeclareInputText{133}{\CYRE}
+\DeclareInputText{134}{\CYRZH}
+\DeclareInputText{135}{\CYRZ}
+\DeclareInputText{136}{\CYRI}
+\DeclareInputText{137}{\CYRISHRT}
+\DeclareInputText{138}{\CYRK}
+\DeclareInputText{139}{\CYRL}
+\DeclareInputText{140}{\CYRM}
+\DeclareInputText{141}{\CYRN}
+\DeclareInputText{142}{\CYRO}
+\DeclareInputText{143}{\CYRP}
+\DeclareInputText{144}{\CYRR}
+\DeclareInputText{145}{\CYRS}
+\DeclareInputText{146}{\CYRT}
+\DeclareInputText{147}{\CYRU}
+\DeclareInputText{148}{\CYRF}
+\DeclareInputText{149}{\CYRH}
+\DeclareInputText{150}{\CYRC}
+\DeclareInputText{151}{\CYRCH}
+\DeclareInputText{152}{\CYRSH}
+\DeclareInputText{153}{\CYRSHCH}
+\DeclareInputText{154}{\CYRHRDSN}
+\DeclareInputText{155}{\CYRERY}
+\DeclareInputText{156}{\CYRSFTSN}
+\DeclareInputText{157}{\CYREREV}
+\DeclareInputText{158}{\CYRYU}
+\DeclareInputText{159}{\CYRYA}
+\DeclareInputText{160}{\textdagger}
+\DeclareInputText{161}{\textdegree}
+\DeclareInputText{162}{\CYRGUP}
+\DeclareInputText{163}{\textsterling}
+\DeclareInputText{164}{\textsection}
+\DeclareInputText{165}{\textbullet}
+\DeclareInputText{166}{\textparagraph}
+\DeclareInputText{167}{\CYRII}
+\DeclareInputText{168}{\textregistered}
+\DeclareInputText{169}{\textcopyright}
+\DeclareInputText{170}{\texttrademark}
+\DeclareInputText{171}{\CYRDJE}
+\DeclareInputText{172}{\cyrdje}
+\DeclareInputText{173}{\textnotequal}
+\DeclareInputText{174}{\@tabacckludge'\CYRG}
+\DeclareInputText{175}{\@tabacckludge'\cyrg}
+\DeclareInputText{176}{\textinfinity}
+\DeclareInputText{177}{\textpm}
+\DeclareInputText{178}{\textlessequal}
+\DeclareInputText{179}{\textgreaterequal}
+\DeclareInputText{180}{\cyrii}
+\DeclareInputText{181}{\textmu}
+\DeclareInputText{182}{\cyrgup}
+\DeclareInputText{183}{\CYRJE}
+\DeclareInputText{184}{\CYRIE}
+\DeclareInputText{185}{\cyrie}
+\DeclareInputText{186}{\CYRYI}
+\DeclareInputText{187}{\cyryi}
+\DeclareInputText{188}{\CYRLJE}
+\DeclareInputText{189}{\cyrlje}
+\DeclareInputText{190}{\CYRNJE}
+\DeclareInputText{191}{\cyrnje}
+\DeclareInputText{192}{\cyrje}
+\DeclareInputText{193}{\CYRDZE}
+\DeclareInputText{194}{\textlnot}
+\DeclareInputText{195}{\textsurd}
+\DeclareInputText{196}{\textflorin}
+\DeclareInputText{197}{\textapproxequal}
+\DeclareInputText{198}{\textincrement}
+\DeclareInputText{199}{\guillemotleft}
+\DeclareInputText{200}{\guillemotright}
+\DeclareInputText{201}{\textellipsis}
+\DeclareInputText{202}{\nobreakspace}
+\DeclareInputText{203}{\CYRTSHE}
+\DeclareInputText{204}{\cyrtshe}
+\DeclareInputText{205}{\@tabacckludge'\CYRK}
+\DeclareInputText{206}{\@tabacckludge'\cyrk}
+\DeclareInputText{207}{\cyrdze}
+\DeclareInputText{208}{\textendash}
+\DeclareInputText{209}{\textemdash}
+\DeclareInputText{210}{\textquotedblleft}
+\DeclareInputText{211}{\textquotedblright}
+\DeclareInputText{212}{\textquoteleft}
+\DeclareInputText{213}{\textquoteright}
+\DeclareInputText{214}{\textdiv}
+\DeclareInputText{215}{\quotedblbase}
+\DeclareInputText{216}{\CYRUSHRT}
+\DeclareInputText{217}{\cyrushrt}
+\DeclareInputText{218}{\CYRDZHE}
+\DeclareInputText{219}{\cyrdzhe}
+\DeclareInputText{220}{\textnumero}
+\DeclareInputText{221}{\CYRYO}
+\DeclareInputText{222}{\cyryo}
+\DeclareInputText{223}{\cyrya}
+\DeclareInputText{224}{\cyra}
+\DeclareInputText{225}{\cyrb}
+\DeclareInputText{226}{\cyrv}
+\DeclareInputText{227}{\cyrg}
+\DeclareInputText{228}{\cyrd}
+\DeclareInputText{229}{\cyre}
+\DeclareInputText{230}{\cyrzh}
+\DeclareInputText{231}{\cyrz}
+\DeclareInputText{232}{\cyri}
+\DeclareInputText{233}{\cyrishrt}
+\DeclareInputText{234}{\cyrk}
+\DeclareInputText{235}{\cyrl}
+\DeclareInputText{236}{\cyrm}
+\DeclareInputText{237}{\cyrn}
+\DeclareInputText{238}{\cyro}
+\DeclareInputText{239}{\cyrp}
+\DeclareInputText{240}{\cyrr}
+\DeclareInputText{241}{\cyrs}
+\DeclareInputText{242}{\cyrt}
+\DeclareInputText{243}{\cyru}
+\DeclareInputText{244}{\cyrf}
+\DeclareInputText{245}{\cyrh}
+\DeclareInputText{246}{\cyrc}
+\DeclareInputText{247}{\cyrch}
+\DeclareInputText{248}{\cyrsh}
+\DeclareInputText{249}{\cyrshch}
+\DeclareInputText{250}{\cyrhrdsn}
+\DeclareInputText{251}{\cyrery}
+\DeclareInputText{252}{\cyrsftsn}
+\DeclareInputText{253}{\cyrerev}
+\DeclareInputText{254}{\cyryu}
+\DeclareInputText{255}{\texteuro}
+%</mac-cyrillic>
+%    \end{macrocode}
 %
 % \subsubsection{Encoding mac-roman}
 %
 %    \begin{macrocode}
 %<*mac-roman>
 \ProvidesFile{x-mac-roman.def}%
-  [2006/08/24 v1.0 Input encoding mac-roman (inputenx)]
+  [2007/04/11 v1.1 Input encoding mac-roman (inputenx)]%
 \ProvideTextCommandDefault{\textOmega}{%
   \ensuremath\Omega
 }
@@ -3811,190 +5112,14 @@ and the derived files
 \DeclareInputText{254}{\k{}}
 \DeclareInputText{255}{\textasciicaron}
 %</mac-roman>
-%    \end{macrocode} 
-%
-% \subsubsection{Encoding mac-ce}
-%
-%    \begin{macrocode}
-%<*mac-ce>
-\ProvidesFile{x-mac-ce.def}%
-  [2006/08/24 v1.0 Input encoding mac-ce (inputenx)]
-\ProvideTextCommandDefault{\textasciicaron}{%
-  \v{}%
-}
-\ProvideTextCommandDefault{\textasciidieresis}{%
-  \"{}%
-}
-\ProvideTextCommandDefault{\textdegree}{%
-  \ensuremath{{^\circ}}%
-}
-\ProvideTextCommandDefault{\textdiv}{%
-  \TextSymbolUnavailable\textdiv
-}
-\ProvideTextCommandDefault{\textgreaterequal}{%
-  \ensuremath\geq
-}
-\ProvideTextCommandDefault{\textincrement}{%
-  \ensuremath\Delta
-}
-\ProvideTextCommandDefault{\textlessequal}{%
-  \ensuremath\leq
-}
-\ProvideTextCommandDefault{\textlnot}{%
-  \ensuremath\lnot
-}
-\ProvideTextCommandDefault{\textlozenge}{%
-  \ensuremath\diamond
-}
-\ProvideTextCommandDefault{\textnotequal}{%
-  \ensuremath\neq
-}
-\ProvideTextCommandDefault{\textpartial}{%
-  \ensuremath\partial
-}
-\ProvideTextCommandDefault{\textsummation}{%
-  \ensuremath\Sigma
-}
-\ProvideTextCommandDefault{\textsurd}{%
-  \ensuremath\surd
-}
-\DeclareInputText{128}{\"A}
-\DeclareInputText{129}{\@tabacckludge=A}
-\DeclareInputText{130}{\@tabacckludge=a}
-\DeclareInputText{131}{\@tabacckludge'E}
-\DeclareInputText{132}{\k A}
-\DeclareInputText{133}{\"O}
-\DeclareInputText{134}{\"U}
-\DeclareInputText{135}{\@tabacckludge'a}
-\DeclareInputText{136}{\k a}
-\DeclareInputText{137}{\v C}
-\DeclareInputText{138}{\"a}
-\DeclareInputText{139}{\v c}
-\DeclareInputText{140}{\@tabacckludge'C}
-\DeclareInputText{141}{\@tabacckludge'c}
-\DeclareInputText{142}{\@tabacckludge'e}
-\DeclareInputText{143}{\@tabacckludge'Z}
-\DeclareInputText{144}{\@tabacckludge'z}
-\DeclareInputText{145}{\v D}
-\DeclareInputText{146}{\@tabacckludge'\i}
-\DeclareInputText{147}{\v d}
-\DeclareInputText{148}{\@tabacckludge=E}
-\DeclareInputText{149}{\@tabacckludge=e}
-\DeclareInputText{150}{\.E}
-\DeclareInputText{151}{\@tabacckludge'o}
-\DeclareInputText{152}{\.e}
-\DeclareInputText{153}{\^o}
-\DeclareInputText{154}{\"o}
-\DeclareInputText{155}{\~o}
-\DeclareInputText{156}{\@tabacckludge'u}
-\DeclareInputText{157}{\v E}
-\DeclareInputText{158}{\v e}
-\DeclareInputText{159}{\"u}
-\DeclareInputText{160}{\textdagger}
-\DeclareInputText{161}{\textdegree}
-\DeclareInputText{162}{\k E}
-\DeclareInputText{163}{\textsterling}
-\DeclareInputText{164}{\textsection}
-\DeclareInputText{165}{\textbullet}
-\DeclareInputText{166}{\textparagraph}
-\DeclareInputText{167}{\ss}
-\DeclareInputText{168}{\textregistered}
-\DeclareInputText{169}{\textcopyright}
-\DeclareInputText{170}{\texttrademark}
-\DeclareInputText{171}{\k e}
-\DeclareInputText{172}{\textasciidieresis}
-\DeclareInputText{173}{\textnotequal}
-\DeclareInputText{174}{\c g}
-\DeclareInputText{175}{\k I}
-\DeclareInputText{176}{\k i}
-\DeclareInputText{177}{\@tabacckludge=I}
-\DeclareInputText{178}{\textlessequal}
-\DeclareInputText{179}{\textgreaterequal}
-\DeclareInputText{180}{\@tabacckludge=\i}
-\DeclareInputText{181}{\c K}
-\DeclareInputText{182}{\textpartial}
-\DeclareInputText{183}{\textsummation}
-\DeclareInputText{184}{\l}
-\DeclareInputText{185}{\c L}
-\DeclareInputText{186}{\c l}
-\DeclareInputText{187}{\v L}
-\DeclareInputText{188}{\v l}
-\DeclareInputText{189}{\@tabacckludge'L}
-\DeclareInputText{190}{\@tabacckludge'l}
-\DeclareInputText{191}{\c N}
-\DeclareInputText{192}{\c n}
-\DeclareInputText{193}{\@tabacckludge'N}
-\DeclareInputText{194}{\textlnot}
-\DeclareInputText{195}{\textsurd}
-\DeclareInputText{196}{\@tabacckludge'n}
-\DeclareInputText{197}{\v N}
-\DeclareInputText{198}{\textincrement}
-\DeclareInputText{199}{\guillemotleft}
-\DeclareInputText{200}{\guillemotright}
-\DeclareInputText{201}{\textellipsis}
-\DeclareInputText{202}{\nobreakspace}
-\DeclareInputText{203}{\v n}
-\DeclareInputText{204}{\H O}
-\DeclareInputText{205}{\~O}
-\DeclareInputText{206}{\H o}
-\DeclareInputText{207}{\@tabacckludge=O}
-\DeclareInputText{208}{\textendash}
-\DeclareInputText{209}{\textemdash}
-\DeclareInputText{210}{\textquotedblleft}
-\DeclareInputText{211}{\textquotedblright}
-\DeclareInputText{212}{\textquoteleft}
-\DeclareInputText{213}{\textquoteright}
-\DeclareInputText{214}{\textdiv}
-\DeclareInputText{215}{\textlozenge}
-\DeclareInputText{216}{\@tabacckludge=o}
-\DeclareInputText{217}{\@tabacckludge'R}
-\DeclareInputText{218}{\@tabacckludge'r}
-\DeclareInputText{219}{\v R}
-\DeclareInputText{220}{\guilsinglleft}
-\DeclareInputText{221}{\guilsinglright}
-\DeclareInputText{222}{\v r}
-\DeclareInputText{223}{\c R}
-\DeclareInputText{224}{\c r}
-\DeclareInputText{225}{\v S}
-\DeclareInputText{226}{\quotesinglbase}
-\DeclareInputText{227}{\quotedblbase}
-\DeclareInputText{228}{\v s}
-\DeclareInputText{229}{\@tabacckludge'S}
-\DeclareInputText{230}{\@tabacckludge's}
-\DeclareInputText{231}{\@tabacckludge'A}
-\DeclareInputText{232}{\v T}
-\DeclareInputText{233}{\v t}
-\DeclareInputText{234}{\@tabacckludge'I}
-\DeclareInputText{235}{\v Z}
-\DeclareInputText{236}{\v z}
-\DeclareInputText{237}{\@tabacckludge=U}
-\DeclareInputText{238}{\@tabacckludge'O}
-\DeclareInputText{239}{\^O}
-\DeclareInputText{240}{\@tabacckludge=u}
-\DeclareInputText{241}{\r U}
-\DeclareInputText{242}{\@tabacckludge'U}
-\DeclareInputText{243}{\r u}
-\DeclareInputText{244}{\H U}
-\DeclareInputText{245}{\H u}
-\DeclareInputText{246}{\k U}
-\DeclareInputText{247}{\k u}
-\DeclareInputText{248}{\@tabacckludge'Y}
-\DeclareInputText{249}{\@tabacckludge'y}
-\DeclareInputText{250}{\c k}
-\DeclareInputText{251}{\.Z}
-\DeclareInputText{252}{\L}
-\DeclareInputText{253}{\.z}
-\DeclareInputText{254}{\c G}
-\DeclareInputText{255}{\textasciicaron}
-%</mac-ce>
-%    \end{macrocode} 
+%    \end{macrocode}
 %
 % \subsubsection{Encoding nextstep}
 %
 %    \begin{macrocode}
 %<*nextstep>
 \ProvidesFile{x-nextstep.def}%
-  [2006/08/24 v1.0 Input encoding nextstep (inputenx)]
+  [2007/04/11 v1.1 Input encoding nextstep (inputenx)]%
 \ProvideTextCommandDefault{\textacutedbl}{%
   \H{}%
 }
@@ -4194,130 +5319,7 @@ and the derived files
 \DeclareInputText{252}{\th}
 \DeclareInputText{253}{\"y}
 %</nextstep>
-%    \end{macrocode} 
-%
-% \subsubsection{Encoding dec-mcs}
-%
-%    \begin{macrocode}
-%<*dec-mcs>
-\ProvidesFile{x-dec-mcs.def}%
-  [2006/08/24 v1.0 Input encoding dec-mcs (inputenx)]
-\ProvideTextCommandDefault{\textcent}{%
-  \TextSymbolUnavailable\textcent
-}
-\ProvideTextCommandDefault{\textcurrency}{%
-  \TextSymbolUnavailable\textcurrency
-}
-\ProvideTextCommandDefault{\textdegree}{%
-  \ensuremath{{^\circ}}%
-}
-\ProvideTextCommandDefault{\textmu}{%
-  \ensuremath\mu
-}
-\ProvideTextCommandDefault{\textonehalf}{%
-  \ensuremath{\frac12}%
-}
-\ProvideTextCommandDefault{\textonequarter}{%
-  \ensuremath{\frac14}%
-}
-\ProvideTextCommandDefault{\textonesuperior}{%
-  \ensuremath{{^1}}%
-}
-\ProvideTextCommandDefault{\textpm}{%
-  \ensuremath\pm
-}
-\ProvideTextCommandDefault{\textthreesuperior}{%
-  \ensuremath{{^3}}%
-}
-\ProvideTextCommandDefault{\texttwosuperior}{%
-  \ensuremath{{^2}}%
-}
-\ProvideTextCommandDefault{\textyen}{%
-  \TextSymbolUnavailable\textyen
-}
-\DeclareInputText{161}{\textexclamdown}
-\DeclareInputText{162}{\textcent}
-\DeclareInputText{163}{\textsterling}
-\DeclareInputText{165}{\textyen}
-\DeclareInputText{167}{\textsection}
-\DeclareInputText{168}{\textcurrency}
-\DeclareInputText{169}{\textcopyright}
-\DeclareInputText{170}{\textordfeminine}
-\DeclareInputText{171}{\guillemotleft}
-\DeclareInputText{176}{\textdegree}
-\DeclareInputText{177}{\textpm}
-\DeclareInputText{178}{\texttwosuperior}
-\DeclareInputText{179}{\textthreesuperior}
-\DeclareInputText{181}{\textmu}
-\DeclareInputText{182}{\textparagraph}
-\DeclareInputText{183}{\textperiodcentered}
-\DeclareInputText{185}{\textonesuperior}
-\DeclareInputText{186}{\textordmasculine}
-\DeclareInputText{187}{\guillemotright}
-\DeclareInputText{188}{\textonequarter}
-\DeclareInputText{189}{\textonehalf}
-\DeclareInputText{191}{\textquestiondown}
-\DeclareInputText{192}{\@tabacckludge`A}
-\DeclareInputText{193}{\@tabacckludge'A}
-\DeclareInputText{194}{\^A}
-\DeclareInputText{195}{\~A}
-\DeclareInputText{196}{\"A}
-\DeclareInputText{197}{\r A}
-\DeclareInputText{198}{\AE}
-\DeclareInputText{199}{\c C}
-\DeclareInputText{200}{\@tabacckludge`E}
-\DeclareInputText{201}{\@tabacckludge'E}
-\DeclareInputText{202}{\^E}
-\DeclareInputText{203}{\"E}
-\DeclareInputText{204}{\@tabacckludge`I}
-\DeclareInputText{205}{\@tabacckludge'I}
-\DeclareInputText{206}{\^I}
-\DeclareInputText{207}{\"I}
-\DeclareInputText{209}{\~N}
-\DeclareInputText{210}{\@tabacckludge`O}
-\DeclareInputText{211}{\@tabacckludge'O}
-\DeclareInputText{212}{\^O}
-\DeclareInputText{213}{\~O}
-\DeclareInputText{214}{\"O}
-\DeclareInputText{215}{\OE}
-\DeclareInputText{216}{\O}
-\DeclareInputText{217}{\@tabacckludge`U}
-\DeclareInputText{218}{\@tabacckludge'U}
-\DeclareInputText{219}{\^U}
-\DeclareInputText{220}{\"U}
-\DeclareInputText{221}{\"Y}
-\DeclareInputText{223}{\ss}
-\DeclareInputText{224}{\@tabacckludge`a}
-\DeclareInputText{225}{\@tabacckludge'a}
-\DeclareInputText{226}{\^a}
-\DeclareInputText{227}{\~a}
-\DeclareInputText{228}{\"a}
-\DeclareInputText{229}{\r a}
-\DeclareInputText{230}{\ae}
-\DeclareInputText{231}{\c c}
-\DeclareInputText{232}{\@tabacckludge`e}
-\DeclareInputText{233}{\@tabacckludge'e}
-\DeclareInputText{234}{\^e}
-\DeclareInputText{235}{\"e}
-\DeclareInputText{236}{\@tabacckludge`\i}
-\DeclareInputText{237}{\@tabacckludge'\i}
-\DeclareInputText{238}{\^\i}
-\DeclareInputText{239}{\"\i}
-\DeclareInputText{241}{\~n}
-\DeclareInputText{242}{\@tabacckludge`o}
-\DeclareInputText{243}{\@tabacckludge'o}
-\DeclareInputText{244}{\^o}
-\DeclareInputText{245}{\~o}
-\DeclareInputText{246}{\"o}
-\DeclareInputText{247}{\oe}
-\DeclareInputText{248}{\o}
-\DeclareInputText{249}{\@tabacckludge`u}
-\DeclareInputText{250}{\@tabacckludge'u}
-\DeclareInputText{251}{\^u}
-\DeclareInputText{252}{\"u}
-\DeclareInputText{253}{\"y}
-%</dec-mcs>
-%    \end{macrocode} 
+%    \end{macrocode}
 %
 % \subsubsection{Non-Unicode additions}
 %
@@ -4335,7 +5337,7 @@ and the derived files
 %    \begin{macrocode}
 %<*dfu>
 \ProvidesFile{ix-utf8enc.dfu}%
-  [2006/08/24 v1.0 Additions of inputenx for utf8enc.dfu]
+  [2007/04/11 v1.1 Additions of inputenx for utf8enc.dfu]%
 \DeclareUnicodeCharacter{00A0}{\nobreakspace}
 \DeclareUnicodeCharacter{00AD}{\-}
 \DeclareUnicodeCharacter{0100}{\@tabacckludge=A}
@@ -4435,6 +5437,10 @@ and the derived files
 \DeclareUnicodeCharacter{03C3}{\textsigma}
 \DeclareUnicodeCharacter{03C4}{\texttau}
 \DeclareUnicodeCharacter{03C6}{\textphi}
+\DeclareUnicodeCharacter{0403}{\@tabacckludge'\CYRG}
+\DeclareUnicodeCharacter{040C}{\@tabacckludge'\CYRK}
+\DeclareUnicodeCharacter{0453}{\@tabacckludge'\cyrg}
+\DeclareUnicodeCharacter{045C}{\@tabacckludge'\cyrk}
 \DeclareUnicodeCharacter{207F}{\textnsuperior}
 \DeclareUnicodeCharacter{20A7}{\textpeseta}
 \DeclareUnicodeCharacter{2202}{\textpartial}
@@ -4511,7 +5517,7 @@ and the derived files
 %    \begin{macrocode}
 %<*name>
 \ProvidesFile{ix-name.def}%
-  [2006/08/24 v1.0 Name list (inputenx)]
+  [2007/04/11 v1.1 Name list (inputenx)]%
 %    \end{macrocode}
 %
 %    \textit{List omitted here, see \xfile{ix-name.def}.}
@@ -4521,6 +5527,7 @@ and the derived files
 \InputenxName{Aacute}{00C1}% LATIN CAPITAL LETTER A WITH ACUTE
 \InputenxName{Abreve}{0102}% LATIN CAPITAL LETTER A WITH BREVE
 \InputenxName{Acircumflex}{00C2}% LATIN CAPITAL LETTER A WITH CIRCUMFLEX
+\InputenxName{Acyrillic}{0410}% CYRILLIC CAPITAL LETTER A
 \InputenxName{Adieresis}{00C4}% LATIN CAPITAL LETTER A WITH DIAERESIS
 \InputenxName{Agrave}{00C0}% LATIN CAPITAL LETTER A WITH GRAVE
 \InputenxName{Amacron}{0100}% LATIN CAPITAL LETTER A WITH MACRON
@@ -4528,29 +5535,88 @@ and the derived files
 \InputenxName{Aring}{00C5}% LATIN CAPITAL LETTER A WITH RING ABOVE
 \InputenxName{Atilde}{00C3}% LATIN CAPITAL LETTER A WITH TILDE
 \InputenxName{Bdotaccent}{1E02}% LATIN CAPITAL LETTER B WITH DOT ABOVE
+\InputenxName{Becyrillic}{0411}% CYRILLIC CAPITAL LETTER BE
+\InputenxName{CYRA}{0410}% CYRILLIC CAPITAL LETTER A
+\InputenxName{CYRB}{0411}% CYRILLIC CAPITAL LETTER BE
+\InputenxName{CYRC}{0426}% CYRILLIC CAPITAL LETTER TSE
+\InputenxName{CYRCH}{0427}% CYRILLIC CAPITAL LETTER CHE
+\InputenxName{CYRD}{0414}% CYRILLIC CAPITAL LETTER DE
+\InputenxName{CYRDJE}{0402}% CYRILLIC CAPITAL LETTER DJE
+\InputenxName{CYRDZE}{0405}% CYRILLIC CAPITAL LETTER DZE
+\InputenxName{CYRDZHE}{040F}% CYRILLIC CAPITAL LETTER DZHE
+\InputenxName{CYRE}{0415}% CYRILLIC CAPITAL LETTER IE
+\InputenxName{CYREREV}{042D}% CYRILLIC CAPITAL LETTER E
+\InputenxName{CYRERY}{042B}% CYRILLIC CAPITAL LETTER YERU
+\InputenxName{CYRF}{0424}% CYRILLIC CAPITAL LETTER EF
+\InputenxName{CYRG}{0413}% CYRILLIC CAPITAL LETTER GHE
+\InputenxName{CYRGUP}{0490}% CYRILLIC CAPITAL LETTER GHE WITH UPTURN
+\InputenxName{CYRH}{0425}% CYRILLIC CAPITAL LETTER HA
+\InputenxName{CYRHRDSN}{042A}% CYRILLIC CAPITAL LETTER HARD SIGN
+\InputenxName{CYRI}{0418}% CYRILLIC CAPITAL LETTER I
+\InputenxName{CYRIE}{0404}% CYRILLIC CAPITAL LETTER UKRAINIAN IE
+\InputenxName{CYRII}{0406}% CYRILLIC CAPITAL LETTER BYELORUSSIAN-UKRAINIAN I
+\InputenxName{CYRISHRT}{0419}% CYRILLIC CAPITAL LETTER SHORT I
+\InputenxName{CYRJE}{0408}% CYRILLIC CAPITAL LETTER JE
+\InputenxName{CYRK}{041A}% CYRILLIC CAPITAL LETTER KA
+\InputenxName{CYRL}{041B}% CYRILLIC CAPITAL LETTER EL
+\InputenxName{CYRLJE}{0409}% CYRILLIC CAPITAL LETTER LJE
+\InputenxName{CYRM}{041C}% CYRILLIC CAPITAL LETTER EM
+\InputenxName{CYRN}{041D}% CYRILLIC CAPITAL LETTER EN
+\InputenxName{CYRNJE}{040A}% CYRILLIC CAPITAL LETTER NJE
+\InputenxName{CYRO}{041E}% CYRILLIC CAPITAL LETTER O
+\InputenxName{CYRP}{041F}% CYRILLIC CAPITAL LETTER PE
+\InputenxName{CYRR}{0420}% CYRILLIC CAPITAL LETTER ER
+\InputenxName{CYRS}{0421}% CYRILLIC CAPITAL LETTER ES
+\InputenxName{CYRSFTSN}{042C}% CYRILLIC CAPITAL LETTER SOFT SIGN
+\InputenxName{CYRSH}{0428}% CYRILLIC CAPITAL LETTER SHA
+\InputenxName{CYRSHCH}{0429}% CYRILLIC CAPITAL LETTER SHCHA
+\InputenxName{CYRT}{0422}% CYRILLIC CAPITAL LETTER TE
+\InputenxName{CYRTSHE}{040B}% CYRILLIC CAPITAL LETTER TSHE
+\InputenxName{CYRU}{0423}% CYRILLIC CAPITAL LETTER U
+\InputenxName{CYRUSHRT}{040E}% CYRILLIC CAPITAL LETTER SHORT U
+\InputenxName{CYRV}{0412}% CYRILLIC CAPITAL LETTER VE
+\InputenxName{CYRYA}{042F}% CYRILLIC CAPITAL LETTER YA
+\InputenxName{CYRYI}{0407}% CYRILLIC CAPITAL LETTER YI
+\InputenxName{CYRYO}{0401}% CYRILLIC CAPITAL LETTER IO
+\InputenxName{CYRYU}{042E}% CYRILLIC CAPITAL LETTER YU
+\InputenxName{CYRZ}{0417}% CYRILLIC CAPITAL LETTER ZE
+\InputenxName{CYRZH}{0416}% CYRILLIC CAPITAL LETTER ZHE
 \InputenxName{Cacute}{0106}% LATIN CAPITAL LETTER C WITH ACUTE
 \InputenxName{Ccaron}{010C}% LATIN CAPITAL LETTER C WITH CARON
 \InputenxName{Ccedilla}{00C7}% LATIN CAPITAL LETTER C WITH CEDILLA
 \InputenxName{Ccircumflex}{0108}% LATIN CAPITAL LETTER C WITH CIRCUMFLEX
 \InputenxName{Cdot}{010A}% LATIN CAPITAL LETTER C WITH DOT ABOVE
 \InputenxName{Cdotaccent}{010A}% LATIN CAPITAL LETTER C WITH DOT ABOVE
+\InputenxName{Checyrillic}{0427}% CYRILLIC CAPITAL LETTER CHE
 \InputenxName{DH}{00D0}% LATIN CAPITAL LETTER ETH
 \InputenxName{DJ}{0110}% LATIN CAPITAL LETTER D WITH STROKE
 \InputenxName{Dcaron}{010E}% LATIN CAPITAL LETTER D WITH CARON
 \InputenxName{Dcroat}{0110}% LATIN CAPITAL LETTER D WITH STROKE
 \InputenxName{Ddotaccent}{1E0A}% LATIN CAPITAL LETTER D WITH DOT ABOVE
+\InputenxName{Decyrillic}{0414}% CYRILLIC CAPITAL LETTER DE
 \InputenxName{Delta}{2206}% INCREMENT
+\InputenxName{Djecyrillic}{0402}% CYRILLIC CAPITAL LETTER DJE
 \InputenxName{Dslash}{0110}% LATIN CAPITAL LETTER D WITH STROKE
+\InputenxName{Dzecyrillic}{0405}% CYRILLIC CAPITAL LETTER DZE
+\InputenxName{Dzhecyrillic}{040F}% CYRILLIC CAPITAL LETTER DZHE
 \InputenxName{Eacute}{00C9}% LATIN CAPITAL LETTER E WITH ACUTE
 \InputenxName{Ecaron}{011A}% LATIN CAPITAL LETTER E WITH CARON
 \InputenxName{Ecircumflex}{00CA}% LATIN CAPITAL LETTER E WITH CIRCUMFLEX
+\InputenxName{Ecyrillic}{0404}% CYRILLIC CAPITAL LETTER UKRAINIAN IE
 \InputenxName{Edieresis}{00CB}% LATIN CAPITAL LETTER E WITH DIAERESIS
 \InputenxName{Edot}{0116}% LATIN CAPITAL LETTER E WITH DOT ABOVE
 \InputenxName{Edotaccent}{0116}% LATIN CAPITAL LETTER E WITH DOT ABOVE
+\InputenxName{Efcyrillic}{0424}% CYRILLIC CAPITAL LETTER EF
 \InputenxName{Egrave}{00C8}% LATIN CAPITAL LETTER E WITH GRAVE
+\InputenxName{Elcyrillic}{041B}% CYRILLIC CAPITAL LETTER EL
 \InputenxName{Emacron}{0112}% LATIN CAPITAL LETTER E WITH MACRON
+\InputenxName{Emcyrillic}{041C}% CYRILLIC CAPITAL LETTER EM
+\InputenxName{Encyrillic}{041D}% CYRILLIC CAPITAL LETTER EN
 \InputenxName{Eng}{014A}% LATIN CAPITAL LETTER ENG
 \InputenxName{Eogonek}{0118}% LATIN CAPITAL LETTER E WITH OGONEK
+\InputenxName{Ercyrillic}{0420}% CYRILLIC CAPITAL LETTER ER
+\InputenxName{Ereversedcyrillic}{042D}% CYRILLIC CAPITAL LETTER E
+\InputenxName{Escyrillic}{0421}% CYRILLIC CAPITAL LETTER ES
 \InputenxName{Eth}{00D0}% LATIN CAPITAL LETTER ETH
 \InputenxName{Euro}{20AC}% EURO SIGN
 \InputenxName{Fdotaccent}{1E1E}% LATIN CAPITAL LETTER F WITH DOT ABOVE
@@ -4561,24 +5627,40 @@ and the derived files
 \InputenxName{Gcommaaccent}{0122}% LATIN CAPITAL LETTER G WITH CEDILLA
 \InputenxName{Gdot}{0120}% LATIN CAPITAL LETTER G WITH DOT ABOVE
 \InputenxName{Gdotaccent}{0120}% LATIN CAPITAL LETTER G WITH DOT ABOVE
+\InputenxName{Gecyrillic}{0413}% CYRILLIC CAPITAL LETTER GHE
+\InputenxName{Gheupturncyrillic}{0490}% CYRILLIC CAPITAL LETTER GHE WITH UPTURN
+\InputenxName{Gjecyrillic}{0403}% CYRILLIC CAPITAL LETTER GJE
+\InputenxName{Hardsigncyrillic}{042A}% CYRILLIC CAPITAL LETTER HARD SIGN
 \InputenxName{Hbar}{0126}% LATIN CAPITAL LETTER H WITH STROKE
 \InputenxName{Hcircumflex}{0124}% LATIN CAPITAL LETTER H WITH CIRCUMFLEX
+\InputenxName{IAcyrillic}{042F}% CYRILLIC CAPITAL LETTER YA
+\InputenxName{IUcyrillic}{042E}% CYRILLIC CAPITAL LETTER YU
 \InputenxName{Iacute}{00CD}% LATIN CAPITAL LETTER I WITH ACUTE
 \InputenxName{Icircumflex}{00CE}% LATIN CAPITAL LETTER I WITH CIRCUMFLEX
+\InputenxName{Icyrillic}{0406}% CYRILLIC CAPITAL LETTER BYELORUSSIAN-UKRAINIAN I
 \InputenxName{Idieresis}{00CF}% LATIN CAPITAL LETTER I WITH DIAERESIS
 \InputenxName{Idot}{0130}% LATIN CAPITAL LETTER I WITH DOT ABOVE
 \InputenxName{Idotaccent}{0130}% LATIN CAPITAL LETTER I WITH DOT ABOVE
+\InputenxName{Iecyrillic}{0415}% CYRILLIC CAPITAL LETTER IE
 \InputenxName{Igrave}{00CC}% LATIN CAPITAL LETTER I WITH GRAVE
+\InputenxName{Iicyrillic}{0418}% CYRILLIC CAPITAL LETTER I
+\InputenxName{Iishortcyrillic}{0419}% CYRILLIC CAPITAL LETTER SHORT I
 \InputenxName{Imacron}{012A}% LATIN CAPITAL LETTER I WITH MACRON
+\InputenxName{Iocyrillic}{0401}% CYRILLIC CAPITAL LETTER IO
 \InputenxName{Iogonek}{012E}% LATIN CAPITAL LETTER I WITH OGONEK
 \InputenxName{Itilde}{0128}% LATIN CAPITAL LETTER I WITH TILDE
 \InputenxName{Jcircumflex}{0134}% LATIN CAPITAL LETTER J WITH CIRCUMFLEX
+\InputenxName{Jecyrillic}{0408}% CYRILLIC CAPITAL LETTER JE
+\InputenxName{Kacyrillic}{041A}% CYRILLIC CAPITAL LETTER KA
 \InputenxName{Kcedilla}{0136}% LATIN CAPITAL LETTER K WITH CEDILLA
 \InputenxName{Kcommaaccent}{0136}% LATIN CAPITAL LETTER K WITH CEDILLA
+\InputenxName{Khacyrillic}{0425}% CYRILLIC CAPITAL LETTER HA
+\InputenxName{Kjecyrillic}{040C}% CYRILLIC CAPITAL LETTER KJE
 \InputenxName{Lacute}{0139}% LATIN CAPITAL LETTER L WITH ACUTE
 \InputenxName{Lcaron}{013D}% LATIN CAPITAL LETTER L WITH CARON
 \InputenxName{Lcedilla}{013B}% LATIN CAPITAL LETTER L WITH CEDILLA
 \InputenxName{Lcommaaccent}{013B}% LATIN CAPITAL LETTER L WITH CEDILLA
+\InputenxName{Ljecyrillic}{0409}% CYRILLIC CAPITAL LETTER LJE
 \InputenxName{Lslash}{0141}% LATIN CAPITAL LETTER L WITH STROKE
 \InputenxName{Mdotaccent}{1E40}% LATIN CAPITAL LETTER M WITH DOT ABOVE
 \InputenxName{NG}{014A}% LATIN CAPITAL LETTER ENG
@@ -4586,10 +5668,12 @@ and the derived files
 \InputenxName{Ncaron}{0147}% LATIN CAPITAL LETTER N WITH CARON
 \InputenxName{Ncedilla}{0145}% LATIN CAPITAL LETTER N WITH CEDILLA
 \InputenxName{Ncommaaccent}{0145}% LATIN CAPITAL LETTER N WITH CEDILLA
+\InputenxName{Njecyrillic}{040A}% CYRILLIC CAPITAL LETTER NJE
 \InputenxName{Ntilde}{00D1}% LATIN CAPITAL LETTER N WITH TILDE
 \InputenxName{OE}{0152}% LATIN CAPITAL LIGATURE OE
 \InputenxName{Oacute}{00D3}% LATIN CAPITAL LETTER O WITH ACUTE
 \InputenxName{Ocircumflex}{00D4}% LATIN CAPITAL LETTER O WITH CIRCUMFLEX
+\InputenxName{Ocyrillic}{041E}% CYRILLIC CAPITAL LETTER O
 \InputenxName{Odblacute}{0150}% LATIN CAPITAL LETTER O WITH DOUBLE ACUTE
 \InputenxName{Odieresis}{00D6}% LATIN CAPITAL LETTER O WITH DIAERESIS
 \InputenxName{Ograve}{00D2}% LATIN CAPITAL LETTER O WITH GRAVE
@@ -4600,6 +5684,7 @@ and the derived files
 \InputenxName{Oslash}{00D8}% LATIN CAPITAL LETTER O WITH STROKE
 \InputenxName{Otilde}{00D5}% LATIN CAPITAL LETTER O WITH TILDE
 \InputenxName{Pdotaccent}{1E56}% LATIN CAPITAL LETTER P WITH DOT ABOVE
+\InputenxName{Pecyrillic}{041F}% CYRILLIC CAPITAL LETTER PE
 \InputenxName{Phi}{03A6}% GREEK CAPITAL LETTER PHI
 \InputenxName{Racute}{0154}% LATIN CAPITAL LETTER R WITH ACUTE
 \InputenxName{Rcaron}{0158}% LATIN CAPITAL LETTER R WITH CARON
@@ -4651,19 +5736,26 @@ and the derived files
 \InputenxName{Scircumflex}{015C}% LATIN CAPITAL LETTER S WITH CIRCUMFLEX
 \InputenxName{Scommaaccent}{0218}% LATIN CAPITAL LETTER S WITH COMMA BELOW
 \InputenxName{Sdotaccent}{1E60}% LATIN CAPITAL LETTER S WITH DOT ABOVE
+\InputenxName{Shacyrillic}{0428}% CYRILLIC CAPITAL LETTER SHA
+\InputenxName{Shchacyrillic}{0429}% CYRILLIC CAPITAL LETTER SHCHA
 \InputenxName{Sigma}{03A3}% GREEK CAPITAL LETTER SIGMA
+\InputenxName{Softsigncyrillic}{042C}% CYRILLIC CAPITAL LETTER SOFT SIGN
 \InputenxName{TH}{00DE}% LATIN CAPITAL LETTER THORN
 \InputenxName{Tbar}{0166}% LATIN CAPITAL LETTER T WITH STROKE
 \InputenxName{Tcaron}{0164}% LATIN CAPITAL LETTER T WITH CARON
 \InputenxName{Tcedilla}{0162}% LATIN CAPITAL LETTER T WITH CEDILLA
 \InputenxName{Tcommaaccent}{0162}% LATIN CAPITAL LETTER T WITH CEDILLA
 \InputenxName{Tdotaccent}{1E6A}% LATIN CAPITAL LETTER T WITH DOT ABOVE
+\InputenxName{Tecyrillic}{0422}% CYRILLIC CAPITAL LETTER TE
 \InputenxName{Theta}{0398}% GREEK CAPITAL LETTER THETA
 \InputenxName{Thorn}{00DE}% LATIN CAPITAL LETTER THORN
+\InputenxName{Tsecyrillic}{0426}% CYRILLIC CAPITAL LETTER TSE
+\InputenxName{Tshecyrillic}{040B}% CYRILLIC CAPITAL LETTER TSHE
 \InputenxName{Tstroke}{0166}% LATIN CAPITAL LETTER T WITH STROKE
 \InputenxName{Uacute}{00DA}% LATIN CAPITAL LETTER U WITH ACUTE
 \InputenxName{Ubreve}{016C}% LATIN CAPITAL LETTER U WITH BREVE
 \InputenxName{Ucircumflex}{00DB}% LATIN CAPITAL LETTER U WITH CIRCUMFLEX
+\InputenxName{Ucyrillic}{0423}% CYRILLIC CAPITAL LETTER U
 \InputenxName{Udblacute}{0170}% LATIN CAPITAL LETTER U WITH DOUBLE ACUTE
 \InputenxName{Udieresis}{00DC}% LATIN CAPITAL LETTER U WITH DIAERESIS
 \InputenxName{Ugrave}{00D9}% LATIN CAPITAL LETTER U WITH GRAVE
@@ -4671,7 +5763,9 @@ and the derived files
 \InputenxName{Umacron}{016A}% LATIN CAPITAL LETTER U WITH MACRON
 \InputenxName{Uogonek}{0172}% LATIN CAPITAL LETTER U WITH OGONEK
 \InputenxName{Uring}{016E}% LATIN CAPITAL LETTER U WITH RING ABOVE
+\InputenxName{Ushortcyrillic}{040E}% CYRILLIC CAPITAL LETTER SHORT U
 \InputenxName{Utilde}{0168}% LATIN CAPITAL LETTER U WITH TILDE
+\InputenxName{Vecyrillic}{0412}% CYRILLIC CAPITAL LETTER VE
 \InputenxName{Wacute}{1E82}% LATIN CAPITAL LETTER W WITH ACUTE
 \InputenxName{Wcircumflex}{0174}% LATIN CAPITAL LETTER W WITH CIRCUMFLEX
 \InputenxName{Wdieresis}{1E84}% LATIN CAPITAL LETTER W WITH DIAERESIS
@@ -4679,16 +5773,21 @@ and the derived files
 \InputenxName{Yacute}{00DD}% LATIN CAPITAL LETTER Y WITH ACUTE
 \InputenxName{Ycircumflex}{0176}% LATIN CAPITAL LETTER Y WITH CIRCUMFLEX
 \InputenxName{Ydieresis}{0178}% LATIN CAPITAL LETTER Y WITH DIAERESIS
+\InputenxName{Yericyrillic}{042B}% CYRILLIC CAPITAL LETTER YERU
 \InputenxName{Ygrave}{1EF2}% LATIN CAPITAL LETTER Y WITH GRAVE
+\InputenxName{Yicyrillic}{0407}% CYRILLIC CAPITAL LETTER YI
 \InputenxName{Zacute}{0179}% LATIN CAPITAL LETTER Z WITH ACUTE
 \InputenxName{Zcaron}{017D}% LATIN CAPITAL LETTER Z WITH CARON
 \InputenxName{Zdot}{017B}% LATIN CAPITAL LETTER Z WITH DOT ABOVE
 \InputenxName{Zdotaccent}{017B}% LATIN CAPITAL LETTER Z WITH DOT ABOVE
+\InputenxName{Zecyrillic}{0417}% CYRILLIC CAPITAL LETTER ZE
+\InputenxName{Zhecyrillic}{0416}% CYRILLIC CAPITAL LETTER ZHE
 \InputenxName{aacute}{00E1}% LATIN SMALL LETTER A WITH ACUTE
 \InputenxName{abreve}{0103}% LATIN SMALL LETTER A WITH BREVE
 \InputenxName{acircumflex}{00E2}% LATIN SMALL LETTER A WITH CIRCUMFLEX
 \InputenxName{acute}{00B4}% ACUTE ACCENT
 \InputenxName{acutedbl}{02DD}% DOUBLE ACUTE ACCENT
+\InputenxName{acyrillic}{0430}% CYRILLIC SMALL LETTER A
 \InputenxName{adieresis}{00E4}% LATIN SMALL LETTER A WITH DIAERESIS
 \InputenxName{ae}{00E6}% LATIN SMALL LETTER AE
 \InputenxName{agrave}{00E0}% LATIN SMALL LETTER A WITH GRAVE
@@ -4707,6 +5806,7 @@ and the derived files
 \InputenxName{asciitilde}{02DC}% SMALL TILDE
 \InputenxName{atilde}{00E3}% LATIN SMALL LETTER A WITH TILDE
 \InputenxName{bdotaccent}{1E03}% LATIN SMALL LETTER B WITH DOT ABOVE
+\InputenxName{becyrillic}{0431}% CYRILLIC SMALL LETTER BE
 \InputenxName{blacksquare}{25A0}% BLACK SQUARE
 \InputenxName{block}{2588}% FULL BLOCK
 \InputenxName{breve}{02D8}% BREVE
@@ -4722,14 +5822,61 @@ and the derived files
 \InputenxName{cdotaccent}{010B}% LATIN SMALL LETTER C WITH DOT ABOVE
 \InputenxName{cedilla}{00B8}% CEDILLA
 \InputenxName{cent}{00A2}% CENT SIGN
+\InputenxName{checyrillic}{0447}% CYRILLIC SMALL LETTER CHE
 \InputenxName{circumflex}{02C6}% MODIFIER LETTER CIRCUMFLEX ACCENT
 \InputenxName{copyright}{00A9}% COPYRIGHT SIGN
 \InputenxName{currency}{00A4}% CURRENCY SIGN
+\InputenxName{cyra}{0430}% CYRILLIC SMALL LETTER A
+\InputenxName{cyrb}{0431}% CYRILLIC SMALL LETTER BE
+\InputenxName{cyrc}{0446}% CYRILLIC SMALL LETTER TSE
+\InputenxName{cyrch}{0447}% CYRILLIC SMALL LETTER CHE
+\InputenxName{cyrd}{0434}% CYRILLIC SMALL LETTER DE
+\InputenxName{cyrdje}{0452}% CYRILLIC SMALL LETTER DJE
+\InputenxName{cyrdze}{0455}% CYRILLIC SMALL LETTER DZE
+\InputenxName{cyrdzhe}{045F}% CYRILLIC SMALL LETTER DZHE
+\InputenxName{cyre}{0435}% CYRILLIC SMALL LETTER IE
+\InputenxName{cyrerev}{044D}% CYRILLIC SMALL LETTER E
+\InputenxName{cyrery}{044B}% CYRILLIC SMALL LETTER YERU
+\InputenxName{cyrf}{0444}% CYRILLIC SMALL LETTER EF
+\InputenxName{cyrg}{0433}% CYRILLIC SMALL LETTER GHE
+\InputenxName{cyrgup}{0491}% CYRILLIC SMALL LETTER GHE WITH UPTURN
+\InputenxName{cyrh}{0445}% CYRILLIC SMALL LETTER HA
+\InputenxName{cyrhrdsn}{044A}% CYRILLIC SMALL LETTER HARD SIGN
+\InputenxName{cyri}{0438}% CYRILLIC SMALL LETTER I
+\InputenxName{cyrie}{0454}% CYRILLIC SMALL LETTER UKRAINIAN IE
+\InputenxName{cyrii}{0456}% CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I
+\InputenxName{cyrishrt}{0439}% CYRILLIC SMALL LETTER SHORT I
+\InputenxName{cyrje}{0458}% CYRILLIC SMALL LETTER JE
+\InputenxName{cyrk}{043A}% CYRILLIC SMALL LETTER KA
+\InputenxName{cyrl}{043B}% CYRILLIC SMALL LETTER EL
+\InputenxName{cyrlje}{0459}% CYRILLIC SMALL LETTER LJE
+\InputenxName{cyrm}{043C}% CYRILLIC SMALL LETTER EM
+\InputenxName{cyrn}{043D}% CYRILLIC SMALL LETTER EN
+\InputenxName{cyrnje}{045A}% CYRILLIC SMALL LETTER NJE
+\InputenxName{cyro}{043E}% CYRILLIC SMALL LETTER O
+\InputenxName{cyrp}{043F}% CYRILLIC SMALL LETTER PE
+\InputenxName{cyrr}{0440}% CYRILLIC SMALL LETTER ER
+\InputenxName{cyrs}{0441}% CYRILLIC SMALL LETTER ES
+\InputenxName{cyrsftsn}{044C}% CYRILLIC SMALL LETTER SOFT SIGN
+\InputenxName{cyrsh}{0448}% CYRILLIC SMALL LETTER SHA
+\InputenxName{cyrshch}{0449}% CYRILLIC SMALL LETTER SHCHA
+\InputenxName{cyrt}{0442}% CYRILLIC SMALL LETTER TE
+\InputenxName{cyrtshe}{045B}% CYRILLIC SMALL LETTER TSHE
+\InputenxName{cyru}{0443}% CYRILLIC SMALL LETTER U
+\InputenxName{cyrushrt}{045E}% CYRILLIC SMALL LETTER SHORT U
+\InputenxName{cyrv}{0432}% CYRILLIC SMALL LETTER VE
+\InputenxName{cyrya}{044F}% CYRILLIC SMALL LETTER YA
+\InputenxName{cyryi}{0457}% CYRILLIC SMALL LETTER YI
+\InputenxName{cyryo}{0451}% CYRILLIC SMALL LETTER IO
+\InputenxName{cyryu}{044E}% CYRILLIC SMALL LETTER YU
+\InputenxName{cyrz}{0437}% CYRILLIC SMALL LETTER ZE
+\InputenxName{cyrzh}{0436}% CYRILLIC SMALL LETTER ZHE
 \InputenxName{dagger}{2020}% DAGGER
 \InputenxName{daggerdbl}{2021}% DOUBLE DAGGER
 \InputenxName{dcaron}{010F}% LATIN SMALL LETTER D WITH CARON
 \InputenxName{dcroat}{0111}% LATIN SMALL LETTER D WITH STROKE
 \InputenxName{ddotaccent}{1E0B}% LATIN SMALL LETTER D WITH DOT ABOVE
+\InputenxName{decyrillic}{0434}% CYRILLIC SMALL LETTER DE
 \InputenxName{degree}{00B0}% DEGREE SIGN
 \InputenxName{delta}{03B4}% GREEK SMALL LETTER DELTA
 \InputenxName{dh}{00F0}% LATIN SMALL LETTER ETH
@@ -4737,26 +5884,37 @@ and the derived files
 \InputenxName{div}{00F7}% DIVISION SIGN
 \InputenxName{divide}{00F7}% DIVISION SIGN
 \InputenxName{dj}{0111}% LATIN SMALL LETTER D WITH STROKE
+\InputenxName{djecyrillic}{0452}% CYRILLIC SMALL LETTER DJE
 \InputenxName{dkshade}{2593}% DARK SHADE
 \InputenxName{dmacron}{0111}% LATIN SMALL LETTER D WITH STROKE
 \InputenxName{dnblock}{2584}% LOWER HALF BLOCK
 \InputenxName{dotaccent}{02D9}% DOT ABOVE
 \InputenxName{dotlessi}{0131}% LATIN SMALL LETTER DOTLESS I
+\InputenxName{dzecyrillic}{0455}% CYRILLIC SMALL LETTER DZE
+\InputenxName{dzhecyrillic}{045F}% CYRILLIC SMALL LETTER DZHE
 \InputenxName{eacute}{00E9}% LATIN SMALL LETTER E WITH ACUTE
 \InputenxName{ecaron}{011B}% LATIN SMALL LETTER E WITH CARON
 \InputenxName{ecircumflex}{00EA}% LATIN SMALL LETTER E WITH CIRCUMFLEX
+\InputenxName{ecyrillic}{0454}% CYRILLIC SMALL LETTER UKRAINIAN IE
 \InputenxName{edieresis}{00EB}% LATIN SMALL LETTER E WITH DIAERESIS
 \InputenxName{edot}{0117}% LATIN SMALL LETTER E WITH DOT ABOVE
 \InputenxName{edotaccent}{0117}% LATIN SMALL LETTER E WITH DOT ABOVE
+\InputenxName{efcyrillic}{0444}% CYRILLIC SMALL LETTER EF
 \InputenxName{egrave}{00E8}% LATIN SMALL LETTER E WITH GRAVE
+\InputenxName{elcyrillic}{043B}% CYRILLIC SMALL LETTER EL
 \InputenxName{ellipsis}{2026}% HORIZONTAL ELLIPSIS
 \InputenxName{emacron}{0113}% LATIN SMALL LETTER E WITH MACRON
+\InputenxName{emcyrillic}{043C}% CYRILLIC SMALL LETTER EM
 \InputenxName{emdash}{2014}% EM DASH
+\InputenxName{encyrillic}{043D}% CYRILLIC SMALL LETTER EN
 \InputenxName{endash}{2013}% EN DASH
 \InputenxName{eng}{014B}% LATIN SMALL LETTER ENG
 \InputenxName{eogonek}{0119}% LATIN SMALL LETTER E WITH OGONEK
 \InputenxName{epsilon}{03B5}% GREEK SMALL LETTER EPSILON
 \InputenxName{equivalence}{2261}% IDENTICAL TO
+\InputenxName{ercyrillic}{0440}% CYRILLIC SMALL LETTER ER
+\InputenxName{ereversedcyrillic}{044D}% CYRILLIC SMALL LETTER E
+\InputenxName{escyrillic}{0441}% CYRILLIC SMALL LETTER ES
 \InputenxName{eth}{00F0}% LATIN SMALL LETTER ETH
 \InputenxName{euro}{20AC}% EURO SIGN
 \InputenxName{exclamdown}{00A1}% INVERTED EXCLAMATION MARK
@@ -4774,31 +5932,46 @@ and the derived files
 \InputenxName{gcommaaccent}{0123}% LATIN SMALL LETTER G WITH CEDILLA
 \InputenxName{gdot}{0121}% LATIN SMALL LETTER G WITH DOT ABOVE
 \InputenxName{gdotaccent}{0121}% LATIN SMALL LETTER G WITH DOT ABOVE
+\InputenxName{gecyrillic}{0433}% CYRILLIC SMALL LETTER GHE
 \InputenxName{germandbls}{00DF}% LATIN SMALL LETTER SHARP S
+\InputenxName{gheupturncyrillic}{0491}% CYRILLIC SMALL LETTER GHE WITH UPTURN
+\InputenxName{gjecyrillic}{0453}% CYRILLIC SMALL LETTER GJE
 \InputenxName{greaterequal}{2265}% GREATER-THAN OR EQUAL TO
 \InputenxName{guillemotleft}{00AB}% LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
 \InputenxName{guillemotright}{00BB}% RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
 \InputenxName{guilsinglleft}{2039}% SINGLE LEFT-POINTING ANGLE QUOTATION MARK
 \InputenxName{guilsinglright}{203A}% SINGLE RIGHT-POINTING ANGLE QUOTATION MARK
+\InputenxName{hardsigncyrillic}{044A}% CYRILLIC SMALL LETTER HARD SIGN
 \InputenxName{hbar}{0127}% LATIN SMALL LETTER H WITH STROKE
 \InputenxName{hcircumflex}{0125}% LATIN SMALL LETTER H WITH CIRCUMFLEX
 \InputenxName{hungarumlaut}{02DD}% DOUBLE ACUTE ACCENT
 \InputenxName{iacute}{00ED}% LATIN SMALL LETTER I WITH ACUTE
+\InputenxName{iacyrillic}{044F}% CYRILLIC SMALL LETTER YA
 \InputenxName{icircumflex}{00EE}% LATIN SMALL LETTER I WITH CIRCUMFLEX
+\InputenxName{icyrillic}{0456}% CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I
 \InputenxName{idieresis}{00EF}% LATIN SMALL LETTER I WITH DIAERESIS
+\InputenxName{iecyrillic}{0435}% CYRILLIC SMALL LETTER IE
 \InputenxName{igrave}{00EC}% LATIN SMALL LETTER I WITH GRAVE
+\InputenxName{iicyrillic}{0438}% CYRILLIC SMALL LETTER I
+\InputenxName{iishortcyrillic}{0439}% CYRILLIC SMALL LETTER SHORT I
 \InputenxName{ilde}{02DC}% SMALL TILDE
 \InputenxName{imacron}{012B}% LATIN SMALL LETTER I WITH MACRON
 \InputenxName{increment}{2206}% INCREMENT
 \InputenxName{infinity}{221E}% INFINITY
 \InputenxName{integral}{222B}% INTEGRAL
 \InputenxName{intersection}{2229}% INTERSECTION
+\InputenxName{iocyrillic}{0451}% CYRILLIC SMALL LETTER IO
 \InputenxName{iogonek}{012F}% LATIN SMALL LETTER I WITH OGONEK
 \InputenxName{itilde}{0129}% LATIN SMALL LETTER I WITH TILDE
+\InputenxName{iucyrillic}{044E}% CYRILLIC SMALL LETTER YU
 \InputenxName{jcircumflex}{0135}% LATIN SMALL LETTER J WITH CIRCUMFLEX
+\InputenxName{jecyrillic}{0458}% CYRILLIC SMALL LETTER JE
+\InputenxName{kacyrillic}{043A}% CYRILLIC SMALL LETTER KA
 \InputenxName{kcedilla}{0137}% LATIN SMALL LETTER K WITH CEDILLA
 \InputenxName{kcommaaccent}{0137}% LATIN SMALL LETTER K WITH CEDILLA
 \InputenxName{kgreenlandic}{0138}% LATIN SMALL LETTER KRA
+\InputenxName{khacyrillic}{0445}% CYRILLIC SMALL LETTER HA
+\InputenxName{kjecyrillic}{045C}% CYRILLIC SMALL LETTER KJE
 \InputenxName{kra}{0138}% LATIN SMALL LETTER KRA
 \InputenxName{lacute}{013A}% LATIN SMALL LETTER L WITH ACUTE
 \InputenxName{lcaron}{013E}% LATIN SMALL LETTER L WITH CARON
@@ -4806,6 +5979,7 @@ and the derived files
 \InputenxName{lcommaaccent}{013C}% LATIN SMALL LETTER L WITH CEDILLA
 \InputenxName{lessequal}{2264}% LESS-THAN OR EQUAL TO
 \InputenxName{lfblock}{258C}% LEFT HALF BLOCK
+\InputenxName{ljecyrillic}{0459}% CYRILLIC SMALL LETTER LJE
 \InputenxName{lnot}{00AC}% NOT SIGN
 \InputenxName{logicalnot}{00AC}% NOT SIGN
 \InputenxName{lozenge}{25CA}% LOZENGE
@@ -4824,13 +5998,16 @@ and the derived files
 \InputenxName{ncedilla}{0146}% LATIN SMALL LETTER N WITH CEDILLA
 \InputenxName{ncommaaccent}{0146}% LATIN SMALL LETTER N WITH CEDILLA
 \InputenxName{ng}{014B}% LATIN SMALL LETTER ENG
+\InputenxName{njecyrillic}{045A}% CYRILLIC SMALL LETTER NJE
 \InputenxName{nobreakspace}{00A0}% NO-BREAK SPACE
 \InputenxName{nonbreakingspace}{00A0}% NO-BREAK SPACE
 \InputenxName{notequal}{2260}% NOT EQUAL TO
 \InputenxName{nsuperior}{207F}% SUPERSCRIPT LATIN SMALL LETTER N
 \InputenxName{ntilde}{00F1}% LATIN SMALL LETTER N WITH TILDE
+\InputenxName{numero}{2116}% NUMERO SIGN
 \InputenxName{oacute}{00F3}% LATIN SMALL LETTER O WITH ACUTE
 \InputenxName{ocircumflex}{00F4}% LATIN SMALL LETTER O WITH CIRCUMFLEX
+\InputenxName{ocyrillic}{043E}% CYRILLIC SMALL LETTER O
 \InputenxName{odblacute}{0151}% LATIN SMALL LETTER O WITH DOUBLE ACUTE
 \InputenxName{odieresis}{00F6}% LATIN SMALL LETTER O WITH DIAERESIS
 \InputenxName{oe}{0153}% LATIN SMALL LIGATURE OE
@@ -4850,6 +6027,7 @@ and the derived files
 \InputenxName{partial}{2202}% PARTIAL DIFFERENTIAL
 \InputenxName{partialdiff}{2202}% PARTIAL DIFFERENTIAL
 \InputenxName{pdotaccent}{1E57}% LATIN SMALL LETTER P WITH DOT ABOVE
+\InputenxName{pecyrillic}{043F}% CYRILLIC SMALL LETTER PE
 \InputenxName{periodcentered}{00B7}% MIDDLE DOT
 \InputenxName{perthousand}{2030}% PER MILLE SIGN
 \InputenxName{peseta}{20A7}% PESETA SIGN
@@ -4881,12 +6059,15 @@ and the derived files
 \InputenxName{sdotaccent}{1E61}% LATIN SMALL LETTER S WITH DOT ABOVE
 \InputenxName{section}{00A7}% SECTION SIGN
 \InputenxName{sfthyphen}{00AD}% SOFT HYPHEN
+\InputenxName{shacyrillic}{0448}% CYRILLIC SMALL LETTER SHA
 \InputenxName{shade}{2592}% MEDIUM SHADE
 \InputenxName{shadedark}{2593}% DARK SHADE
 \InputenxName{shadelight}{2591}% LIGHT SHADE
 \InputenxName{shademedium}{2592}% MEDIUM SHADE
+\InputenxName{shchacyrillic}{0449}% CYRILLIC SMALL LETTER SHCHA
 \InputenxName{sigma}{03C3}% GREEK SMALL LETTER SIGMA
 \InputenxName{softhyphen}{00AD}% SOFT HYPHEN
+\InputenxName{softsigncyrillic}{044C}% CYRILLIC SMALL LETTER SOFT SIGN
 \InputenxName{ss}{00DF}% LATIN SMALL LETTER SHARP S
 \InputenxName{sterling}{00A3}% POUND SIGN
 \InputenxName{summation}{2211}% N-ARY SUMMATION
@@ -4897,6 +6078,7 @@ and the derived files
 \InputenxName{tcedilla}{0163}% LATIN SMALL LETTER T WITH CEDILLA
 \InputenxName{tcommaaccent}{0163}% LATIN SMALL LETTER T WITH CEDILLA
 \InputenxName{tdotaccent}{1E6B}% LATIN SMALL LETTER T WITH DOT ABOVE
+\InputenxName{tecyrillic}{0442}% CYRILLIC SMALL LETTER TE
 \InputenxName{th}{00FE}% LATIN SMALL LETTER THORN
 \InputenxName{thorn}{00FE}% LATIN SMALL LETTER THORN
 \InputenxName{threequarters}{00BE}% VULGAR FRACTION THREE QUARTERS
@@ -4904,11 +6086,14 @@ and the derived files
 \InputenxName{tilde}{02DC}% SMALL TILDE
 \InputenxName{times}{00D7}% MULTIPLICATION SIGN
 \InputenxName{trademark}{2122}% TRADE MARK SIGN
+\InputenxName{tsecyrillic}{0446}% CYRILLIC SMALL LETTER TSE
+\InputenxName{tshecyrillic}{045B}% CYRILLIC SMALL LETTER TSHE
 \InputenxName{tstroke}{0167}% LATIN SMALL LETTER T WITH STROKE
 \InputenxName{twosuperior}{00B2}% SUPERSCRIPT TWO
 \InputenxName{uacute}{00FA}% LATIN SMALL LETTER U WITH ACUTE
 \InputenxName{ubreve}{016D}% LATIN SMALL LETTER U WITH BREVE
 \InputenxName{ucircumflex}{00FB}% LATIN SMALL LETTER U WITH CIRCUMFLEX
+\InputenxName{ucyrillic}{0443}% CYRILLIC SMALL LETTER U
 \InputenxName{udblacute}{0171}% LATIN SMALL LETTER U WITH DOUBLE ACUTE
 \InputenxName{udieresis}{00FC}% LATIN SMALL LETTER U WITH DIAERESIS
 \InputenxName{ugrave}{00F9}% LATIN SMALL LETTER U WITH GRAVE
@@ -4917,7 +6102,9 @@ and the derived files
 \InputenxName{uogonek}{0173}% LATIN SMALL LETTER U WITH OGONEK
 \InputenxName{upblock}{2580}% UPPER HALF BLOCK
 \InputenxName{uring}{016F}% LATIN SMALL LETTER U WITH RING ABOVE
+\InputenxName{ushortcyrillic}{045E}% CYRILLIC SMALL LETTER SHORT U
 \InputenxName{utilde}{0169}% LATIN SMALL LETTER U WITH TILDE
+\InputenxName{vecyrillic}{0432}% CYRILLIC SMALL LETTER VE
 \InputenxName{wacute}{1E83}% LATIN SMALL LETTER W WITH ACUTE
 \InputenxName{wcircumflex}{0175}% LATIN SMALL LETTER W WITH CIRCUMFLEX
 \InputenxName{wdieresis}{1E85}% LATIN SMALL LETTER W WITH DIAERESIS
@@ -4926,11 +6113,15 @@ and the derived files
 \InputenxName{ycircumflex}{0177}% LATIN SMALL LETTER Y WITH CIRCUMFLEX
 \InputenxName{ydieresis}{00FF}% LATIN SMALL LETTER Y WITH DIAERESIS
 \InputenxName{yen}{00A5}% YEN SIGN
+\InputenxName{yericyrillic}{044B}% CYRILLIC SMALL LETTER YERU
 \InputenxName{ygrave}{1EF3}% LATIN SMALL LETTER Y WITH GRAVE
+\InputenxName{yicyrillic}{0457}% CYRILLIC SMALL LETTER YI
 \InputenxName{zacute}{017A}% LATIN SMALL LETTER Z WITH ACUTE
 \InputenxName{zcaron}{017E}% LATIN SMALL LETTER Z WITH CARON
 \InputenxName{zdot}{017C}% LATIN SMALL LETTER Z WITH DOT ABOVE
 \InputenxName{zdotaccent}{017C}% LATIN SMALL LETTER Z WITH DOT ABOVE
+\InputenxName{zecyrillic}{0437}% CYRILLIC SMALL LETTER ZE
+\InputenxName{zhecyrillic}{0436}% CYRILLIC SMALL LETTER ZHE
 %    \end{macrocode}
 %    \fi
 %
@@ -4943,118 +6134,185 @@ and the derived files
 %    \begin{macrocode}
 %<*slot>
 \ProvidesFile{ix-slot.def}%
-  [2006/08/24 v1.0 SLOT and UC to Encodings (inputenx)]
+  [2007/04/11 v1.1 SLOT and UC to Encodings (inputenx)]%
 %    \end{macrocode}
 %
 %    \textit{List omitted here, see \xfile{ix-slot.def}.}
 %    \iffalse
 %    \begin{macrocode}
 \InputenxSlot{128}{00A0}{\do{nextstep}}
-\InputenxSlot{128}{00C4}{\do{mac-roman}\do{mac-ce}}
+\InputenxSlot{128}{00C4}{\do{mac-centeuro}\do{mac-roman}}
 \InputenxSlot{128}{00C7}{%
   \do{cp437}\do{cp850}\do{cp852}\do{cp858}\do{cp865}%
 }
+\InputenxSlot{128}{0402}{\do{cp1251}}
+\InputenxSlot{128}{0410}{\do{cp866}\do{mac-cyrillic}}
+\InputenxSlot{128}{0452}{\do{cp855}}
 \InputenxSlot{128}{20AC}{\do{cp1250}\do{cp1252}\do{cp1257}}
+\InputenxSlot{128}{2500}{\do{koi8-r}}
 \InputenxSlot{129}{00C0}{\do{nextstep}}
 \InputenxSlot{129}{00C5}{\do{mac-roman}}
 \InputenxSlot{129}{00FC}{%
   \do{cp437}\do{cp850}\do{cp852}\do{cp858}\do{cp865}%
 }
-\InputenxSlot{129}{0100}{\do{mac-ce}}
+\InputenxSlot{129}{0100}{\do{mac-centeuro}}
+\InputenxSlot{129}{0402}{\do{cp855}}
+\InputenxSlot{129}{0403}{\do{cp1251}}
+\InputenxSlot{129}{0411}{\do{cp866}\do{mac-cyrillic}}
+\InputenxSlot{129}{2502}{\do{koi8-r}}
 \InputenxSlot{130}{00C1}{\do{nextstep}}
 \InputenxSlot{130}{00C7}{\do{mac-roman}}
 \InputenxSlot{130}{00E9}{%
   \do{cp437}\do{cp850}\do{cp852}\do{cp858}\do{cp865}%
 }
-\InputenxSlot{130}{0101}{\do{mac-ce}}
-\InputenxSlot{130}{201A}{\do{cp1250}\do{cp1252}\do{cp1257}}
+\InputenxSlot{130}{0101}{\do{mac-centeuro}}
+\InputenxSlot{130}{0412}{\do{cp866}\do{mac-cyrillic}}
+\InputenxSlot{130}{0453}{\do{cp855}}
+\InputenxSlot{130}{201A}{%
+  \do{cp1250}\do{cp1251}\do{cp1252}\do{cp1257}%
+}
+\InputenxSlot{130}{250C}{\do{koi8-r}}
 \InputenxSlot{131}{00C2}{\do{nextstep}}
-\InputenxSlot{131}{00C9}{\do{mac-roman}\do{mac-ce}}
+\InputenxSlot{131}{00C9}{\do{mac-centeuro}\do{mac-roman}}
 \InputenxSlot{131}{00E2}{%
   \do{cp437}\do{cp850}\do{cp852}\do{cp858}\do{cp865}%
 }
 \InputenxSlot{131}{0192}{\do{cp1252}}
+\InputenxSlot{131}{0403}{\do{cp855}}
+\InputenxSlot{131}{0413}{\do{cp866}\do{mac-cyrillic}}
+\InputenxSlot{131}{0453}{\do{cp1251}}
+\InputenxSlot{131}{2510}{\do{koi8-r}}
 \InputenxSlot{132}{00C3}{\do{nextstep}}
 \InputenxSlot{132}{00D1}{\do{mac-roman}}
 \InputenxSlot{132}{00E4}{%
   \do{cp437}\do{cp850}\do{cp852}\do{cp858}\do{cp865}%
 }
-\InputenxSlot{132}{0104}{\do{mac-ce}}
-\InputenxSlot{132}{201E}{\do{cp1250}\do{cp1252}\do{cp1257}}
+\InputenxSlot{132}{0104}{\do{mac-centeuro}}
+\InputenxSlot{132}{0414}{\do{cp866}\do{mac-cyrillic}}
+\InputenxSlot{132}{0451}{\do{cp855}}
+\InputenxSlot{132}{201E}{%
+  \do{cp1250}\do{cp1251}\do{cp1252}\do{cp1257}%
+}
+\InputenxSlot{132}{2514}{\do{koi8-r}}
 \InputenxSlot{133}{00C4}{\do{nextstep}}
-\InputenxSlot{133}{00D6}{\do{mac-roman}\do{mac-ce}}
+\InputenxSlot{133}{00D6}{\do{mac-centeuro}\do{mac-roman}}
 \InputenxSlot{133}{00E0}{%
   \do{cp437}\do{cp850}\do{cp858}\do{cp865}%
 }
 \InputenxSlot{133}{016F}{\do{cp852}}
-\InputenxSlot{133}{2026}{\do{cp1250}\do{cp1252}\do{cp1257}}
+\InputenxSlot{133}{0401}{\do{cp855}}
+\InputenxSlot{133}{0415}{\do{cp866}\do{mac-cyrillic}}
+\InputenxSlot{133}{2026}{%
+  \do{cp1250}\do{cp1251}\do{cp1252}\do{cp1257}%
+}
+\InputenxSlot{133}{2518}{\do{koi8-r}}
 \InputenxSlot{134}{00C5}{\do{nextstep}}
-\InputenxSlot{134}{00DC}{\do{mac-roman}\do{mac-ce}}
+\InputenxSlot{134}{00DC}{\do{mac-centeuro}\do{mac-roman}}
 \InputenxSlot{134}{00E5}{%
   \do{cp437}\do{cp850}\do{cp858}\do{cp865}%
 }
 \InputenxSlot{134}{0107}{\do{cp852}}
-\InputenxSlot{134}{2020}{\do{cp1250}\do{cp1252}\do{cp1257}}
+\InputenxSlot{134}{0416}{\do{cp866}\do{mac-cyrillic}}
+\InputenxSlot{134}{0454}{\do{cp855}}
+\InputenxSlot{134}{2020}{%
+  \do{cp1250}\do{cp1251}\do{cp1252}\do{cp1257}%
+}
+\InputenxSlot{134}{251C}{\do{koi8-r}}
 \InputenxSlot{135}{00C7}{\do{nextstep}}
-\InputenxSlot{135}{00E1}{\do{mac-roman}\do{mac-ce}}
+\InputenxSlot{135}{00E1}{\do{mac-centeuro}\do{mac-roman}}
 \InputenxSlot{135}{00E7}{%
   \do{cp437}\do{cp850}\do{cp852}\do{cp858}\do{cp865}%
 }
-\InputenxSlot{135}{2021}{\do{cp1250}\do{cp1252}\do{cp1257}}
+\InputenxSlot{135}{0404}{\do{cp855}}
+\InputenxSlot{135}{0417}{\do{cp866}\do{mac-cyrillic}}
+\InputenxSlot{135}{2021}{%
+  \do{cp1250}\do{cp1251}\do{cp1252}\do{cp1257}%
+}
+\InputenxSlot{135}{2524}{\do{koi8-r}}
 \InputenxSlot{136}{00C8}{\do{nextstep}}
 \InputenxSlot{136}{00E0}{\do{mac-roman}}
 \InputenxSlot{136}{00EA}{%
   \do{cp437}\do{cp850}\do{cp858}\do{cp865}%
 }
-\InputenxSlot{136}{0105}{\do{mac-ce}}
+\InputenxSlot{136}{0105}{\do{mac-centeuro}}
 \InputenxSlot{136}{0142}{\do{cp852}}
 \InputenxSlot{136}{02C6}{\do{cp1252}}
+\InputenxSlot{136}{0418}{\do{cp866}\do{mac-cyrillic}}
+\InputenxSlot{136}{0455}{\do{cp855}}
+\InputenxSlot{136}{20AC}{\do{cp1251}}
+\InputenxSlot{136}{252C}{\do{koi8-r}}
 \InputenxSlot{137}{00C9}{\do{nextstep}}
 \InputenxSlot{137}{00E2}{\do{mac-roman}}
 \InputenxSlot{137}{00EB}{%
   \do{cp437}\do{cp850}\do{cp852}\do{cp858}\do{cp865}%
 }
-\InputenxSlot{137}{010C}{\do{mac-ce}}
-\InputenxSlot{137}{2030}{\do{cp1250}\do{cp1252}\do{cp1257}}
+\InputenxSlot{137}{010C}{\do{mac-centeuro}}
+\InputenxSlot{137}{0405}{\do{cp855}}
+\InputenxSlot{137}{0419}{\do{cp866}\do{mac-cyrillic}}
+\InputenxSlot{137}{2030}{%
+  \do{cp1250}\do{cp1251}\do{cp1252}\do{cp1257}%
+}
+\InputenxSlot{137}{2534}{\do{koi8-r}}
 \InputenxSlot{138}{00CA}{\do{nextstep}}
-\InputenxSlot{138}{00E4}{\do{mac-roman}\do{mac-ce}}
+\InputenxSlot{138}{00E4}{\do{mac-centeuro}\do{mac-roman}}
 \InputenxSlot{138}{00E8}{%
   \do{cp437}\do{cp850}\do{cp858}\do{cp865}%
 }
 \InputenxSlot{138}{0150}{\do{cp852}}
 \InputenxSlot{138}{0160}{\do{cp1250}\do{cp1252}}
+\InputenxSlot{138}{0409}{\do{cp1251}}
+\InputenxSlot{138}{041A}{\do{cp866}\do{mac-cyrillic}}
+\InputenxSlot{138}{0456}{\do{cp855}}
+\InputenxSlot{138}{253C}{\do{koi8-r}}
 \InputenxSlot{139}{00CB}{\do{nextstep}}
 \InputenxSlot{139}{00E3}{\do{mac-roman}}
 \InputenxSlot{139}{00EF}{%
   \do{cp437}\do{cp850}\do{cp858}\do{cp865}%
 }
-\InputenxSlot{139}{010D}{\do{mac-ce}}
+\InputenxSlot{139}{010D}{\do{mac-centeuro}}
 \InputenxSlot{139}{0151}{\do{cp852}}
-\InputenxSlot{139}{2039}{\do{cp1250}\do{cp1252}\do{cp1257}}
+\InputenxSlot{139}{0406}{\do{cp855}}
+\InputenxSlot{139}{041B}{\do{cp866}\do{mac-cyrillic}}
+\InputenxSlot{139}{2039}{%
+  \do{cp1250}\do{cp1251}\do{cp1252}\do{cp1257}%
+}
+\InputenxSlot{139}{2580}{\do{koi8-r}}
 \InputenxSlot{140}{00CC}{\do{nextstep}}
 \InputenxSlot{140}{00E5}{\do{mac-roman}}
 \InputenxSlot{140}{00EE}{%
   \do{cp437}\do{cp850}\do{cp852}\do{cp858}\do{cp865}%
 }
-\InputenxSlot{140}{0106}{\do{mac-ce}}
+\InputenxSlot{140}{0106}{\do{mac-centeuro}}
 \InputenxSlot{140}{0152}{\do{cp1252}}
 \InputenxSlot{140}{015A}{\do{cp1250}}
+\InputenxSlot{140}{040A}{\do{cp1251}}
+\InputenxSlot{140}{041C}{\do{cp866}\do{mac-cyrillic}}
+\InputenxSlot{140}{0457}{\do{cp855}}
+\InputenxSlot{140}{2584}{\do{koi8-r}}
 \InputenxSlot{141}{00A8}{\do{cp1257}}
 \InputenxSlot{141}{00CD}{\do{nextstep}}
 \InputenxSlot{141}{00E7}{\do{mac-roman}}
 \InputenxSlot{141}{00EC}{%
   \do{cp437}\do{cp850}\do{cp858}\do{cp865}%
 }
-\InputenxSlot{141}{0107}{\do{mac-ce}}
+\InputenxSlot{141}{0107}{\do{mac-centeuro}}
 \InputenxSlot{141}{0164}{\do{cp1250}}
 \InputenxSlot{141}{0179}{\do{cp852}}
+\InputenxSlot{141}{0407}{\do{cp855}}
+\InputenxSlot{141}{040C}{\do{cp1251}}
+\InputenxSlot{141}{041D}{\do{cp866}\do{mac-cyrillic}}
+\InputenxSlot{141}{2588}{\do{koi8-r}}
 \InputenxSlot{142}{00C4}{%
   \do{cp437}\do{cp850}\do{cp852}\do{cp858}\do{cp865}%
 }
 \InputenxSlot{142}{00CE}{\do{nextstep}}
-\InputenxSlot{142}{00E9}{\do{mac-roman}\do{mac-ce}}
+\InputenxSlot{142}{00E9}{\do{mac-centeuro}\do{mac-roman}}
 \InputenxSlot{142}{017D}{\do{cp1250}\do{cp1252}}
 \InputenxSlot{142}{02C7}{\do{cp1257}}
+\InputenxSlot{142}{040B}{\do{cp1251}}
+\InputenxSlot{142}{041E}{\do{cp866}\do{mac-cyrillic}}
+\InputenxSlot{142}{0458}{\do{cp855}}
+\InputenxSlot{142}{258C}{\do{koi8-r}}
 \InputenxSlot{143}{00B8}{\do{cp1257}}
 \InputenxSlot{143}{00C5}{%
   \do{cp437}\do{cp850}\do{cp858}\do{cp865}%
@@ -5062,137 +6320,213 @@ and the derived files
 \InputenxSlot{143}{00CF}{\do{nextstep}}
 \InputenxSlot{143}{00E8}{\do{mac-roman}}
 \InputenxSlot{143}{0106}{\do{cp852}}
-\InputenxSlot{143}{0179}{\do{cp1250}\do{mac-ce}}
+\InputenxSlot{143}{0179}{\do{cp1250}\do{mac-centeuro}}
+\InputenxSlot{143}{0408}{\do{cp855}}
+\InputenxSlot{143}{040F}{\do{cp1251}}
+\InputenxSlot{143}{041F}{\do{cp866}\do{mac-cyrillic}}
+\InputenxSlot{143}{2590}{\do{koi8-r}}
 \InputenxSlot{144}{00C9}{%
   \do{cp437}\do{cp850}\do{cp852}\do{cp858}\do{cp865}%
 }
 \InputenxSlot{144}{00D0}{\do{nextstep}}
 \InputenxSlot{144}{00EA}{\do{mac-roman}}
-\InputenxSlot{144}{017A}{\do{mac-ce}}
+\InputenxSlot{144}{017A}{\do{mac-centeuro}}
+\InputenxSlot{144}{0420}{\do{cp866}\do{mac-cyrillic}}
+\InputenxSlot{144}{0452}{\do{cp1251}}
+\InputenxSlot{144}{0459}{\do{cp855}}
+\InputenxSlot{144}{2591}{\do{koi8-r}}
 \InputenxSlot{145}{00D1}{\do{nextstep}}
 \InputenxSlot{145}{00E6}{%
   \do{cp437}\do{cp850}\do{cp858}\do{cp865}%
 }
 \InputenxSlot{145}{00EB}{\do{mac-roman}}
-\InputenxSlot{145}{010E}{\do{mac-ce}}
+\InputenxSlot{145}{010E}{\do{mac-centeuro}}
 \InputenxSlot{145}{0139}{\do{cp852}}
-\InputenxSlot{145}{2018}{\do{cp1250}\do{cp1252}\do{cp1257}}
+\InputenxSlot{145}{0409}{\do{cp855}}
+\InputenxSlot{145}{0421}{\do{cp866}\do{mac-cyrillic}}
+\InputenxSlot{145}{2018}{%
+  \do{cp1250}\do{cp1251}\do{cp1252}\do{cp1257}%
+}
+\InputenxSlot{145}{2592}{\do{koi8-r}}
 \InputenxSlot{146}{00C6}{%
   \do{cp437}\do{cp850}\do{cp858}\do{cp865}%
 }
 \InputenxSlot{146}{00D2}{\do{nextstep}}
-\InputenxSlot{146}{00ED}{\do{mac-roman}\do{mac-ce}}
+\InputenxSlot{146}{00ED}{\do{mac-centeuro}\do{mac-roman}}
 \InputenxSlot{146}{013A}{\do{cp852}}
-\InputenxSlot{146}{2019}{\do{cp1250}\do{cp1252}\do{cp1257}}
+\InputenxSlot{146}{0422}{\do{cp866}\do{mac-cyrillic}}
+\InputenxSlot{146}{045A}{\do{cp855}}
+\InputenxSlot{146}{2019}{%
+  \do{cp1250}\do{cp1251}\do{cp1252}\do{cp1257}%
+}
+\InputenxSlot{146}{2593}{\do{koi8-r}}
 \InputenxSlot{147}{00D3}{\do{nextstep}}
 \InputenxSlot{147}{00EC}{\do{mac-roman}}
 \InputenxSlot{147}{00F4}{%
   \do{cp437}\do{cp850}\do{cp852}\do{cp858}\do{cp865}%
 }
-\InputenxSlot{147}{010F}{\do{mac-ce}}
-\InputenxSlot{147}{201C}{\do{cp1250}\do{cp1252}\do{cp1257}}
+\InputenxSlot{147}{010F}{\do{mac-centeuro}}
+\InputenxSlot{147}{040A}{\do{cp855}}
+\InputenxSlot{147}{0423}{\do{cp866}\do{mac-cyrillic}}
+\InputenxSlot{147}{201C}{%
+  \do{cp1250}\do{cp1251}\do{cp1252}\do{cp1257}%
+}
 \InputenxSlot{148}{00D4}{\do{nextstep}}
 \InputenxSlot{148}{00EE}{\do{mac-roman}}
 \InputenxSlot{148}{00F6}{%
   \do{cp437}\do{cp850}\do{cp852}\do{cp858}\do{cp865}%
 }
-\InputenxSlot{148}{0112}{\do{mac-ce}}
-\InputenxSlot{148}{201D}{\do{cp1250}\do{cp1252}\do{cp1257}}
+\InputenxSlot{148}{0112}{\do{mac-centeuro}}
+\InputenxSlot{148}{0424}{\do{cp866}\do{mac-cyrillic}}
+\InputenxSlot{148}{045B}{\do{cp855}}
+\InputenxSlot{148}{201D}{%
+  \do{cp1250}\do{cp1251}\do{cp1252}\do{cp1257}%
+}
+\InputenxSlot{148}{25A0}{\do{koi8-r}}
 \InputenxSlot{149}{00D5}{\do{nextstep}}
 \InputenxSlot{149}{00EF}{\do{mac-roman}}
 \InputenxSlot{149}{00F2}{%
   \do{cp437}\do{cp850}\do{cp858}\do{cp865}%
 }
-\InputenxSlot{149}{0113}{\do{mac-ce}}
+\InputenxSlot{149}{0113}{\do{mac-centeuro}}
 \InputenxSlot{149}{013D}{\do{cp852}}
-\InputenxSlot{149}{2022}{\do{cp1250}\do{cp1252}\do{cp1257}}
+\InputenxSlot{149}{040B}{\do{cp855}}
+\InputenxSlot{149}{0425}{\do{cp866}\do{mac-cyrillic}}
+\InputenxSlot{149}{2022}{%
+  \do{cp1250}\do{cp1251}\do{cp1252}\do{cp1257}%
+}
+\InputenxSlot{149}{2219}{\do{koi8-r}}
 \InputenxSlot{150}{00D6}{\do{nextstep}}
 \InputenxSlot{150}{00F1}{\do{mac-roman}}
 \InputenxSlot{150}{00FB}{%
   \do{cp437}\do{cp850}\do{cp858}\do{cp865}%
 }
-\InputenxSlot{150}{0116}{\do{mac-ce}}
+\InputenxSlot{150}{0116}{\do{mac-centeuro}}
 \InputenxSlot{150}{013E}{\do{cp852}}
-\InputenxSlot{150}{2013}{\do{cp1250}\do{cp1252}\do{cp1257}}
+\InputenxSlot{150}{0426}{\do{cp866}\do{mac-cyrillic}}
+\InputenxSlot{150}{045C}{\do{cp855}}
+\InputenxSlot{150}{2013}{%
+  \do{cp1250}\do{cp1251}\do{cp1252}\do{cp1257}%
+}
+\InputenxSlot{150}{221A}{\do{koi8-r}}
 \InputenxSlot{151}{00D9}{\do{nextstep}}
-\InputenxSlot{151}{00F3}{\do{mac-roman}\do{mac-ce}}
+\InputenxSlot{151}{00F3}{\do{mac-centeuro}\do{mac-roman}}
 \InputenxSlot{151}{00F9}{%
   \do{cp437}\do{cp850}\do{cp858}\do{cp865}%
 }
 \InputenxSlot{151}{015A}{\do{cp852}}
-\InputenxSlot{151}{2014}{\do{cp1250}\do{cp1252}\do{cp1257}}
+\InputenxSlot{151}{040C}{\do{cp855}}
+\InputenxSlot{151}{0427}{\do{cp866}\do{mac-cyrillic}}
+\InputenxSlot{151}{2014}{%
+  \do{cp1250}\do{cp1251}\do{cp1252}\do{cp1257}%
+}
+\InputenxSlot{151}{2248}{\do{koi8-r}}
 \InputenxSlot{152}{00DA}{\do{nextstep}}
 \InputenxSlot{152}{00F2}{\do{mac-roman}}
 \InputenxSlot{152}{00FF}{%
   \do{cp437}\do{cp850}\do{cp858}\do{cp865}%
 }
-\InputenxSlot{152}{0117}{\do{mac-ce}}
+\InputenxSlot{152}{0117}{\do{mac-centeuro}}
 \InputenxSlot{152}{015B}{\do{cp852}}
 \InputenxSlot{152}{02DC}{\do{cp1252}}
+\InputenxSlot{152}{0428}{\do{cp866}\do{mac-cyrillic}}
+\InputenxSlot{152}{045E}{\do{cp855}}
+\InputenxSlot{152}{2264}{\do{koi8-r}}
 \InputenxSlot{153}{00D6}{%
   \do{cp437}\do{cp850}\do{cp852}\do{cp858}\do{cp865}%
 }
 \InputenxSlot{153}{00DB}{\do{nextstep}}
-\InputenxSlot{153}{00F4}{\do{mac-roman}\do{mac-ce}}
-\InputenxSlot{153}{2122}{\do{cp1250}\do{cp1252}\do{cp1257}}
+\InputenxSlot{153}{00F4}{\do{mac-centeuro}\do{mac-roman}}
+\InputenxSlot{153}{040E}{\do{cp855}}
+\InputenxSlot{153}{0429}{\do{cp866}\do{mac-cyrillic}}
+\InputenxSlot{153}{2122}{%
+  \do{cp1250}\do{cp1251}\do{cp1252}\do{cp1257}%
+}
+\InputenxSlot{153}{2265}{\do{koi8-r}}
+\InputenxSlot{154}{00A0}{\do{koi8-r}}
 \InputenxSlot{154}{00DC}{%
   \do{cp437}\do{cp850}\do{cp852}\do{cp858}\do{cp865}\do{nextstep}%
 }
-\InputenxSlot{154}{00F6}{\do{mac-roman}\do{mac-ce}}
+\InputenxSlot{154}{00F6}{\do{mac-centeuro}\do{mac-roman}}
 \InputenxSlot{154}{0161}{\do{cp1250}\do{cp1252}}
+\InputenxSlot{154}{042A}{\do{cp866}\do{mac-cyrillic}}
+\InputenxSlot{154}{0459}{\do{cp1251}}
+\InputenxSlot{154}{045F}{\do{cp855}}
 \InputenxSlot{155}{00A2}{\do{cp437}}
 \InputenxSlot{155}{00DD}{\do{nextstep}}
-\InputenxSlot{155}{00F5}{\do{mac-roman}\do{mac-ce}}
+\InputenxSlot{155}{00F5}{\do{mac-centeuro}\do{mac-roman}}
 \InputenxSlot{155}{00F8}{\do{cp850}\do{cp858}\do{cp865}}
 \InputenxSlot{155}{0164}{\do{cp852}}
-\InputenxSlot{155}{203A}{\do{cp1250}\do{cp1252}\do{cp1257}}
+\InputenxSlot{155}{040F}{\do{cp855}}
+\InputenxSlot{155}{042B}{\do{cp866}\do{mac-cyrillic}}
+\InputenxSlot{155}{203A}{%
+  \do{cp1250}\do{cp1251}\do{cp1252}\do{cp1257}%
+}
 \InputenxSlot{156}{00A3}{%
   \do{cp437}\do{cp850}\do{cp858}\do{cp865}%
 }
+\InputenxSlot{156}{00B0}{\do{koi8-r}}
 \InputenxSlot{156}{00DE}{\do{nextstep}}
-\InputenxSlot{156}{00FA}{\do{mac-roman}\do{mac-ce}}
+\InputenxSlot{156}{00FA}{\do{mac-centeuro}\do{mac-roman}}
 \InputenxSlot{156}{0153}{\do{cp1252}}
 \InputenxSlot{156}{015B}{\do{cp1250}}
 \InputenxSlot{156}{0165}{\do{cp852}}
+\InputenxSlot{156}{042C}{\do{cp866}\do{mac-cyrillic}}
+\InputenxSlot{156}{044E}{\do{cp855}}
+\InputenxSlot{156}{045A}{\do{cp1251}}
 \InputenxSlot{157}{00A5}{\do{cp437}}
 \InputenxSlot{157}{00AF}{\do{cp1257}}
+\InputenxSlot{157}{00B2}{\do{koi8-r}}
 \InputenxSlot{157}{00B5}{\do{nextstep}}
 \InputenxSlot{157}{00D8}{\do{cp850}\do{cp858}\do{cp865}}
 \InputenxSlot{157}{00F9}{\do{mac-roman}}
-\InputenxSlot{157}{011A}{\do{mac-ce}}
+\InputenxSlot{157}{011A}{\do{mac-centeuro}}
 \InputenxSlot{157}{0141}{\do{cp852}}
 \InputenxSlot{157}{0165}{\do{cp1250}}
+\InputenxSlot{157}{042D}{\do{cp866}\do{mac-cyrillic}}
+\InputenxSlot{157}{042E}{\do{cp855}}
+\InputenxSlot{157}{045C}{\do{cp1251}}
+\InputenxSlot{158}{00B7}{\do{koi8-r}}
 \InputenxSlot{158}{00D7}{%
   \do{cp850}\do{cp852}\do{cp858}\do{nextstep}%
 }
 \InputenxSlot{158}{00FB}{\do{mac-roman}}
-\InputenxSlot{158}{011B}{\do{mac-ce}}
+\InputenxSlot{158}{011B}{\do{mac-centeuro}}
 \InputenxSlot{158}{017E}{\do{cp1250}\do{cp1252}}
 \InputenxSlot{158}{02DB}{\do{cp1257}}
+\InputenxSlot{158}{042E}{\do{cp866}\do{mac-cyrillic}}
+\InputenxSlot{158}{044A}{\do{cp855}}
+\InputenxSlot{158}{045B}{\do{cp1251}}
 \InputenxSlot{158}{20A7}{\do{cp437}\do{cp865}}
-\InputenxSlot{159}{00F7}{\do{nextstep}}
-\InputenxSlot{159}{00FC}{\do{mac-roman}\do{mac-ce}}
+\InputenxSlot{159}{00F7}{\do{koi8-r}\do{nextstep}}
+\InputenxSlot{159}{00FC}{\do{mac-centeuro}\do{mac-roman}}
 \InputenxSlot{159}{010D}{\do{cp852}}
 \InputenxSlot{159}{0178}{\do{cp1252}}
 \InputenxSlot{159}{017A}{\do{cp1250}}
 \InputenxSlot{159}{0192}{%
   \do{cp437}\do{cp850}\do{cp858}\do{cp865}%
 }
+\InputenxSlot{159}{042A}{\do{cp855}}
+\InputenxSlot{159}{042F}{\do{cp866}\do{mac-cyrillic}}
+\InputenxSlot{159}{045F}{\do{cp1251}}
 \InputenxSlot{160}{00A0}{%
   \do{iso-8859-1}\do{iso-8859-2}\do{iso-8859-3}\do{iso-8859-4}%
-  \do{iso-8859-9}\do{iso-8859-10}\do{iso-8859-13}\do{iso-8859-14}%
-  \do{iso-8859-15}\do{iso-8859-16}\do{cp1250}\do{cp1252}\do{cp1257}%
+  \do{iso-8859-5}\do{iso-8859-9}\do{iso-8859-10}\do{iso-8859-13}%
+  \do{iso-8859-14}\do{iso-8859-15}\do{iso-8859-16}\do{cp1250}%
+  \do{cp1251}\do{cp1252}\do{cp1257}%
 }
 \InputenxSlot{160}{00A9}{\do{nextstep}}
 \InputenxSlot{160}{00E1}{%
   \do{cp437}\do{cp850}\do{cp852}\do{cp858}\do{cp865}%
 }
-\InputenxSlot{160}{2020}{\do{mac-roman}\do{mac-ce}}
+\InputenxSlot{160}{0430}{\do{cp855}\do{cp866}}
+\InputenxSlot{160}{2020}{\do{mac-centeuro}\do{mac-cyrillic}\do{mac-roman}}
+\InputenxSlot{160}{2550}{\do{koi8-r}}
 \InputenxSlot{161}{00A1}{%
   \do{iso-8859-1}\do{iso-8859-9}\do{iso-8859-15}\do{cp1252}%
-  \do{nextstep}\do{dec-mcs}%
+  \do{dec-mcs}\do{nextstep}%
 }
-\InputenxSlot{161}{00B0}{\do{mac-roman}\do{mac-ce}}
+\InputenxSlot{161}{00B0}{\do{mac-centeuro}\do{mac-cyrillic}\do{mac-roman}}
 \InputenxSlot{161}{00ED}{%
   \do{cp437}\do{cp850}\do{cp852}\do{cp858}\do{cp865}%
 }
@@ -5201,25 +6535,36 @@ and the derived files
 }
 \InputenxSlot{161}{0126}{\do{iso-8859-3}}
 \InputenxSlot{161}{02C7}{\do{cp1250}}
+\InputenxSlot{161}{0401}{\do{iso-8859-5}}
+\InputenxSlot{161}{040E}{\do{cp1251}}
+\InputenxSlot{161}{0410}{\do{cp855}}
+\InputenxSlot{161}{0431}{\do{cp866}}
 \InputenxSlot{161}{1E02}{\do{iso-8859-14}}
 \InputenxSlot{161}{201D}{\do{iso-8859-13}}
+\InputenxSlot{161}{2551}{\do{koi8-r}}
 \InputenxSlot{162}{00A2}{%
   \do{iso-8859-1}\do{iso-8859-9}\do{iso-8859-13}\do{iso-8859-15}%
-  \do{cp1252}\do{cp1257}\do{mac-roman}\do{nextstep}\do{dec-mcs}%
+  \do{cp1252}\do{cp1257}\do{dec-mcs}\do{mac-roman}\do{nextstep}%
 }
 \InputenxSlot{162}{00F3}{%
   \do{cp437}\do{cp850}\do{cp852}\do{cp858}\do{cp865}%
 }
 \InputenxSlot{162}{0105}{\do{iso-8859-16}}
 \InputenxSlot{162}{0112}{\do{iso-8859-10}}
-\InputenxSlot{162}{0118}{\do{mac-ce}}
+\InputenxSlot{162}{0118}{\do{mac-centeuro}}
 \InputenxSlot{162}{0138}{\do{iso-8859-4}}
 \InputenxSlot{162}{02D8}{\do{iso-8859-2}\do{iso-8859-3}\do{cp1250}}
+\InputenxSlot{162}{0402}{\do{iso-8859-5}}
+\InputenxSlot{162}{0431}{\do{cp855}}
+\InputenxSlot{162}{0432}{\do{cp866}}
+\InputenxSlot{162}{045E}{\do{cp1251}}
+\InputenxSlot{162}{0490}{\do{mac-cyrillic}}
 \InputenxSlot{162}{1E03}{\do{iso-8859-14}}
+\InputenxSlot{162}{2552}{\do{koi8-r}}
 \InputenxSlot{163}{00A3}{%
   \do{iso-8859-1}\do{iso-8859-3}\do{iso-8859-9}\do{iso-8859-13}%
-  \do{iso-8859-14}\do{iso-8859-15}\do{cp1252}\do{cp1257}%
-  \do{mac-roman}\do{mac-ce}\do{nextstep}\do{dec-mcs}%
+  \do{iso-8859-14}\do{iso-8859-15}\do{cp1252}\do{cp1257}\do{dec-mcs}%
+  \do{mac-centeuro}\do{mac-cyrillic}\do{mac-roman}\do{nextstep}%
 }
 \InputenxSlot{163}{00FA}{%
   \do{cp437}\do{cp850}\do{cp852}\do{cp858}\do{cp865}%
@@ -5227,22 +6572,32 @@ and the derived files
 \InputenxSlot{163}{0122}{\do{iso-8859-10}}
 \InputenxSlot{163}{0141}{\do{iso-8859-2}\do{iso-8859-16}\do{cp1250}}
 \InputenxSlot{163}{0156}{\do{iso-8859-4}}
+\InputenxSlot{163}{0403}{\do{iso-8859-5}}
+\InputenxSlot{163}{0408}{\do{cp1251}}
+\InputenxSlot{163}{0411}{\do{cp855}}
+\InputenxSlot{163}{0433}{\do{cp866}}
+\InputenxSlot{163}{0451}{\do{koi8-r}}
 \InputenxSlot{164}{00A4}{%
   \do{iso-8859-1}\do{iso-8859-2}\do{iso-8859-3}\do{iso-8859-4}%
-  \do{iso-8859-9}\do{iso-8859-13}\do{cp1250}\do{cp1252}\do{cp1257}%
+  \do{iso-8859-9}\do{iso-8859-13}\do{cp1250}\do{cp1251}\do{cp1252}%
+  \do{cp1257}%
 }
-\InputenxSlot{164}{00A7}{\do{mac-roman}\do{mac-ce}}
+\InputenxSlot{164}{00A7}{\do{mac-centeuro}\do{mac-cyrillic}\do{mac-roman}}
 \InputenxSlot{164}{00F1}{%
   \do{cp437}\do{cp850}\do{cp858}\do{cp865}%
 }
 \InputenxSlot{164}{0104}{\do{cp852}}
 \InputenxSlot{164}{010A}{\do{iso-8859-14}}
 \InputenxSlot{164}{012A}{\do{iso-8859-10}}
+\InputenxSlot{164}{0404}{\do{iso-8859-5}}
+\InputenxSlot{164}{0434}{\do{cp866}}
+\InputenxSlot{164}{0446}{\do{cp855}}
 \InputenxSlot{164}{2044}{\do{nextstep}}
 \InputenxSlot{164}{20AC}{\do{iso-8859-15}\do{iso-8859-16}}
+\InputenxSlot{164}{2553}{\do{koi8-r}}
 \InputenxSlot{165}{00A5}{%
   \do{iso-8859-1}\do{iso-8859-9}\do{iso-8859-15}\do{cp1252}%
-  \do{nextstep}\do{dec-mcs}%
+  \do{dec-mcs}\do{nextstep}%
 }
 \InputenxSlot{165}{00D1}{%
   \do{cp437}\do{cp850}\do{cp858}\do{cp865}%
@@ -5252,16 +6607,21 @@ and the derived files
 \InputenxSlot{165}{010B}{\do{iso-8859-14}}
 \InputenxSlot{165}{0128}{\do{iso-8859-4}\do{iso-8859-10}}
 \InputenxSlot{165}{013D}{\do{iso-8859-2}}
+\InputenxSlot{165}{0405}{\do{iso-8859-5}}
+\InputenxSlot{165}{0426}{\do{cp855}}
+\InputenxSlot{165}{0435}{\do{cp866}}
+\InputenxSlot{165}{0490}{\do{cp1251}}
 \InputenxSlot{165}{201E}{\do{iso-8859-13}\do{iso-8859-16}}
-\InputenxSlot{165}{2022}{\do{mac-roman}\do{mac-ce}}
+\InputenxSlot{165}{2022}{\do{mac-centeuro}\do{mac-cyrillic}\do{mac-roman}}
+\InputenxSlot{165}{2554}{\do{koi8-r}}
 \InputenxSlot{166}{00A6}{%
   \do{iso-8859-1}\do{iso-8859-9}\do{iso-8859-13}\do{cp1250}%
-  \do{cp1252}\do{cp1257}%
+  \do{cp1251}\do{cp1252}\do{cp1257}%
 }
 \InputenxSlot{166}{00AA}{%
   \do{cp437}\do{cp850}\do{cp858}\do{cp865}%
 }
-\InputenxSlot{166}{00B6}{\do{mac-roman}\do{mac-ce}}
+\InputenxSlot{166}{00B6}{\do{mac-centeuro}\do{mac-cyrillic}\do{mac-roman}}
 \InputenxSlot{166}{0124}{\do{iso-8859-3}}
 \InputenxSlot{166}{0136}{\do{iso-8859-10}}
 \InputenxSlot{166}{013B}{\do{iso-8859-4}}
@@ -5269,24 +6629,33 @@ and the derived files
 \InputenxSlot{166}{0160}{\do{iso-8859-15}\do{iso-8859-16}}
 \InputenxSlot{166}{017D}{\do{cp852}}
 \InputenxSlot{166}{0192}{\do{nextstep}}
+\InputenxSlot{166}{0406}{\do{iso-8859-5}}
+\InputenxSlot{166}{0434}{\do{cp855}}
+\InputenxSlot{166}{0436}{\do{cp866}}
 \InputenxSlot{166}{1E0A}{\do{iso-8859-14}}
+\InputenxSlot{166}{2555}{\do{koi8-r}}
 \InputenxSlot{167}{00A7}{%
   \do{iso-8859-1}\do{iso-8859-2}\do{iso-8859-3}\do{iso-8859-4}%
   \do{iso-8859-9}\do{iso-8859-10}\do{iso-8859-13}\do{iso-8859-14}%
-  \do{iso-8859-15}\do{iso-8859-16}\do{cp1250}\do{cp1252}\do{cp1257}%
-  \do{nextstep}\do{dec-mcs}%
+  \do{iso-8859-15}\do{iso-8859-16}\do{cp1250}\do{cp1251}\do{cp1252}%
+  \do{cp1257}\do{dec-mcs}\do{nextstep}%
 }
 \InputenxSlot{167}{00BA}{%
   \do{cp437}\do{cp850}\do{cp858}\do{cp865}%
 }
-\InputenxSlot{167}{00DF}{\do{mac-roman}\do{mac-ce}}
+\InputenxSlot{167}{00DF}{\do{mac-centeuro}\do{mac-roman}}
 \InputenxSlot{167}{017E}{\do{cp852}}
-\InputenxSlot{168}{00A4}{\do{nextstep}\do{dec-mcs}}
+\InputenxSlot{167}{0406}{\do{mac-cyrillic}}
+\InputenxSlot{167}{0407}{\do{iso-8859-5}}
+\InputenxSlot{167}{0414}{\do{cp855}}
+\InputenxSlot{167}{0437}{\do{cp866}}
+\InputenxSlot{167}{2556}{\do{koi8-r}}
+\InputenxSlot{168}{00A4}{\do{dec-mcs}\do{nextstep}}
 \InputenxSlot{168}{00A8}{%
   \do{iso-8859-1}\do{iso-8859-2}\do{iso-8859-3}\do{iso-8859-4}%
   \do{iso-8859-9}\do{cp1250}\do{cp1252}%
 }
-\InputenxSlot{168}{00AE}{\do{mac-roman}\do{mac-ce}}
+\InputenxSlot{168}{00AE}{\do{mac-centeuro}\do{mac-cyrillic}\do{mac-roman}}
 \InputenxSlot{168}{00BF}{%
   \do{cp437}\do{cp850}\do{cp858}\do{cp865}%
 }
@@ -5294,18 +6663,28 @@ and the derived files
 \InputenxSlot{168}{0118}{\do{cp852}}
 \InputenxSlot{168}{013B}{\do{iso-8859-10}}
 \InputenxSlot{168}{0161}{\do{iso-8859-15}\do{iso-8859-16}}
+\InputenxSlot{168}{0401}{\do{cp1251}}
+\InputenxSlot{168}{0408}{\do{iso-8859-5}}
+\InputenxSlot{168}{0435}{\do{cp855}}
+\InputenxSlot{168}{0438}{\do{cp866}}
 \InputenxSlot{168}{1E80}{\do{iso-8859-14}}
+\InputenxSlot{168}{2557}{\do{koi8-r}}
 \InputenxSlot{169}{00A9}{%
   \do{iso-8859-1}\do{iso-8859-9}\do{iso-8859-13}\do{iso-8859-14}%
-  \do{iso-8859-15}\do{iso-8859-16}\do{cp1250}\do{cp1252}\do{cp1257}%
-  \do{mac-roman}\do{mac-ce}\do{dec-mcs}%
+  \do{iso-8859-15}\do{iso-8859-16}\do{cp1250}\do{cp1251}\do{cp1252}%
+  \do{cp1257}\do{dec-mcs}\do{mac-centeuro}\do{mac-cyrillic}%
+  \do{mac-roman}%
 }
 \InputenxSlot{169}{00AE}{\do{cp850}\do{cp858}}
 \InputenxSlot{169}{0110}{\do{iso-8859-10}}
 \InputenxSlot{169}{0119}{\do{cp852}}
 \InputenxSlot{169}{0130}{\do{iso-8859-3}}
 \InputenxSlot{169}{0160}{\do{iso-8859-2}\do{iso-8859-4}}
+\InputenxSlot{169}{0409}{\do{iso-8859-5}}
+\InputenxSlot{169}{0415}{\do{cp855}}
+\InputenxSlot{169}{0439}{\do{cp866}}
 \InputenxSlot{169}{2019}{\do{nextstep}}
+\InputenxSlot{169}{2558}{\do{koi8-r}}
 \InputenxSlot{170}{00AA}{%
   \do{iso-8859-1}\do{iso-8859-9}\do{iso-8859-15}\do{cp1252}%
   \do{dec-mcs}%
@@ -5318,29 +6697,39 @@ and the derived files
 \InputenxSlot{170}{015E}{\do{iso-8859-2}\do{iso-8859-3}\do{cp1250}}
 \InputenxSlot{170}{0160}{\do{iso-8859-10}}
 \InputenxSlot{170}{0218}{\do{iso-8859-16}}
+\InputenxSlot{170}{0404}{\do{cp1251}}
+\InputenxSlot{170}{040A}{\do{iso-8859-5}}
+\InputenxSlot{170}{043A}{\do{cp866}}
+\InputenxSlot{170}{0444}{\do{cp855}}
 \InputenxSlot{170}{1E82}{\do{iso-8859-14}}
 \InputenxSlot{170}{201C}{\do{nextstep}}
-\InputenxSlot{170}{2122}{\do{mac-roman}\do{mac-ce}}
+\InputenxSlot{170}{2122}{\do{mac-centeuro}\do{mac-cyrillic}\do{mac-roman}}
+\InputenxSlot{170}{2559}{\do{koi8-r}}
 \InputenxSlot{171}{00AB}{%
   \do{iso-8859-1}\do{iso-8859-9}\do{iso-8859-13}\do{iso-8859-15}%
-  \do{iso-8859-16}\do{cp1250}\do{cp1252}\do{cp1257}\do{nextstep}%
-  \do{dec-mcs}%
+  \do{iso-8859-16}\do{cp1250}\do{cp1251}\do{cp1252}\do{cp1257}%
+  \do{dec-mcs}\do{nextstep}%
 }
 \InputenxSlot{171}{00B4}{\do{mac-roman}}
 \InputenxSlot{171}{00BD}{%
   \do{cp437}\do{cp850}\do{cp858}\do{cp865}%
 }
-\InputenxSlot{171}{0119}{\do{mac-ce}}
+\InputenxSlot{171}{0119}{\do{mac-centeuro}}
 \InputenxSlot{171}{011E}{\do{iso-8859-3}}
 \InputenxSlot{171}{0122}{\do{iso-8859-4}}
 \InputenxSlot{171}{0164}{\do{iso-8859-2}}
 \InputenxSlot{171}{0166}{\do{iso-8859-10}}
 \InputenxSlot{171}{017A}{\do{cp852}}
+\InputenxSlot{171}{0402}{\do{mac-cyrillic}}
+\InputenxSlot{171}{040B}{\do{iso-8859-5}}
+\InputenxSlot{171}{0424}{\do{cp855}}
+\InputenxSlot{171}{043B}{\do{cp866}}
 \InputenxSlot{171}{1E0B}{\do{iso-8859-14}}
-\InputenxSlot{172}{00A8}{\do{mac-roman}\do{mac-ce}}
+\InputenxSlot{171}{255A}{\do{koi8-r}}
+\InputenxSlot{172}{00A8}{\do{mac-centeuro}\do{mac-roman}}
 \InputenxSlot{172}{00AC}{%
   \do{iso-8859-1}\do{iso-8859-9}\do{iso-8859-13}\do{iso-8859-15}%
-  \do{cp1250}\do{cp1252}\do{cp1257}%
+  \do{cp1250}\do{cp1251}\do{cp1252}\do{cp1257}%
 }
 \InputenxSlot{172}{00BC}{%
   \do{cp437}\do{cp850}\do{cp858}\do{cp865}%
@@ -5350,31 +6739,44 @@ and the derived files
 \InputenxSlot{172}{0166}{\do{iso-8859-4}}
 \InputenxSlot{172}{0179}{\do{iso-8859-2}\do{iso-8859-16}}
 \InputenxSlot{172}{017D}{\do{iso-8859-10}}
+\InputenxSlot{172}{040C}{\do{iso-8859-5}}
+\InputenxSlot{172}{0433}{\do{cp855}}
+\InputenxSlot{172}{043C}{\do{cp866}}
+\InputenxSlot{172}{0452}{\do{mac-cyrillic}}
 \InputenxSlot{172}{1EF2}{\do{iso-8859-14}}
 \InputenxSlot{172}{2039}{\do{nextstep}}
+\InputenxSlot{172}{255B}{\do{koi8-r}}
 \InputenxSlot{173}{00A1}{%
   \do{cp437}\do{cp850}\do{cp858}\do{cp865}%
 }
 \InputenxSlot{173}{00AD}{%
   \do{iso-8859-1}\do{iso-8859-2}\do{iso-8859-3}\do{iso-8859-4}%
-  \do{iso-8859-9}\do{iso-8859-10}\do{iso-8859-13}\do{iso-8859-14}%
-  \do{iso-8859-15}\do{iso-8859-16}\do{cp1250}\do{cp1252}\do{cp1257}%
+  \do{iso-8859-5}\do{iso-8859-9}\do{iso-8859-10}\do{iso-8859-13}%
+  \do{iso-8859-14}\do{iso-8859-15}\do{iso-8859-16}\do{cp1250}%
+  \do{cp1251}\do{cp1252}\do{cp1257}%
 }
 \InputenxSlot{173}{015F}{\do{cp852}}
+\InputenxSlot{173}{0413}{\do{cp855}}
+\InputenxSlot{173}{043D}{\do{cp866}}
 \InputenxSlot{173}{203A}{\do{nextstep}}
-\InputenxSlot{173}{2260}{\do{mac-roman}\do{mac-ce}}
+\InputenxSlot{173}{2260}{\do{mac-centeuro}\do{mac-cyrillic}\do{mac-roman}}
+\InputenxSlot{173}{255C}{\do{koi8-r}}
 \InputenxSlot{174}{00AB}{%
-  \do{cp437}\do{cp850}\do{cp852}\do{cp858}\do{cp865}%
+  \do{cp437}\do{cp850}\do{cp852}\do{cp855}\do{cp858}\do{cp865}%
 }
 \InputenxSlot{174}{00AE}{%
   \do{iso-8859-1}\do{iso-8859-9}\do{iso-8859-13}\do{iso-8859-14}%
-  \do{iso-8859-15}\do{cp1250}\do{cp1252}\do{cp1257}%
+  \do{iso-8859-15}\do{cp1250}\do{cp1251}\do{cp1252}\do{cp1257}%
 }
 \InputenxSlot{174}{00C6}{\do{mac-roman}}
-\InputenxSlot{174}{0123}{\do{mac-ce}}
+\InputenxSlot{174}{0123}{\do{mac-centeuro}}
 \InputenxSlot{174}{016A}{\do{iso-8859-10}}
 \InputenxSlot{174}{017A}{\do{iso-8859-16}}
 \InputenxSlot{174}{017D}{\do{iso-8859-2}\do{iso-8859-4}}
+\InputenxSlot{174}{0403}{\do{mac-cyrillic}}
+\InputenxSlot{174}{040E}{\do{iso-8859-5}}
+\InputenxSlot{174}{043E}{\do{cp866}}
+\InputenxSlot{174}{255D}{\do{koi8-r}}
 \InputenxSlot{174}{FB01}{\do{nextstep}}
 \InputenxSlot{175}{00A4}{\do{cp865}}
 \InputenxSlot{175}{00AF}{%
@@ -5382,41 +6784,53 @@ and the derived files
   \do{cp1252}%
 }
 \InputenxSlot{175}{00BB}{%
-  \do{cp437}\do{cp850}\do{cp852}\do{cp858}%
+  \do{cp437}\do{cp850}\do{cp852}\do{cp855}\do{cp858}%
 }
 \InputenxSlot{175}{00C6}{\do{iso-8859-13}\do{cp1257}}
 \InputenxSlot{175}{00D8}{\do{mac-roman}}
-\InputenxSlot{175}{012E}{\do{mac-ce}}
+\InputenxSlot{175}{012E}{\do{mac-centeuro}}
 \InputenxSlot{175}{014A}{\do{iso-8859-10}}
 \InputenxSlot{175}{0178}{\do{iso-8859-14}}
 \InputenxSlot{175}{017B}{%
   \do{iso-8859-2}\do{iso-8859-3}\do{iso-8859-16}\do{cp1250}%
 }
+\InputenxSlot{175}{0407}{\do{cp1251}}
+\InputenxSlot{175}{040F}{\do{iso-8859-5}}
+\InputenxSlot{175}{043F}{\do{cp866}}
+\InputenxSlot{175}{0453}{\do{mac-cyrillic}}
+\InputenxSlot{175}{255E}{\do{koi8-r}}
 \InputenxSlot{175}{FB02}{\do{nextstep}}
 \InputenxSlot{176}{00AE}{\do{nextstep}}
 \InputenxSlot{176}{00B0}{%
   \do{iso-8859-1}\do{iso-8859-2}\do{iso-8859-3}\do{iso-8859-4}%
   \do{iso-8859-9}\do{iso-8859-10}\do{iso-8859-13}\do{iso-8859-15}%
-  \do{iso-8859-16}\do{cp1250}\do{cp1252}\do{cp1257}\do{dec-mcs}%
+  \do{iso-8859-16}\do{cp1250}\do{cp1251}\do{cp1252}\do{cp1257}%
+  \do{dec-mcs}%
 }
-\InputenxSlot{176}{012F}{\do{mac-ce}}
+\InputenxSlot{176}{012F}{\do{mac-centeuro}}
+\InputenxSlot{176}{0410}{\do{iso-8859-5}}
 \InputenxSlot{176}{1E1E}{\do{iso-8859-14}}
-\InputenxSlot{176}{221E}{\do{mac-roman}}
+\InputenxSlot{176}{221E}{\do{mac-cyrillic}\do{mac-roman}}
+\InputenxSlot{176}{255F}{\do{koi8-r}}
 \InputenxSlot{176}{2591}{%
-  \do{cp437}\do{cp850}\do{cp852}\do{cp858}\do{cp865}%
+  \do{cp437}\do{cp850}\do{cp852}\do{cp855}\do{cp858}\do{cp865}%
+  \do{cp866}%
 }
 \InputenxSlot{177}{00B1}{%
   \do{iso-8859-1}\do{iso-8859-9}\do{iso-8859-13}\do{iso-8859-15}%
-  \do{iso-8859-16}\do{cp1250}\do{cp1252}\do{cp1257}\do{mac-roman}%
-  \do{dec-mcs}%
+  \do{iso-8859-16}\do{cp1250}\do{cp1251}\do{cp1252}\do{cp1257}%
+  \do{dec-mcs}\do{mac-cyrillic}\do{mac-roman}%
 }
 \InputenxSlot{177}{0105}{\do{iso-8859-2}\do{iso-8859-4}\do{iso-8859-10}}
 \InputenxSlot{177}{0127}{\do{iso-8859-3}}
-\InputenxSlot{177}{012A}{\do{mac-ce}}
+\InputenxSlot{177}{012A}{\do{mac-centeuro}}
+\InputenxSlot{177}{0411}{\do{iso-8859-5}}
 \InputenxSlot{177}{1E1F}{\do{iso-8859-14}}
 \InputenxSlot{177}{2013}{\do{nextstep}}
+\InputenxSlot{177}{2560}{\do{koi8-r}}
 \InputenxSlot{177}{2592}{%
-  \do{cp437}\do{cp850}\do{cp852}\do{cp858}\do{cp865}%
+  \do{cp437}\do{cp850}\do{cp852}\do{cp855}\do{cp858}\do{cp865}%
+  \do{cp866}%
 }
 \InputenxSlot{178}{00B2}{%
   \do{iso-8859-1}\do{iso-8859-3}\do{iso-8859-9}\do{iso-8859-13}%
@@ -5426,10 +6840,14 @@ and the derived files
 \InputenxSlot{178}{0113}{\do{iso-8859-10}}
 \InputenxSlot{178}{0120}{\do{iso-8859-14}}
 \InputenxSlot{178}{02DB}{\do{iso-8859-2}\do{iso-8859-4}\do{cp1250}}
+\InputenxSlot{178}{0406}{\do{cp1251}}
+\InputenxSlot{178}{0412}{\do{iso-8859-5}}
 \InputenxSlot{178}{2020}{\do{nextstep}}
-\InputenxSlot{178}{2264}{\do{mac-roman}\do{mac-ce}}
+\InputenxSlot{178}{2264}{\do{mac-centeuro}\do{mac-cyrillic}\do{mac-roman}}
+\InputenxSlot{178}{2561}{\do{koi8-r}}
 \InputenxSlot{178}{2593}{%
-  \do{cp437}\do{cp850}\do{cp852}\do{cp858}\do{cp865}%
+  \do{cp437}\do{cp850}\do{cp852}\do{cp855}\do{cp858}\do{cp865}%
+  \do{cp866}%
 }
 \InputenxSlot{179}{00B3}{%
   \do{iso-8859-1}\do{iso-8859-3}\do{iso-8859-9}\do{iso-8859-13}%
@@ -5439,10 +6857,14 @@ and the derived files
 \InputenxSlot{179}{0123}{\do{iso-8859-10}}
 \InputenxSlot{179}{0142}{\do{iso-8859-2}\do{iso-8859-16}\do{cp1250}}
 \InputenxSlot{179}{0157}{\do{iso-8859-4}}
+\InputenxSlot{179}{0401}{\do{koi8-r}}
+\InputenxSlot{179}{0413}{\do{iso-8859-5}}
+\InputenxSlot{179}{0456}{\do{cp1251}}
 \InputenxSlot{179}{2021}{\do{nextstep}}
-\InputenxSlot{179}{2265}{\do{mac-roman}\do{mac-ce}}
+\InputenxSlot{179}{2265}{\do{mac-centeuro}\do{mac-cyrillic}\do{mac-roman}}
 \InputenxSlot{179}{2502}{%
-  \do{cp437}\do{cp850}\do{cp852}\do{cp858}\do{cp865}%
+  \do{cp437}\do{cp850}\do{cp852}\do{cp855}\do{cp858}\do{cp865}%
+  \do{cp866}%
 }
 \InputenxSlot{180}{00A5}{\do{mac-roman}}
 \InputenxSlot{180}{00B4}{%
@@ -5450,50 +6872,66 @@ and the derived files
   \do{iso-8859-9}\do{cp1250}\do{cp1252}\do{cp1257}%
 }
 \InputenxSlot{180}{00B7}{\do{nextstep}}
-\InputenxSlot{180}{012B}{\do{iso-8859-10}\do{mac-ce}}
+\InputenxSlot{180}{012B}{\do{iso-8859-10}\do{mac-centeuro}}
 \InputenxSlot{180}{017D}{\do{iso-8859-15}\do{iso-8859-16}}
+\InputenxSlot{180}{0414}{\do{iso-8859-5}}
+\InputenxSlot{180}{0456}{\do{mac-cyrillic}}
+\InputenxSlot{180}{0491}{\do{cp1251}}
 \InputenxSlot{180}{1E40}{\do{iso-8859-14}}
 \InputenxSlot{180}{201C}{\do{iso-8859-13}}
 \InputenxSlot{180}{2524}{%
-  \do{cp437}\do{cp850}\do{cp852}\do{cp858}\do{cp865}%
+  \do{cp437}\do{cp850}\do{cp852}\do{cp855}\do{cp858}\do{cp865}%
+  \do{cp866}%
 }
+\InputenxSlot{180}{2562}{\do{koi8-r}}
 \InputenxSlot{181}{00A6}{\do{nextstep}}
 \InputenxSlot{181}{00B5}{%
   \do{iso-8859-1}\do{iso-8859-3}\do{iso-8859-9}\do{iso-8859-13}%
-  \do{iso-8859-15}\do{cp1250}\do{cp1252}\do{cp1257}\do{mac-roman}%
-  \do{dec-mcs}%
+  \do{iso-8859-15}\do{cp1250}\do{cp1251}\do{cp1252}\do{cp1257}%
+  \do{dec-mcs}\do{mac-cyrillic}\do{mac-roman}%
 }
 \InputenxSlot{181}{00C1}{\do{cp850}\do{cp852}\do{cp858}}
 \InputenxSlot{181}{0129}{\do{iso-8859-4}\do{iso-8859-10}}
-\InputenxSlot{181}{0136}{\do{mac-ce}}
+\InputenxSlot{181}{0136}{\do{mac-centeuro}}
 \InputenxSlot{181}{013E}{\do{iso-8859-2}}
+\InputenxSlot{181}{0415}{\do{iso-8859-5}}
+\InputenxSlot{181}{0445}{\do{cp855}}
 \InputenxSlot{181}{1E41}{\do{iso-8859-14}}
 \InputenxSlot{181}{201D}{\do{iso-8859-16}}
-\InputenxSlot{181}{2561}{\do{cp437}\do{cp865}}
+\InputenxSlot{181}{2561}{\do{cp437}\do{cp865}\do{cp866}}
+\InputenxSlot{181}{2563}{\do{koi8-r}}
 \InputenxSlot{182}{00B6}{%
   \do{iso-8859-1}\do{iso-8859-9}\do{iso-8859-13}\do{iso-8859-14}%
-  \do{iso-8859-15}\do{iso-8859-16}\do{cp1250}\do{cp1252}\do{cp1257}%
-  \do{nextstep}\do{dec-mcs}%
+  \do{iso-8859-15}\do{iso-8859-16}\do{cp1250}\do{cp1251}\do{cp1252}%
+  \do{cp1257}\do{dec-mcs}\do{nextstep}%
 }
 \InputenxSlot{182}{00C2}{\do{cp850}\do{cp852}\do{cp858}}
 \InputenxSlot{182}{0125}{\do{iso-8859-3}}
 \InputenxSlot{182}{0137}{\do{iso-8859-10}}
 \InputenxSlot{182}{013C}{\do{iso-8859-4}}
 \InputenxSlot{182}{015B}{\do{iso-8859-2}}
-\InputenxSlot{182}{2202}{\do{mac-roman}\do{mac-ce}}
-\InputenxSlot{182}{2562}{\do{cp437}\do{cp865}}
+\InputenxSlot{182}{0416}{\do{iso-8859-5}}
+\InputenxSlot{182}{0425}{\do{cp855}}
+\InputenxSlot{182}{0491}{\do{mac-cyrillic}}
+\InputenxSlot{182}{2202}{\do{mac-centeuro}\do{mac-roman}}
+\InputenxSlot{182}{2562}{\do{cp437}\do{cp865}\do{cp866}}
+\InputenxSlot{182}{2564}{\do{koi8-r}}
 \InputenxSlot{183}{00B7}{%
   \do{iso-8859-1}\do{iso-8859-3}\do{iso-8859-9}\do{iso-8859-10}%
   \do{iso-8859-13}\do{iso-8859-15}\do{iso-8859-16}\do{cp1250}%
-  \do{cp1252}\do{cp1257}\do{dec-mcs}%
+  \do{cp1251}\do{cp1252}\do{cp1257}\do{dec-mcs}%
 }
 \InputenxSlot{183}{00C0}{\do{cp850}\do{cp858}}
 \InputenxSlot{183}{011A}{\do{cp852}}
 \InputenxSlot{183}{02C7}{\do{iso-8859-2}\do{iso-8859-4}}
+\InputenxSlot{183}{0408}{\do{mac-cyrillic}}
+\InputenxSlot{183}{0417}{\do{iso-8859-5}}
+\InputenxSlot{183}{0438}{\do{cp855}}
 \InputenxSlot{183}{1E56}{\do{iso-8859-14}}
 \InputenxSlot{183}{2022}{\do{nextstep}}
-\InputenxSlot{183}{2211}{\do{mac-roman}\do{mac-ce}}
-\InputenxSlot{183}{2556}{\do{cp437}\do{cp865}}
+\InputenxSlot{183}{2211}{\do{mac-centeuro}\do{mac-roman}}
+\InputenxSlot{183}{2556}{\do{cp437}\do{cp865}\do{cp866}}
+\InputenxSlot{183}{2565}{\do{koi8-r}}
 \InputenxSlot{184}{00A9}{\do{cp850}\do{cp858}}
 \InputenxSlot{184}{00B8}{%
   \do{iso-8859-1}\do{iso-8859-2}\do{iso-8859-3}\do{iso-8859-4}%
@@ -5501,13 +6939,17 @@ and the derived files
 }
 \InputenxSlot{184}{00F8}{\do{iso-8859-13}\do{cp1257}}
 \InputenxSlot{184}{013C}{\do{iso-8859-10}}
-\InputenxSlot{184}{0142}{\do{mac-ce}}
+\InputenxSlot{184}{0142}{\do{mac-centeuro}}
 \InputenxSlot{184}{015E}{\do{cp852}}
 \InputenxSlot{184}{017E}{\do{iso-8859-15}\do{iso-8859-16}}
+\InputenxSlot{184}{0404}{\do{mac-cyrillic}}
+\InputenxSlot{184}{0418}{\do{iso-8859-5}\do{cp855}}
+\InputenxSlot{184}{0451}{\do{cp1251}}
 \InputenxSlot{184}{1E81}{\do{iso-8859-14}}
 \InputenxSlot{184}{201A}{\do{nextstep}}
 \InputenxSlot{184}{220F}{\do{mac-roman}}
-\InputenxSlot{184}{2555}{\do{cp437}\do{cp865}}
+\InputenxSlot{184}{2555}{\do{cp437}\do{cp865}\do{cp866}}
+\InputenxSlot{184}{2566}{\do{koi8-r}}
 \InputenxSlot{185}{00B9}{%
   \do{iso-8859-1}\do{iso-8859-9}\do{iso-8859-13}\do{iso-8859-15}%
   \do{cp1252}\do{cp1257}\do{dec-mcs}%
@@ -5516,45 +6958,59 @@ and the derived files
 \InputenxSlot{185}{010D}{\do{iso-8859-16}}
 \InputenxSlot{185}{0111}{\do{iso-8859-10}}
 \InputenxSlot{185}{0131}{\do{iso-8859-3}}
-\InputenxSlot{185}{013B}{\do{mac-ce}}
+\InputenxSlot{185}{013B}{\do{mac-centeuro}}
 \InputenxSlot{185}{0161}{\do{iso-8859-2}\do{iso-8859-4}}
 \InputenxSlot{185}{03C0}{\do{mac-roman}}
+\InputenxSlot{185}{0419}{\do{iso-8859-5}}
+\InputenxSlot{185}{0454}{\do{mac-cyrillic}}
 \InputenxSlot{185}{1E57}{\do{iso-8859-14}}
 \InputenxSlot{185}{201E}{\do{nextstep}}
+\InputenxSlot{185}{2116}{\do{cp1251}}
 \InputenxSlot{185}{2563}{%
-  \do{cp437}\do{cp850}\do{cp852}\do{cp858}\do{cp865}%
+  \do{cp437}\do{cp850}\do{cp852}\do{cp855}\do{cp858}\do{cp865}%
+  \do{cp866}%
 }
+\InputenxSlot{185}{2567}{\do{koi8-r}}
 \InputenxSlot{186}{00BA}{%
   \do{iso-8859-1}\do{iso-8859-9}\do{iso-8859-15}\do{cp1252}%
   \do{dec-mcs}%
 }
 \InputenxSlot{186}{0113}{\do{iso-8859-4}}
-\InputenxSlot{186}{013C}{\do{mac-ce}}
+\InputenxSlot{186}{013C}{\do{mac-centeuro}}
 \InputenxSlot{186}{0157}{\do{iso-8859-13}\do{cp1257}}
 \InputenxSlot{186}{015F}{\do{iso-8859-2}\do{iso-8859-3}\do{cp1250}}
 \InputenxSlot{186}{0161}{\do{iso-8859-10}}
 \InputenxSlot{186}{0219}{\do{iso-8859-16}}
+\InputenxSlot{186}{0407}{\do{mac-cyrillic}}
+\InputenxSlot{186}{041A}{\do{iso-8859-5}}
+\InputenxSlot{186}{0454}{\do{cp1251}}
 \InputenxSlot{186}{1E83}{\do{iso-8859-14}}
 \InputenxSlot{186}{201D}{\do{nextstep}}
 \InputenxSlot{186}{222B}{\do{mac-roman}}
 \InputenxSlot{186}{2551}{%
-  \do{cp437}\do{cp850}\do{cp852}\do{cp858}\do{cp865}%
+  \do{cp437}\do{cp850}\do{cp852}\do{cp855}\do{cp858}\do{cp865}%
+  \do{cp866}%
 }
+\InputenxSlot{186}{2568}{\do{koi8-r}}
 \InputenxSlot{187}{00AA}{\do{mac-roman}}
 \InputenxSlot{187}{00BB}{%
   \do{iso-8859-1}\do{iso-8859-9}\do{iso-8859-13}\do{iso-8859-15}%
-  \do{iso-8859-16}\do{cp1250}\do{cp1252}\do{cp1257}\do{nextstep}%
-  \do{dec-mcs}%
+  \do{iso-8859-16}\do{cp1250}\do{cp1251}\do{cp1252}\do{cp1257}%
+  \do{dec-mcs}\do{nextstep}%
 }
 \InputenxSlot{187}{011F}{\do{iso-8859-3}}
 \InputenxSlot{187}{0123}{\do{iso-8859-4}}
-\InputenxSlot{187}{013D}{\do{mac-ce}}
+\InputenxSlot{187}{013D}{\do{mac-centeuro}}
 \InputenxSlot{187}{0165}{\do{iso-8859-2}}
 \InputenxSlot{187}{0167}{\do{iso-8859-10}}
+\InputenxSlot{187}{041B}{\do{iso-8859-5}}
+\InputenxSlot{187}{0457}{\do{mac-cyrillic}}
 \InputenxSlot{187}{1E60}{\do{iso-8859-14}}
 \InputenxSlot{187}{2557}{%
-  \do{cp437}\do{cp850}\do{cp852}\do{cp858}\do{cp865}%
+  \do{cp437}\do{cp850}\do{cp852}\do{cp855}\do{cp858}\do{cp865}%
+  \do{cp866}%
 }
+\InputenxSlot{187}{2569}{\do{koi8-r}}
 \InputenxSlot{188}{00BA}{\do{mac-roman}}
 \InputenxSlot{188}{00BC}{%
   \do{iso-8859-1}\do{iso-8859-9}\do{iso-8859-13}\do{cp1252}%
@@ -5562,30 +7018,40 @@ and the derived files
 }
 \InputenxSlot{188}{0135}{\do{iso-8859-3}}
 \InputenxSlot{188}{013D}{\do{cp1250}}
-\InputenxSlot{188}{013E}{\do{mac-ce}}
+\InputenxSlot{188}{013E}{\do{mac-centeuro}}
 \InputenxSlot{188}{0152}{\do{iso-8859-15}\do{iso-8859-16}}
 \InputenxSlot{188}{0167}{\do{iso-8859-4}}
 \InputenxSlot{188}{017A}{\do{iso-8859-2}}
 \InputenxSlot{188}{017E}{\do{iso-8859-10}}
+\InputenxSlot{188}{0409}{\do{mac-cyrillic}}
+\InputenxSlot{188}{041C}{\do{iso-8859-5}}
+\InputenxSlot{188}{0458}{\do{cp1251}}
 \InputenxSlot{188}{1EF3}{\do{iso-8859-14}}
 \InputenxSlot{188}{2026}{\do{nextstep}}
 \InputenxSlot{188}{255D}{%
-  \do{cp437}\do{cp850}\do{cp852}\do{cp858}\do{cp865}%
+  \do{cp437}\do{cp850}\do{cp852}\do{cp855}\do{cp858}\do{cp865}%
+  \do{cp866}%
 }
+\InputenxSlot{188}{256A}{\do{koi8-r}}
 \InputenxSlot{189}{00A2}{\do{cp850}\do{cp858}}
 \InputenxSlot{189}{00BD}{%
   \do{iso-8859-1}\do{iso-8859-3}\do{iso-8859-9}\do{iso-8859-13}%
   \do{cp1252}\do{cp1257}\do{dec-mcs}%
 }
-\InputenxSlot{189}{0139}{\do{mac-ce}}
+\InputenxSlot{189}{0139}{\do{mac-centeuro}}
 \InputenxSlot{189}{014A}{\do{iso-8859-4}}
 \InputenxSlot{189}{0153}{\do{iso-8859-15}\do{iso-8859-16}}
 \InputenxSlot{189}{017B}{\do{cp852}}
 \InputenxSlot{189}{02DD}{\do{iso-8859-2}\do{cp1250}}
 \InputenxSlot{189}{03A9}{\do{mac-roman}}
+\InputenxSlot{189}{0405}{\do{cp1251}}
+\InputenxSlot{189}{041D}{\do{iso-8859-5}}
+\InputenxSlot{189}{0439}{\do{cp855}}
+\InputenxSlot{189}{0459}{\do{mac-cyrillic}}
 \InputenxSlot{189}{1E84}{\do{iso-8859-14}}
 \InputenxSlot{189}{2030}{\do{nextstep}}
-\InputenxSlot{189}{255C}{\do{cp437}\do{cp865}}
+\InputenxSlot{189}{255C}{\do{cp437}\do{cp865}\do{cp866}}
+\InputenxSlot{189}{256B}{\do{koi8-r}}
 \InputenxSlot{190}{00A5}{\do{cp850}\do{cp858}}
 \InputenxSlot{190}{00AC}{\do{nextstep}}
 \InputenxSlot{190}{00BE}{%
@@ -5593,28 +7059,38 @@ and the derived files
   \do{cp1257}%
 }
 \InputenxSlot{190}{00E6}{\do{mac-roman}}
-\InputenxSlot{190}{013A}{\do{mac-ce}}
+\InputenxSlot{190}{013A}{\do{mac-centeuro}}
 \InputenxSlot{190}{013E}{\do{cp1250}}
 \InputenxSlot{190}{016B}{\do{iso-8859-10}}
 \InputenxSlot{190}{0178}{\do{iso-8859-15}\do{iso-8859-16}}
 \InputenxSlot{190}{017C}{\do{cp852}}
 \InputenxSlot{190}{017E}{\do{iso-8859-2}\do{iso-8859-4}}
+\InputenxSlot{190}{040A}{\do{mac-cyrillic}}
+\InputenxSlot{190}{0419}{\do{cp855}}
+\InputenxSlot{190}{041E}{\do{iso-8859-5}}
+\InputenxSlot{190}{0455}{\do{cp1251}}
 \InputenxSlot{190}{1E85}{\do{iso-8859-14}}
-\InputenxSlot{190}{255B}{\do{cp437}\do{cp865}}
+\InputenxSlot{190}{255B}{\do{cp437}\do{cp865}\do{cp866}}
+\InputenxSlot{190}{256C}{\do{koi8-r}}
+\InputenxSlot{191}{00A9}{\do{koi8-r}}
 \InputenxSlot{191}{00BF}{%
   \do{iso-8859-1}\do{iso-8859-9}\do{iso-8859-15}\do{cp1252}%
-  \do{nextstep}\do{dec-mcs}%
+  \do{dec-mcs}\do{nextstep}%
 }
 \InputenxSlot{191}{00E6}{\do{iso-8859-13}\do{cp1257}}
 \InputenxSlot{191}{00F8}{\do{mac-roman}}
-\InputenxSlot{191}{0145}{\do{mac-ce}}
+\InputenxSlot{191}{0145}{\do{mac-centeuro}}
 \InputenxSlot{191}{014B}{\do{iso-8859-4}\do{iso-8859-10}}
 \InputenxSlot{191}{017C}{%
   \do{iso-8859-2}\do{iso-8859-3}\do{iso-8859-16}\do{cp1250}%
 }
+\InputenxSlot{191}{041F}{\do{iso-8859-5}}
+\InputenxSlot{191}{0457}{\do{cp1251}}
+\InputenxSlot{191}{045A}{\do{mac-cyrillic}}
 \InputenxSlot{191}{1E61}{\do{iso-8859-14}}
 \InputenxSlot{191}{2510}{%
-  \do{cp437}\do{cp850}\do{cp852}\do{cp858}\do{cp865}%
+  \do{cp437}\do{cp850}\do{cp852}\do{cp855}\do{cp858}\do{cp865}%
+  \do{cp866}%
 }
 \InputenxSlot{192}{00B9}{\do{nextstep}}
 \InputenxSlot{192}{00BF}{\do{mac-roman}}
@@ -5624,10 +7100,15 @@ and the derived files
 }
 \InputenxSlot{192}{0100}{\do{iso-8859-4}\do{iso-8859-10}}
 \InputenxSlot{192}{0104}{\do{iso-8859-13}\do{cp1257}}
-\InputenxSlot{192}{0146}{\do{mac-ce}}
+\InputenxSlot{192}{0146}{\do{mac-centeuro}}
 \InputenxSlot{192}{0154}{\do{iso-8859-2}\do{cp1250}}
+\InputenxSlot{192}{0410}{\do{cp1251}}
+\InputenxSlot{192}{0420}{\do{iso-8859-5}}
+\InputenxSlot{192}{044E}{\do{koi8-r}}
+\InputenxSlot{192}{0458}{\do{mac-cyrillic}}
 \InputenxSlot{192}{2514}{%
-  \do{cp437}\do{cp850}\do{cp852}\do{cp858}\do{cp865}%
+  \do{cp437}\do{cp850}\do{cp852}\do{cp855}\do{cp858}\do{cp865}%
+  \do{cp866}%
 }
 \InputenxSlot{193}{00A1}{\do{mac-roman}}
 \InputenxSlot{193}{00C1}{%
@@ -5636,12 +7117,17 @@ and the derived files
   \do{iso-8859-16}\do{cp1250}\do{cp1252}\do{dec-mcs}%
 }
 \InputenxSlot{193}{012E}{\do{iso-8859-13}\do{cp1257}}
-\InputenxSlot{193}{0143}{\do{mac-ce}}
+\InputenxSlot{193}{0143}{\do{mac-centeuro}}
 \InputenxSlot{193}{02CB}{\do{nextstep}}
+\InputenxSlot{193}{0405}{\do{mac-cyrillic}}
+\InputenxSlot{193}{0411}{\do{cp1251}}
+\InputenxSlot{193}{0421}{\do{iso-8859-5}}
+\InputenxSlot{193}{0430}{\do{koi8-r}}
 \InputenxSlot{193}{2534}{%
-  \do{cp437}\do{cp850}\do{cp852}\do{cp858}\do{cp865}%
+  \do{cp437}\do{cp850}\do{cp852}\do{cp855}\do{cp858}\do{cp865}%
+  \do{cp866}%
 }
-\InputenxSlot{194}{00AC}{\do{mac-roman}\do{mac-ce}}
+\InputenxSlot{194}{00AC}{\do{mac-centeuro}\do{mac-cyrillic}\do{mac-roman}}
 \InputenxSlot{194}{00B4}{\do{nextstep}}
 \InputenxSlot{194}{00C2}{%
   \do{iso-8859-1}\do{iso-8859-2}\do{iso-8859-3}\do{iso-8859-4}%
@@ -5649,8 +7135,12 @@ and the derived files
   \do{iso-8859-16}\do{cp1250}\do{cp1252}\do{dec-mcs}%
 }
 \InputenxSlot{194}{0100}{\do{iso-8859-13}\do{cp1257}}
+\InputenxSlot{194}{0412}{\do{cp1251}}
+\InputenxSlot{194}{0422}{\do{iso-8859-5}}
+\InputenxSlot{194}{0431}{\do{koi8-r}}
 \InputenxSlot{194}{252C}{%
-  \do{cp437}\do{cp850}\do{cp852}\do{cp858}\do{cp865}%
+  \do{cp437}\do{cp850}\do{cp852}\do{cp855}\do{cp858}\do{cp865}%
+  \do{cp866}%
 }
 \InputenxSlot{195}{00C3}{%
   \do{iso-8859-1}\do{iso-8859-4}\do{iso-8859-9}\do{iso-8859-10}%
@@ -5659,9 +7149,13 @@ and the derived files
 \InputenxSlot{195}{0102}{\do{iso-8859-2}\do{iso-8859-16}\do{cp1250}}
 \InputenxSlot{195}{0106}{\do{iso-8859-13}\do{cp1257}}
 \InputenxSlot{195}{02C6}{\do{nextstep}}
-\InputenxSlot{195}{221A}{\do{mac-roman}\do{mac-ce}}
+\InputenxSlot{195}{0413}{\do{cp1251}}
+\InputenxSlot{195}{0423}{\do{iso-8859-5}}
+\InputenxSlot{195}{0446}{\do{koi8-r}}
+\InputenxSlot{195}{221A}{\do{mac-centeuro}\do{mac-cyrillic}\do{mac-roman}}
 \InputenxSlot{195}{251C}{%
-  \do{cp437}\do{cp850}\do{cp852}\do{cp858}\do{cp865}%
+  \do{cp437}\do{cp850}\do{cp852}\do{cp855}\do{cp858}\do{cp865}%
+  \do{cp866}%
 }
 \InputenxSlot{196}{00C4}{%
   \do{iso-8859-1}\do{iso-8859-2}\do{iso-8859-3}\do{iso-8859-4}%
@@ -5669,11 +7163,15 @@ and the derived files
   \do{iso-8859-15}\do{iso-8859-16}\do{cp1250}\do{cp1252}\do{cp1257}%
   \do{dec-mcs}%
 }
-\InputenxSlot{196}{0144}{\do{mac-ce}}
-\InputenxSlot{196}{0192}{\do{mac-roman}}
+\InputenxSlot{196}{0144}{\do{mac-centeuro}}
+\InputenxSlot{196}{0192}{\do{mac-cyrillic}\do{mac-roman}}
 \InputenxSlot{196}{02DC}{\do{nextstep}}
+\InputenxSlot{196}{0414}{\do{cp1251}}
+\InputenxSlot{196}{0424}{\do{iso-8859-5}}
+\InputenxSlot{196}{0434}{\do{koi8-r}}
 \InputenxSlot{196}{2500}{%
-  \do{cp437}\do{cp850}\do{cp852}\do{cp858}\do{cp865}%
+  \do{cp437}\do{cp850}\do{cp852}\do{cp855}\do{cp858}\do{cp865}%
+  \do{cp866}%
 }
 \InputenxSlot{197}{00AF}{\do{nextstep}}
 \InputenxSlot{197}{00C5}{%
@@ -5684,10 +7182,14 @@ and the derived files
 \InputenxSlot{197}{0106}{\do{iso-8859-16}}
 \InputenxSlot{197}{010A}{\do{iso-8859-3}}
 \InputenxSlot{197}{0139}{\do{iso-8859-2}\do{cp1250}}
-\InputenxSlot{197}{0147}{\do{mac-ce}}
-\InputenxSlot{197}{2248}{\do{mac-roman}}
+\InputenxSlot{197}{0147}{\do{mac-centeuro}}
+\InputenxSlot{197}{0415}{\do{cp1251}}
+\InputenxSlot{197}{0425}{\do{iso-8859-5}}
+\InputenxSlot{197}{0435}{\do{koi8-r}}
+\InputenxSlot{197}{2248}{\do{mac-cyrillic}\do{mac-roman}}
 \InputenxSlot{197}{253C}{%
-  \do{cp437}\do{cp850}\do{cp852}\do{cp858}\do{cp865}%
+  \do{cp437}\do{cp850}\do{cp852}\do{cp855}\do{cp858}\do{cp865}%
+  \do{cp866}%
 }
 \InputenxSlot{198}{00C6}{%
   \do{iso-8859-1}\do{iso-8859-4}\do{iso-8859-9}\do{iso-8859-10}%
@@ -5700,9 +7202,13 @@ and the derived files
 \InputenxSlot{198}{0108}{\do{iso-8859-3}}
 \InputenxSlot{198}{0118}{\do{iso-8859-13}\do{cp1257}}
 \InputenxSlot{198}{02D8}{\do{nextstep}}
-\InputenxSlot{198}{2206}{\do{mac-roman}\do{mac-ce}}
-\InputenxSlot{198}{255E}{\do{cp437}\do{cp865}}
-\InputenxSlot{199}{00AB}{\do{mac-roman}\do{mac-ce}}
+\InputenxSlot{198}{0416}{\do{cp1251}}
+\InputenxSlot{198}{0426}{\do{iso-8859-5}}
+\InputenxSlot{198}{043A}{\do{cp855}}
+\InputenxSlot{198}{0444}{\do{koi8-r}}
+\InputenxSlot{198}{2206}{\do{mac-centeuro}\do{mac-cyrillic}\do{mac-roman}}
+\InputenxSlot{198}{255E}{\do{cp437}\do{cp865}\do{cp866}}
+\InputenxSlot{199}{00AB}{\do{mac-centeuro}\do{mac-cyrillic}\do{mac-roman}}
 \InputenxSlot{199}{00C3}{\do{cp850}\do{cp858}}
 \InputenxSlot{199}{00C7}{%
   \do{iso-8859-1}\do{iso-8859-2}\do{iso-8859-3}\do{iso-8859-9}%
@@ -5713,9 +7219,13 @@ and the derived files
 \InputenxSlot{199}{0112}{\do{iso-8859-13}\do{cp1257}}
 \InputenxSlot{199}{012E}{\do{iso-8859-4}\do{iso-8859-10}}
 \InputenxSlot{199}{02D9}{\do{nextstep}}
-\InputenxSlot{199}{255F}{\do{cp437}\do{cp865}}
+\InputenxSlot{199}{0417}{\do{cp1251}}
+\InputenxSlot{199}{041A}{\do{cp855}}
+\InputenxSlot{199}{0427}{\do{iso-8859-5}}
+\InputenxSlot{199}{0433}{\do{koi8-r}}
+\InputenxSlot{199}{255F}{\do{cp437}\do{cp865}\do{cp866}}
 \InputenxSlot{200}{00A8}{\do{nextstep}}
-\InputenxSlot{200}{00BB}{\do{mac-roman}\do{mac-ce}}
+\InputenxSlot{200}{00BB}{\do{mac-centeuro}\do{mac-cyrillic}\do{mac-roman}}
 \InputenxSlot{200}{00C8}{%
   \do{iso-8859-1}\do{iso-8859-3}\do{iso-8859-9}\do{iso-8859-14}%
   \do{iso-8859-15}\do{iso-8859-16}\do{cp1252}\do{dec-mcs}%
@@ -5724,8 +7234,12 @@ and the derived files
   \do{iso-8859-2}\do{iso-8859-4}\do{iso-8859-10}\do{iso-8859-13}%
   \do{cp1250}\do{cp1257}%
 }
+\InputenxSlot{200}{0418}{\do{cp1251}}
+\InputenxSlot{200}{0428}{\do{iso-8859-5}}
+\InputenxSlot{200}{0445}{\do{koi8-r}}
 \InputenxSlot{200}{255A}{%
-  \do{cp437}\do{cp850}\do{cp852}\do{cp858}\do{cp865}%
+  \do{cp437}\do{cp850}\do{cp852}\do{cp855}\do{cp858}\do{cp865}%
+  \do{cp866}%
 }
 \InputenxSlot{201}{00B2}{\do{nextstep}}
 \InputenxSlot{201}{00C9}{%
@@ -5734,11 +7248,15 @@ and the derived files
   \do{iso-8859-15}\do{iso-8859-16}\do{cp1250}\do{cp1252}\do{cp1257}%
   \do{dec-mcs}%
 }
-\InputenxSlot{201}{2026}{\do{mac-roman}\do{mac-ce}}
+\InputenxSlot{201}{0419}{\do{cp1251}}
+\InputenxSlot{201}{0429}{\do{iso-8859-5}}
+\InputenxSlot{201}{0438}{\do{koi8-r}}
+\InputenxSlot{201}{2026}{\do{mac-centeuro}\do{mac-cyrillic}\do{mac-roman}}
 \InputenxSlot{201}{2554}{%
-  \do{cp437}\do{cp850}\do{cp852}\do{cp858}\do{cp865}%
+  \do{cp437}\do{cp850}\do{cp852}\do{cp855}\do{cp858}\do{cp865}%
+  \do{cp866}%
 }
-\InputenxSlot{202}{00A0}{\do{mac-roman}\do{mac-ce}}
+\InputenxSlot{202}{00A0}{\do{mac-centeuro}\do{mac-cyrillic}\do{mac-roman}}
 \InputenxSlot{202}{00CA}{%
   \do{iso-8859-1}\do{iso-8859-3}\do{iso-8859-9}\do{iso-8859-14}%
   \do{iso-8859-15}\do{iso-8859-16}\do{cp1252}\do{dec-mcs}%
@@ -5748,8 +7266,12 @@ and the derived files
 }
 \InputenxSlot{202}{0179}{\do{iso-8859-13}\do{cp1257}}
 \InputenxSlot{202}{02DA}{\do{nextstep}}
+\InputenxSlot{202}{041A}{\do{cp1251}}
+\InputenxSlot{202}{042A}{\do{iso-8859-5}}
+\InputenxSlot{202}{0439}{\do{koi8-r}}
 \InputenxSlot{202}{2569}{%
-  \do{cp437}\do{cp850}\do{cp852}\do{cp858}\do{cp865}%
+  \do{cp437}\do{cp850}\do{cp852}\do{cp855}\do{cp858}\do{cp865}%
+  \do{cp866}%
 }
 \InputenxSlot{203}{00B8}{\do{nextstep}}
 \InputenxSlot{203}{00C0}{\do{mac-roman}}
@@ -5759,9 +7281,14 @@ and the derived files
   \do{iso-8859-16}\do{cp1250}\do{cp1252}\do{dec-mcs}%
 }
 \InputenxSlot{203}{0116}{\do{iso-8859-13}\do{cp1257}}
-\InputenxSlot{203}{0148}{\do{mac-ce}}
+\InputenxSlot{203}{0148}{\do{mac-centeuro}}
+\InputenxSlot{203}{040B}{\do{mac-cyrillic}}
+\InputenxSlot{203}{041B}{\do{cp1251}}
+\InputenxSlot{203}{042B}{\do{iso-8859-5}}
+\InputenxSlot{203}{043A}{\do{koi8-r}}
 \InputenxSlot{203}{2566}{%
-  \do{cp437}\do{cp850}\do{cp852}\do{cp858}\do{cp865}%
+  \do{cp437}\do{cp850}\do{cp852}\do{cp855}\do{cp858}\do{cp865}%
+  \do{cp866}%
 }
 \InputenxSlot{204}{00B3}{\do{nextstep}}
 \InputenxSlot{204}{00C3}{\do{mac-roman}}
@@ -5772,20 +7299,30 @@ and the derived files
 \InputenxSlot{204}{0116}{\do{iso-8859-4}\do{iso-8859-10}}
 \InputenxSlot{204}{011A}{\do{iso-8859-2}\do{cp1250}}
 \InputenxSlot{204}{0122}{\do{iso-8859-13}\do{cp1257}}
-\InputenxSlot{204}{0150}{\do{mac-ce}}
+\InputenxSlot{204}{0150}{\do{mac-centeuro}}
+\InputenxSlot{204}{041C}{\do{cp1251}}
+\InputenxSlot{204}{042C}{\do{iso-8859-5}}
+\InputenxSlot{204}{043B}{\do{koi8-r}}
+\InputenxSlot{204}{045B}{\do{mac-cyrillic}}
 \InputenxSlot{204}{2560}{%
-  \do{cp437}\do{cp850}\do{cp852}\do{cp858}\do{cp865}%
+  \do{cp437}\do{cp850}\do{cp852}\do{cp855}\do{cp858}\do{cp865}%
+  \do{cp866}%
 }
 \InputenxSlot{205}{00CD}{%
   \do{iso-8859-1}\do{iso-8859-2}\do{iso-8859-3}\do{iso-8859-4}%
   \do{iso-8859-9}\do{iso-8859-10}\do{iso-8859-14}\do{iso-8859-15}%
   \do{iso-8859-16}\do{cp1250}\do{cp1252}\do{dec-mcs}%
 }
-\InputenxSlot{205}{00D5}{\do{mac-roman}\do{mac-ce}}
+\InputenxSlot{205}{00D5}{\do{mac-centeuro}\do{mac-roman}}
 \InputenxSlot{205}{0136}{\do{iso-8859-13}\do{cp1257}}
 \InputenxSlot{205}{02DD}{\do{nextstep}}
+\InputenxSlot{205}{040C}{\do{mac-cyrillic}}
+\InputenxSlot{205}{041D}{\do{cp1251}}
+\InputenxSlot{205}{042D}{\do{iso-8859-5}}
+\InputenxSlot{205}{043C}{\do{koi8-r}}
 \InputenxSlot{205}{2550}{%
-  \do{cp437}\do{cp850}\do{cp852}\do{cp858}\do{cp865}%
+  \do{cp437}\do{cp850}\do{cp852}\do{cp855}\do{cp858}\do{cp865}%
+  \do{cp866}%
 }
 \InputenxSlot{206}{00CE}{%
   \do{iso-8859-1}\do{iso-8859-2}\do{iso-8859-3}\do{iso-8859-4}%
@@ -5793,13 +7330,20 @@ and the derived files
   \do{iso-8859-16}\do{cp1250}\do{cp1252}\do{dec-mcs}%
 }
 \InputenxSlot{206}{012A}{\do{iso-8859-13}\do{cp1257}}
-\InputenxSlot{206}{0151}{\do{mac-ce}}
+\InputenxSlot{206}{0151}{\do{mac-centeuro}}
 \InputenxSlot{206}{0152}{\do{mac-roman}}
 \InputenxSlot{206}{02DB}{\do{nextstep}}
+\InputenxSlot{206}{041E}{\do{cp1251}}
+\InputenxSlot{206}{042E}{\do{iso-8859-5}}
+\InputenxSlot{206}{043D}{\do{koi8-r}}
+\InputenxSlot{206}{045C}{\do{mac-cyrillic}}
 \InputenxSlot{206}{256C}{%
-  \do{cp437}\do{cp850}\do{cp852}\do{cp858}\do{cp865}%
+  \do{cp437}\do{cp850}\do{cp852}\do{cp855}\do{cp858}\do{cp865}%
+  \do{cp866}%
+}
+\InputenxSlot{207}{00A4}{%
+  \do{cp850}\do{cp852}\do{cp855}\do{cp858}%
 }
-\InputenxSlot{207}{00A4}{\do{cp850}\do{cp852}\do{cp858}}
 \InputenxSlot{207}{00CF}{%
   \do{iso-8859-1}\do{iso-8859-3}\do{iso-8859-9}\do{iso-8859-10}%
   \do{iso-8859-14}\do{iso-8859-15}\do{iso-8859-16}\do{cp1252}%
@@ -5808,10 +7352,14 @@ and the derived files
 \InputenxSlot{207}{010E}{\do{iso-8859-2}\do{cp1250}}
 \InputenxSlot{207}{012A}{\do{iso-8859-4}}
 \InputenxSlot{207}{013B}{\do{iso-8859-13}\do{cp1257}}
-\InputenxSlot{207}{014C}{\do{mac-ce}}
+\InputenxSlot{207}{014C}{\do{mac-centeuro}}
 \InputenxSlot{207}{0153}{\do{mac-roman}}
 \InputenxSlot{207}{02C7}{\do{nextstep}}
-\InputenxSlot{207}{2567}{\do{cp437}\do{cp865}}
+\InputenxSlot{207}{041F}{\do{cp1251}}
+\InputenxSlot{207}{042F}{\do{iso-8859-5}}
+\InputenxSlot{207}{043E}{\do{koi8-r}}
+\InputenxSlot{207}{0455}{\do{mac-cyrillic}}
+\InputenxSlot{207}{2567}{\do{cp437}\do{cp865}\do{cp866}}
 \InputenxSlot{208}{00D0}{%
   \do{iso-8859-1}\do{iso-8859-10}\do{iso-8859-15}\do{cp1252}%
 }
@@ -5823,9 +7371,13 @@ and the derived files
 \InputenxSlot{208}{011E}{\do{iso-8859-9}}
 \InputenxSlot{208}{0160}{\do{iso-8859-13}\do{cp1257}}
 \InputenxSlot{208}{0174}{\do{iso-8859-14}}
-\InputenxSlot{208}{2013}{\do{mac-roman}\do{mac-ce}}
+\InputenxSlot{208}{0420}{\do{cp1251}}
+\InputenxSlot{208}{0430}{\do{iso-8859-5}}
+\InputenxSlot{208}{043B}{\do{cp855}}
+\InputenxSlot{208}{043F}{\do{koi8-r}}
+\InputenxSlot{208}{2013}{\do{mac-centeuro}\do{mac-cyrillic}\do{mac-roman}}
 \InputenxSlot{208}{2014}{\do{nextstep}}
-\InputenxSlot{208}{2568}{\do{cp437}\do{cp865}}
+\InputenxSlot{208}{2568}{\do{cp437}\do{cp865}\do{cp866}}
 \InputenxSlot{209}{00B1}{\do{nextstep}}
 \InputenxSlot{209}{00D0}{\do{cp850}\do{cp858}}
 \InputenxSlot{209}{00D1}{%
@@ -5838,8 +7390,12 @@ and the derived files
   \do{cp1257}%
 }
 \InputenxSlot{209}{0145}{\do{iso-8859-4}\do{iso-8859-10}}
-\InputenxSlot{209}{2014}{\do{mac-roman}\do{mac-ce}}
-\InputenxSlot{209}{2564}{\do{cp437}\do{cp865}}
+\InputenxSlot{209}{041B}{\do{cp855}}
+\InputenxSlot{209}{0421}{\do{cp1251}}
+\InputenxSlot{209}{0431}{\do{iso-8859-5}}
+\InputenxSlot{209}{044F}{\do{koi8-r}}
+\InputenxSlot{209}{2014}{\do{mac-centeuro}\do{mac-cyrillic}\do{mac-roman}}
+\InputenxSlot{209}{2564}{\do{cp437}\do{cp865}\do{cp866}}
 \InputenxSlot{210}{00BC}{\do{nextstep}}
 \InputenxSlot{210}{00CA}{\do{cp850}\do{cp858}}
 \InputenxSlot{210}{00D2}{%
@@ -5850,8 +7406,12 @@ and the derived files
 \InputenxSlot{210}{0145}{\do{iso-8859-13}\do{cp1257}}
 \InputenxSlot{210}{0147}{\do{iso-8859-2}\do{cp1250}}
 \InputenxSlot{210}{014C}{\do{iso-8859-4}\do{iso-8859-10}}
-\InputenxSlot{210}{201C}{\do{mac-roman}\do{mac-ce}}
-\InputenxSlot{210}{2565}{\do{cp437}\do{cp865}}
+\InputenxSlot{210}{0422}{\do{cp1251}}
+\InputenxSlot{210}{0432}{\do{iso-8859-5}}
+\InputenxSlot{210}{043C}{\do{cp855}}
+\InputenxSlot{210}{0440}{\do{koi8-r}}
+\InputenxSlot{210}{201C}{\do{mac-centeuro}\do{mac-cyrillic}\do{mac-roman}}
+\InputenxSlot{210}{2565}{\do{cp437}\do{cp865}\do{cp866}}
 \InputenxSlot{211}{00BD}{\do{nextstep}}
 \InputenxSlot{211}{00CB}{\do{cp850}\do{cp852}\do{cp858}}
 \InputenxSlot{211}{00D3}{%
@@ -5860,8 +7420,12 @@ and the derived files
   \do{iso-8859-16}\do{cp1250}\do{cp1252}\do{cp1257}\do{dec-mcs}%
 }
 \InputenxSlot{211}{0136}{\do{iso-8859-4}}
-\InputenxSlot{211}{201D}{\do{mac-roman}\do{mac-ce}}
-\InputenxSlot{211}{2559}{\do{cp437}\do{cp865}}
+\InputenxSlot{211}{041C}{\do{cp855}}
+\InputenxSlot{211}{0423}{\do{cp1251}}
+\InputenxSlot{211}{0433}{\do{iso-8859-5}}
+\InputenxSlot{211}{0441}{\do{koi8-r}}
+\InputenxSlot{211}{201D}{\do{mac-centeuro}\do{mac-cyrillic}\do{mac-roman}}
+\InputenxSlot{211}{2559}{\do{cp437}\do{cp865}\do{cp866}}
 \InputenxSlot{212}{00BE}{\do{nextstep}}
 \InputenxSlot{212}{00C8}{\do{cp850}\do{cp858}}
 \InputenxSlot{212}{00D4}{%
@@ -5871,8 +7435,12 @@ and the derived files
 }
 \InputenxSlot{212}{010F}{\do{cp852}}
 \InputenxSlot{212}{014C}{\do{iso-8859-13}\do{cp1257}}
-\InputenxSlot{212}{2018}{\do{mac-roman}\do{mac-ce}}
-\InputenxSlot{212}{2558}{\do{cp437}\do{cp865}}
+\InputenxSlot{212}{0424}{\do{cp1251}}
+\InputenxSlot{212}{0434}{\do{iso-8859-5}}
+\InputenxSlot{212}{043D}{\do{cp855}}
+\InputenxSlot{212}{0442}{\do{koi8-r}}
+\InputenxSlot{212}{2018}{\do{mac-centeuro}\do{mac-cyrillic}\do{mac-roman}}
+\InputenxSlot{212}{2558}{\do{cp437}\do{cp865}\do{cp866}}
 \InputenxSlot{213}{00D5}{%
   \do{iso-8859-1}\do{iso-8859-4}\do{iso-8859-9}\do{iso-8859-10}%
   \do{iso-8859-13}\do{iso-8859-14}\do{iso-8859-15}\do{cp1252}%
@@ -5883,9 +7451,13 @@ and the derived files
 \InputenxSlot{213}{0131}{\do{cp850}}
 \InputenxSlot{213}{0147}{\do{cp852}}
 \InputenxSlot{213}{0150}{\do{iso-8859-2}\do{iso-8859-16}\do{cp1250}}
-\InputenxSlot{213}{2019}{\do{mac-roman}\do{mac-ce}}
+\InputenxSlot{213}{041D}{\do{cp855}}
+\InputenxSlot{213}{0425}{\do{cp1251}}
+\InputenxSlot{213}{0435}{\do{iso-8859-5}}
+\InputenxSlot{213}{0443}{\do{koi8-r}}
+\InputenxSlot{213}{2019}{\do{mac-centeuro}\do{mac-cyrillic}\do{mac-roman}}
 \InputenxSlot{213}{20AC}{\do{cp858}}
-\InputenxSlot{213}{2552}{\do{cp437}\do{cp865}}
+\InputenxSlot{213}{2552}{\do{cp437}\do{cp865}\do{cp866}}
 \InputenxSlot{214}{00CD}{\do{cp850}\do{cp852}\do{cp858}}
 \InputenxSlot{214}{00D6}{%
   \do{iso-8859-1}\do{iso-8859-2}\do{iso-8859-3}\do{iso-8859-4}%
@@ -5894,8 +7466,11 @@ and the derived files
   \do{dec-mcs}%
 }
 \InputenxSlot{214}{00E1}{\do{nextstep}}
-\InputenxSlot{214}{00F7}{\do{mac-roman}\do{mac-ce}}
-\InputenxSlot{214}{2553}{\do{cp437}\do{cp865}}
+\InputenxSlot{214}{00F7}{\do{mac-centeuro}\do{mac-cyrillic}\do{mac-roman}}
+\InputenxSlot{214}{0426}{\do{cp1251}}
+\InputenxSlot{214}{0436}{\do{iso-8859-5}\do{koi8-r}}
+\InputenxSlot{214}{043E}{\do{cp855}}
+\InputenxSlot{214}{2553}{\do{cp437}\do{cp865}\do{cp866}}
 \InputenxSlot{215}{00CE}{\do{cp850}\do{cp852}\do{cp858}}
 \InputenxSlot{215}{00D7}{%
   \do{iso-8859-1}\do{iso-8859-2}\do{iso-8859-3}\do{iso-8859-4}%
@@ -5906,9 +7481,14 @@ and the derived files
 \InputenxSlot{215}{0152}{\do{dec-mcs}}
 \InputenxSlot{215}{015A}{\do{iso-8859-16}}
 \InputenxSlot{215}{0168}{\do{iso-8859-10}}
+\InputenxSlot{215}{041E}{\do{cp855}}
+\InputenxSlot{215}{0427}{\do{cp1251}}
+\InputenxSlot{215}{0432}{\do{koi8-r}}
+\InputenxSlot{215}{0437}{\do{iso-8859-5}}
 \InputenxSlot{215}{1E6A}{\do{iso-8859-14}}
-\InputenxSlot{215}{256B}{\do{cp437}\do{cp865}}
-\InputenxSlot{215}{25CA}{\do{mac-roman}\do{mac-ce}}
+\InputenxSlot{215}{201E}{\do{mac-cyrillic}}
+\InputenxSlot{215}{256B}{\do{cp437}\do{cp865}\do{cp866}}
+\InputenxSlot{215}{25CA}{\do{mac-centeuro}\do{mac-roman}}
 \InputenxSlot{216}{00CF}{\do{cp850}\do{cp858}}
 \InputenxSlot{216}{00D8}{%
   \do{iso-8859-1}\do{iso-8859-4}\do{iso-8859-9}\do{iso-8859-10}%
@@ -5918,23 +7498,33 @@ and the derived files
 \InputenxSlot{216}{00FF}{\do{mac-roman}}
 \InputenxSlot{216}{011B}{\do{cp852}}
 \InputenxSlot{216}{011C}{\do{iso-8859-3}}
-\InputenxSlot{216}{014D}{\do{mac-ce}}
+\InputenxSlot{216}{014D}{\do{mac-centeuro}}
 \InputenxSlot{216}{0158}{\do{iso-8859-2}\do{cp1250}}
 \InputenxSlot{216}{0170}{\do{iso-8859-16}}
 \InputenxSlot{216}{0172}{\do{iso-8859-13}\do{cp1257}}
-\InputenxSlot{216}{256A}{\do{cp437}\do{cp865}}
+\InputenxSlot{216}{040E}{\do{mac-cyrillic}}
+\InputenxSlot{216}{0428}{\do{cp1251}}
+\InputenxSlot{216}{0438}{\do{iso-8859-5}}
+\InputenxSlot{216}{043F}{\do{cp855}}
+\InputenxSlot{216}{044C}{\do{koi8-r}}
+\InputenxSlot{216}{256A}{\do{cp437}\do{cp865}\do{cp866}}
 \InputenxSlot{217}{00D9}{%
   \do{iso-8859-1}\do{iso-8859-3}\do{iso-8859-9}\do{iso-8859-14}%
   \do{iso-8859-15}\do{iso-8859-16}\do{cp1252}\do{dec-mcs}%
 }
 \InputenxSlot{217}{00E4}{\do{nextstep}}
 \InputenxSlot{217}{0141}{\do{iso-8859-13}\do{cp1257}}
-\InputenxSlot{217}{0154}{\do{mac-ce}}
+\InputenxSlot{217}{0154}{\do{mac-centeuro}}
 \InputenxSlot{217}{016E}{\do{iso-8859-2}\do{cp1250}}
 \InputenxSlot{217}{0172}{\do{iso-8859-4}\do{iso-8859-10}}
 \InputenxSlot{217}{0178}{\do{mac-roman}}
+\InputenxSlot{217}{0429}{\do{cp1251}}
+\InputenxSlot{217}{0439}{\do{iso-8859-5}}
+\InputenxSlot{217}{044B}{\do{koi8-r}}
+\InputenxSlot{217}{045E}{\do{mac-cyrillic}}
 \InputenxSlot{217}{2518}{%
-  \do{cp437}\do{cp850}\do{cp852}\do{cp858}\do{cp865}%
+  \do{cp437}\do{cp850}\do{cp852}\do{cp855}\do{cp858}\do{cp865}%
+  \do{cp866}%
 }
 \InputenxSlot{218}{00DA}{%
   \do{iso-8859-1}\do{iso-8859-2}\do{iso-8859-3}\do{iso-8859-4}%
@@ -5942,11 +7532,16 @@ and the derived files
   \do{iso-8859-16}\do{cp1250}\do{cp1252}\do{dec-mcs}%
 }
 \InputenxSlot{218}{00E5}{\do{nextstep}}
-\InputenxSlot{218}{0155}{\do{mac-ce}}
+\InputenxSlot{218}{0155}{\do{mac-centeuro}}
 \InputenxSlot{218}{015A}{\do{iso-8859-13}\do{cp1257}}
+\InputenxSlot{218}{040F}{\do{mac-cyrillic}}
+\InputenxSlot{218}{042A}{\do{cp1251}}
+\InputenxSlot{218}{0437}{\do{koi8-r}}
+\InputenxSlot{218}{043A}{\do{iso-8859-5}}
 \InputenxSlot{218}{2044}{\do{mac-roman}}
 \InputenxSlot{218}{250C}{%
-  \do{cp437}\do{cp850}\do{cp852}\do{cp858}\do{cp865}%
+  \do{cp437}\do{cp850}\do{cp852}\do{cp855}\do{cp858}\do{cp865}%
+  \do{cp866}%
 }
 \InputenxSlot{219}{00DB}{%
   \do{iso-8859-1}\do{iso-8859-3}\do{iso-8859-4}\do{iso-8859-9}%
@@ -5954,12 +7549,17 @@ and the derived files
   \do{cp1252}\do{dec-mcs}%
 }
 \InputenxSlot{219}{00E7}{\do{nextstep}}
-\InputenxSlot{219}{0158}{\do{mac-ce}}
+\InputenxSlot{219}{0158}{\do{mac-centeuro}}
 \InputenxSlot{219}{016A}{\do{iso-8859-13}\do{cp1257}}
 \InputenxSlot{219}{0170}{\do{iso-8859-2}\do{cp1250}}
+\InputenxSlot{219}{042B}{\do{cp1251}}
+\InputenxSlot{219}{043B}{\do{iso-8859-5}}
+\InputenxSlot{219}{0448}{\do{koi8-r}}
+\InputenxSlot{219}{045F}{\do{mac-cyrillic}}
 \InputenxSlot{219}{20AC}{\do{mac-roman}}
 \InputenxSlot{219}{2588}{%
-  \do{cp437}\do{cp850}\do{cp852}\do{cp858}\do{cp865}%
+  \do{cp437}\do{cp850}\do{cp852}\do{cp855}\do{cp858}\do{cp865}%
+  \do{cp866}%
 }
 \InputenxSlot{220}{00DC}{%
   \do{iso-8859-1}\do{iso-8859-2}\do{iso-8859-3}\do{iso-8859-4}%
@@ -5968,9 +7568,14 @@ and the derived files
   \do{dec-mcs}%
 }
 \InputenxSlot{220}{00E8}{\do{nextstep}}
-\InputenxSlot{220}{2039}{\do{mac-roman}\do{mac-ce}}
+\InputenxSlot{220}{042C}{\do{cp1251}}
+\InputenxSlot{220}{043C}{\do{iso-8859-5}}
+\InputenxSlot{220}{044D}{\do{koi8-r}}
+\InputenxSlot{220}{2039}{\do{mac-centeuro}\do{mac-roman}}
+\InputenxSlot{220}{2116}{\do{mac-cyrillic}}
 \InputenxSlot{220}{2584}{%
-  \do{cp437}\do{cp850}\do{cp852}\do{cp858}\do{cp865}%
+  \do{cp437}\do{cp850}\do{cp852}\do{cp855}\do{cp858}\do{cp865}%
+  \do{cp866}%
 }
 \InputenxSlot{221}{00A6}{\do{cp850}\do{cp858}}
 \InputenxSlot{221}{00DD}{%
@@ -5985,14 +7590,19 @@ and the derived files
 \InputenxSlot{221}{016C}{\do{iso-8859-3}}
 \InputenxSlot{221}{0178}{\do{dec-mcs}}
 \InputenxSlot{221}{017B}{\do{iso-8859-13}\do{cp1257}}
-\InputenxSlot{221}{203A}{\do{mac-roman}\do{mac-ce}}
-\InputenxSlot{221}{258C}{\do{cp437}\do{cp865}}
+\InputenxSlot{221}{0401}{\do{mac-cyrillic}}
+\InputenxSlot{221}{041F}{\do{cp855}}
+\InputenxSlot{221}{042D}{\do{cp1251}}
+\InputenxSlot{221}{043D}{\do{iso-8859-5}}
+\InputenxSlot{221}{0449}{\do{koi8-r}}
+\InputenxSlot{221}{203A}{\do{mac-centeuro}\do{mac-roman}}
+\InputenxSlot{221}{258C}{\do{cp437}\do{cp865}\do{cp866}}
 \InputenxSlot{222}{00CC}{\do{cp850}\do{cp858}}
 \InputenxSlot{222}{00DE}{%
   \do{iso-8859-1}\do{iso-8859-10}\do{iso-8859-15}\do{cp1252}%
 }
 \InputenxSlot{222}{00EA}{\do{nextstep}}
-\InputenxSlot{222}{0159}{\do{mac-ce}}
+\InputenxSlot{222}{0159}{\do{mac-centeuro}}
 \InputenxSlot{222}{015C}{\do{iso-8859-3}}
 \InputenxSlot{222}{015E}{\do{iso-8859-9}}
 \InputenxSlot{222}{0162}{\do{iso-8859-2}\do{cp1250}}
@@ -6001,7 +7611,12 @@ and the derived files
 \InputenxSlot{222}{0176}{\do{iso-8859-14}}
 \InputenxSlot{222}{017D}{\do{iso-8859-13}\do{cp1257}}
 \InputenxSlot{222}{021A}{\do{iso-8859-16}}
-\InputenxSlot{222}{2590}{\do{cp437}\do{cp865}}
+\InputenxSlot{222}{042E}{\do{cp1251}}
+\InputenxSlot{222}{043E}{\do{iso-8859-5}}
+\InputenxSlot{222}{0447}{\do{koi8-r}}
+\InputenxSlot{222}{044F}{\do{cp855}}
+\InputenxSlot{222}{0451}{\do{mac-cyrillic}}
+\InputenxSlot{222}{2590}{\do{cp437}\do{cp865}\do{cp866}}
 \InputenxSlot{222}{FB01}{\do{mac-roman}}
 \InputenxSlot{223}{00DF}{%
   \do{iso-8859-1}\do{iso-8859-2}\do{iso-8859-3}\do{iso-8859-4}%
@@ -6010,9 +7625,14 @@ and the derived files
   \do{dec-mcs}%
 }
 \InputenxSlot{223}{00EB}{\do{nextstep}}
-\InputenxSlot{223}{0156}{\do{mac-ce}}
+\InputenxSlot{223}{0156}{\do{mac-centeuro}}
+\InputenxSlot{223}{042F}{\do{cp1251}}
+\InputenxSlot{223}{043F}{\do{iso-8859-5}}
+\InputenxSlot{223}{044A}{\do{koi8-r}}
+\InputenxSlot{223}{044F}{\do{mac-cyrillic}}
 \InputenxSlot{223}{2580}{%
-  \do{cp437}\do{cp850}\do{cp852}\do{cp858}\do{cp865}%
+  \do{cp437}\do{cp850}\do{cp852}\do{cp855}\do{cp858}\do{cp865}%
+  \do{cp866}%
 }
 \InputenxSlot{223}{FB02}{\do{mac-roman}}
 \InputenxSlot{224}{00D3}{\do{cp850}\do{cp852}\do{cp858}}
@@ -6024,8 +7644,12 @@ and the derived files
 \InputenxSlot{224}{0101}{\do{iso-8859-4}\do{iso-8859-10}}
 \InputenxSlot{224}{0105}{\do{iso-8859-13}\do{cp1257}}
 \InputenxSlot{224}{0155}{\do{iso-8859-2}\do{cp1250}}
-\InputenxSlot{224}{0157}{\do{mac-ce}}
+\InputenxSlot{224}{0157}{\do{mac-centeuro}}
 \InputenxSlot{224}{03B1}{\do{cp437}\do{cp865}}
+\InputenxSlot{224}{042E}{\do{koi8-r}}
+\InputenxSlot{224}{042F}{\do{cp855}}
+\InputenxSlot{224}{0430}{\do{cp1251}\do{mac-cyrillic}}
+\InputenxSlot{224}{0440}{\do{iso-8859-5}\do{cp866}}
 \InputenxSlot{224}{2021}{\do{mac-roman}}
 \InputenxSlot{225}{00B7}{\do{mac-roman}}
 \InputenxSlot{225}{00C6}{\do{nextstep}}
@@ -6038,7 +7662,11 @@ and the derived files
   \do{iso-8859-16}\do{cp1250}\do{cp1252}\do{dec-mcs}%
 }
 \InputenxSlot{225}{012F}{\do{iso-8859-13}\do{cp1257}}
-\InputenxSlot{225}{0160}{\do{mac-ce}}
+\InputenxSlot{225}{0160}{\do{mac-centeuro}}
+\InputenxSlot{225}{0410}{\do{koi8-r}}
+\InputenxSlot{225}{0431}{\do{cp1251}\do{mac-cyrillic}}
+\InputenxSlot{225}{0440}{\do{cp855}}
+\InputenxSlot{225}{0441}{\do{iso-8859-5}\do{cp866}}
 \InputenxSlot{226}{00D4}{\do{cp850}\do{cp852}\do{cp858}}
 \InputenxSlot{226}{00E2}{%
   \do{iso-8859-1}\do{iso-8859-2}\do{iso-8859-3}\do{iso-8859-4}%
@@ -6048,7 +7676,11 @@ and the derived files
 \InputenxSlot{226}{00ED}{\do{nextstep}}
 \InputenxSlot{226}{0101}{\do{iso-8859-13}\do{cp1257}}
 \InputenxSlot{226}{0393}{\do{cp437}\do{cp865}}
-\InputenxSlot{226}{201A}{\do{mac-roman}\do{mac-ce}}
+\InputenxSlot{226}{0411}{\do{koi8-r}}
+\InputenxSlot{226}{0420}{\do{cp855}}
+\InputenxSlot{226}{0432}{\do{cp1251}\do{mac-cyrillic}}
+\InputenxSlot{226}{0442}{\do{iso-8859-5}\do{cp866}}
+\InputenxSlot{226}{201A}{\do{mac-centeuro}\do{mac-roman}}
 \InputenxSlot{227}{00AA}{\do{nextstep}}
 \InputenxSlot{227}{00D2}{\do{cp850}\do{cp858}}
 \InputenxSlot{227}{00E3}{%
@@ -6059,7 +7691,11 @@ and the derived files
 \InputenxSlot{227}{0107}{\do{iso-8859-13}\do{cp1257}}
 \InputenxSlot{227}{0143}{\do{cp852}}
 \InputenxSlot{227}{03C0}{\do{cp437}\do{cp865}}
-\InputenxSlot{227}{201E}{\do{mac-roman}\do{mac-ce}}
+\InputenxSlot{227}{0426}{\do{koi8-r}}
+\InputenxSlot{227}{0433}{\do{cp1251}\do{mac-cyrillic}}
+\InputenxSlot{227}{0441}{\do{cp855}}
+\InputenxSlot{227}{0443}{\do{iso-8859-5}\do{cp866}}
+\InputenxSlot{227}{201E}{\do{mac-centeuro}\do{mac-roman}}
 \InputenxSlot{228}{00E4}{%
   \do{iso-8859-1}\do{iso-8859-2}\do{iso-8859-3}\do{iso-8859-4}%
   \do{iso-8859-9}\do{iso-8859-10}\do{iso-8859-13}\do{iso-8859-14}%
@@ -6069,8 +7705,12 @@ and the derived files
 \InputenxSlot{228}{00EE}{\do{nextstep}}
 \InputenxSlot{228}{00F5}{\do{cp850}\do{cp858}}
 \InputenxSlot{228}{0144}{\do{cp852}}
-\InputenxSlot{228}{0161}{\do{mac-ce}}
+\InputenxSlot{228}{0161}{\do{mac-centeuro}}
 \InputenxSlot{228}{03A3}{\do{cp437}\do{cp865}}
+\InputenxSlot{228}{0414}{\do{koi8-r}}
+\InputenxSlot{228}{0421}{\do{cp855}}
+\InputenxSlot{228}{0434}{\do{cp1251}\do{mac-cyrillic}}
+\InputenxSlot{228}{0444}{\do{iso-8859-5}\do{cp866}}
 \InputenxSlot{228}{2030}{\do{mac-roman}}
 \InputenxSlot{229}{00C2}{\do{mac-roman}}
 \InputenxSlot{229}{00D5}{\do{cp850}\do{cp858}}
@@ -6084,8 +7724,12 @@ and the derived files
 \InputenxSlot{229}{010B}{\do{iso-8859-3}}
 \InputenxSlot{229}{013A}{\do{iso-8859-2}\do{cp1250}}
 \InputenxSlot{229}{0148}{\do{cp852}}
-\InputenxSlot{229}{015A}{\do{mac-ce}}
+\InputenxSlot{229}{015A}{\do{mac-centeuro}}
 \InputenxSlot{229}{03C3}{\do{cp437}\do{cp865}}
+\InputenxSlot{229}{0415}{\do{koi8-r}}
+\InputenxSlot{229}{0435}{\do{cp1251}\do{mac-cyrillic}}
+\InputenxSlot{229}{0442}{\do{cp855}}
+\InputenxSlot{229}{0445}{\do{iso-8859-5}\do{cp866}}
 \InputenxSlot{230}{00B5}{%
   \do{cp437}\do{cp850}\do{cp858}\do{cp865}%
 }
@@ -6099,9 +7743,13 @@ and the derived files
 \InputenxSlot{230}{0107}{\do{iso-8859-2}\do{cp1250}}
 \InputenxSlot{230}{0109}{\do{iso-8859-3}}
 \InputenxSlot{230}{0119}{\do{iso-8859-13}\do{cp1257}}
-\InputenxSlot{230}{015B}{\do{mac-ce}}
+\InputenxSlot{230}{015B}{\do{mac-centeuro}}
 \InputenxSlot{230}{0160}{\do{cp852}}
-\InputenxSlot{231}{00C1}{\do{mac-roman}\do{mac-ce}}
+\InputenxSlot{230}{0422}{\do{cp855}}
+\InputenxSlot{230}{0424}{\do{koi8-r}}
+\InputenxSlot{230}{0436}{\do{cp1251}\do{mac-cyrillic}}
+\InputenxSlot{230}{0446}{\do{iso-8859-5}\do{cp866}}
+\InputenxSlot{231}{00C1}{\do{mac-centeuro}\do{mac-roman}}
 \InputenxSlot{231}{00E7}{%
   \do{iso-8859-1}\do{iso-8859-2}\do{iso-8859-3}\do{iso-8859-9}%
   \do{iso-8859-14}\do{iso-8859-15}\do{iso-8859-16}\do{cp1250}%
@@ -6113,6 +7761,10 @@ and the derived files
 \InputenxSlot{231}{012F}{\do{iso-8859-4}\do{iso-8859-10}}
 \InputenxSlot{231}{0161}{\do{cp852}}
 \InputenxSlot{231}{03C4}{\do{cp437}\do{cp865}}
+\InputenxSlot{231}{0413}{\do{koi8-r}}
+\InputenxSlot{231}{0437}{\do{cp1251}\do{mac-cyrillic}}
+\InputenxSlot{231}{0443}{\do{cp855}}
+\InputenxSlot{231}{0447}{\do{iso-8859-5}\do{cp866}}
 \InputenxSlot{232}{00CB}{\do{mac-roman}}
 \InputenxSlot{232}{00DE}{\do{cp850}\do{cp858}}
 \InputenxSlot{232}{00E8}{%
@@ -6125,8 +7777,12 @@ and the derived files
 }
 \InputenxSlot{232}{0141}{\do{nextstep}}
 \InputenxSlot{232}{0154}{\do{cp852}}
-\InputenxSlot{232}{0164}{\do{mac-ce}}
+\InputenxSlot{232}{0164}{\do{mac-centeuro}}
 \InputenxSlot{232}{03A6}{\do{cp437}\do{cp865}}
+\InputenxSlot{232}{0423}{\do{cp855}}
+\InputenxSlot{232}{0425}{\do{koi8-r}}
+\InputenxSlot{232}{0438}{\do{cp1251}\do{mac-cyrillic}}
+\InputenxSlot{232}{0448}{\do{iso-8859-5}\do{cp866}}
 \InputenxSlot{233}{00C8}{\do{mac-roman}}
 \InputenxSlot{233}{00D8}{\do{nextstep}}
 \InputenxSlot{233}{00DA}{\do{cp850}\do{cp852}\do{cp858}}
@@ -6136,9 +7792,13 @@ and the derived files
   \do{iso-8859-15}\do{iso-8859-16}\do{cp1250}\do{cp1252}\do{cp1257}%
   \do{dec-mcs}%
 }
-\InputenxSlot{233}{0165}{\do{mac-ce}}
+\InputenxSlot{233}{0165}{\do{mac-centeuro}}
 \InputenxSlot{233}{0398}{\do{cp437}\do{cp865}}
-\InputenxSlot{234}{00CD}{\do{mac-roman}\do{mac-ce}}
+\InputenxSlot{233}{0418}{\do{koi8-r}}
+\InputenxSlot{233}{0436}{\do{cp855}}
+\InputenxSlot{233}{0439}{\do{cp1251}\do{mac-cyrillic}}
+\InputenxSlot{233}{0449}{\do{iso-8859-5}\do{cp866}}
+\InputenxSlot{234}{00CD}{\do{mac-centeuro}\do{mac-roman}}
 \InputenxSlot{234}{00DB}{\do{cp850}\do{cp858}}
 \InputenxSlot{234}{00EA}{%
   \do{iso-8859-1}\do{iso-8859-3}\do{iso-8859-9}\do{iso-8859-14}%
@@ -6151,6 +7811,10 @@ and the derived files
 \InputenxSlot{234}{0155}{\do{cp852}}
 \InputenxSlot{234}{017A}{\do{iso-8859-13}\do{cp1257}}
 \InputenxSlot{234}{03A9}{\do{cp437}\do{cp865}}
+\InputenxSlot{234}{0416}{\do{cp855}}
+\InputenxSlot{234}{0419}{\do{koi8-r}}
+\InputenxSlot{234}{043A}{\do{cp1251}\do{mac-cyrillic}}
+\InputenxSlot{234}{044A}{\do{iso-8859-5}\do{cp866}}
 \InputenxSlot{235}{00BA}{\do{nextstep}}
 \InputenxSlot{235}{00CE}{\do{mac-roman}}
 \InputenxSlot{235}{00D9}{\do{cp850}\do{cp858}}
@@ -6161,8 +7825,12 @@ and the derived files
 }
 \InputenxSlot{235}{0117}{\do{iso-8859-13}\do{cp1257}}
 \InputenxSlot{235}{0170}{\do{cp852}}
-\InputenxSlot{235}{017D}{\do{mac-ce}}
+\InputenxSlot{235}{017D}{\do{mac-centeuro}}
 \InputenxSlot{235}{03B4}{\do{cp437}\do{cp865}}
+\InputenxSlot{235}{041A}{\do{koi8-r}}
+\InputenxSlot{235}{0432}{\do{cp855}}
+\InputenxSlot{235}{043B}{\do{cp1251}\do{mac-cyrillic}}
+\InputenxSlot{235}{044B}{\do{iso-8859-5}\do{cp866}}
 \InputenxSlot{236}{00CF}{\do{mac-roman}}
 \InputenxSlot{236}{00EC}{%
   \do{iso-8859-1}\do{iso-8859-3}\do{iso-8859-9}\do{iso-8859-14}%
@@ -6173,7 +7841,11 @@ and the derived files
 \InputenxSlot{236}{0117}{\do{iso-8859-4}\do{iso-8859-10}}
 \InputenxSlot{236}{011B}{\do{iso-8859-2}\do{cp1250}}
 \InputenxSlot{236}{0123}{\do{iso-8859-13}\do{cp1257}}
-\InputenxSlot{236}{017E}{\do{mac-ce}}
+\InputenxSlot{236}{017E}{\do{mac-centeuro}}
+\InputenxSlot{236}{0412}{\do{cp855}}
+\InputenxSlot{236}{041B}{\do{koi8-r}}
+\InputenxSlot{236}{043C}{\do{cp1251}\do{mac-cyrillic}}
+\InputenxSlot{236}{044C}{\do{iso-8859-5}\do{cp866}}
 \InputenxSlot{236}{221E}{\do{cp437}\do{cp865}}
 \InputenxSlot{237}{00CC}{\do{mac-roman}}
 \InputenxSlot{237}{00DD}{\do{cp850}\do{cp852}\do{cp858}}
@@ -6184,10 +7856,14 @@ and the derived files
 }
 \InputenxSlot{237}{00F3}{\do{nextstep}}
 \InputenxSlot{237}{0137}{\do{iso-8859-13}\do{cp1257}}
-\InputenxSlot{237}{016A}{\do{mac-ce}}
+\InputenxSlot{237}{016A}{\do{mac-centeuro}}
 \InputenxSlot{237}{03C6}{\do{cp437}\do{cp865}}
+\InputenxSlot{237}{041C}{\do{koi8-r}}
+\InputenxSlot{237}{043D}{\do{cp1251}\do{mac-cyrillic}}
+\InputenxSlot{237}{044C}{\do{cp855}}
+\InputenxSlot{237}{044D}{\do{iso-8859-5}\do{cp866}}
 \InputenxSlot{238}{00AF}{\do{cp850}\do{cp858}}
-\InputenxSlot{238}{00D3}{\do{mac-roman}\do{mac-ce}}
+\InputenxSlot{238}{00D3}{\do{mac-centeuro}\do{mac-roman}}
 \InputenxSlot{238}{00EE}{%
   \do{iso-8859-1}\do{iso-8859-2}\do{iso-8859-3}\do{iso-8859-4}%
   \do{iso-8859-9}\do{iso-8859-10}\do{iso-8859-14}\do{iso-8859-15}%
@@ -6197,8 +7873,12 @@ and the derived files
 \InputenxSlot{238}{012B}{\do{iso-8859-13}\do{cp1257}}
 \InputenxSlot{238}{0163}{\do{cp852}}
 \InputenxSlot{238}{03B5}{\do{cp437}\do{cp865}}
+\InputenxSlot{238}{041D}{\do{koi8-r}}
+\InputenxSlot{238}{042C}{\do{cp855}}
+\InputenxSlot{238}{043E}{\do{cp1251}\do{mac-cyrillic}}
+\InputenxSlot{238}{044E}{\do{iso-8859-5}\do{cp866}}
 \InputenxSlot{239}{00B4}{\do{cp850}\do{cp852}\do{cp858}}
-\InputenxSlot{239}{00D4}{\do{mac-roman}\do{mac-ce}}
+\InputenxSlot{239}{00D4}{\do{mac-centeuro}\do{mac-roman}}
 \InputenxSlot{239}{00EF}{%
   \do{iso-8859-1}\do{iso-8859-3}\do{iso-8859-9}\do{iso-8859-10}%
   \do{iso-8859-14}\do{iso-8859-15}\do{iso-8859-16}\do{cp1252}%
@@ -6208,8 +7888,14 @@ and the derived files
 \InputenxSlot{239}{010F}{\do{iso-8859-2}\do{cp1250}}
 \InputenxSlot{239}{012B}{\do{iso-8859-4}}
 \InputenxSlot{239}{013C}{\do{iso-8859-13}\do{cp1257}}
+\InputenxSlot{239}{041E}{\do{koi8-r}}
+\InputenxSlot{239}{043F}{\do{cp1251}\do{mac-cyrillic}}
+\InputenxSlot{239}{044F}{\do{iso-8859-5}\do{cp866}}
+\InputenxSlot{239}{2116}{\do{cp855}}
 \InputenxSlot{239}{2229}{\do{cp437}\do{cp865}}
-\InputenxSlot{240}{00AD}{\do{cp850}\do{cp852}\do{cp858}}
+\InputenxSlot{240}{00AD}{%
+  \do{cp850}\do{cp852}\do{cp855}\do{cp858}%
+}
 \InputenxSlot{240}{00F0}{%
   \do{iso-8859-1}\do{iso-8859-10}\do{iso-8859-15}\do{cp1252}%
 }
@@ -6219,8 +7905,12 @@ and the derived files
 }
 \InputenxSlot{240}{011F}{\do{iso-8859-9}}
 \InputenxSlot{240}{0161}{\do{iso-8859-13}\do{cp1257}}
-\InputenxSlot{240}{016B}{\do{mac-ce}}
+\InputenxSlot{240}{016B}{\do{mac-centeuro}}
 \InputenxSlot{240}{0175}{\do{iso-8859-14}}
+\InputenxSlot{240}{0401}{\do{cp866}}
+\InputenxSlot{240}{041F}{\do{koi8-r}}
+\InputenxSlot{240}{0440}{\do{cp1251}\do{mac-cyrillic}}
+\InputenxSlot{240}{2116}{\do{iso-8859-5}}
 \InputenxSlot{240}{2261}{\do{cp437}\do{cp865}}
 \InputenxSlot{241}{00B1}{%
   \do{cp437}\do{cp850}\do{cp858}\do{cp865}%
@@ -6236,9 +7926,13 @@ and the derived files
   \do{cp1257}%
 }
 \InputenxSlot{241}{0146}{\do{iso-8859-4}\do{iso-8859-10}}
-\InputenxSlot{241}{016E}{\do{mac-ce}}
+\InputenxSlot{241}{016E}{\do{mac-centeuro}}
 \InputenxSlot{241}{02DD}{\do{cp852}}
-\InputenxSlot{242}{00DA}{\do{mac-roman}\do{mac-ce}}
+\InputenxSlot{241}{042F}{\do{koi8-r}}
+\InputenxSlot{241}{0441}{\do{cp1251}\do{mac-cyrillic}}
+\InputenxSlot{241}{044B}{\do{cp855}}
+\InputenxSlot{241}{0451}{\do{iso-8859-5}\do{cp866}}
+\InputenxSlot{242}{00DA}{\do{mac-centeuro}\do{mac-roman}}
 \InputenxSlot{242}{00F2}{%
   \do{iso-8859-1}\do{iso-8859-3}\do{iso-8859-9}\do{iso-8859-14}%
   \do{iso-8859-15}\do{iso-8859-16}\do{cp1252}\do{dec-mcs}%
@@ -6248,6 +7942,11 @@ and the derived files
 \InputenxSlot{242}{0148}{\do{iso-8859-2}\do{cp1250}}
 \InputenxSlot{242}{014D}{\do{iso-8859-4}\do{iso-8859-10}}
 \InputenxSlot{242}{02DB}{\do{cp852}}
+\InputenxSlot{242}{0404}{\do{cp866}}
+\InputenxSlot{242}{0420}{\do{koi8-r}}
+\InputenxSlot{242}{042B}{\do{cp855}}
+\InputenxSlot{242}{0442}{\do{cp1251}\do{mac-cyrillic}}
+\InputenxSlot{242}{0452}{\do{iso-8859-5}}
 \InputenxSlot{242}{2265}{\do{cp437}\do{cp865}}
 \InputenxSlot{243}{00BE}{\do{cp850}\do{cp858}}
 \InputenxSlot{243}{00DB}{\do{mac-roman}}
@@ -6258,8 +7957,13 @@ and the derived files
 }
 \InputenxSlot{243}{00FA}{\do{nextstep}}
 \InputenxSlot{243}{0137}{\do{iso-8859-4}}
-\InputenxSlot{243}{016F}{\do{mac-ce}}
+\InputenxSlot{243}{016F}{\do{mac-centeuro}}
 \InputenxSlot{243}{02C7}{\do{cp852}}
+\InputenxSlot{243}{0421}{\do{koi8-r}}
+\InputenxSlot{243}{0437}{\do{cp855}}
+\InputenxSlot{243}{0443}{\do{cp1251}\do{mac-cyrillic}}
+\InputenxSlot{243}{0453}{\do{iso-8859-5}}
+\InputenxSlot{243}{0454}{\do{cp866}}
 \InputenxSlot{243}{2264}{\do{cp437}\do{cp865}}
 \InputenxSlot{244}{00B6}{\do{cp850}\do{cp858}}
 \InputenxSlot{244}{00D9}{\do{mac-roman}}
@@ -6270,8 +7974,13 @@ and the derived files
 }
 \InputenxSlot{244}{00FB}{\do{nextstep}}
 \InputenxSlot{244}{014D}{\do{iso-8859-13}\do{cp1257}}
-\InputenxSlot{244}{0170}{\do{mac-ce}}
+\InputenxSlot{244}{0170}{\do{mac-centeuro}}
 \InputenxSlot{244}{02D8}{\do{cp852}}
+\InputenxSlot{244}{0407}{\do{cp866}}
+\InputenxSlot{244}{0417}{\do{cp855}}
+\InputenxSlot{244}{0422}{\do{koi8-r}}
+\InputenxSlot{244}{0444}{\do{cp1251}\do{mac-cyrillic}}
+\InputenxSlot{244}{0454}{\do{iso-8859-5}}
 \InputenxSlot{245}{00A7}{\do{cp850}\do{cp852}\do{cp858}}
 \InputenxSlot{245}{00F5}{%
   \do{iso-8859-1}\do{iso-8859-4}\do{iso-8859-9}\do{iso-8859-10}%
@@ -6281,7 +7990,12 @@ and the derived files
 \InputenxSlot{245}{0121}{\do{iso-8859-3}}
 \InputenxSlot{245}{0131}{\do{mac-roman}\do{nextstep}}
 \InputenxSlot{245}{0151}{\do{iso-8859-2}\do{iso-8859-16}\do{cp1250}}
-\InputenxSlot{245}{0171}{\do{mac-ce}}
+\InputenxSlot{245}{0171}{\do{mac-centeuro}}
+\InputenxSlot{245}{0423}{\do{koi8-r}}
+\InputenxSlot{245}{0445}{\do{cp1251}\do{mac-cyrillic}}
+\InputenxSlot{245}{0448}{\do{cp855}}
+\InputenxSlot{245}{0455}{\do{iso-8859-5}}
+\InputenxSlot{245}{0457}{\do{cp866}}
 \InputenxSlot{246}{00F6}{%
   \do{iso-8859-1}\do{iso-8859-2}\do{iso-8859-3}\do{iso-8859-4}%
   \do{iso-8859-9}\do{iso-8859-10}\do{iso-8859-13}\do{iso-8859-14}%
@@ -6292,8 +8006,13 @@ and the derived files
   \do{cp437}\do{cp850}\do{cp852}\do{cp858}\do{cp865}%
 }
 \InputenxSlot{246}{00FC}{\do{nextstep}}
-\InputenxSlot{246}{0172}{\do{mac-ce}}
+\InputenxSlot{246}{0172}{\do{mac-centeuro}}
 \InputenxSlot{246}{02C6}{\do{mac-roman}}
+\InputenxSlot{246}{040E}{\do{cp866}}
+\InputenxSlot{246}{0416}{\do{koi8-r}}
+\InputenxSlot{246}{0428}{\do{cp855}}
+\InputenxSlot{246}{0446}{\do{cp1251}\do{mac-cyrillic}}
+\InputenxSlot{246}{0456}{\do{iso-8859-5}}
 \InputenxSlot{247}{00B8}{\do{cp850}\do{cp852}\do{cp858}}
 \InputenxSlot{247}{00F7}{%
   \do{iso-8859-1}\do{iso-8859-2}\do{iso-8859-3}\do{iso-8859-4}%
@@ -6304,15 +8023,20 @@ and the derived files
 \InputenxSlot{247}{0153}{\do{dec-mcs}}
 \InputenxSlot{247}{015B}{\do{iso-8859-16}}
 \InputenxSlot{247}{0169}{\do{iso-8859-10}}
-\InputenxSlot{247}{0173}{\do{mac-ce}}
+\InputenxSlot{247}{0173}{\do{mac-centeuro}}
 \InputenxSlot{247}{02DC}{\do{mac-roman}}
+\InputenxSlot{247}{0412}{\do{koi8-r}}
+\InputenxSlot{247}{0447}{\do{cp1251}\do{mac-cyrillic}}
+\InputenxSlot{247}{044D}{\do{cp855}}
+\InputenxSlot{247}{0457}{\do{iso-8859-5}}
+\InputenxSlot{247}{045E}{\do{cp866}}
 \InputenxSlot{247}{1E6B}{\do{iso-8859-14}}
 \InputenxSlot{247}{2248}{\do{cp437}\do{cp865}}
 \InputenxSlot{248}{00AF}{\do{mac-roman}}
 \InputenxSlot{248}{00B0}{%
-  \do{cp437}\do{cp850}\do{cp852}\do{cp858}\do{cp865}%
+  \do{cp437}\do{cp850}\do{cp852}\do{cp858}\do{cp865}\do{cp866}%
 }
-\InputenxSlot{248}{00DD}{\do{mac-ce}}
+\InputenxSlot{248}{00DD}{\do{mac-centeuro}}
 \InputenxSlot{248}{00F8}{%
   \do{iso-8859-1}\do{iso-8859-4}\do{iso-8859-9}\do{iso-8859-10}%
   \do{iso-8859-14}\do{iso-8859-15}\do{cp1252}\do{dec-mcs}%
@@ -6322,30 +8046,41 @@ and the derived files
 \InputenxSlot{248}{0159}{\do{iso-8859-2}\do{cp1250}}
 \InputenxSlot{248}{0171}{\do{iso-8859-16}}
 \InputenxSlot{248}{0173}{\do{iso-8859-13}\do{cp1257}}
+\InputenxSlot{248}{042C}{\do{koi8-r}}
+\InputenxSlot{248}{042D}{\do{cp855}}
+\InputenxSlot{248}{0448}{\do{cp1251}\do{mac-cyrillic}}
+\InputenxSlot{248}{0458}{\do{iso-8859-5}}
 \InputenxSlot{249}{00A8}{\do{cp850}\do{cp852}\do{cp858}}
 \InputenxSlot{249}{00F8}{\do{nextstep}}
 \InputenxSlot{249}{00F9}{%
   \do{iso-8859-1}\do{iso-8859-3}\do{iso-8859-9}\do{iso-8859-14}%
   \do{iso-8859-15}\do{iso-8859-16}\do{cp1252}\do{dec-mcs}%
 }
-\InputenxSlot{249}{00FD}{\do{mac-ce}}
+\InputenxSlot{249}{00FD}{\do{mac-centeuro}}
 \InputenxSlot{249}{0142}{\do{iso-8859-13}\do{cp1257}}
 \InputenxSlot{249}{016F}{\do{iso-8859-2}\do{cp1250}}
 \InputenxSlot{249}{0173}{\do{iso-8859-4}\do{iso-8859-10}}
 \InputenxSlot{249}{02D8}{\do{mac-roman}}
-\InputenxSlot{249}{2219}{\do{cp437}\do{cp865}}
+\InputenxSlot{249}{042B}{\do{koi8-r}}
+\InputenxSlot{249}{0449}{\do{cp855}\do{cp1251}\do{mac-cyrillic}}
+\InputenxSlot{249}{0459}{\do{iso-8859-5}}
+\InputenxSlot{249}{2219}{\do{cp437}\do{cp865}\do{cp866}}
 \InputenxSlot{250}{00B7}{%
-  \do{cp437}\do{cp850}\do{cp858}\do{cp865}%
+  \do{cp437}\do{cp850}\do{cp858}\do{cp865}\do{cp866}%
 }
 \InputenxSlot{250}{00FA}{%
   \do{iso-8859-1}\do{iso-8859-2}\do{iso-8859-3}\do{iso-8859-4}%
   \do{iso-8859-9}\do{iso-8859-10}\do{iso-8859-14}\do{iso-8859-15}%
   \do{iso-8859-16}\do{cp1250}\do{cp1252}\do{dec-mcs}%
 }
-\InputenxSlot{250}{0137}{\do{mac-ce}}
+\InputenxSlot{250}{0137}{\do{mac-centeuro}}
 \InputenxSlot{250}{0153}{\do{nextstep}}
 \InputenxSlot{250}{015B}{\do{iso-8859-13}\do{cp1257}}
 \InputenxSlot{250}{02D9}{\do{cp852}\do{mac-roman}}
+\InputenxSlot{250}{0417}{\do{koi8-r}}
+\InputenxSlot{250}{0429}{\do{cp855}}
+\InputenxSlot{250}{044A}{\do{cp1251}\do{mac-cyrillic}}
+\InputenxSlot{250}{045A}{\do{iso-8859-5}}
 \InputenxSlot{251}{00B9}{\do{cp850}\do{cp858}}
 \InputenxSlot{251}{00DF}{\do{nextstep}}
 \InputenxSlot{251}{00FB}{%
@@ -6355,9 +8090,13 @@ and the derived files
 }
 \InputenxSlot{251}{016B}{\do{iso-8859-13}\do{cp1257}}
 \InputenxSlot{251}{0171}{\do{iso-8859-2}\do{cp852}\do{cp1250}}
-\InputenxSlot{251}{017B}{\do{mac-ce}}
+\InputenxSlot{251}{017B}{\do{mac-centeuro}}
 \InputenxSlot{251}{02DA}{\do{mac-roman}}
-\InputenxSlot{251}{221A}{\do{cp437}\do{cp865}}
+\InputenxSlot{251}{0428}{\do{koi8-r}}
+\InputenxSlot{251}{0447}{\do{cp855}}
+\InputenxSlot{251}{044B}{\do{cp1251}\do{mac-cyrillic}}
+\InputenxSlot{251}{045B}{\do{iso-8859-5}}
+\InputenxSlot{251}{221A}{\do{cp437}\do{cp865}\do{cp866}}
 \InputenxSlot{252}{00B3}{\do{cp850}\do{cp858}}
 \InputenxSlot{252}{00B8}{\do{mac-roman}}
 \InputenxSlot{252}{00FC}{%
@@ -6367,9 +8106,16 @@ and the derived files
   \do{dec-mcs}%
 }
 \InputenxSlot{252}{00FE}{\do{nextstep}}
-\InputenxSlot{252}{0141}{\do{mac-ce}}
+\InputenxSlot{252}{0141}{\do{mac-centeuro}}
 \InputenxSlot{252}{0158}{\do{cp852}}
+\InputenxSlot{252}{0427}{\do{cp855}}
+\InputenxSlot{252}{042D}{\do{koi8-r}}
+\InputenxSlot{252}{044C}{\do{cp1251}\do{mac-cyrillic}}
+\InputenxSlot{252}{045C}{\do{iso-8859-5}}
 \InputenxSlot{252}{207F}{\do{cp437}\do{cp865}}
+\InputenxSlot{252}{2116}{\do{cp866}}
+\InputenxSlot{253}{00A4}{\do{cp866}}
+\InputenxSlot{253}{00A7}{\do{iso-8859-5}\do{cp855}}
 \InputenxSlot{253}{00B2}{%
   \do{cp437}\do{cp850}\do{cp858}\do{cp865}%
 }
@@ -6377,18 +8123,20 @@ and the derived files
   \do{iso-8859-1}\do{iso-8859-2}\do{iso-8859-10}\do{iso-8859-14}%
   \do{iso-8859-15}\do{cp1250}\do{cp1252}%
 }
-\InputenxSlot{253}{00FF}{\do{nextstep}\do{dec-mcs}}
+\InputenxSlot{253}{00FF}{\do{dec-mcs}\do{nextstep}}
 \InputenxSlot{253}{0119}{\do{iso-8859-16}}
 \InputenxSlot{253}{0131}{\do{iso-8859-9}}
 \InputenxSlot{253}{0159}{\do{cp852}}
 \InputenxSlot{253}{0169}{\do{iso-8859-4}}
 \InputenxSlot{253}{016D}{\do{iso-8859-3}}
-\InputenxSlot{253}{017C}{\do{iso-8859-13}\do{cp1257}\do{mac-ce}}
+\InputenxSlot{253}{017C}{\do{iso-8859-13}\do{cp1257}\do{mac-centeuro}}
 \InputenxSlot{253}{02DD}{\do{mac-roman}}
+\InputenxSlot{253}{0429}{\do{koi8-r}}
+\InputenxSlot{253}{044D}{\do{cp1251}\do{mac-cyrillic}}
 \InputenxSlot{254}{00FE}{%
   \do{iso-8859-1}\do{iso-8859-10}\do{iso-8859-15}\do{cp1252}%
 }
-\InputenxSlot{254}{0122}{\do{mac-ce}}
+\InputenxSlot{254}{0122}{\do{mac-centeuro}}
 \InputenxSlot{254}{015D}{\do{iso-8859-3}}
 \InputenxSlot{254}{015F}{\do{iso-8859-9}}
 \InputenxSlot{254}{0163}{\do{iso-8859-2}\do{cp1250}}
@@ -6397,22 +8145,31 @@ and the derived files
 \InputenxSlot{254}{017E}{\do{iso-8859-13}\do{cp1257}}
 \InputenxSlot{254}{021B}{\do{iso-8859-16}}
 \InputenxSlot{254}{02DB}{\do{mac-roman}}
+\InputenxSlot{254}{0427}{\do{koi8-r}}
+\InputenxSlot{254}{044E}{\do{cp1251}\do{mac-cyrillic}}
+\InputenxSlot{254}{045E}{\do{iso-8859-5}}
 \InputenxSlot{254}{25A0}{%
-  \do{cp437}\do{cp850}\do{cp852}\do{cp858}\do{cp865}%
+  \do{cp437}\do{cp850}\do{cp852}\do{cp855}\do{cp858}\do{cp865}%
+  \do{cp866}%
 }
 \InputenxSlot{255}{00A0}{%
-  \do{cp437}\do{cp850}\do{cp852}\do{cp858}\do{cp865}%
+  \do{cp437}\do{cp850}\do{cp852}\do{cp855}\do{cp858}\do{cp865}%
+  \do{cp866}%
 }
 \InputenxSlot{255}{00FF}{%
   \do{iso-8859-1}\do{iso-8859-9}\do{iso-8859-14}\do{iso-8859-15}%
   \do{iso-8859-16}\do{cp1252}%
 }
 \InputenxSlot{255}{0138}{\do{iso-8859-10}}
-\InputenxSlot{255}{02C7}{\do{mac-roman}\do{mac-ce}}
+\InputenxSlot{255}{02C7}{\do{mac-centeuro}\do{mac-roman}}
 \InputenxSlot{255}{02D9}{%
   \do{iso-8859-2}\do{iso-8859-3}\do{iso-8859-4}\do{cp1250}\do{cp1257}%
 }
+\InputenxSlot{255}{042A}{\do{koi8-r}}
+\InputenxSlot{255}{044F}{\do{cp1251}}
+\InputenxSlot{255}{045F}{\do{iso-8859-5}}
 \InputenxSlot{255}{2019}{\do{iso-8859-13}}
+\InputenxSlot{255}{20AC}{\do{mac-cyrillic}}
 %    \end{macrocode}
 %    \fi
 %
@@ -6425,7 +8182,7 @@ and the derived files
 %    \begin{macrocode}
 %<*uc>
 \ProvidesFile{ix-uc.def}%
-  [2006/08/24 v1.0 UC to LICR (inputenx)]
+  [2007/04/11 v1.1 UC to LICR (inputenx)]%
 %    \end{macrocode}
 %
 %    \textit{List omitted here, see \xfile{ix-uc.def}.}
@@ -6897,6 +8654,7 @@ and the derived files
 }
 \InputenxUC{0401}{\CYRYO}{}
 \InputenxUC{0402}{\CYRDJE}{}
+\InputenxUC{0403}{\@tabacckludge'\CYRG}{}
 \InputenxUC{0404}{\CYRIE}{}
 \InputenxUC{0405}{\CYRDZE}{}
 \InputenxUC{0406}{\CYRII}{}
@@ -6905,6 +8663,7 @@ and the derived files
 \InputenxUC{0409}{\CYRLJE}{}
 \InputenxUC{040A}{\CYRNJE}{}
 \InputenxUC{040B}{\CYRTSHE}{}
+\InputenxUC{040C}{\@tabacckludge'\CYRK}{}
 \InputenxUC{040E}{\CYRUSHRT}{}
 \InputenxUC{040F}{\CYRDZHE}{}
 \InputenxUC{0410}{\CYRA}{}
@@ -6973,6 +8732,7 @@ and the derived files
 \InputenxUC{044F}{\cyrya}{}
 \InputenxUC{0451}{\cyryo}{}
 \InputenxUC{0452}{\cyrdje}{}
+\InputenxUC{0453}{\@tabacckludge'\cyrg}{}
 \InputenxUC{0454}{\cyrie}{}
 \InputenxUC{0455}{\cyrdze}{}
 \InputenxUC{0456}{\cyrii}{}
@@ -6981,6 +8741,7 @@ and the derived files
 \InputenxUC{0459}{\cyrlje}{}
 \InputenxUC{045A}{\cyrnje}{}
 \InputenxUC{045B}{\cyrtshe}{}
+\InputenxUC{045C}{\@tabacckludge'\cyrk}{}
 \InputenxUC{045E}{\cyrushrt}{}
 \InputenxUC{045F}{\cyrdzhe}{}
 \InputenxUC{0462}{\CYRYAT}{}
@@ -7382,7 +9143,7 @@ and the derived files
 %    \begin{macrocode}
 %<*math>
 \ProvidesFile{ix-math.def}%
-  [2006/08/24 v1.0 Math list (inputenx)]
+  [2007/04/11 v1.1 Math list (inputenx)]%
 %    \end{macrocode}
 %
 %    The next math meaning for \cs{ss} looks a little funny.
@@ -7465,7 +9226,7 @@ and the derived files
 % defined by standard \LaTeX\ without extra packages.
 %    \begin{macrocode}
 %<*licrcmds>
- % List of known LICR commdands of inputenx 2006/08/24 v1.0
+ % List of known LICR commdands of inputenx 2007/04/11 v1.1
  %
  % Format: \LICRcmd{<command>}{<type>}
  % Types:
@@ -7574,7 +9335,7 @@ and the derived files
 %
 %    \begin{macrocode}
 %<*dfudoc>
- % inputenx-utf8enc.txt 2006/08/24 v1.0
+ % inputenx-utf8enc.txt 2007/04/11 v1.1
  % Commented additions for utf8enc.dfu
 
 %    \end{macrocode}
@@ -7910,6 +9671,22 @@ and the derived files
   % GREEK SMALL LETTER PHI
   % ???
 
+\DeclareUnicodeCharacter{0403}{\@tabacckludge'\CYRG}
+  % CYRILLIC CAPITAL LETTER GJE
+  % cp1251[0x81/129]
+
+\DeclareUnicodeCharacter{040C}{\@tabacckludge'\CYRK}
+  % CYRILLIC CAPITAL LETTER KJE
+  % cp1251[0x8D/141]
+
+\DeclareUnicodeCharacter{0453}{\@tabacckludge'\cyrg}
+  % CYRILLIC SMALL LETTER GJE
+  % cp1251[0x83/131]
+
+\DeclareUnicodeCharacter{045C}{\@tabacckludge'\cyrk}
+  % CYRILLIC SMALL LETTER KJE
+  % cp1251[0x9D/157]
+
   % \DeclareUnicodeCharacter{2017}{}
   % DOUBLE LOW LINE
   % SPACING DOUBLE UNDERSCORE
@@ -8382,13 +10159,47 @@ and the derived files
 %    \end{macrocode}
 % \section{Installation}
 %
-% \paragraph{CTAN.} This package is available on
+% \subsection{Download}
+%
+% \paragraph{Package.} This package is available on
 % CTAN\footnote{\url{ftp://ftp.ctan.org/tex-archive/}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/inputenx.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/inputenx.pdf}] Documentation.
 % \end{description}
 %
+%
+% \paragraph{Bundle.} All the packages of the bundle `oberdiek'
+% are also available in a TDS compliant ZIP archive. There
+% the packages are already unpacked and the documentation files
+% are generated. The files and directories obey the TDS standard.
+% \begin{description}
+% \item[\CTAN{macros/latex/contrib/oberdiek/oberdiek-tds.zip}]
+% \end{description}
+%
+% \subsection{Bundle installation}
+%
+% \paragraph{Unpacking.} Unpack the \xfile{oberdiek-tds.zip} in the
+% TDS tree (also known as \xfile{texmf} tree) of your choice.
+% Example (linux):
+% \begin{quote}
+%   |unzip oberdiek-tds.zip -d ~/texmf|
+% \end{quote}
+%
+% \paragraph{Script installation.}
+% Check the directory \xfile{TDS:scripts/oberdiek/} for
+% scripts that need further installation steps.
+% Package \xpackage{attachfile2} comes with the Perl script
+% \xfile{pdfatfi.pl} that should be installed in such a way
+% that it can be called as \texttt{pdfatfi}.
+% Example (linux):
+% \begin{quote}
+%   |chmod +x scripts/oberdiek/pdfatfi.pl|\\
+%   |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
+% \end{quote}
+%
+% \subsection{Package installation}
+%
 % \paragraph{Unpacking.} The \xfile{.dtx} file is a self-extracting
 % \docstrip\ archive. The files are extracted by running the
 % \xfile{.dtx} through \plainTeX:
@@ -8414,6 +10225,7 @@ and the derived files
 %   x-iso-8859-2.def & tex/latex/oberdiek/x-iso-8859-2.def\\
 %   x-iso-8859-3.def & tex/latex/oberdiek/x-iso-8859-3.def\\
 %   x-iso-8859-4.def & tex/latex/oberdiek/x-iso-8859-4.def\\
+%   x-iso-8859-5.def & tex/latex/oberdiek/x-iso-8859-5.def\\
 %   x-iso-8859-9.def & tex/latex/oberdiek/x-iso-8859-9.def\\
 %   x-iso-8859-10.def & tex/latex/oberdiek/x-iso-8859-10.def\\
 %   x-iso-8859-13.def & tex/latex/oberdiek/x-iso-8859-13.def\\
@@ -8423,15 +10235,20 @@ and the derived files
 %   x-cp437.def & tex/latex/oberdiek/x-cp437.def\\
 %   x-cp850.def & tex/latex/oberdiek/x-cp850.def\\
 %   x-cp852.def & tex/latex/oberdiek/x-cp852.def\\
+%   x-cp855.def & tex/latex/oberdiek/x-cp855.def\\
 %   x-cp858.def & tex/latex/oberdiek/x-cp858.def\\
 %   x-cp865.def & tex/latex/oberdiek/x-cp865.def\\
+%   x-cp866.def & tex/latex/oberdiek/x-cp866.def\\
 %   x-cp1250.def & tex/latex/oberdiek/x-cp1250.def\\
+%   x-cp1251.def & tex/latex/oberdiek/x-cp1251.def\\
 %   x-cp1252.def & tex/latex/oberdiek/x-cp1252.def\\
 %   x-cp1257.def & tex/latex/oberdiek/x-cp1257.def\\
+%   x-dec-mcs.def & tex/latex/oberdiek/x-dec-mcs.def\\
+%   x-koi8-r.def & tex/latex/oberdiek/x-koi8-r.def\\
+%   x-mac-centeuro.def & tex/latex/oberdiek/x-mac-centeuro.def\\
+%   x-mac-cyrillic.def & tex/latex/oberdiek/x-mac-cyrillic.def\\
 %   x-mac-roman.def & tex/latex/oberdiek/x-mac-roman.def\\
-%   x-mac-ce.def & tex/latex/oberdiek/x-mac-ce.def\\
 %   x-nextstep.def & tex/latex/oberdiek/x-nextstep.def\\
-%   x-dec-mcs.def & tex/latex/oberdiek/x-dec-mcs.def\\
 %   inputenx.pdf & doc/latex/oberdiek/inputenx.pdf\\
 %   inputenx-licrcmds.txt & doc/latex/oberdiek/inputenx-licrcmds.txt\\
 %   inputenx-utf8enc.txt & doc/latex/oberdiek/inputenx-utf8enc.txt\\
@@ -8450,8 +10267,10 @@ and the derived files
 % TDS installing feature, then some files can already be in the right
 % place, see the documentation of \docstrip.
 %
-% \paragraph{Refresh file databases.} If your \TeX~distribution
-% (\teTeX, \mikTeX, \dots) rely on file databases, you must refresh
+% \subsection{Refresh file name databases}
+%
+% If your \TeX~distribution
+% (\teTeX, \mikTeX, \dots) relies on file name databases, you must refresh
 % these. For example, \teTeX\ users run \verb|texhash| or
 % \verb|mktexlsr|.
 %
@@ -8540,6 +10359,11 @@ and the derived files
 %   \textit{ISO/IEC 8859-4:1998 to Unicode}, 27th July 1999.
 %   \url{ftp://ftp.unicode.org/Public/MAPPINGS/ISO8859/8859-4.TXT}
 %
+% \bibitem{iso8859-5}
+%   Ken Whistler,
+%   \textit{ISO/IEC 8859-5:1998 to Unicode}, 27th July 1999.
+%   \url{ftp://ftp.unicode.org/Public/MAPPINGS/ISO8859/8859-5.TXT}
+%
 % \bibitem{iso8859-9}
 %   Ken Whistler,
 %   \textit{ISO/IEC 8859-9:1999 to Unicode}, 27th July 1999.
@@ -8555,18 +10379,35 @@ and the derived files
 %   \textit{ISO/IEC 8859-16:2001 to Unicode}, 26th July 2001.
 %   \url{ftp://ftp.unicode.org/Public/MAPPINGS/ISO8859/8859-16.TXT}
 %
-% \bibitem{mac-ce}
+% \bibitem{koi8-r}
+%   Helmut Richter,
+%   \textit{KOI8-R (RFC1486) to Unicode}, 18th August 1999.
+%   \url{ftp://ftp.unicode.org/Public/MAPPINGS/VENDORS/MISC/KOI8-R.TXT}
+%
+% \bibitem{mac-centeuro}
 %   Apple Computer,
 %   \textit{Map (external version) from MAC OS Central European character
 %     set to Unicode 2.1 and later}, 4th April 2005.
 %   \url{ftp://ftp.unicode.org/Public/MAPPINGS/VENDORS/APPLE/CENTEURO.TXT}
 %
+% \bibitem{mac-cyrillic}
+%   Apple Computer,
+%   \textit{Map (external version) from MAC OS Cyrillic character
+%     set to Unicode 2.1 and later}, 5th April 2005.
+%   \url{ftp://ftp.unicode.org/Public/MAPPINGS/VENDORS/APPLE/CYRILLIC.TXT}
+%
 % \bibitem{mac-roman}
 %   Apple Computer,
 %   \textit{Map (external version) from MAC OS Roman character
 %     set to Unicode 2.1 and later}, 5th April 2005.
 %   \url{ftp://ftp.unicode.org/Public/MAPPINGS/VENDORS/APPLE/ROMAN.TXT}
 %
+% \bibitem{mac-ukrainian}
+%   Apple Computer,
+%   \textit{Map (external version) from MAC OS Urainian character
+%     set to Unicode 2.1 and later}, 5th April 2005.
+%   \url{ftp://ftp.unicode.org/Public/MAPPINGS/VENDORS/APPLE/UKRAINIAN.TXT}
+%
 % \bibitem{nextstep}
 %   Rick McGowan,
 %   \textit{NextStep Encoding to Unicode}, 23rd September 1999.
@@ -8579,6 +10420,13 @@ and the derived files
 %   \item
 %     First version.
 %   \end{Version}
+%   \begin{Version}{2007/04/11 v1.1}
+%   \item
+%     Some Cyrillic encodings added:
+%     cp855, cp866, cp1251, koi8-r, mac-cyrillic
+%   \item
+%     x-mac-ce renamed to x-mac-centeuro.
+%   \end{Version}
 % \end{History}
 %
 % \PrintIndex
diff --git a/Master/texmf-dist/source/latex/oberdiek/kvoptions.dtx b/Master/texmf-dist/source/latex/oberdiek/kvoptions.dtx
index 4da9f9f2706..7c76961ae2d 100644
--- a/Master/texmf-dist/source/latex/oberdiek/kvoptions.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/kvoptions.dtx
@@ -1,6 +1,7 @@
 % \iffalse meta-comment
 %
-% Copyright (C) 2004, 2006 by Heiko Oberdiek <oberdiek@uni-freiburg.de>
+% Copyright (C) 2004, 2006, 2007 by
+%    Heiko Oberdiek <oberdiek@uni-freiburg.de>
 %
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either
@@ -57,7 +58,7 @@
 %
 %<*ignore>
 \begingroup
-  \def\x{LaTeX2e}
+  \def\x{LaTeX2e}%
 \expandafter\endgroup
 \ifcase 0\ifx\install y1\fi\expandafter
          \ifx\csname processbatchFile\endcsname\relax\else1\fi
@@ -68,7 +69,7 @@
 \input docstrip.tex
 \Msg{************************************************************************}
 \Msg{* Installation}
-\Msg{* Package: kvoptions 2006/08/22 v2.4 Connects package keyval with LaTeX options (HO)}
+\Msg{* Package: kvoptions 2007/04/11 v2.5 Connects package keyval with LaTeX options (HO)}
 \Msg{************************************************************************}
 
 \keepsilent
@@ -78,7 +79,8 @@
 
 This is a generated file.
 
-Copyright (C) 2004, 2006 by Heiko Oberdiek <oberdiek@uni-freiburg.de>
+Copyright (C) 2004, 2006, 2007 by
+   Heiko Oberdiek <oberdiek@uni-freiburg.de>
 
 This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either
@@ -131,11 +133,11 @@ and the derived files
 %<*driver>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{kvoptions.drv}%
-  [2006/08/22 v2.4 Connects package keyval with LaTeX options (HO)]
+  [2007/04/11 v2.5 Connects package keyval with LaTeX options (HO)]%
 \documentclass{ltxdoc}
 \usepackage{holtxdoc}
 \begin{document}
-  \DocInput{kvoptions.dtx}
+  \DocInput{kvoptions.dtx}%
 \end{document}
 %</driver>
 % \fi
@@ -161,7 +163,7 @@ and the derived files
 % \GetFileInfo{kvoptions.drv}
 %
 % \title{The \xpackage{kvoptions} package}
-% \date{2006/08/22 v2.4}
+% \date{2007/04/11 v2.5}
 % \author{Heiko Oberdiek\\\xemail{oberdiek@uni-freiburg.de}}
 %
 % \maketitle
@@ -624,7 +626,7 @@ and the derived files
     % Package identification
     % -----------------------
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{example-mycolorsetup}[2006/08/22 Managing my colors]
+\ProvidesPackage{example-mycolorsetup}[2007/04/11 Managing my colors]
 
 \RequirePackage{ifpdf}
 \RequirePackage{kvoptions}
@@ -926,7 +928,7 @@ and the derived files
 %<*package>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{kvoptions}
-  [2006/08/22 v2.4 Connects package keyval with LaTeX options (HO)]
+  [2007/04/11 v2.5 Connects package keyval with LaTeX options (HO)]%
 %    \end{macrocode}
 %
 % \paragraph{External resources.}
@@ -1354,7 +1356,7 @@ and the derived files
     \def\x{\endgroup}%
     \@ifundefined{KVO@action@\KVOdyn@action}{%
       \PackageError{kvoptions}{%
-        Unknown disable action
+        Unknown disable action %
         `\expandafter\strip@prefix\meaning\KVOdyn@action'\MessageBreak
         for option `#3' in keyval family '#2'%
       }\@ehc
@@ -1934,10 +1936,10 @@ and the derived files
           \def\y{#2}%
           \edef\y{\expandafter\strip@prefix\meaning\y}%
           \@latex@error{Option clash for \@cls@pkg\space #1}{%
-            The package #1 has already been loaded
+            The package #1 has already been loaded %
             with options:\MessageBreak
             \space\space[\x]\MessageBreak
-            There has now been an attempt to load it
+            There has now been an attempt to load it %
              with options\MessageBreak
             \space\space[\y]\MessageBreak
             Adding the global options:\MessageBreak
@@ -1966,12 +1968,12 @@ and the derived files
     \@ifl@ter\@currext{#1}{#3}{%
     }{%
       \@latex@warning@no@line{%
-        You have requested,\on@line,
+        You have requested,\on@line, %
         version\MessageBreak
           #3' of \@cls@pkg\space #1,\MessageBreak
         but only version\MessageBreak
          `\csname ver@#1.\@currext\endcsname'\MessageBreak
-        is available
+        is available%
       }%
     }%
     \ifx\@currext\@clsextension\let\LoadClass\@twoloadclasserror\fi
@@ -1988,10 +1990,10 @@ and the derived files
     Unknown option `\KVO@SanitizedCurrentOption' %
     for \@cls@pkg\space`\@currname'%
   }{%
-    The option `\KVO@SanitizedCurrentOption' was not declared in
+    The option `\KVO@SanitizedCurrentOption' was not declared in %
     \@cls@pkg\space`\@currname', perhaps you\MessageBreak
-    misspelled its name.
-    Try typing \space <return>
+    misspelled its name. %
+    Try typing \space <return> %
     \space to proceed.%
   }%
 }
@@ -2137,13 +2139,47 @@ and the derived files
 %    \end{macrocode}
 % \section{Installation}
 %
-% \paragraph{CTAN.} This package is available on
+% \subsection{Download}
+%
+% \paragraph{Package.} This package is available on
 % CTAN\footnote{\url{ftp://ftp.ctan.org/tex-archive/}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/kvoptions.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/kvoptions.pdf}] Documentation.
 % \end{description}
 %
+%
+% \paragraph{Bundle.} All the packages of the bundle `oberdiek'
+% are also available in a TDS compliant ZIP archive. There
+% the packages are already unpacked and the documentation files
+% are generated. The files and directories obey the TDS standard.
+% \begin{description}
+% \item[\CTAN{macros/latex/contrib/oberdiek/oberdiek-tds.zip}]
+% \end{description}
+%
+% \subsection{Bundle installation}
+%
+% \paragraph{Unpacking.} Unpack the \xfile{oberdiek-tds.zip} in the
+% TDS tree (also known as \xfile{texmf} tree) of your choice.
+% Example (linux):
+% \begin{quote}
+%   |unzip oberdiek-tds.zip -d ~/texmf|
+% \end{quote}
+%
+% \paragraph{Script installation.}
+% Check the directory \xfile{TDS:scripts/oberdiek/} for
+% scripts that need further installation steps.
+% Package \xpackage{attachfile2} comes with the Perl script
+% \xfile{pdfatfi.pl} that should be installed in such a way
+% that it can be called as \texttt{pdfatfi}.
+% Example (linux):
+% \begin{quote}
+%   |chmod +x scripts/oberdiek/pdfatfi.pl|\\
+%   |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
+% \end{quote}
+%
+% \subsection{Package installation}
+%
 % \paragraph{Unpacking.} The \xfile{.dtx} file is a self-extracting
 % \docstrip\ archive. The files are extracted by running the
 % \xfile{.dtx} through \plainTeX:
@@ -2175,8 +2211,10 @@ and the derived files
 % TDS installing feature, then some files can already be in the right
 % place, see the documentation of \docstrip.
 %
-% \paragraph{Refresh file databases.} If your \TeX~distribution
-% (\teTeX, \mikTeX, \dots) rely on file databases, you must refresh
+% \subsection{Refresh file name databases}
+%
+% If your \TeX~distribution
+% (\teTeX, \mikTeX, \dots) relies on file name databases, you must refresh
 % these. For example, \teTeX\ users run \verb|texhash| or
 % \verb|mktexlsr|.
 %
@@ -2311,6 +2349,10 @@ and the derived files
 %     Option \xoption{patch}: \cs{ExecuteOptions} does not
 %     change meaning of \cs{CurrentOption} at all.
 %   \end{Version}
+%   \begin{Version}{2007/04/11 v2.5}
+%   \item
+%     Line ends sanitized.
+%   \end{Version}
 % \end{History}
 %
 % \PrintIndex
diff --git a/Master/texmf-dist/source/latex/oberdiek/kvsetkeys.dtx b/Master/texmf-dist/source/latex/oberdiek/kvsetkeys.dtx
index 4e661ae2e29..acf7773b9cc 100644
--- a/Master/texmf-dist/source/latex/oberdiek/kvsetkeys.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/kvsetkeys.dtx
@@ -57,7 +57,7 @@
 %
 %<*ignore>
 \begingroup
-  \def\x{LaTeX2e}
+  \def\x{LaTeX2e}%
 \expandafter\endgroup
 \ifcase 0\ifx\install y1\fi\expandafter
          \ifx\csname processbatchFile\endcsname\relax\else1\fi
@@ -131,11 +131,11 @@ and the derived files
 %<*driver>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{kvsetkeys.drv}%
-  [2006/10/19 v1.1 Key value parser with default handler support (HO)]
+  [2006/10/19 v1.1 Key value parser with default handler support (HO)]%
 \documentclass{ltxdoc}
 \usepackage{holtxdoc}
 \begin{document}
-  \DocInput{kvsetkeys.dtx}
+  \DocInput{kvsetkeys.dtx}%
 \end{document}
 %</driver>
 % \fi
@@ -484,7 +484,7 @@ and the derived files
   \def\KVS@comma{%
     \toks@\expandafter{\expandafter}\expandafter
     \KVS@@comma\the\toks@~\KVS@nil
-  }
+  }%
   \def\KVS@@comma#1~#2\KVS@nil{%
     \toks@\expandafter{\the\toks@#1,}%
     \toks2{#2}%
@@ -509,7 +509,7 @@ and the derived files
   \def\KVS@equal{%
     \toks@\expandafter{\expandafter}\expandafter
     \KVS@@equal\the\toks@~\KVS@nil
-  }
+  }%
   \def\KVS@@equal#1~#2\KVS@nil{%
     \edef\x{\the\toks@}%
     \ifx\x\KVS@empty
@@ -808,13 +808,47 @@ and the derived files
 %    \end{macrocode}
 % \section{Installation}
 %
-% \paragraph{CTAN.} This package is available on
+% \subsection{Download}
+%
+% \paragraph{Package.} This package is available on
 % CTAN\footnote{\url{ftp://ftp.ctan.org/tex-archive/}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/kvsetkeys.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/kvsetkeys.pdf}] Documentation.
 % \end{description}
 %
+%
+% \paragraph{Bundle.} All the packages of the bundle `oberdiek'
+% are also available in a TDS compliant ZIP archive. There
+% the packages are already unpacked and the documentation files
+% are generated. The files and directories obey the TDS standard.
+% \begin{description}
+% \item[\CTAN{macros/latex/contrib/oberdiek/oberdiek-tds.zip}]
+% \end{description}
+%
+% \subsection{Bundle installation}
+%
+% \paragraph{Unpacking.} Unpack the \xfile{oberdiek-tds.zip} in the
+% TDS tree (also known as \xfile{texmf} tree) of your choice.
+% Example (linux):
+% \begin{quote}
+%   |unzip oberdiek-tds.zip -d ~/texmf|
+% \end{quote}
+%
+% \paragraph{Script installation.}
+% Check the directory \xfile{TDS:scripts/oberdiek/} for
+% scripts that need further installation steps.
+% Package \xpackage{attachfile2} comes with the Perl script
+% \xfile{pdfatfi.pl} that should be installed in such a way
+% that it can be called as \texttt{pdfatfi}.
+% Example (linux):
+% \begin{quote}
+%   |chmod +x scripts/oberdiek/pdfatfi.pl|\\
+%   |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
+% \end{quote}
+%
+% \subsection{Package installation}
+%
 % \paragraph{Unpacking.} The \xfile{.dtx} file is a self-extracting
 % \docstrip\ archive. The files are extracted by running the
 % \xfile{.dtx} through \plainTeX:
@@ -846,8 +880,10 @@ and the derived files
 % TDS installing feature, then some files can already be in the right
 % place, see the documentation of \docstrip.
 %
-% \paragraph{Refresh file databases.} If your \TeX~distribution
-% (\teTeX, \mikTeX, \dots) rely on file databases, you must refresh
+% \subsection{Refresh file name databases}
+%
+% If your \TeX~distribution
+% (\teTeX, \mikTeX, \dots) relies on file name databases, you must refresh
 % these. For example, \teTeX\ users run \verb|texhash| or
 % \verb|mktexlsr|.
 %
diff --git a/Master/texmf-dist/source/latex/oberdiek/makerobust.dtx b/Master/texmf-dist/source/latex/oberdiek/makerobust.dtx
index a486927a6f8..965e803bc56 100644
--- a/Master/texmf-dist/source/latex/oberdiek/makerobust.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/makerobust.dtx
@@ -57,7 +57,7 @@
 %
 %<*ignore>
 \begingroup
-  \def\x{LaTeX2e}
+  \def\x{LaTeX2e}%
 \expandafter\endgroup
 \ifcase 0\ifx\install y1\fi\expandafter
          \ifx\csname processbatchFile\endcsname\relax\else1\fi
@@ -131,11 +131,11 @@ and the derived files
 %<*driver>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{makerobust.drv}%
-  [2006/03/18 v1.0 Making a macro robust (HO)]
+  [2006/03/18 v1.0 Making a macro robust (HO)]%
 \documentclass{ltxdoc}
 \usepackage{holtxdoc}
 \begin{document}
-  \DocInput{makerobust.dtx}
+  \DocInput{makerobust.dtx}%
 \end{document}
 %</driver>
 % \fi
@@ -251,7 +251,7 @@ Second page.
 %<*package>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{makerobust}%
-  [2006/03/18 v1.0 Making a macro robust (HO)]
+  [2006/03/18 v1.0 Making a macro robust (HO)]%
 %    \end{macrocode}
 %
 %    \begin{macrocode}
@@ -295,13 +295,47 @@ Second page.
 %    \end{macrocode}
 % \section{Installation}
 %
-% \paragraph{CTAN.} This package is available on
+% \subsection{Download}
+%
+% \paragraph{Package.} This package is available on
 % CTAN\footnote{\url{ftp://ftp.ctan.org/tex-archive/}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/makerobust.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/makerobust.pdf}] Documentation.
 % \end{description}
 %
+%
+% \paragraph{Bundle.} All the packages of the bundle `oberdiek'
+% are also available in a TDS compliant ZIP archive. There
+% the packages are already unpacked and the documentation files
+% are generated. The files and directories obey the TDS standard.
+% \begin{description}
+% \item[\CTAN{macros/latex/contrib/oberdiek/oberdiek-tds.zip}]
+% \end{description}
+%
+% \subsection{Bundle installation}
+%
+% \paragraph{Unpacking.} Unpack the \xfile{oberdiek-tds.zip} in the
+% TDS tree (also known as \xfile{texmf} tree) of your choice.
+% Example (linux):
+% \begin{quote}
+%   |unzip oberdiek-tds.zip -d ~/texmf|
+% \end{quote}
+%
+% \paragraph{Script installation.}
+% Check the directory \xfile{TDS:scripts/oberdiek/} for
+% scripts that need further installation steps.
+% Package \xpackage{attachfile2} comes with the Perl script
+% \xfile{pdfatfi.pl} that should be installed in such a way
+% that it can be called as \texttt{pdfatfi}.
+% Example (linux):
+% \begin{quote}
+%   |chmod +x scripts/oberdiek/pdfatfi.pl|\\
+%   |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
+% \end{quote}
+%
+% \subsection{Package installation}
+%
 % \paragraph{Unpacking.} The \xfile{.dtx} file is a self-extracting
 % \docstrip\ archive. The files are extracted by running the
 % \xfile{.dtx} through \plainTeX:
@@ -333,8 +367,10 @@ Second page.
 % TDS installing feature, then some files can already be in the right
 % place, see the documentation of \docstrip.
 %
-% \paragraph{Refresh file databases.} If your \TeX~distribution
-% (\teTeX, \mikTeX, \dots) rely on file databases, you must refresh
+% \subsection{Refresh file name databases}
+%
+% If your \TeX~distribution
+% (\teTeX, \mikTeX, \dots) relies on file name databases, you must refresh
 % these. For example, \teTeX\ users run \verb|texhash| or
 % \verb|mktexlsr|.
 %
diff --git a/Master/texmf-dist/source/latex/oberdiek/oberdiek.ins b/Master/texmf-dist/source/latex/oberdiek/oberdiek.ins
index 89b20d5e96f..48342cc9cf1 100644
--- a/Master/texmf-dist/source/latex/oberdiek/oberdiek.ins
+++ b/Master/texmf-dist/source/latex/oberdiek/oberdiek.ins
@@ -1,5 +1,5 @@
 % oberdiek.ins
-% 2007/03/05
+% 2007/04/11
 %
 % Copyright (C) 1999, 2001, 2006 by
 %    Heiko Oberdiek <oberdiek@uni-freiburg.de>
@@ -22,8 +22,10 @@
 %
 \input docstrip
 
+\batchinput{accsupp.dtx}
 \batchinput{aliascnt.dtx}
 \batchinput{alphalph.dtx}
+\batchinput{atenddvi.dtx}
 \batchinput{attachfile2.dtx}
 \batchinput{auxhook.dtx}
 \batchinput{bmpsize.dtx}
@@ -39,11 +41,13 @@
 \batchinput{flags.dtx}
 \batchinput{grffile.dtx}
 \batchinput{holtxdoc.dtx}
+\batchinput{hycolor.dtx}
 \batchinput{hypbmsec.dtx}
 \batchinput{hypcap.dtx}
 \batchinput{hypdestopt.dtx}
 \batchinput{hypdoc.dtx}
 \batchinput{ifdraft.dtx}
+\batchinput{iflang.dtx}
 \batchinput{ifpdf.dtx}
 \batchinput{ifvtex.dtx}
 \batchinput{inputenx.dtx}
diff --git a/Master/texmf-dist/source/latex/oberdiek/oberdiek.tex b/Master/texmf-dist/source/latex/oberdiek/oberdiek.tex
index 22a5b0bc5a9..f16021f467c 100644
--- a/Master/texmf-dist/source/latex/oberdiek/oberdiek.tex
+++ b/Master/texmf-dist/source/latex/oberdiek/oberdiek.tex
@@ -6,7 +6,7 @@
 \newcommand*{\Subject}{CTAN:\CTANdir}
 \newcommand*{\Author}{Heiko Oberdiek}
 \newcommand*{\Email}{oberdiek@uni-freiburg.de}
-\newcommand*{\Date}{2007/03/05}
+\newcommand*{\Date}{2007/04/11}
 
 % Copyright (C) 2006 by
 %    Heiko Oberdiek <oberdiek@uni-freiburg.de>
@@ -155,17 +155,21 @@
 
 \section{Overview}
 \begin{overview}
+\entry{accsupp}{2007/03/21}{0.1}{Accessibility support by marked content}%
+[\entrysep]
 \entry{aliascnt}{2006/09/25}{1.2}{Alias counter}%
 [\entrysep]
-\entry{alphalph}{2006/05/30}{1.4}{Converting numbers to letters}%
+\entry{alphalph}{2007/04/11}{1.5}{Converting numbers to letters}%
+[\entrysep]
+\entry{atenddvi}{2007/03/20}{1.0}{At end DVI hook}%
 [\entrysep]
-\entry{attachfile2}{2006/08/16}{2.2}{attach files into PDF}%
+\entry{attachfile2}{2007/04/11}{2.3}{attach files into PDF}%
 [\entrysep]
-\entry{auxhook}{2006/05/31}{1.0}{Hooks for auxiliary files}%
+\entry{auxhook}{2006/04/06}{1.1}{Hooks for auxiliary files}%
 [\entrysep]
-\entry{bmpsize}{2007/02/18}{1.1}{Extract size and resolution data from bitmap files}%
+\entry{bmpsize}{2007/04/11}{1.2}{Extract size and resolution data from bitmap files}%
 [\entrysep]
-\entry{bookmark}{2007/03/03}{0.6}{PDF bookmarks}%
+\entry{bookmark}{2007/04/09}{0.8}{PDF bookmarks}%
 [\entrysep]
 \entry{centernot}{2006/12/02}{1.0}{Centers the not symbol horizontally}%
 [\entrysep]
@@ -177,53 +181,57 @@
 [\entrysep]
 \entry{dvipscol}{2006/02/20}{1.1}{Fix for dvips.def}%
 [\entrysep]
-\entry{embedfile}{2006/08/16}{1.0}{embed files into PDF}%
+\entry{embedfile}{2007/04/11}{1.1}{embed files into PDF}%
 [\entrysep]
-\entry{engord}{2006/02/20}{1.2}{Provides the ifpdf switch}%
+\entry{engord}{2007/04/11}{1.3}{Provides the ifpdf switch}%
 [\entrysep]
 \entry{epstopdf}{2006/08/26}{1.3}{Conversion with epstopdf on the fly}%
 [\entrysep]
-\entry{flags}{2007/02/18}{0.1}{Flag setting in bit fields}%
+\entry{flags}{2007/03/07}{0.3}{Flag setting in bit fields}%
 [\entrysep]
-\entry{grffile}{2006/11/30}{1.2}{Extended file name support for graphics}%
+\entry{grffile}{2007/04/11}{1.3}{Extended file name support for graphics}%
 [\entrysep]
 \entry{holtxdoc}{2006/06/02}{0.7}{Private additional ltxdoc support}%
 [\entrysep]
-\entry{hypbmsec}{2006/03/05}{2.3}{Bookmarks in sectioning commands}%
+\entry{hycolor}{2007/04/11}{1.1}{Code for color options of hyperref/bookmark}%
+[\entrysep]
+\entry{hypbmsec}{2007/04/11}{2.4}{Bookmarks in sectioning commands}%
 [\entrysep]
-\entry{hypcap}{2007/02/19}{1.6}{Adjusting anchors of captions}%
+\entry{hypcap}{2007/04/09}{1.7}{Adjusting anchors of captions}%
 [\entrysep]
 \entry{hypdestopt}{2006/06/01}{2.0}{Hyperref destination optimizer}%
 [\entrysep]
-\entry{hypdoc}{2006/06/02}{1.4}{Hyper extensions for doc.sty}%
+\entry{hypdoc}{2007/04/11}{1.5}{Hyper extensions for doc.sty}%
 [\entrysep]
 \entry{ifdraft}{2006/02/20}{1.2}{Switch for option draft}%
 [\entrysep]
+\entry{iflang}{2007/04/12}{1.2}{Language checks}%
+[\entrysep]
 \entry{ifpdf}{2006/02/20}{1.4}{Provides the ifpdf switch}%
 [\entrysep]
 \entry{ifvtex}{2007/01/10}{1.2}{Switches for detecting VTeX and its modes}%
 [\entrysep]
-\entry{inputenx}{2006/08/24}{1.0}{Enhanced input encoding handling}%
+\entry{inputenx}{2007/04/11}{1.1}{Enhanced input encoding handling}%
 [\entrysep]
-\entry{kvoptions}{2006/08/22}{2.4}{Connects package keyval with \LaTeX{} options}%
+\entry{kvoptions}{2007/04/11}{2.5}{Connects package keyval with \LaTeX{} options}%
 [\entrysep]
 \entry{kvsetkeys}{2006/10/19}{1.1}{Key value parser with default handler support}%
 [\entrysep]
 \entry{makerobust}{2006/03/18}{1.0}{Making a macro robust}%
 [\entrysep]
-\entry{pagesel}{2006/03/07}{1.5}{Selecting shipout output pages}%
+\entry{pagesel}{2007/04/11}{1.6}{Selecting shipout output pages}%
 [\entrysep]
 \entry{pdfcolfoot}{2007/01/08}{1.0}{pdfTeX's color stack for footnotes}%
 [\entrysep]
-\entry{pdfcolmk}{2007/01/01}{1.0}{PDFtex COLor MarK}%
+\entry{pdfcolmk}{2007/04/11}{1.1}{PDFtex COLor MarK}%
 [\entrysep]
-\entry{pdfcrypt}{2006/02/20}{0.8}{Setting pdf encryption}%
+\entry{pdfcrypt}{2007/04/11}{0.9}{Setting pdf encryption}%
 [\entrysep]
-\entry{pdfescape}{2006/02/25}{1.1}{Provides hex, PDF name and string conversions}%
+\entry{pdfescape}{2007/04/11}{1.3}{Provides hex, PDF name and string conversions}%
 [\entrysep]
-\entry{pdflscape}{2006/04/24}{0.6}{Landscape pages in PDF}%
+\entry{pdflscape}{2007/04/11}{0.7}{Landscape pages in PDF}%
 [\entrysep]
-\entry{picture}{2006/08/26}{1.0}{Dimens for picture macros}%
+\entry{picture}{2007/04/11}{1.1}{Dimens for picture macros}%
 [\entrysep]
 \entry{pmboxdraw}{2006/05/03}{1.0}{Poor man's box drawing characters}%
 [\entrysep]
@@ -231,26 +239,38 @@
 [\entrysep]
 \entry{setouterhbox}{2006/08/26}{1.4}{Set hbox in outer horizontal mode}%
 [\entrysep]
-\entry{settobox}{2006/02/20}{1.2}{Getting box sizes}%
+\entry{settobox}{2007/04/11}{1.3}{Getting box sizes}%
 [\entrysep]
 \entry{stackrel}{2006/12/02}{1.0}{Adding subscript option to stackrel}%
 [\entrysep]
-\entry{tabularht}{2006/12/22}{2.3}{Tabular with height specification}%
+\entry{tabularht}{2007/04/11}{2.5}{Tabular with height specification}%
 [\entrysep]
 \entry{tabularkv}{2006/02/20}{1.1}{Key value interface for tabular parameters}%
 [\entrysep]
-\entry{telprint}{2006/08/16}{1.7}{Formatting of German phone numbers}%
+\entry{telprint}{2007/04/11}{1.8}{Formatting of German phone numbers}%
 [\entrysep]
 \entry{transparent}{2007/01/08}{1.0}{Using a pdfTeX's color stack for transparency}%
 [\entrysep]
 \entry{twoopt}{2006/02/20}{1.4}{Definitions with two optional arguments}%
 [\entrysep]
-\entry{zref}{2007/02/18}{1.5}{New reference scheme for \LaTeXe{}}%
+\entry{zref}{2007/04/06}{1.6}{New reference scheme for \LaTeXe{}}%
 \end{overview}
 
 \section{Packages}
 \hypersetup{bookmarksnumbered=false}
 
+\subsection{\pkgsectformat{accsupp}}
+\label{accsupp}
+\begin{abstract}
+Since PDF 1.5 portions of a page can be marked for better
+accessibility support.
+For example, replacement texts or expansions of abbreviations can be
+provided. Package \xpackage{accsupp} starts with providing a minimal
+low-level interface for programmers. Status is experimental.
+\end{abstract}
+\tocinclude{accsupp}
+
+\newpage
 \subsection{\pkgsectformat{aliascnt}}
 \label{aliascnt}
 \begin{abstract}
@@ -270,6 +290,19 @@ consists of lowercase and uppercase letters respectively.
 \tocinclude{alphalph}
 
 \newpage
+\subsection{\pkgsectformat{atenddvi}}
+\label{atenddvi}
+\begin{abstract}
+\LaTeX\ offers \cs{AtBeginDvi}. This package \xpackage{atenddvi}
+provides the counterpart \cs{AtEndDvi}. The execution of its
+argument is delayed to the end of the document at the end of the
+last page. Thus \cs{special} and \cs{write} remain effective, because
+they are put into the last page. This is the main difference
+to \cs{AtEndDocument}.
+\end{abstract}
+\tocinclude{atenddvi}
+
+\newpage
 \subsection{\pkgsectformat{attachfile2}}
 \label{attachfile2}
 \begin{abstract}
@@ -431,6 +464,16 @@ that may be useful for others in package \xpackage{hypdoc}.
 \tocinclude{holtxdoc}
 
 \newpage
+\subsection{\pkgsectformat{hycolor}}
+\label{hycolor}
+\begin{abstract}
+Package \xpackage{hycolor} implements the color option stuff that
+is used by packages \xpackage{hyperref} and \xpackage{bookmark}.
+It is not intended as package for the user.
+\end{abstract}
+\tocinclude{hycolor}
+
+\newpage
 \subsection{\pkgsectformat{hypbmsec}}
 \label{hypbmsec}
 \begin{abstract}
@@ -486,6 +529,15 @@ on the options \xoption{draft} and \xoption{final}.
 \tocinclude{ifdraft}
 
 \newpage
+\subsection{\pkgsectformat{iflang}}
+\label{iflang}
+\begin{abstract}
+This package provides expandible checks for the current language
+based on macro \cs{languagename} or hyphenation patterns.
+\end{abstract}
+\tocinclude{iflang}
+
+\newpage
 \subsection{\pkgsectformat{ifpdf}}
 \label{ifpdf}
 \begin{abstract}
diff --git a/Master/texmf-dist/source/latex/oberdiek/pagesel.dtx b/Master/texmf-dist/source/latex/oberdiek/pagesel.dtx
index b5abe2e44ea..7399f819c3b 100644
--- a/Master/texmf-dist/source/latex/oberdiek/pagesel.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/pagesel.dtx
@@ -1,6 +1,6 @@
 % \iffalse meta-comment
 %
-% Copyright (C) 1999, 2003, 2006 by
+% Copyright (C) 1999, 2003, 2006, 2007 by
 %    Heiko Oberdiek <oberdiek@uni-freiburg.de>
 %
 % This work may be distributed and/or modified under the
@@ -56,7 +56,7 @@
 %
 %<*ignore>
 \begingroup
-  \def\x{LaTeX2e}
+  \def\x{LaTeX2e}%
 \expandafter\endgroup
 \ifcase 0\ifx\install y1\fi\expandafter
          \ifx\csname processbatchFile\endcsname\relax\else1\fi
@@ -67,7 +67,7 @@
 \input docstrip.tex
 \Msg{************************************************************************}
 \Msg{* Installation}
-\Msg{* Package: pagesel 2006/03/07 v1.5 Selecting shipout output pages (HO)}
+\Msg{* Package: pagesel 2007/04/11 v1.6 Selecting shipout output pages (HO)}
 \Msg{************************************************************************}
 
 \keepsilent
@@ -77,7 +77,7 @@
 
 This is a generated file.
 
-Copyright (C) 1999, 2003, 2006 by
+Copyright (C) 1999, 2003, 2006, 2007 by
    Heiko Oberdiek <oberdiek@uni-freiburg.de>
 
 This work may be distributed and/or modified under the
@@ -128,11 +128,11 @@ and the derived files
 %<*driver>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{pagesel.drv}%
-  [2006/03/07 v1.5 Selecting shipout output pages (HO)]
+  [2007/04/11 v1.6 Selecting shipout output pages (HO)]%
 \documentclass{ltxdoc}
 \usepackage{holtxdoc}
 \begin{document}
-  \DocInput{pagesel.dtx}
+  \DocInput{pagesel.dtx}%
 \end{document}
 %</driver>
 % \fi
@@ -158,7 +158,7 @@ and the derived files
 % \GetFileInfo{pagesel.drv}
 %
 % \title{The \xpackage{pagesel} package}
-% \date{2006/03/07 v1.5}
+% \date{2007/04/11 v1.6}
 % \author{Heiko Oberdiek\\\xemail{oberdiek@uni-freiburg.de}}
 %
 % \maketitle
@@ -280,7 +280,7 @@ and the derived files
 %<*package>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{pagesel}
-  [2006/03/07 v1.5 Selecting shipout output pages (HO)]
+  [2007/04/11 v1.6 Selecting shipout output pages (HO)]%
 %    \end{macrocode}
 %
 %    If the package is loaded twice, the package code does not
@@ -399,7 +399,7 @@ and the derived files
   }%
   \ifx\x\@empty
     \endgroup
-    \PackageInfo{pagesel}{Nothing to do}
+    \PackageInfo{pagesel}{Nothing to do}%
     \expandafter\endinput
   \fi
 \endgroup
@@ -467,7 +467,7 @@ and the derived files
 %    \begin{macro}{\ps@pagetest}
 %    \begin{macrocode}
 \newcommand*{\ps@pagetest}[2]{%
-  \ps@ifinset{#1}{#2}{\let\ps@next\@empty}{}
+  \ps@ifinset{#1}{#2}{\let\ps@next\@empty}{}%
 }
 %    \end{macrocode}
 %    \end{macro}
@@ -498,13 +498,13 @@ and the derived files
     \let\ps@next\ps@makevoid
     \ps@testlist
   \fi
-  \ifnum\ps@oddpages=1
+  \ifnum\ps@oddpages=1 %
     \ifodd\value{ps@count}%
     \else
       \let\ps@next\ps@makevoid
     \fi
   \fi
-  \ifnum\ps@oddpages=2
+  \ifnum\ps@oddpages=2 %
     \ifodd\value{ps@count}%
       \let\ps@next\ps@makevoid
     \else
@@ -609,13 +609,47 @@ and the derived files
 %    \end{macrocode}
 % \section{Installation}
 %
-% \paragraph{CTAN.} This package is available on
+% \subsection{Download}
+%
+% \paragraph{Package.} This package is available on
 % CTAN\footnote{\url{ftp://ftp.ctan.org/tex-archive/}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/pagesel.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/pagesel.pdf}] Documentation.
 % \end{description}
 %
+%
+% \paragraph{Bundle.} All the packages of the bundle `oberdiek'
+% are also available in a TDS compliant ZIP archive. There
+% the packages are already unpacked and the documentation files
+% are generated. The files and directories obey the TDS standard.
+% \begin{description}
+% \item[\CTAN{macros/latex/contrib/oberdiek/oberdiek-tds.zip}]
+% \end{description}
+%
+% \subsection{Bundle installation}
+%
+% \paragraph{Unpacking.} Unpack the \xfile{oberdiek-tds.zip} in the
+% TDS tree (also known as \xfile{texmf} tree) of your choice.
+% Example (linux):
+% \begin{quote}
+%   |unzip oberdiek-tds.zip -d ~/texmf|
+% \end{quote}
+%
+% \paragraph{Script installation.}
+% Check the directory \xfile{TDS:scripts/oberdiek/} for
+% scripts that need further installation steps.
+% Package \xpackage{attachfile2} comes with the Perl script
+% \xfile{pdfatfi.pl} that should be installed in such a way
+% that it can be called as \texttt{pdfatfi}.
+% Example (linux):
+% \begin{quote}
+%   |chmod +x scripts/oberdiek/pdfatfi.pl|\\
+%   |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
+% \end{quote}
+%
+% \subsection{Package installation}
+%
 % \paragraph{Unpacking.} The \xfile{.dtx} file is a self-extracting
 % \docstrip\ archive. The files are extracted by running the
 % \xfile{.dtx} through \plainTeX:
@@ -646,8 +680,10 @@ and the derived files
 % TDS installing feature, then some files can already be in the right
 % place, see the documentation of \docstrip.
 %
-% \paragraph{Refresh file databases.} If your \TeX~distribution
-% (\teTeX, \mikTeX, \dots) rely on file databases, you must refresh
+% \subsection{Refresh file name databases}
+%
+% If your \TeX~distribution
+% (\teTeX, \mikTeX, \dots) relies on file name databases, you must refresh
 % these. For example, \teTeX\ users run \verb|texhash| or
 % \verb|mktexlsr|.
 %
@@ -749,6 +785,10 @@ and the derived files
 %   \item
 %     Job is aborted after last selected page.
 %   \end{Version}
+%   \begin{Version}{2007/04/11 v1.6}
+%   \item
+%     Line ends sanitized.
+%   \end{Version}
 % \end{History}
 %
 % \PrintIndex
diff --git a/Master/texmf-dist/source/latex/oberdiek/pdfcolfoot.dtx b/Master/texmf-dist/source/latex/oberdiek/pdfcolfoot.dtx
index 9ca7b544bea..2dd49af9832 100644
--- a/Master/texmf-dist/source/latex/oberdiek/pdfcolfoot.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/pdfcolfoot.dtx
@@ -55,7 +55,7 @@
 %
 %<*ignore>
 \begingroup
-  \def\x{LaTeX2e}
+  \def\x{LaTeX2e}%
 \expandafter\endgroup
 \ifcase 0\ifx\install y1\fi\expandafter
          \ifx\csname processbatchFile\endcsname\relax\else1\fi
@@ -126,11 +126,11 @@ and the derived files
 %<*driver>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{pdfcolfoot.drv}%
-  [2007/01/08 v1.0 pdfTeX's color stack for footnotes (HO)]
+  [2007/01/08 v1.0 pdfTeX's color stack for footnotes (HO)]%
 \documentclass{ltxdoc}
 \usepackage{holtxdoc}
 \begin{document}
-  \DocInput{pdfcolfoot.dtx}
+  \DocInput{pdfcolfoot.dtx}%
 \end{document}
 %</driver>
 % \fi
@@ -255,7 +255,7 @@ and the derived files
 %<*package>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{pdfcolfoot}%
-  [2007/01/08 v1.0 pdfTeX's color stack for footnotes (HO)]
+  [2007/01/08 v1.0 pdfTeX's color stack for footnotes (HO)]%
 %    \end{macrocode}
 %
 % \subsection{Initial checks}
@@ -507,13 +507,47 @@ and the derived files
 %    \end{macrocode}
 % \section{Installation}
 %
-% \paragraph{CTAN.} This package is available on
+% \subsection{Download}
+%
+% \paragraph{Package.} This package is available on
 % CTAN\footnote{\url{ftp://ftp.ctan.org/tex-archive/}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/pdfcolfoot.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/pdfcolfoot.pdf}] Documentation.
 % \end{description}
 %
+%
+% \paragraph{Bundle.} All the packages of the bundle `oberdiek'
+% are also available in a TDS compliant ZIP archive. There
+% the packages are already unpacked and the documentation files
+% are generated. The files and directories obey the TDS standard.
+% \begin{description}
+% \item[\CTAN{macros/latex/contrib/oberdiek/oberdiek-tds.zip}]
+% \end{description}
+%
+% \subsection{Bundle installation}
+%
+% \paragraph{Unpacking.} Unpack the \xfile{oberdiek-tds.zip} in the
+% TDS tree (also known as \xfile{texmf} tree) of your choice.
+% Example (linux):
+% \begin{quote}
+%   |unzip oberdiek-tds.zip -d ~/texmf|
+% \end{quote}
+%
+% \paragraph{Script installation.}
+% Check the directory \xfile{TDS:scripts/oberdiek/} for
+% scripts that need further installation steps.
+% Package \xpackage{attachfile2} comes with the Perl script
+% \xfile{pdfatfi.pl} that should be installed in such a way
+% that it can be called as \texttt{pdfatfi}.
+% Example (linux):
+% \begin{quote}
+%   |chmod +x scripts/oberdiek/pdfatfi.pl|\\
+%   |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
+% \end{quote}
+%
+% \subsection{Package installation}
+%
 % \paragraph{Unpacking.} The \xfile{.dtx} file is a self-extracting
 % \docstrip\ archive. The files are extracted by running the
 % \xfile{.dtx} through \plainTeX:
@@ -544,8 +578,10 @@ and the derived files
 % TDS installing feature, then some files can already be in the right
 % place, see the documentation of \docstrip.
 %
-% \paragraph{Refresh file databases.} If your \TeX~distribution
-% (\teTeX, \mikTeX, \dots) rely on file databases, you must refresh
+% \subsection{Refresh file name databases}
+%
+% If your \TeX~distribution
+% (\teTeX, \mikTeX, \dots) relies on file name databases, you must refresh
 % these. For example, \teTeX\ users run \verb|texhash| or
 % \verb|mktexlsr|.
 %
diff --git a/Master/texmf-dist/source/latex/oberdiek/pdfcolmk.dtx b/Master/texmf-dist/source/latex/oberdiek/pdfcolmk.dtx
index fa7cf85bc39..dc5b4985f43 100644
--- a/Master/texmf-dist/source/latex/oberdiek/pdfcolmk.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/pdfcolmk.dtx
@@ -56,7 +56,7 @@
 %
 %<*ignore>
 \begingroup
-  \def\x{LaTeX2e}
+  \def\x{LaTeX2e}%
 \expandafter\endgroup
 \ifcase 0\ifx\install y1\fi\expandafter
          \ifx\csname processbatchFile\endcsname\relax\else1\fi
@@ -67,7 +67,7 @@
 \input docstrip.tex
 \Msg{************************************************************************}
 \Msg{* Installation}
-\Msg{* Package: pdfcolmk 2007/01/01 v1.0 PDFtex COLor MarK (HO)}
+\Msg{* Package: pdfcolmk 2007/04/11 v1.1 PDFtex COLor MarK (HO)}
 \Msg{************************************************************************}
 
 \keepsilent
@@ -128,11 +128,11 @@ and the derived files
 %<*driver>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{pdfcolmk.drv}%
-  [2007/01/01 v1.0 PDFtex COLor MarK (HO)]
+  [2007/04/11 v1.1 PDFtex COLor MarK (HO)]%
 \documentclass{ltxdoc}
 \usepackage{holtxdoc}
 \begin{document}
-  \DocInput{pdfcolmk.dtx}
+  \DocInput{pdfcolmk.dtx}%
 \end{document}
 %</driver>
 % \fi
@@ -158,7 +158,7 @@ and the derived files
 % \GetFileInfo{pdfcolmk.drv}
 %
 % \title{The \xpackage{pdfcolmk} package}
-% \date{2007/01/01 v1.0}
+% \date{2007/04/11 v1.1}
 % \author{Heiko Oberdiek\\\xemail{oberdiek@uni-freiburg.de}}
 %
 % \maketitle
@@ -260,7 +260,7 @@ and the derived files
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{pdfcolmk}%
-  [2007/01/01 v1.0 PDFtex COLor MarK (HO)]
+  [2007/04/11 v1.1 PDFtex COLor MarK (HO)]
 %    \end{macrocode}
 %
 %    \begin{macrocode}
@@ -305,38 +305,38 @@ and the derived files
   \long\def\mark#1{%
     \protected@xdef\pec@value{#1}%
     \pec@setmark
-  }
+  }%
   \def\pec@setmark{%
     \begingroup
       \@temptokena\expandafter{\pec@value}%
       \pec@mark{{\current@color}\the\@temptokena}%
     \endgroup
-  }
+  }%
   \def\pec@getmark{%
     \xdef\pec@botcolor{%
       \expandafter\@firstofthree\botmark\@empty\@empty\@empty
     }%
-  }
+  }%
   \long\def\@firstofthree#1#2#3{#1}%
-  \CheckCommand{\@leftmark}[2]{#1}
-  \CheckCommand{\@rightmark}[2]{#2}
+  \CheckCommand{\@leftmark}[2]{#1}%
+  \CheckCommand{\@rightmark}[2]{#2}%
   \CheckCommand*{\leftmark}{%
     \expandafter\@leftmark\botmark\@empty\@empty
-  }
+  }%
   \CheckCommand*{\rightmark}{%
     \expandafter\@rightmark\firstmark\@empty\@empty
-  }
-  \long\def\@leftmark#1#2#3{#2}
-  \long\def\@rightmark#1#2#3{#3}
+  }%
+  \long\def\@leftmark#1#2#3{#2}%
+  \long\def\@rightmark#1#2#3{#3}%
   \g@addto@macro\leftmark\@empty
   \g@addto@macro\rightmark\@empty
 
 \else
 
-  \RequirePackage{etex}[1998/03/26]
+  \RequirePackage{etex}[1998/03/26]%
   \newmarks\pec@marks
-  \def\pec@setmark{\marks\pec@marks{\current@color}}
-  \def\pec@getmark{\xdef\pec@botcolor{\botmarks\pec@marks}}
+  \def\pec@setmark{\marks\pec@marks{\current@color}}%
+  \def\pec@getmark{\xdef\pec@botcolor{\botmarks\pec@marks}}%
 
 \fi
 %    \end{macrocode}
@@ -703,7 +703,7 @@ and the derived files
 }{}
 
 \@ifclassloaded{seminar}{%
-  \newcommand\pec@org@makeslide{}
+  \newcommand\pec@org@makeslide{}%
   \let\pec@org@makeslide\@makeslide
   \def\@makeslide{%
     \pec@PatchVBoxCCLV
@@ -744,13 +744,47 @@ and the derived files
 %    \end{macrocode}
 % \section{Installation}
 %
-% \paragraph{CTAN.} This package is available on
+% \subsection{Download}
+%
+% \paragraph{Package.} This package is available on
 % CTAN\footnote{\url{ftp://ftp.ctan.org/tex-archive/}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/pdfcolmk.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/pdfcolmk.pdf}] Documentation.
 % \end{description}
 %
+%
+% \paragraph{Bundle.} All the packages of the bundle `oberdiek'
+% are also available in a TDS compliant ZIP archive. There
+% the packages are already unpacked and the documentation files
+% are generated. The files and directories obey the TDS standard.
+% \begin{description}
+% \item[\CTAN{macros/latex/contrib/oberdiek/oberdiek-tds.zip}]
+% \end{description}
+%
+% \subsection{Bundle installation}
+%
+% \paragraph{Unpacking.} Unpack the \xfile{oberdiek-tds.zip} in the
+% TDS tree (also known as \xfile{texmf} tree) of your choice.
+% Example (linux):
+% \begin{quote}
+%   |unzip oberdiek-tds.zip -d ~/texmf|
+% \end{quote}
+%
+% \paragraph{Script installation.}
+% Check the directory \xfile{TDS:scripts/oberdiek/} for
+% scripts that need further installation steps.
+% Package \xpackage{attachfile2} comes with the Perl script
+% \xfile{pdfatfi.pl} that should be installed in such a way
+% that it can be called as \texttt{pdfatfi}.
+% Example (linux):
+% \begin{quote}
+%   |chmod +x scripts/oberdiek/pdfatfi.pl|\\
+%   |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
+% \end{quote}
+%
+% \subsection{Package installation}
+%
 % \paragraph{Unpacking.} The \xfile{.dtx} file is a self-extracting
 % \docstrip\ archive. The files are extracted by running the
 % \xfile{.dtx} through \plainTeX:
@@ -781,8 +815,10 @@ and the derived files
 % TDS installing feature, then some files can already be in the right
 % place, see the documentation of \docstrip.
 %
-% \paragraph{Refresh file databases.} If your \TeX~distribution
-% (\teTeX, \mikTeX, \dots) rely on file databases, you must refresh
+% \subsection{Refresh file name databases}
+%
+% If your \TeX~distribution
+% (\teTeX, \mikTeX, \dots) relies on file name databases, you must refresh
 % these. For example, \teTeX\ users run \verb|texhash| or
 % \verb|mktexlsr|.
 %
@@ -879,6 +915,10 @@ and the derived files
 %     If \xfile{pdftex.def} \textgreater= 2007/01/01 v0.04a is used with
 %     \pdfTeX\ 1.40.0, then package \xpackage{pdfcolmk} is obsolete.
 %   \end{Version}
+%   \begin{Version}{2007/04/11 v1.1}
+%   \item
+%     Line ends sanitized.
+%   \end{Version}
 % \end{History}
 %
 % \PrintIndex
diff --git a/Master/texmf-dist/source/latex/oberdiek/pdfcrypt.dtx b/Master/texmf-dist/source/latex/oberdiek/pdfcrypt.dtx
index de4a8e158f7..f48e8c09a75 100644
--- a/Master/texmf-dist/source/latex/oberdiek/pdfcrypt.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/pdfcrypt.dtx
@@ -55,7 +55,7 @@
 %
 %<*ignore>
 \begingroup
-  \def\x{LaTeX2e}
+  \def\x{LaTeX2e}%
 \expandafter\endgroup
 \ifcase 0\ifx\install y1\fi\expandafter
          \ifx\csname processbatchFile\endcsname\relax\else1\fi
@@ -66,7 +66,7 @@
 \input docstrip.tex
 \Msg{************************************************************************}
 \Msg{* Installation}
-\Msg{* Package: pdfcrypt 2006/02/20 v0.8 Setting pdf encryption (HO)}
+\Msg{* Package: pdfcrypt 2007/04/11 v0.9 Setting pdf encryption (HO)}
 \Msg{************************************************************************}
 
 \keepsilent
@@ -126,16 +126,16 @@ and the derived files
 %<*driver>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{pdfcrypt.drv}%
-  [2006/02/20 v0.8 Setting pdf encryption (HO)]
+  [2007/04/11 v0.9 Setting pdf encryption (HO)]%
 \documentclass{ltxdoc}
 \usepackage{holtxdoc}
 \begin{document}
-  \DocInput{pdfcrypt.dtx}
+  \DocInput{pdfcrypt.dtx}%
 \end{document}
 %</driver>
 % \fi
 %
-% \CheckSum{730}
+% \CheckSum{731}
 %
 % \CharacterTable
 %  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -156,7 +156,7 @@ and the derived files
 % \GetFileInfo{pdfcrypt.drv}
 %
 % \title{The \xpackage{pdfcrypt} package}
-% \date{2006/02/20 v0.8}
+% \date{2007/04/11 v0.9}
 % \author{Heiko Oberdiek\\\xemail{oberdiek@uni-freiburg.de}}
 %
 % \maketitle
@@ -244,7 +244,7 @@ and the derived files
 % the macro \cs{pdfcryptsetup}, eg:
 % \begin{quote}
 %   |\pdfcryptsetup{user={\{\\Hello\}},print=false}|
-% \end{quote} 
+% \end{quote}
 % The password here is ``|{\Hello}|''.
 % Active characters can be used and are not expanded.
 % Macros except for |\{|, |\}|, and |\\| should not be used
@@ -378,7 +378,7 @@ and the derived files
 
 \@ifundefined{ProvidesPackage}{%
   \def\ProvidesPackage#1{%
-    \@ifnextchar[{\pc@ProvidesPackage{#1}}
+    \@ifnextchar[{\pc@ProvidesPackage{#1}}%
                  {\pc@ProvidesPackage{#1}[]}%
   }%
   \def\pc@ProvidesPackage#1[#2]{%
@@ -437,7 +437,7 @@ and the derived files
 %
 %    \begin{macrocode}
 \ProvidesPackage{pdfcrypt}%
-  [2006/02/20 v0.8 Setting pdf encryption (HO)]
+  [2007/04/11 v0.9 Setting pdf encryption (HO)]%
 %    \end{macrocode}
 %
 %    \begin{macrocode}
@@ -480,7 +480,7 @@ and the derived files
         \pc@endinput
       }{%
         \gdef\pc@driver{pdftex}%
-      }
+      }%
     \fi
   }%
   % VTeX detection
@@ -520,7 +520,7 @@ and the derived files
 }{}
 
 \@ifundefined{@namedef}{%
-  \def\@namedef#1{\expandafter\def\csname#1\endcsname}
+  \def\@namedef#1{\expandafter\def\csname#1\endcsname}%
 }{}
 
 \@ifundefined{@nameuse}{%
@@ -593,9 +593,9 @@ and the derived files
 
 \begingroup\expandafter\expandafter\expandafter\endgroup
 \expandafter\ifx\csname RequirePackage\endcsname\relax
-  \input keyval.sty
+  \input keyval.sty\relax
 \else
-  \RequirePackage{keyval}
+  \RequirePackage{keyval}%
 \fi
 \pc@KeyvalRestore
 %    \end{macrocode}
@@ -604,8 +604,8 @@ and the derived files
 %
 %    \begin{macrocode}
 \@ifundefined{@dblarg}{%
-  \long\def\@dblarg#1{\@ifnextchar[{#1}{\@xdblarg{#1}}}
-  \long\def\@xdblarg#1#2{#1[{#2}]{#2}}
+  \long\def\@dblarg#1{\@ifnextchar[{#1}{\@xdblarg{#1}}}%
+  \long\def\@xdblarg#1#2{#1[{#2}]{#2}}%
 }{}
 
 \newif\ifpc@set
@@ -652,7 +652,7 @@ and the derived files
     \else
       Encryption is set for `\pc@driver'%
     \fi
-  }
+  }%
   \ifpc@nopdfcrypt
   \else
     \@ifundefined{pc@set@\pc@driver}{%
@@ -677,11 +677,11 @@ and the derived files
 }
 \def\pc@set@pdftexold{%
   \pdfcrypt{%
-    owner "\pc@owner"
-    user "\pc@user"
-    \ifpc@print   \else no\fi print
-    \ifpc@copy    \else no\fi copy
-    \ifpc@edit    \else no\fi edit
+    owner "\pc@owner" %
+    user "\pc@user" %
+    \ifpc@print   \else no\fi print %
+    \ifpc@copy    \else no\fi copy %
+    \ifpc@edit    \else no\fi edit %
     \ifpc@annotate\else no\fi annotate%
   }%
 }
@@ -689,9 +689,9 @@ and the derived files
   \pdfcrypt
     owner{\pc@owner}%
     user{\pc@user}%
-    \ifpc@print   \else no\fi print
-    \ifpc@copy    \else no\fi copy
-    \ifpc@edit    \else no\fi edit
+    \ifpc@print   \else no\fi print %
+    \ifpc@copy    \else no\fi copy %
+    \ifpc@edit    \else no\fi edit %
     \ifpc@annotate\else no\fi annotate%
   \relax
 }
@@ -730,7 +730,7 @@ and the derived files
     |edef#1{|expandafter|strip@prefix|meaning#1}%
     |edef#1{|expandafter|pc@SpaceToOther#1 |@nil}%
     |edef#1{|expandafter|pc@EscapeRemove#1|@empty\|@empty|@nil}%
-  }
+  }%
   |gdef|pc@EscapeRemove#1\#2#3|@nil{%
     #1#2%
     |ifx|\#3|\%
@@ -739,7 +739,7 @@ and the derived files
         |pc@EscapeRemove#3|@nil
       }%
     |fi
-  }
+  }%
 |endgroup
 \def\pc@SpaceToOther#1 #2\@nil{%
   #1%
@@ -767,9 +767,9 @@ and the derived files
   \fi
   \ifx\pc@temp\relax
     \PackageWarning{pdfcrypt}{%
-      Unexpected value \string`#3\string' of
+      Unexpected value \string`#3\string' of %
       option \string`#2\string'\MessageBreak
-      instead of
+      instead of %
       \string`true\string' or \string`false\string'%
     }%
   \else
@@ -852,7 +852,7 @@ and the derived files
   }%
 \else
   \let\pc@ExecuteOptions\ExecuteOptions
-  \InputIfFileExists{pdfcrypt.cfg}{}{}
+  \InputIfFileExists{pdfcrypt.cfg}{}{}%
   \let\ExecuteOptions\pc@ExecuteOptions
 \fi
 %    \end{macrocode}
@@ -896,13 +896,47 @@ and the derived files
 %    \end{macrocode}
 % \section{Installation}
 %
-% \paragraph{CTAN.} This package is available on
+% \subsection{Download}
+%
+% \paragraph{Package.} This package is available on
 % CTAN\footnote{\url{ftp://ftp.ctan.org/tex-archive/}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/pdfcrypt.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/pdfcrypt.pdf}] Documentation.
 % \end{description}
 %
+%
+% \paragraph{Bundle.} All the packages of the bundle `oberdiek'
+% are also available in a TDS compliant ZIP archive. There
+% the packages are already unpacked and the documentation files
+% are generated. The files and directories obey the TDS standard.
+% \begin{description}
+% \item[\CTAN{macros/latex/contrib/oberdiek/oberdiek-tds.zip}]
+% \end{description}
+%
+% \subsection{Bundle installation}
+%
+% \paragraph{Unpacking.} Unpack the \xfile{oberdiek-tds.zip} in the
+% TDS tree (also known as \xfile{texmf} tree) of your choice.
+% Example (linux):
+% \begin{quote}
+%   |unzip oberdiek-tds.zip -d ~/texmf|
+% \end{quote}
+%
+% \paragraph{Script installation.}
+% Check the directory \xfile{TDS:scripts/oberdiek/} for
+% scripts that need further installation steps.
+% Package \xpackage{attachfile2} comes with the Perl script
+% \xfile{pdfatfi.pl} that should be installed in such a way
+% that it can be called as \texttt{pdfatfi}.
+% Example (linux):
+% \begin{quote}
+%   |chmod +x scripts/oberdiek/pdfatfi.pl|\\
+%   |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
+% \end{quote}
+%
+% \subsection{Package installation}
+%
 % \paragraph{Unpacking.} The \xfile{.dtx} file is a self-extracting
 % \docstrip\ archive. The files are extracted by running the
 % \xfile{.dtx} through \plainTeX:
@@ -933,8 +967,10 @@ and the derived files
 % TDS installing feature, then some files can already be in the right
 % place, see the documentation of \docstrip.
 %
-% \paragraph{Refresh file databases.} If your \TeX~distribution
-% (\teTeX, \mikTeX, \dots) rely on file databases, you must refresh
+% \subsection{Refresh file name databases}
+%
+% If your \TeX~distribution
+% (\teTeX, \mikTeX, \dots) relies on file name databases, you must refresh
 % these. For example, \teTeX\ users run \verb|texhash| or
 % \verb|mktexlsr|.
 %
@@ -1034,6 +1070,10 @@ and the derived files
 %   \item
 %     LPPL 1.3
 %   \end{Version}
+%   \begin{Version}{2007/04/11 v0.9}
+%   \item
+%     Line ends sanitized.
+%   \end{Version}
 % \end{History}
 %
 % \PrintIndex
diff --git a/Master/texmf-dist/source/latex/oberdiek/pdfescape.dtx b/Master/texmf-dist/source/latex/oberdiek/pdfescape.dtx
index 0f4cd5ff633..56419efe093 100644
--- a/Master/texmf-dist/source/latex/oberdiek/pdfescape.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/pdfescape.dtx
@@ -60,7 +60,7 @@
 %
 %<*ignore>
 \begingroup
-  \def\x{LaTeX2e}
+  \def\x{LaTeX2e}%
 \expandafter\endgroup
 \ifcase 0\ifx\install y1\fi\expandafter
          \ifx\csname processbatchFile\endcsname\relax\else1\fi
@@ -71,7 +71,7 @@
 \input docstrip.tex
 \Msg{************************************************************************}
 \Msg{* Installation}
-\Msg{* Package: pdfescape 2006/02/25 v1.1 Provides hex, PDF name and string conversions (HO)}
+\Msg{* Package: pdfescape 2007/04/11 v1.3 Provides hex, PDF name and string conversions (HO)}
 \Msg{************************************************************************}
 
 \keepsilent
@@ -137,16 +137,16 @@ and the derived files
 %<*driver>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{pdfescape.drv}%
-  [2006/02/25 v1.1 Provides hex, PDF name and string conversions (HO)]
+  [2007/04/11 v1.3 Provides hex, PDF name and string conversions (HO)]%
 \documentclass{ltxdoc}
 \usepackage{holtxdoc}
 \begin{document}
-  \DocInput{pdfescape.dtx}
+  \DocInput{pdfescape.dtx}%
 \end{document}
 %</driver>
 % \fi
 %
-% \CheckSum{1075}
+% \CheckSum{1074}
 %
 % \CharacterTable
 %  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -167,7 +167,7 @@ and the derived files
 % \GetFileInfo{pdfescape.drv}
 %
 % \title{The \xpackage{pdfescape} package}
-% \date{2006/02/25 v1.1}
+% \date{2007/04/11 v1.3}
 % \author{Heiko Oberdiek\\\xemail{oberdiek@uni-freiburg.de}}
 %
 % \maketitle
@@ -264,7 +264,7 @@ and the derived files
   \fi
 \expandafter\x\csname ver@pdfescape.sty\endcsname
 \ProvidesPackage{pdfescape}%
-  [2006/02/25 v1.1 Provides hex, PDF name and string conversions (HO)]
+  [2007/04/11 v1.3 Provides hex, PDF name and string conversions (HO)]
 %    \end{macrocode}
 %
 % \subsection{Preparations}
@@ -789,7 +789,7 @@ and the derived files
 %    \begin{macrocode}
 %<*test1>
 \ProvidesFile{pdfescape-test1.tex}%
-    [2006/02/25 v1.1 Test with \string\pdfescape... commands]
+    [2007/04/11 v1.3 Test with \string\pdfescape... commands]%
 %</test1>
 %    \end{macrocode}
 %
@@ -798,7 +798,7 @@ and the derived files
 %    \begin{macrocode}
 %<*test2>
 \ProvidesFile{pdfescape-test2.tex}%
-    [2006/02/25 v1.1 Test without \string\pdfescape..., with e-TeX]
+    [2007/04/11 v1.3 Test without \string\pdfescape..., with e-TeX]%
 %</test2>
 %    \end{macrocode}
 %
@@ -807,7 +807,7 @@ and the derived files
 %    \begin{macrocode}
 %<*test3>
 \ProvidesFile{pdfescape-test3.tex}%
-    [2006/02/25 v1.1 Test without \string\pdfescape... and e-TeX]
+    [2007/04/11 v1.3 Test without \string\pdfescape... and e-TeX]%
 %</test3>
 %    \end{macrocode}
 %
@@ -863,12 +863,9 @@ and the derived files
 }
 
 \makeatletter
-
-
 \begingroup
-  \makeatletter
-  \gdef\AllBytes{}
-  \count@=0
+  \gdef\AllBytes{}%
+  \count@=0 %
   \catcode0=12 %
   \@whilenum\count@<256 \do{%
     \lccode0=\count@
@@ -925,14 +922,14 @@ and the derived files
     #D0#D1#D2#D3#D4#D5#D6#D7#D8#D9#DA#DB#DC#DD#DE#DF%
     #E0#E1#E2#E3#E4#E5#E6#E7#E8#E9#EA#EB#EC#ED#EE#EF%
     #F0#F1#F2#F3#F4#F5#F6#F7#F8#F9#FA#FB#FC#FD#FE#FF%
-  }
+  }%
 \endgroup
 \@onelevel@sanitize\AllBytesName
 
 \newcommand*{\AllBytesString}{}
 \begingroup
-  \def\|{|}
-  \edef\%{\@percentchar}
+  \def\|{|}%
+  \edef\%{\@percentchar}%
   \catcode`\|=0 %
   \catcode`\#=12 %
   \catcode`\~=12 %
@@ -954,7 +951,7 @@ and the derived files
     \320\321\322\323\324\325\326\327\330\331\332\333\334\335\336\337%
     \340\341\342\343\344\345\346\347\350\351\352\353\354\355\356\357%
     \360\361\362\363\364\365\366\367\370\371\372\373\374\375\376\377%
-  }
+  }%
 |endgroup
 \@onelevel@sanitize\AllBytesString
 
@@ -971,52 +968,52 @@ and the derived files
 %</test3>
 
 \begin{qstest}{all-hex}{\AllBytes, escapehex}
-  \EdefEscapeHex\x{\AllBytes}
+  \EdefEscapeHex\x{\AllBytes}%
   \Expect*{\x}*{\AllBytesHex}%
   \ExpectVar\x\AllBytesHex
 \end{qstest}
 
 \begin{qstest}{all-unhex}{\AllBytesHex, unescapehex}
-  \EdefUnescapeHex\x{\AllBytesHex}
-  \Expect*{\x}*{\AllBytes}
+  \EdefUnescapeHex\x{\AllBytesHex}%
+  \Expect*{\x}*{\AllBytes}%
   \ExpectVar\x\AllBytes
 \end{qstest}
 
 \begin{qstest}{all-unhex-lc}{\AllBytesHexLC, unescapehex, lowercase}
-  \EdefUnescapeHex\x{\AllBytesHexLC}
-  \Expect*{\x}*{\AllBytes}
+  \EdefUnescapeHex\x{\AllBytesHexLC}%
+  \Expect*{\x}*{\AllBytes}%
   \ExpectVar\x\AllBytes
 \end{qstest}
 
 \begin{qstest}{unhex-incomplete}{unescapehex, incomplete}
-  \EdefUnescapeHex\x{4}
-  \Expect*{\x}{@}
+  \EdefUnescapeHex\x{4}%
+  \Expect*{\x}{@}%
 \end{qstest}
 
 \begin{qstest}{unhex-space}{unescapehex, space}
-  \EdefUnescapeHex\x{20}
-  \Expect*{\x}{ }
+  \EdefUnescapeHex\x{20}%
+  \Expect*{\x}{ }%
   \ExpectVar\x\space
 \end{qstest}
 
 \begin{qstest}{unhex-spaces}{unescapehex, spaces}
-  \EdefUnescapeHex\x{204020204120}
+  \EdefUnescapeHex\x{204020204120}%
   \def\y#1{%
     \edef\z{#1\string @#1#1\string A#1}%
-  }\y{ }
-  \Expect*{\x}*{\z}
+  }\y{ }%
+  \Expect*{\x}*{\z}%
   \ExpectVar\x\z
 \end{qstest}
 
 \begin{qstest}{all-name}{\AllBytes, escapename}
-  \EdefEscapeName\x{\AllBytes}
-  \Expect*{\x}*{\AllBytesName}
+  \EdefEscapeName\x{\AllBytes}%
+  \Expect*{\x}*{\AllBytesName}%
   \ExpectVar\x\AllBytesName
 \end{qstest}
 
 \begin{qstest}{all-string}{\AllBytes, escapestring}
-  \EdefEscapeString\x{\AllBytes}
-  \Expect*{\x}*{\AllBytesString}
+  \EdefEscapeString\x{\AllBytes}%
+  \Expect*{\x}*{\AllBytesString}%
   \ExpectVar\x\AllBytesString
 \end{qstest}
 
@@ -1028,13 +1025,47 @@ and the derived files
 %    \end{macrocode}
 % \section{Installation}
 %
-% \paragraph{CTAN.} This package is available on
+% \subsection{Download}
+%
+% \paragraph{Package.} This package is available on
 % CTAN\footnote{\url{ftp://ftp.ctan.org/tex-archive/}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/pdfescape.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/pdfescape.pdf}] Documentation.
 % \end{description}
 %
+%
+% \paragraph{Bundle.} All the packages of the bundle `oberdiek'
+% are also available in a TDS compliant ZIP archive. There
+% the packages are already unpacked and the documentation files
+% are generated. The files and directories obey the TDS standard.
+% \begin{description}
+% \item[\CTAN{macros/latex/contrib/oberdiek/oberdiek-tds.zip}]
+% \end{description}
+%
+% \subsection{Bundle installation}
+%
+% \paragraph{Unpacking.} Unpack the \xfile{oberdiek-tds.zip} in the
+% TDS tree (also known as \xfile{texmf} tree) of your choice.
+% Example (linux):
+% \begin{quote}
+%   |unzip oberdiek-tds.zip -d ~/texmf|
+% \end{quote}
+%
+% \paragraph{Script installation.}
+% Check the directory \xfile{TDS:scripts/oberdiek/} for
+% scripts that need further installation steps.
+% Package \xpackage{attachfile2} comes with the Perl script
+% \xfile{pdfatfi.pl} that should be installed in such a way
+% that it can be called as \texttt{pdfatfi}.
+% Example (linux):
+% \begin{quote}
+%   |chmod +x scripts/oberdiek/pdfatfi.pl|\\
+%   |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
+% \end{quote}
+%
+% \subsection{Package installation}
+%
 % \paragraph{Unpacking.} The \xfile{.dtx} file is a self-extracting
 % \docstrip\ archive. The files are extracted by running the
 % \xfile{.dtx} through \plainTeX:
@@ -1068,8 +1099,10 @@ and the derived files
 % TDS installing feature, then some files can already be in the right
 % place, see the documentation of \docstrip.
 %
-% \paragraph{Refresh file databases.} If your \TeX~distribution
-% (\teTeX, \mikTeX, \dots) rely on file databases, you must refresh
+% \subsection{Refresh file name databases}
+%
+% If your \TeX~distribution
+% (\teTeX, \mikTeX, \dots) relies on file name databases, you must refresh
 % these. For example, \teTeX\ users run \verb|texhash| or
 % \verb|mktexlsr|.
 %
@@ -1143,6 +1176,14 @@ and the derived files
 %     Fix: \cs{EdefEscapeHex} and \cs{EdefEscapeName} now generate
 %     tokens with catcode 12 (other) only.
 %   \end{Version}
+%   \begin{Version}{2007/03/20 v1.2}
+%   \item
+%     Fix: Wrong year in \cs{ProvidesPackage}.
+%   \end{Version}
+%   \begin{Version}{2007/04/11 v1.3}
+%   \item
+%     Line ends sanitized.
+%   \end{Version}
 % \end{History}
 %
 % \PrintIndex
diff --git a/Master/texmf-dist/source/latex/oberdiek/pdflscape.dtx b/Master/texmf-dist/source/latex/oberdiek/pdflscape.dtx
index 1ecb850a71e..9d437cef7f1 100644
--- a/Master/texmf-dist/source/latex/oberdiek/pdflscape.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/pdflscape.dtx
@@ -1,6 +1,6 @@
 % \iffalse meta-comment
 %
-% Copyright (C) 2001, 2004, 2006 by
+% Copyright (C) 2001, 2004, 2006, 2007 by
 %    Heiko Oberdiek <oberdiek@uni-freiburg.de>
 %
 % This work may be distributed and/or modified under the
@@ -56,7 +56,7 @@
 %
 %<*ignore>
 \begingroup
-  \def\x{LaTeX2e}
+  \def\x{LaTeX2e}%
 \expandafter\endgroup
 \ifcase 0\ifx\install y1\fi\expandafter
          \ifx\csname processbatchFile\endcsname\relax\else1\fi
@@ -67,7 +67,7 @@
 \input docstrip.tex
 \Msg{************************************************************************}
 \Msg{* Installation}
-\Msg{* Package: pdflscape 2006/04/24 v0.6 Landscape pages in PDF (HO)}
+\Msg{* Package: pdflscape 2007/04/11 v0.7 Landscape pages in PDF (HO)}
 \Msg{************************************************************************}
 
 \keepsilent
@@ -77,7 +77,7 @@
 
 This is a generated file.
 
-Copyright (C) 2001, 2004, 2006 by
+Copyright (C) 2001, 2004, 2006, 2007 by
    Heiko Oberdiek <oberdiek@uni-freiburg.de>
 
 This work may be distributed and/or modified under the
@@ -128,11 +128,11 @@ and the derived files
 %<*driver>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{pdflscape.drv}%
-  [2006/04/24 v0.6 Landscape pages in PDF (HO)]
+  [2007/04/11 v0.7 Landscape pages in PDF (HO)]%
 \documentclass{ltxdoc}
 \usepackage{holtxdoc}
 \begin{document}
-  \DocInput{pdflscape.dtx}
+  \DocInput{pdflscape.dtx}%
 \end{document}
 %</driver>
 % \fi
@@ -158,7 +158,7 @@ and the derived files
 % \GetFileInfo{pdflscape.drv}
 %
 % \title{The \xpackage{pdflscape} package}
-% \date{2006/04/24 v0.6}
+% \date{2007/04/11 v0.7}
 % \author{Heiko Oberdiek\\\xemail{oberdiek@uni-freiburg.de}}
 %
 % \maketitle
@@ -224,7 +224,7 @@ and the derived files
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{pdflscape}%
-  [2006/04/24 v0.6 Landscape pages in PDF (HO)]
+  [2007/04/11 v0.7 Landscape pages in PDF (HO)]
 %    \end{macrocode}
 %
 % \subsection{Driver options}
@@ -366,7 +366,7 @@ and the derived files
 \def\PLS@temp{pdftex}
 \ifx\PLS@temp\PLS@driver
   \def\PLS@AddRotate#1{%
-    \ifnum#1=0
+    \ifnum#1=0 %
 %    \end{macrocode}
 %    Already the default.
 %    \begin{macrocode}
@@ -376,7 +376,7 @@ and the derived files
         /Rotate #1%
       }%
     \fi
-  }
+  }%
 %    \end{macrocode}
 %    Removes a |/Rotate| entry.
 %    \begin{macrocode}
@@ -386,7 +386,7 @@ and the derived files
       \expandafter\PLS@@RemoveRotate
         \the\pdfpageattr /Rotate\@nil
     \endgroup
-  }
+  }%
   \def\PLS@@RemoveRotate#1/Rotate#2\@nil{%
 %    \end{macrocode}
 %    Append |/Rotate| free stuff to \cs{pdfpageattr}.
@@ -405,7 +405,7 @@ and the derived files
       \afterassignment\PLS@@RemoveRotate
       \count0=#2\@nil
     \fi
-  }
+  }%
 \fi
 %    \end{macrocode}
 %
@@ -418,7 +418,7 @@ and the derived files
   \EveryShipout{\PLS@EveryShi}%
   \let\PLS@EveryShi\@empty
   \def\PLS@AddRotate#1{%
-    \ifnum#1=0
+    \ifnum#1=0 %
     \else
       \def\PLS@EveryShi{%
         \global\setbox\@cclv\vbox{%
@@ -444,11 +444,11 @@ and the derived files
   \EveryShipout{\PLS@EveryShi}%
   \let\PLS@EveryShi\@empty
   \def\PLS@AddRotate#1{%
-    \ifnum#1=0
+    \ifnum#1=0 %
     \else
       \def\PLS@EveryShi{%
         \global\setbox\@cclv\vbox{%
-          \special{pdf: put @thispage << /Rotate #1 >>}%
+          \special{pdf: put @thispage <</Rotate #1>>}%
           \box\@cclv
         }%
       }%
@@ -501,7 +501,7 @@ and the derived files
 %    Nothing means zero:
 %    \begin{macrocode}
   \ifx\\#1\\%
-    \count@=0
+    \count@=0 %
   \else
     \count@=#1\relax
   \fi
@@ -524,7 +524,7 @@ and the derived files
     \PackageError{pdflscape}{%
       Invalid value \the\count@\space for /Rotate%
     }\@ehc
-    \count@=0
+    \count@=0 %
   \fi
 }
 %    \end{macrocode}
@@ -535,13 +535,47 @@ and the derived files
 %    \end{macrocode}
 % \section{Installation}
 %
-% \paragraph{CTAN.} This package is available on
+% \subsection{Download}
+%
+% \paragraph{Package.} This package is available on
 % CTAN\footnote{\url{ftp://ftp.ctan.org/tex-archive/}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/pdflscape.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/pdflscape.pdf}] Documentation.
 % \end{description}
 %
+%
+% \paragraph{Bundle.} All the packages of the bundle `oberdiek'
+% are also available in a TDS compliant ZIP archive. There
+% the packages are already unpacked and the documentation files
+% are generated. The files and directories obey the TDS standard.
+% \begin{description}
+% \item[\CTAN{macros/latex/contrib/oberdiek/oberdiek-tds.zip}]
+% \end{description}
+%
+% \subsection{Bundle installation}
+%
+% \paragraph{Unpacking.} Unpack the \xfile{oberdiek-tds.zip} in the
+% TDS tree (also known as \xfile{texmf} tree) of your choice.
+% Example (linux):
+% \begin{quote}
+%   |unzip oberdiek-tds.zip -d ~/texmf|
+% \end{quote}
+%
+% \paragraph{Script installation.}
+% Check the directory \xfile{TDS:scripts/oberdiek/} for
+% scripts that need further installation steps.
+% Package \xpackage{attachfile2} comes with the Perl script
+% \xfile{pdfatfi.pl} that should be installed in such a way
+% that it can be called as \texttt{pdfatfi}.
+% Example (linux):
+% \begin{quote}
+%   |chmod +x scripts/oberdiek/pdfatfi.pl|\\
+%   |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
+% \end{quote}
+%
+% \subsection{Package installation}
+%
 % \paragraph{Unpacking.} The \xfile{.dtx} file is a self-extracting
 % \docstrip\ archive. The files are extracted by running the
 % \xfile{.dtx} through \plainTeX:
@@ -572,8 +606,10 @@ and the derived files
 % TDS installing feature, then some files can already be in the right
 % place, see the documentation of \docstrip.
 %
-% \paragraph{Refresh file databases.} If your \TeX~distribution
-% (\teTeX, \mikTeX, \dots) rely on file databases, you must refresh
+% \subsection{Refresh file name databases}
+%
+% If your \TeX~distribution
+% (\teTeX, \mikTeX, \dots) relies on file name databases, you must refresh
 % these. For example, \teTeX\ users run \verb|texhash| or
 % \verb|mktexlsr|.
 %
@@ -660,6 +696,10 @@ and the derived files
 %     Fix for \cs{PLS@RemoveRotate} (dvips/dvipdfm): \cs{PLS@EverhShi}
 %     hook is cleared.
 %   \end{Version}
+%   \begin{Version}{2007/04/11 v0.7}
+%   \item
+%     Line ends sanitized.
+%   \end{Version}
 % \end{History}
 %
 % \PrintIndex
diff --git a/Master/texmf-dist/source/latex/oberdiek/picture.dtx b/Master/texmf-dist/source/latex/oberdiek/picture.dtx
index 03f77e8ffce..e5f2d0f65af 100644
--- a/Master/texmf-dist/source/latex/oberdiek/picture.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/picture.dtx
@@ -1,6 +1,6 @@
 % \iffalse meta-comment
 %
-% Copyright (C) 2006 by Heiko Oberdiek <oberdiek@uni-freiburg.de>
+% Copyright (C) 2006, 2007 by Heiko Oberdiek <oberdiek@uni-freiburg.de>
 %
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either
@@ -57,7 +57,7 @@
 %
 %<*ignore>
 \begingroup
-  \def\x{LaTeX2e}
+  \def\x{LaTeX2e}%
 \expandafter\endgroup
 \ifcase 0\ifx\install y1\fi\expandafter
          \ifx\csname processbatchFile\endcsname\relax\else1\fi
@@ -68,7 +68,7 @@
 \input docstrip.tex
 \Msg{************************************************************************}
 \Msg{* Installation}
-\Msg{* Package: picture 2006/08/26 v1.0 Dimens for picture macros (HO)}
+\Msg{* Package: picture 2007/04/11 v1.1 Dimens for picture macros (HO)}
 \Msg{************************************************************************}
 
 \keepsilent
@@ -78,7 +78,7 @@
 
 This is a generated file.
 
-Copyright (C) 2006 by Heiko Oberdiek <oberdiek@uni-freiburg.de>
+Copyright (C) 2006, 2007 by Heiko Oberdiek <oberdiek@uni-freiburg.de>
 
 This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either
@@ -131,11 +131,11 @@ and the derived files
 %<*driver>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{picture.drv}%
-  [2006/08/26 v1.0 Dimens for picture macros (HO)]
+  [2007/04/11 v1.1 Dimens for picture macros (HO)]%
 \documentclass{ltxdoc}
 \usepackage{holtxdoc}
 \begin{document}
-  \DocInput{picture.dtx}
+  \DocInput{picture.dtx}%
 \end{document}
 %</driver>
 % \fi
@@ -161,7 +161,7 @@ and the derived files
 % \GetFileInfo{picture.drv}
 %
 % \title{The \xpackage{picture} package}
-% \date{2006/08/26 v1.0}
+% \date{2007/04/11 v1.1}
 % \author{Heiko Oberdiek\\\xemail{oberdiek@uni-freiburg.de}}
 %
 % \maketitle
@@ -217,14 +217,14 @@ and the derived files
 \setlength{\unitlength}{1pt}
 
 \begin{picture}(\widthof{Hello World}, 10mm)
-  \put(0, 0){\makebox(0,0)[lb]{Hello World}}
+  \put(0, 0){\makebox(0,0)[lb]{Hello World}}%
   \put(0, \heightof{Hello World} + \fboxsep){%
     \line(1, 0){\widthof{Hello World}}%
-  }
+  }%
   \put(\widthof{Hello World}, 10mm){%
     \line(0, -1){10mm}%
-  }
-\end{picture}%
+  }%
+\end{picture}
 
 \end{document}
 %</example>
@@ -257,7 +257,7 @@ and the derived files
 %<*package>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{picture}%
-  [2006/08/26 v1.0 Dimens for picture macros (HO)]
+  [2007/04/11 v1.1 Dimens for picture macros (HO)]%
 %    \end{macrocode}
 %
 % \subsection{Options}
@@ -303,7 +303,7 @@ and the derived files
 \ProcessOptions*
 \begingroup
   \let\on@line\@empty
-  \PackageInfo{picture}{Calculation method: \Pc@method}
+  \PackageInfo{picture}{Calculation method: \Pc@method}%
 \endgroup
 %    \end{macrocode}
 %
@@ -510,12 +510,12 @@ and the derived files
 %     by adding an optional argument.
 %    \begin{macrocode}
 \@ifpackageloaded{pspicture}{%
-  \picture@redefine\@oval{[&1](&2,&3)}
-  \picture@redefine\Line{(&1,&2)}
-  \picture@redefine\Curve{(&1,&2)}
-  \picture@redefine\Vector{(&1,&2)}
+  \picture@redefine\@oval{[&1](&2,&3)}%
+  \picture@redefine\Line{(&1,&2)}%
+  \picture@redefine\Curve{(&1,&2)}%
+  \picture@redefine\Vector{(&1,&2)}%
 }{
-  \picture@redefine\@oval{(&1,&2)}
+  \picture@redefine\@oval{(&1,&2)}%
 }
 %    \end{macrocode}
 %    \begin{macrocode}
@@ -523,13 +523,47 @@ and the derived files
 %    \end{macrocode}
 % \section{Installation}
 %
-% \paragraph{CTAN.} This package is available on
+% \subsection{Download}
+%
+% \paragraph{Package.} This package is available on
 % CTAN\footnote{\url{ftp://ftp.ctan.org/tex-archive/}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/picture.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/picture.pdf}] Documentation.
 % \end{description}
 %
+%
+% \paragraph{Bundle.} All the packages of the bundle `oberdiek'
+% are also available in a TDS compliant ZIP archive. There
+% the packages are already unpacked and the documentation files
+% are generated. The files and directories obey the TDS standard.
+% \begin{description}
+% \item[\CTAN{macros/latex/contrib/oberdiek/oberdiek-tds.zip}]
+% \end{description}
+%
+% \subsection{Bundle installation}
+%
+% \paragraph{Unpacking.} Unpack the \xfile{oberdiek-tds.zip} in the
+% TDS tree (also known as \xfile{texmf} tree) of your choice.
+% Example (linux):
+% \begin{quote}
+%   |unzip oberdiek-tds.zip -d ~/texmf|
+% \end{quote}
+%
+% \paragraph{Script installation.}
+% Check the directory \xfile{TDS:scripts/oberdiek/} for
+% scripts that need further installation steps.
+% Package \xpackage{attachfile2} comes with the Perl script
+% \xfile{pdfatfi.pl} that should be installed in such a way
+% that it can be called as \texttt{pdfatfi}.
+% Example (linux):
+% \begin{quote}
+%   |chmod +x scripts/oberdiek/pdfatfi.pl|\\
+%   |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
+% \end{quote}
+%
+% \subsection{Package installation}
+%
 % \paragraph{Unpacking.} The \xfile{.dtx} file is a self-extracting
 % \docstrip\ archive. The files are extracted by running the
 % \xfile{.dtx} through \plainTeX:
@@ -561,8 +595,10 @@ and the derived files
 % TDS installing feature, then some files can already be in the right
 % place, see the documentation of \docstrip.
 %
-% \paragraph{Refresh file databases.} If your \TeX~distribution
-% (\teTeX, \mikTeX, \dots) rely on file databases, you must refresh
+% \subsection{Refresh file name databases}
+%
+% If your \TeX~distribution
+% (\teTeX, \mikTeX, \dots) relies on file name databases, you must refresh
 % these. For example, \teTeX\ users run \verb|texhash| or
 % \verb|mktexlsr|.
 %
@@ -618,6 +654,10 @@ and the derived files
 %   \item
 %     First released version. (First start of the project was June/July 2002.)
 %   \end{Version}
+%   \begin{Version}{2007/04/11 v1.1}
+%   \item
+%     Line ends sanitized.
+%   \end{Version}
 % \end{History}
 %
 % \PrintIndex
diff --git a/Master/texmf-dist/source/latex/oberdiek/pmboxdraw.dtx b/Master/texmf-dist/source/latex/oberdiek/pmboxdraw.dtx
index 6b5ab70e170..9686eb2d73a 100644
--- a/Master/texmf-dist/source/latex/oberdiek/pmboxdraw.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/pmboxdraw.dtx
@@ -57,7 +57,7 @@
 %
 %<*ignore>
 \begingroup
-  \def\x{LaTeX2e}
+  \def\x{LaTeX2e}%
 \expandafter\endgroup
 \ifcase 0\ifx\install y1\fi\expandafter
          \ifx\csname processbatchFile\endcsname\relax\else1\fi
@@ -130,7 +130,7 @@ and the derived files
 %<*driver>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{pmboxdraw.drv}%
-  [2006/05/03 v1.0 Poor man's box drawing characters (HO)]
+  [2006/05/03 v1.0 Poor man's box drawing characters (HO)]%
 \documentclass{ltxdoc}
 \usepackage{holtxdoc}
 \usepackage{color}
@@ -139,7 +139,7 @@ and the derived files
 \setcounter{tocdepth}{2}
 \hypersetup{bookmarksdepth=3}
 \begin{document}
-  \DocInput{pmboxdraw.dtx}
+  \DocInput{pmboxdraw.dtx}%
 \end{document}
 %</driver>
 % \fi
@@ -355,7 +355,7 @@ and the derived files
 %<*package>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{pmboxdraw}%
-  [2006/05/03 v1.0 Poor man's box drawing characters (HO)]
+  [2006/05/03 v1.0 Poor man's box drawing characters (HO)]%
 %    \end{macrocode}
 %
 % \subsection{Dummy font encoding}
@@ -1620,7 +1620,7 @@ and the derived files
 %    \begin{macrocode}
 %<*utf8>
 \ProvidesFile{pmboxdrawenc.dfu}%
-  [2006/05/03 v1.0 UTF-8 support for box drawing characters]
+  [2006/05/03 v1.0 UTF-8 support for box drawing characters]%
 %    \end{macrocode}
 %
 %    \begin{macrocode}
@@ -1679,13 +1679,47 @@ and the derived files
 %    \end{macrocode}
 % \section{Installation}
 %
-% \paragraph{CTAN.} This package is available on
+% \subsection{Download}
+%
+% \paragraph{Package.} This package is available on
 % CTAN\footnote{\url{ftp://ftp.ctan.org/tex-archive/}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/pmboxdraw.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/pmboxdraw.pdf}] Documentation.
 % \end{description}
 %
+%
+% \paragraph{Bundle.} All the packages of the bundle `oberdiek'
+% are also available in a TDS compliant ZIP archive. There
+% the packages are already unpacked and the documentation files
+% are generated. The files and directories obey the TDS standard.
+% \begin{description}
+% \item[\CTAN{macros/latex/contrib/oberdiek/oberdiek-tds.zip}]
+% \end{description}
+%
+% \subsection{Bundle installation}
+%
+% \paragraph{Unpacking.} Unpack the \xfile{oberdiek-tds.zip} in the
+% TDS tree (also known as \xfile{texmf} tree) of your choice.
+% Example (linux):
+% \begin{quote}
+%   |unzip oberdiek-tds.zip -d ~/texmf|
+% \end{quote}
+%
+% \paragraph{Script installation.}
+% Check the directory \xfile{TDS:scripts/oberdiek/} for
+% scripts that need further installation steps.
+% Package \xpackage{attachfile2} comes with the Perl script
+% \xfile{pdfatfi.pl} that should be installed in such a way
+% that it can be called as \texttt{pdfatfi}.
+% Example (linux):
+% \begin{quote}
+%   |chmod +x scripts/oberdiek/pdfatfi.pl|\\
+%   |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
+% \end{quote}
+%
+% \subsection{Package installation}
+%
 % \paragraph{Unpacking.} The \xfile{.dtx} file is a self-extracting
 % \docstrip\ archive. The files are extracted by running the
 % \xfile{.dtx} through \plainTeX:
@@ -1717,8 +1751,10 @@ and the derived files
 % TDS installing feature, then some files can already be in the right
 % place, see the documentation of \docstrip.
 %
-% \paragraph{Refresh file databases.} If your \TeX~distribution
-% (\teTeX, \mikTeX, \dots) rely on file databases, you must refresh
+% \subsection{Refresh file name databases}
+%
+% If your \TeX~distribution
+% (\teTeX, \mikTeX, \dots) relies on file name databases, you must refresh
 % these. For example, \teTeX\ users run \verb|texhash| or
 % \verb|mktexlsr|.
 %
diff --git a/Master/texmf-dist/source/latex/oberdiek/refcount.dtx b/Master/texmf-dist/source/latex/oberdiek/refcount.dtx
index c0997e8baf9..138c287f886 100644
--- a/Master/texmf-dist/source/latex/oberdiek/refcount.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/refcount.dtx
@@ -56,7 +56,7 @@
 %
 %<*ignore>
 \begingroup
-  \def\x{LaTeX2e}
+  \def\x{LaTeX2e}%
 \expandafter\endgroup
 \ifcase 0\ifx\install y1\fi\expandafter
          \ifx\csname processbatchFile\endcsname\relax\else1\fi
@@ -128,11 +128,11 @@ and the derived files
 %<*driver>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{refcount.drv}%
-  [2006/02/20 v3.0 Data extraction from references (HO)]
+  [2006/02/20 v3.0 Data extraction from references (HO)]%
 \documentclass{ltxdoc}
 \usepackage{holtxdoc}
 \begin{document}
-  \DocInput{refcount.dtx}
+  \DocInput{refcount.dtx}%
 \end{document}
 %</driver>
 % \fi
@@ -216,7 +216,7 @@ and the derived files
 %   \cs{get...refnumber} |{|\meta{reference}|}|
 % \end{quote}
 % The default for undefined references can be changed
-% with macro \cs{setrefcountdefault}, for example this   
+% with macro \cs{setrefcountdefault}, for example this
 % package calls:
 % \begin{quote}
 %   \cs{setrefcountdefault}|{0}|
@@ -248,7 +248,7 @@ and the derived files
 % \subsection{Undefined references}
 %
 % Because warnings and assignments cannot be used in
-% expandible contexts, undefined references do not  
+% expandible contexts, undefined references do not
 % produce a warning, their values are assumed to be zero.
 % Example:
 % \begin{quote}
@@ -278,9 +278,9 @@ and the derived files
 % \item
 %   The method of extracting the number in this
 %   package also works in cases, where the
-%   reference cannot be used directly, because  
+%   reference cannot be used directly, because
 %   a package such as \xpackage{hyperref} has added
-%   extra stuff (hyper link), so that the reference cannot   
+%   extra stuff (hyper link), so that the reference cannot
 %   be used as number any more.
 % \item
 %   If the reference does not contain a number,
@@ -297,7 +297,7 @@ and the derived files
 %<*package>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{refcount}
-  [2006/02/20 v3.0 Data extraction from references (HO)]
+  [2006/02/20 v3.0 Data extraction from references (HO)]%
 
 \def\setrefcountdefault#1{%
   \def\rc@default{#1}%
@@ -426,13 +426,47 @@ and the derived files
 %    \end{macrocode}
 % \section{Installation}
 %
-% \paragraph{CTAN.} This package is available on
+% \subsection{Download}
+%
+% \paragraph{Package.} This package is available on
 % CTAN\footnote{\url{ftp://ftp.ctan.org/tex-archive/}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/refcount.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/refcount.pdf}] Documentation.
 % \end{description}
 %
+%
+% \paragraph{Bundle.} All the packages of the bundle `oberdiek'
+% are also available in a TDS compliant ZIP archive. There
+% the packages are already unpacked and the documentation files
+% are generated. The files and directories obey the TDS standard.
+% \begin{description}
+% \item[\CTAN{macros/latex/contrib/oberdiek/oberdiek-tds.zip}]
+% \end{description}
+%
+% \subsection{Bundle installation}
+%
+% \paragraph{Unpacking.} Unpack the \xfile{oberdiek-tds.zip} in the
+% TDS tree (also known as \xfile{texmf} tree) of your choice.
+% Example (linux):
+% \begin{quote}
+%   |unzip oberdiek-tds.zip -d ~/texmf|
+% \end{quote}
+%
+% \paragraph{Script installation.}
+% Check the directory \xfile{TDS:scripts/oberdiek/} for
+% scripts that need further installation steps.
+% Package \xpackage{attachfile2} comes with the Perl script
+% \xfile{pdfatfi.pl} that should be installed in such a way
+% that it can be called as \texttt{pdfatfi}.
+% Example (linux):
+% \begin{quote}
+%   |chmod +x scripts/oberdiek/pdfatfi.pl|\\
+%   |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
+% \end{quote}
+%
+% \subsection{Package installation}
+%
 % \paragraph{Unpacking.} The \xfile{.dtx} file is a self-extracting
 % \docstrip\ archive. The files are extracted by running the
 % \xfile{.dtx} through \plainTeX:
@@ -463,8 +497,10 @@ and the derived files
 % TDS installing feature, then some files can already be in the right
 % place, see the documentation of \docstrip.
 %
-% \paragraph{Refresh file databases.} If your \TeX~distribution
-% (\teTeX, \mikTeX, \dots) rely on file databases, you must refresh
+% \subsection{Refresh file name databases}
+%
+% If your \TeX~distribution
+% (\teTeX, \mikTeX, \dots) relies on file name databases, you must refresh
 % these. For example, \teTeX\ users run \verb|texhash| or
 % \verb|mktexlsr|.
 %
diff --git a/Master/texmf-dist/source/latex/oberdiek/setouterhbox.dtx b/Master/texmf-dist/source/latex/oberdiek/setouterhbox.dtx
index 2377efb7d37..761057133c8 100644
--- a/Master/texmf-dist/source/latex/oberdiek/setouterhbox.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/setouterhbox.dtx
@@ -57,7 +57,7 @@
 %
 %<*ignore>
 \begingroup
-  \def\x{LaTeX2e}
+  \def\x{LaTeX2e}%
 \expandafter\endgroup
 \ifcase 0\ifx\install y1\fi\expandafter
          \ifx\csname processbatchFile\endcsname\relax\else1\fi
@@ -131,11 +131,11 @@ and the derived files
 %<*driver>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{setouterhbox.drv}%
-  [2006/08/26 v1.4 Set hbox in outer horizontal mode (HO)]
+  [2006/08/26 v1.4 Set hbox in outer horizontal mode (HO)]%
 \documentclass{ltxdoc}
 \usepackage{holtxdoc}
 \begin{document}
-  \DocInput{setouterhbox.dtx}
+  \DocInput{setouterhbox.dtx}%
 \end{document}
 %</driver>
 % \fi
@@ -386,7 +386,7 @@ by/a/very_long_long_long_path.html}%
   \fi
 \expandafter\x\csname ver@setouterhbox.sty\endcsname
 \ProvidesPackage{setouterhbox}%
-  [2006/08/26 v1.4 Set hbox in outer horizontal mode (HO)]
+  [2006/08/26 v1.4 Set hbox in outer horizontal mode (HO)]%
 %    \end{macrocode}
 %
 %    \begin{macro}{\setouterhboxBox}
@@ -671,13 +671,47 @@ E   \egroup
 %    \end{macrocode}
 % \section{Installation}
 %
-% \paragraph{CTAN.} This package is available on
+% \subsection{Download}
+%
+% \paragraph{Package.} This package is available on
 % CTAN\footnote{\url{ftp://ftp.ctan.org/tex-archive/}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/setouterhbox.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/setouterhbox.pdf}] Documentation.
 % \end{description}
 %
+%
+% \paragraph{Bundle.} All the packages of the bundle `oberdiek'
+% are also available in a TDS compliant ZIP archive. There
+% the packages are already unpacked and the documentation files
+% are generated. The files and directories obey the TDS standard.
+% \begin{description}
+% \item[\CTAN{macros/latex/contrib/oberdiek/oberdiek-tds.zip}]
+% \end{description}
+%
+% \subsection{Bundle installation}
+%
+% \paragraph{Unpacking.} Unpack the \xfile{oberdiek-tds.zip} in the
+% TDS tree (also known as \xfile{texmf} tree) of your choice.
+% Example (linux):
+% \begin{quote}
+%   |unzip oberdiek-tds.zip -d ~/texmf|
+% \end{quote}
+%
+% \paragraph{Script installation.}
+% Check the directory \xfile{TDS:scripts/oberdiek/} for
+% scripts that need further installation steps.
+% Package \xpackage{attachfile2} comes with the Perl script
+% \xfile{pdfatfi.pl} that should be installed in such a way
+% that it can be called as \texttt{pdfatfi}.
+% Example (linux):
+% \begin{quote}
+%   |chmod +x scripts/oberdiek/pdfatfi.pl|\\
+%   |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
+% \end{quote}
+%
+% \subsection{Package installation}
+%
 % \paragraph{Unpacking.} The \xfile{.dtx} file is a self-extracting
 % \docstrip\ archive. The files are extracted by running the
 % \xfile{.dtx} through \plainTeX:
@@ -709,8 +743,10 @@ E   \egroup
 % TDS installing feature, then some files can already be in the right
 % place, see the documentation of \docstrip.
 %
-% \paragraph{Refresh file databases.} If your \TeX~distribution
-% (\teTeX, \mikTeX, \dots) rely on file databases, you must refresh
+% \subsection{Refresh file name databases}
+%
+% If your \TeX~distribution
+% (\teTeX, \mikTeX, \dots) relies on file name databases, you must refresh
 % these. For example, \teTeX\ users run \verb|texhash| or
 % \verb|mktexlsr|.
 %
diff --git a/Master/texmf-dist/source/latex/oberdiek/settobox.dtx b/Master/texmf-dist/source/latex/oberdiek/settobox.dtx
index 095633e8cef..5230e0ce22c 100644
--- a/Master/texmf-dist/source/latex/oberdiek/settobox.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/settobox.dtx
@@ -1,6 +1,7 @@
 % \iffalse meta-comment
 %
-% Copyright (C) 2000, 2006 by Heiko Oberdiek <oberdiek@uni-freiburg.de>
+% Copyright (C) 2000, 2006, 2007 by
+%    Heiko Oberdiek <oberdiek@uni-freiburg.de>
 %
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either
@@ -57,7 +58,7 @@
 %
 %<*ignore>
 \begingroup
-  \def\x{LaTeX2e}
+  \def\x{LaTeX2e}%
 \expandafter\endgroup
 \ifcase 0\ifx\install y1\fi\expandafter
          \ifx\csname processbatchFile\endcsname\relax\else1\fi
@@ -68,7 +69,7 @@
 \input docstrip.tex
 \Msg{************************************************************************}
 \Msg{* Installation}
-\Msg{* Package: settobox 2006/02/20 v1.2 Getting box sizes (HO)}
+\Msg{* Package: settobox 2007/04/11 v1.3 Getting box sizes (HO)}
 \Msg{************************************************************************}
 
 \keepsilent
@@ -78,7 +79,8 @@
 
 This is a generated file.
 
-Copyright (C) 2000, 2006 by Heiko Oberdiek <oberdiek@uni-freiburg.de>
+Copyright (C) 2000, 2006, 2007 by
+   Heiko Oberdiek <oberdiek@uni-freiburg.de>
 
 This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either
@@ -131,13 +133,13 @@ and the derived files
 %<*driver>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{settobox.drv}%
-  [2006/02/20 v1.2 Getting box sizes (HO)]
+  [2007/04/11 v1.3 Getting box sizes (HO)]%
 \documentclass{ltxdoc}
 \usepackage{holtxdoc}
 \usepackage{calc}
 \usepackage{settobox}
 \begin{document}
-  \DocInput{settobox.dtx}
+  \DocInput{settobox.dtx}%
 \end{document}
 %</driver>
 % \fi
@@ -163,7 +165,7 @@ and the derived files
 % \GetFileInfo{settobox.drv}
 %
 % \title{The \xpackage{settobox} package}
-% \date{2006/02/20 v1.2}
+% \date{2007/04/11 v1.3}
 % \author{Heiko Oberdiek\\\xemail{oberdiek@uni-freiburg.de}}
 %
 % \maketitle
@@ -276,21 +278,21 @@ and the derived files
   \par
   \begingroup
     \raggedright
-    \edef\x{\detokenize{#1}}
+    \edef\x{\detokenize{#1}}%
     \let\do\@makeother
     \dospecials
     \catcode`\~\active
     \catcode`\ =10\relax
     \def~{\\}%
     \noindent
-    \texttt{\scantokens\expandafter{\x}}
+    \texttt{\scantokens\expandafter{\x}}%
     \par
   \endgroup
   \begingroup
     \let~\relax
-    \sbox{\mybox}{The cracy fox.}
+    \sbox{\mybox}{The cracy fox.}%
      #1%
-     A---\fbox{\usebox\mybox}---B
+     A---\fbox{\usebox\mybox}---B%
   \endgroup
   \par
 }
@@ -301,22 +303,22 @@ and the derived files
 \test{\setboxwidth{\mybox}{1.25\width}}
 \test{\setboxheight{\mybox}{0pt}}
 \test{\setboxheight{\mybox}{2\height}}
-\test{\setboxdepth{\mybox}{\height}}  
-\test{\setboxmoveleft{\mybox}{5pt}}   
+\test{\setboxdepth{\mybox}{\height}}
+\test{\setboxmoveleft{\mybox}{5pt}}
 \test{%
   \setboxmoveleft{\mybox}{5pt}~%
   \setboxwidth{\mybox}{\width + 5pt}%
 }
 \test{\setboxmoveright{\mybox}{0.5\width}}
 \test{\setboxlower{\mybox}{\height}}
-\test{\setboxraise{\mybox}{\depth}} 
+\test{\setboxraise{\mybox}{\depth}}
 \test{%
   \setboxmoveright{\mybox}{5pt}~%
   \setboxwidth{\mybox}{\width + 5pt}~%
   \setboxheight{\mybox}{\height + 5pt}~%
-  \setboxdepth{\mybox}{\depth + 5pt}%   
+  \setboxdepth{\mybox}{\depth + 5pt}%
 }
- 
+
 \end{document}
 %</example>
 %    \end{macrocode}
@@ -362,15 +364,15 @@ and the derived files
 % \test{\setboxwidth{\mybox}{1.25\width}}
 % \test{\setboxheight{\mybox}{0pt}}
 % \test{\setboxheight{\mybox}{2\height}}
-% \test{\setboxdepth{\mybox}{\height}}  
-% \test{\setboxmoveleft{\mybox}{5pt}}   
+% \test{\setboxdepth{\mybox}{\height}}
+% \test{\setboxmoveleft{\mybox}{5pt}}
 % \test{^^A
 %   \setboxmoveleft{\mybox}{5pt}~^^A
 %   \setboxwidth{\mybox}{\width + 5pt}^^A
 % }
 % \test{\setboxmoveright{\mybox}{0.5\width}}
 % \test{\setboxlower{\mybox}{\height}}
-% \test{\setboxraise{\mybox}{\depth}} 
+% \test{\setboxraise{\mybox}{\depth}}
 % \test{^^A
 %   \setboxmoveright{\mybox}{5pt}~^^A
 %   \setboxwidth{\mybox}{\width + 5pt}~^^A
@@ -395,7 +397,7 @@ and the derived files
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{settobox}%
-  [2006/02/20 v1.2 Getting box sizes (HO)]
+  [2007/04/11 v1.3 Getting box sizes (HO)]
 %    \end{macrocode}
 %
 %    \begin{macrocode}
@@ -515,13 +517,47 @@ and the derived files
 %    \end{macrocode}
 % \section{Installation}
 %
-% \paragraph{CTAN.} This package is available on
+% \subsection{Download}
+%
+% \paragraph{Package.} This package is available on
 % CTAN\footnote{\url{ftp://ftp.ctan.org/tex-archive/}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/settobox.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/settobox.pdf}] Documentation.
 % \end{description}
 %
+%
+% \paragraph{Bundle.} All the packages of the bundle `oberdiek'
+% are also available in a TDS compliant ZIP archive. There
+% the packages are already unpacked and the documentation files
+% are generated. The files and directories obey the TDS standard.
+% \begin{description}
+% \item[\CTAN{macros/latex/contrib/oberdiek/oberdiek-tds.zip}]
+% \end{description}
+%
+% \subsection{Bundle installation}
+%
+% \paragraph{Unpacking.} Unpack the \xfile{oberdiek-tds.zip} in the
+% TDS tree (also known as \xfile{texmf} tree) of your choice.
+% Example (linux):
+% \begin{quote}
+%   |unzip oberdiek-tds.zip -d ~/texmf|
+% \end{quote}
+%
+% \paragraph{Script installation.}
+% Check the directory \xfile{TDS:scripts/oberdiek/} for
+% scripts that need further installation steps.
+% Package \xpackage{attachfile2} comes with the Perl script
+% \xfile{pdfatfi.pl} that should be installed in such a way
+% that it can be called as \texttt{pdfatfi}.
+% Example (linux):
+% \begin{quote}
+%   |chmod +x scripts/oberdiek/pdfatfi.pl|\\
+%   |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
+% \end{quote}
+%
+% \subsection{Package installation}
+%
 % \paragraph{Unpacking.} The \xfile{.dtx} file is a self-extracting
 % \docstrip\ archive. The files are extracted by running the
 % \xfile{.dtx} through \plainTeX:
@@ -553,8 +589,10 @@ and the derived files
 % TDS installing feature, then some files can already be in the right
 % place, see the documentation of \docstrip.
 %
-% \paragraph{Refresh file databases.} If your \TeX~distribution
-% (\teTeX, \mikTeX, \dots) rely on file databases, you must refresh
+% \subsection{Refresh file name databases}
+%
+% If your \TeX~distribution
+% (\teTeX, \mikTeX, \dots) relies on file name databases, you must refresh
 % these. For example, \teTeX\ users run \verb|texhash| or
 % \verb|mktexlsr|.
 %
@@ -628,6 +666,10 @@ and the derived files
 %   \item
 %     LPPL 1.3
 %   \end{Version}
+%   \begin{Version}{2007/04/11 v1.3}
+%   \item
+%     Line ends sanitized.
+%   \end{Version}
 % \end{History}
 %
 % \PrintIndex
diff --git a/Master/texmf-dist/source/latex/oberdiek/stackrel.dtx b/Master/texmf-dist/source/latex/oberdiek/stackrel.dtx
index e225af5ddcb..3cce4a5dcfe 100644
--- a/Master/texmf-dist/source/latex/oberdiek/stackrel.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/stackrel.dtx
@@ -55,7 +55,7 @@
 %
 %<*ignore>
 \begingroup
-  \def\x{LaTeX2e}
+  \def\x{LaTeX2e}%
 \expandafter\endgroup
 \ifcase 0\ifx\install y1\fi\expandafter
          \ifx\csname processbatchFile\endcsname\relax\else1\fi
@@ -126,13 +126,13 @@ and the derived files
 %<*driver>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{stackrel.drv}%
-  [2006/12/02 v1.0 Adding subscript option to stackrel (HO)]
+  [2006/12/02 v1.0 Adding subscript option to stackrel (HO)]%
 \documentclass{ltxdoc}
 \usepackage{holtxdoc}
 \usepackage{amsmath}
 \usepackage{stackrel}
 \begin{document}
-  \DocInput{stackrel.dtx}
+  \DocInput{stackrel.dtx}%
 \end{document}
 %</driver>
 % \fi
@@ -205,7 +205,7 @@ and the derived files
 %<*package>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{stackrel}
-  [2006/12/02 v1.0 Adding subscript option to stackrel (HO)]
+  [2006/12/02 v1.0 Adding subscript option to stackrel (HO)]%
 %    \end{macrocode}
 %
 %    Given the original definition of \cs{stackrel} the addition
@@ -274,13 +274,47 @@ and the derived files
 %    \end{macrocode}
 % \section{Installation}
 %
-% \paragraph{CTAN.} This package is available on
+% \subsection{Download}
+%
+% \paragraph{Package.} This package is available on
 % CTAN\footnote{\url{ftp://ftp.ctan.org/tex-archive/}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/stackrel.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/stackrel.pdf}] Documentation.
 % \end{description}
 %
+%
+% \paragraph{Bundle.} All the packages of the bundle `oberdiek'
+% are also available in a TDS compliant ZIP archive. There
+% the packages are already unpacked and the documentation files
+% are generated. The files and directories obey the TDS standard.
+% \begin{description}
+% \item[\CTAN{macros/latex/contrib/oberdiek/oberdiek-tds.zip}]
+% \end{description}
+%
+% \subsection{Bundle installation}
+%
+% \paragraph{Unpacking.} Unpack the \xfile{oberdiek-tds.zip} in the
+% TDS tree (also known as \xfile{texmf} tree) of your choice.
+% Example (linux):
+% \begin{quote}
+%   |unzip oberdiek-tds.zip -d ~/texmf|
+% \end{quote}
+%
+% \paragraph{Script installation.}
+% Check the directory \xfile{TDS:scripts/oberdiek/} for
+% scripts that need further installation steps.
+% Package \xpackage{attachfile2} comes with the Perl script
+% \xfile{pdfatfi.pl} that should be installed in such a way
+% that it can be called as \texttt{pdfatfi}.
+% Example (linux):
+% \begin{quote}
+%   |chmod +x scripts/oberdiek/pdfatfi.pl|\\
+%   |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
+% \end{quote}
+%
+% \subsection{Package installation}
+%
 % \paragraph{Unpacking.} The \xfile{.dtx} file is a self-extracting
 % \docstrip\ archive. The files are extracted by running the
 % \xfile{.dtx} through \plainTeX:
@@ -311,8 +345,10 @@ and the derived files
 % TDS installing feature, then some files can already be in the right
 % place, see the documentation of \docstrip.
 %
-% \paragraph{Refresh file databases.} If your \TeX~distribution
-% (\teTeX, \mikTeX, \dots) rely on file databases, you must refresh
+% \subsection{Refresh file name databases}
+%
+% If your \TeX~distribution
+% (\teTeX, \mikTeX, \dots) relies on file name databases, you must refresh
 % these. For example, \teTeX\ users run \verb|texhash| or
 % \verb|mktexlsr|.
 %
diff --git a/Master/texmf-dist/source/latex/oberdiek/tabularht.dtx b/Master/texmf-dist/source/latex/oberdiek/tabularht.dtx
index c4ecd3ef961..2fab037126d 100644
--- a/Master/texmf-dist/source/latex/oberdiek/tabularht.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/tabularht.dtx
@@ -1,6 +1,7 @@
 % \iffalse meta-comment
 %
-% Copyright (C) 2005, 2006 by Heiko Oberdiek <oberdiek@uni-freiburg.de>
+% Copyright (C) 2005, 2006, 2007 by
+%    Heiko Oberdiek <oberdiek@uni-freiburg.de>
 %
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either
@@ -58,7 +59,7 @@
 %
 %<*ignore>
 \begingroup
-  \def\x{LaTeX2e}
+  \def\x{LaTeX2e}%
 \expandafter\endgroup
 \ifcase 0\ifx\install y1\fi\expandafter
          \ifx\csname processbatchFile\endcsname\relax\else1\fi
@@ -69,7 +70,7 @@
 \input docstrip.tex
 \Msg{************************************************************************}
 \Msg{* Installation}
-\Msg{* Package: tabularht 2006/12/22 v2.3 Tabular with height specification (HO)}
+\Msg{* Package: tabularht 2007/04/11 v2.5 Tabular with height specification (HO)}
 \Msg{************************************************************************}
 
 \keepsilent
@@ -79,7 +80,8 @@
 
 This is a generated file.
 
-Copyright (C) 2005, 2006 by Heiko Oberdiek <oberdiek@uni-freiburg.de>
+Copyright (C) 2005, 2006, 2007 by
+   Heiko Oberdiek <oberdiek@uni-freiburg.de>
 
 This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either
@@ -133,16 +135,16 @@ and the derived files
 %<*driver>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{tabularht.drv}%
-  [2006/12/22 v2.3 Tabular with height specification (HO)]
+  [2007/04/11 v2.5 Tabular with height specification (HO)]%
 \documentclass{ltxdoc}
 \usepackage{holtxdoc}
 \begin{document}
-  \DocInput{tabularht.dtx}
+  \DocInput{tabularht.dtx}%
 \end{document}
 %</driver>
 % \fi
 %
-% \CheckSum{647}
+% \CheckSum{651}
 %
 % \CharacterTable
 %  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -163,7 +165,7 @@ and the derived files
 % \GetFileInfo{tabularht.drv}
 %
 % \title{The \xpackage{tabularht} package}
-% \date{2006/12/22 v2.3}
+% \date{2007/04/11 v2.5}
 % \author{Heiko Oberdiek\\\xemail{oberdiek@uni-freiburg.de}}
 %
 % \maketitle
@@ -325,12 +327,12 @@ and the derived files
 
 \begin{document}
 \fbox{%
-  \begin{tabularht*}{1in}{4in}{@{}l@{\extracolsep{\fill}}r@{}}
+  \begin{tabularht*}{1in}{4in}{@{}l@{\extracolsep{\fill}}r@{}}%
     upper left corner & upper right corner\\%
     \noalign{\vfill}%
-    \multicolumn{2}{@{}c@{}}{bounding box}\\
+    \multicolumn{2}{@{}c@{}}{bounding box}\\%
     \noalign{\vfill}%
-    lower left corner & lower right corner\\
+    lower left corner & lower right corner\\%
   \end{tabularht*}%
 }
 \end{document}
@@ -349,22 +351,22 @@ and the derived files
 
 \begin{tabularht}{spread=0pt}{|l|l|}
   \hline
-  First&Line\\
+  First&Line\\%
   \hline
 \interrowstart
-  \addlinespace[10mm]
+  \addlinespace[10mm]%
 \interrowstop
   \hline
-  Second&Line\\
+  Second&Line\\%
 \interrowstart
   \hline
   \hline
 \interrowstop
-  Third&Line\\
+  Third&Line\\%
   \hline
 \interrowspace{10mm}
   \hline
-  Fourth&Line\\
+  Fourth&Line\\%
   \hline
 \end{tabularht}
 
@@ -384,7 +386,7 @@ and the derived files
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{tabularht}%
-  [2006/12/22 v2.3 Tabular with height specification (HO)]
+  [2007/04/11 v2.5 Tabular with height specification (HO)]
 %    \end{macrocode}
 %
 % \subsection{Environments}
@@ -564,8 +566,10 @@ and the derived files
 % \subsection{Option vlines, driver independent stuff}
 %
 %    \begin{macrocode}
-\newcounter{tabH@unique}
-\setcounter{tabH@unique}{0}
+\begingroup
+  \let\@addtoreset\@gobbletwo
+  \newcounter{tabH@unique}%
+\endgroup
 \let\tabH@currenttab\@empty
 
 \def\tabH@array@init{%
@@ -637,10 +641,10 @@ and the derived files
         \tabH@aux@vrule{#1}{\tabH@lastxpos}%
       }%
     \fi
-  }
+  }%
 
-  \def\tabH@lastxpos{\the\pdflastxpos}
-  \def\tabH@lastypos{\the\pdflastypos}
+  \def\tabH@lastxpos{\the\pdflastxpos}%
+  \def\tabH@lastypos{\the\pdflastypos}%
 
   % The .aux file contains three commands:
   % \tabH@aux@vrule{tabular id}{x position}
@@ -656,7 +660,7 @@ and the derived files
     \let\tabH@aux@done\@empty
     \if@filesw
       \immediate\write\@mainaux{%
-        \@percentchar\@percentchar BeginProlog: tabularht
+        \@percentchar\@percentchar BeginProlog: tabularht%
       }%
       % items in the aux file are executed,
       % if tabularht is loaded
@@ -678,10 +682,10 @@ and the derived files
         }%
       }%
       \immediate\write\@mainaux{%
-        \@percentchar\@percentchar EndProlog: tabularht
+        \@percentchar\@percentchar EndProlog: tabularht%
       }%
     \fi
-  }
+  }%
 
   % the x positions of vrules are stored in
   % \tabH@<tabcount>list with distinct values
@@ -703,7 +707,7 @@ and the derived files
         }%
       \endgroup
     }%
-  }
+  }%
   \def\tabH@do@add#1{%
     \ifx\y\@undefined
       \ifnum#1<\x\space
@@ -715,7 +719,7 @@ and the derived files
       \fi
     \fi
     \noexpand\do{#1}%
-  }
+  }%
 
   \def\tabH@vspace@start#1{%
     \if@filesw
@@ -764,7 +768,7 @@ and the derived files
         \tabH@aux@vstop{\tabH@lastypos}%
       }%
     \fi
-  }
+  }%
   \def\tabH@do@set#1{%
     \hbox to \z@{%
       \hskip \dimexpr #1sp - \x sp\relax
@@ -772,7 +776,7 @@ and the derived files
              \@depth\dimexpr \y sp\relax
       \hss
     }%
-  }
+  }%
   \def\tabH@do@filter{%
     \@tempswafalse
     \advance\count@\@ne
@@ -786,20 +790,20 @@ and the derived files
     \else
       \expandafter\@gobble
     \fi
-  }
+  }%
 
   \protected\def\tabH@aux@vstart#1#2#3#4{%
     \def\tabH@current@vstart{{#1}{#2}{#3}{#4}}%
-  }
+  }%
   \protected\def\tabH@aux@vstop{%
     \expandafter\tabH@aux@v\tabH@current@vstart
-  }
+  }%
   \def\tabH@aux@v#1#2#3#4#5{%
     \expandafter\gdef\csname tabH@#1row#2x\endcsname{#3}%
     \expandafter\xdef\csname tabH@#1row#2y\endcsname{%
       \the\numexpr #4 - #5\relax
     }%
-  }
+  }%
 
   \csname fi\endcsname
   \endinput
@@ -848,7 +852,7 @@ and the derived files
   % thus simulate a large motion
   \kern1in\relax
   \tabH@literalps{%
-    #1 tabH.vrule
+    #1 tabH.vrule %
     Resolution neg 0 translate%
   }%
   \vrule#3\arrayrulewidth
@@ -878,13 +882,13 @@ and the derived files
 }
 
 \tabH@headerps{%
-  userdict begin
-    /tabH.list 10 dict def
-    /tabH.job [] def
+  userdict begin%
+    /tabH.list 10 dict def%
+    /tabH.job [] def %
   end%
   /tabH.vrule{%
     10 string cvs cvn dup tabH.list exch known{%
-      tabH.list exch dup [ exch tabH.list exch get
+      tabH.list exch dup [ exch tabH.list exch get %
       currentpoint pop round exch true exch{%
         % tabH.list key [ ... x true i
         % tabH.list key [ ... false i
@@ -892,32 +896,32 @@ and the derived files
           % ... [ ... x i
           2 copy lt{false}{%
             2 copy eq{pop false}{exch true}ifelse%
-          }ifelse
-        }{false}ifelse
-      }forall
+          }ifelse%
+        }{false}ifelse%
+      }forall %
       pop%
       ]put%
     }{%
-      tabH.list exch[currentpoint pop round]put
-    }ifelse
-  }bind def
+      tabH.list exch[currentpoint pop round]put%
+    }ifelse%
+  }bind def%
   % <tab num> <cols array> <ytop> <ybottom> <rulewidth[sp]>
   /tabH.vspace{%
-    userdict begin
-      10 dict dup begin
-        exch 65536 div Resolution mul 72.27 div
+    userdict begin %
+      10 dict dup begin %
+        exch 65536 div Resolution mul 72.27 div %
         % dvips uses a poor man's ceil function
         % see dopage.c before "drawrule": (int)(... + 0.9999999)
         0.9999999 add truncate%
-        /rulewidth exch def
-        exch/ybottom exch def
-        exch/ytop exch def
-        exch/cols exch def
-        exch/tabkey exch 10 string cvs cvn def
-      end
-      /tabH.job exch[exch userdict/tabH.job get aload pop]def
+        /rulewidth exch def %
+        exch/ybottom exch def %
+        exch/ytop exch def %
+        exch/cols exch def %
+        exch/tabkey exch 10 string cvs cvn def %
+      end%
+      /tabH.job exch[exch userdict/tabH.job get aload pop]def %
     end%
-  }bind def
+  }bind def %
   % Now we do the work at the end of the page.
   % Unhappily "eop-hook" cannot be used, because "eop"
   % executes "restore" before, so that all data are lost.
@@ -927,12 +931,12 @@ and the derived files
       {%
         tabH.job{%
           begin%
-           /colarray
-             tabH.list tabkey known{tabH.list tabkey get}{[]}ifelse
-           def
+           /colarray %
+             tabH.list tabkey known{tabH.list tabkey get}{[]}ifelse %
+           def %
            cols length 0 eq not{%
              /colarray[%
-               cols{1 sub
+               cols{1 sub %
                  dup 0 lt{pop}{%
                    dup colarray length ge{pop}{%
                      colarray exch get%
@@ -940,18 +944,18 @@ and the derived files
                  }ifelse%
                }forall%
              ]def%
-           }if
+           }if %
            colarray{%
              % (rulewidth) == rulewidth == % debug
-             Resolution sub
-             ytop rulewidth ytop ybottom sub v
-           }forall
-          end
-        }forall
+             Resolution sub %
+             ytop rulewidth ytop ybottom sub v%
+           }forall %
+          end%
+        }forall%
         % tabH.list{== ==}forall % debug
-      }bind aload pop
-      TeXDict /eop get aload pop
-    ]cvx def
+      }bind aload pop %
+      TeXDict /eop get aload pop%
+    ]cvx def %
   end%
 }
 %    \end{macrocode}
@@ -961,13 +965,47 @@ and the derived files
 %    \end{macrocode}
 % \section{Installation}
 %
-% \paragraph{CTAN.} This package is available on
+% \subsection{Download}
+%
+% \paragraph{Package.} This package is available on
 % CTAN\footnote{\url{ftp://ftp.ctan.org/tex-archive/}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/tabularht.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/tabularht.pdf}] Documentation.
 % \end{description}
 %
+%
+% \paragraph{Bundle.} All the packages of the bundle `oberdiek'
+% are also available in a TDS compliant ZIP archive. There
+% the packages are already unpacked and the documentation files
+% are generated. The files and directories obey the TDS standard.
+% \begin{description}
+% \item[\CTAN{macros/latex/contrib/oberdiek/oberdiek-tds.zip}]
+% \end{description}
+%
+% \subsection{Bundle installation}
+%
+% \paragraph{Unpacking.} Unpack the \xfile{oberdiek-tds.zip} in the
+% TDS tree (also known as \xfile{texmf} tree) of your choice.
+% Example (linux):
+% \begin{quote}
+%   |unzip oberdiek-tds.zip -d ~/texmf|
+% \end{quote}
+%
+% \paragraph{Script installation.}
+% Check the directory \xfile{TDS:scripts/oberdiek/} for
+% scripts that need further installation steps.
+% Package \xpackage{attachfile2} comes with the Perl script
+% \xfile{pdfatfi.pl} that should be installed in such a way
+% that it can be called as \texttt{pdfatfi}.
+% Example (linux):
+% \begin{quote}
+%   |chmod +x scripts/oberdiek/pdfatfi.pl|\\
+%   |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
+% \end{quote}
+%
+% \subsection{Package installation}
+%
 % \paragraph{Unpacking.} The \xfile{.dtx} file is a self-extracting
 % \docstrip\ archive. The files are extracted by running the
 % \xfile{.dtx} through \plainTeX:
@@ -1000,8 +1038,10 @@ and the derived files
 % TDS installing feature, then some files can already be in the right
 % place, see the documentation of \docstrip.
 %
-% \paragraph{Refresh file databases.} If your \TeX~distribution
-% (\teTeX, \mikTeX, \dots) rely on file databases, you must refresh
+% \subsection{Refresh file name databases}
+%
+% If your \TeX~distribution
+% (\teTeX, \mikTeX, \dots) relies on file name databases, you must refresh
 % these. For example, \teTeX\ users run \verb|texhash| or
 % \verb|mktexlsr|.
 %
@@ -1085,6 +1125,14 @@ and the derived files
 %   \item
 %     Fix in code of option vlines.
 %   \end{Version}
+%   \begin{Version}{2007/03/21 v2.4}
+%   \item
+%     Fix: Counter |tabh@unique| must not be changed by \cs{include}.
+%   \end{Version}
+%   \begin{Version}{2007/04/11 v2.5}
+%   \item
+%     Line ends sanitized.
+%   \end{Version}
 % \end{History}
 %
 % \PrintIndex
diff --git a/Master/texmf-dist/source/latex/oberdiek/tabularkv.dtx b/Master/texmf-dist/source/latex/oberdiek/tabularkv.dtx
index e6140b81ed5..108707caa81 100644
--- a/Master/texmf-dist/source/latex/oberdiek/tabularkv.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/tabularkv.dtx
@@ -57,7 +57,7 @@
 %
 %<*ignore>
 \begingroup
-  \def\x{LaTeX2e}
+  \def\x{LaTeX2e}%
 \expandafter\endgroup
 \ifcase 0\ifx\install y1\fi\expandafter
          \ifx\csname processbatchFile\endcsname\relax\else1\fi
@@ -131,11 +131,11 @@ and the derived files
 %<*driver>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{tabularkv.drv}%
-  [2006/02/20 v1.1 Key value interface for tabular parameters (HO)]
+  [2006/02/20 v1.1 Key value interface for tabular parameters (HO)]%
 \documentclass{ltxdoc}
 \usepackage{holtxdoc}
 \begin{document}
-  \DocInput{tabularkv.dtx}
+  \DocInput{tabularkv.dtx}%
 \end{document}
 %</driver>
 % \fi
@@ -213,7 +213,7 @@ and the derived files
     height=1in,
     valign=center
   ]{@{}l@{\extracolsep{\fill}}r@{}}
-    upper left corner & upper right corner\\%
+    upper left corner & upper right corner\\
     \noalign{\vfill}%
     \multicolumn{2}{@{}c@{}}{bounding box}\\
     \noalign{\vfill}%
@@ -280,13 +280,47 @@ and the derived files
 %    \end{macrocode}
 % \section{Installation}
 %
-% \paragraph{CTAN.} This package is available on
+% \subsection{Download}
+%
+% \paragraph{Package.} This package is available on
 % CTAN\footnote{\url{ftp://ftp.ctan.org/tex-archive/}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/tabularkv.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/tabularkv.pdf}] Documentation.
 % \end{description}
 %
+%
+% \paragraph{Bundle.} All the packages of the bundle `oberdiek'
+% are also available in a TDS compliant ZIP archive. There
+% the packages are already unpacked and the documentation files
+% are generated. The files and directories obey the TDS standard.
+% \begin{description}
+% \item[\CTAN{macros/latex/contrib/oberdiek/oberdiek-tds.zip}]
+% \end{description}
+%
+% \subsection{Bundle installation}
+%
+% \paragraph{Unpacking.} Unpack the \xfile{oberdiek-tds.zip} in the
+% TDS tree (also known as \xfile{texmf} tree) of your choice.
+% Example (linux):
+% \begin{quote}
+%   |unzip oberdiek-tds.zip -d ~/texmf|
+% \end{quote}
+%
+% \paragraph{Script installation.}
+% Check the directory \xfile{TDS:scripts/oberdiek/} for
+% scripts that need further installation steps.
+% Package \xpackage{attachfile2} comes with the Perl script
+% \xfile{pdfatfi.pl} that should be installed in such a way
+% that it can be called as \texttt{pdfatfi}.
+% Example (linux):
+% \begin{quote}
+%   |chmod +x scripts/oberdiek/pdfatfi.pl|\\
+%   |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
+% \end{quote}
+%
+% \subsection{Package installation}
+%
 % \paragraph{Unpacking.} The \xfile{.dtx} file is a self-extracting
 % \docstrip\ archive. The files are extracted by running the
 % \xfile{.dtx} through \plainTeX:
@@ -318,8 +352,10 @@ and the derived files
 % TDS installing feature, then some files can already be in the right
 % place, see the documentation of \docstrip.
 %
-% \paragraph{Refresh file databases.} If your \TeX~distribution
-% (\teTeX, \mikTeX, \dots) rely on file databases, you must refresh
+% \subsection{Refresh file name databases}
+%
+% If your \TeX~distribution
+% (\teTeX, \mikTeX, \dots) relies on file name databases, you must refresh
 % these. For example, \teTeX\ users run \verb|texhash| or
 % \verb|mktexlsr|.
 %
diff --git a/Master/texmf-dist/source/latex/oberdiek/telprint.dtx b/Master/texmf-dist/source/latex/oberdiek/telprint.dtx
index 9dec93c4ffe..d748ca5a17f 100644
--- a/Master/texmf-dist/source/latex/oberdiek/telprint.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/telprint.dtx
@@ -1,6 +1,6 @@
 % \iffalse meta-comment
 %
-% Copyright (C) 1996, 1997, 2004, 2005, 2006 by
+% Copyright (C) 1996, 1997, 2004, 2005, 2006, 2007 by
 %    Heiko Oberdiek <oberdiek@uni-freiburg.de>
 %
 % This work may be distributed and/or modified under the
@@ -56,7 +56,7 @@
 %
 %<*ignore>
 \begingroup
-  \def\x{LaTeX2e}
+  \def\x{LaTeX2e}%
 \expandafter\endgroup
 \ifcase 0\ifx\install y1\fi\expandafter
          \ifx\csname processbatchFile\endcsname\relax\else1\fi
@@ -67,7 +67,7 @@
 \input docstrip.tex
 \Msg{************************************************************************}
 \Msg{* Installation}
-\Msg{* Package: telprint 2006/08/16 v1.7 Formatting of German phone numbers (HO)}
+\Msg{* Package: telprint 2007/04/11 v1.8 Formatting of German phone numbers (HO)}
 \Msg{************************************************************************}
 
 \keepsilent
@@ -77,7 +77,7 @@
 
 This is a generated file.
 
-Copyright (C) 1996, 1997, 2004, 2005, 2006 by
+Copyright (C) 1996, 1997, 2004, 2005, 2006, 2007 by
    Heiko Oberdiek <oberdiek@uni-freiburg.de>
 
 This work may be distributed and/or modified under the
@@ -128,12 +128,12 @@ and the derived files
 %<*driver>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{telprint.drv}%
-  [2006/08/16 v1.7 Formatting of German phone numbers (HO)]
+  [2007/04/11 v1.8 Formatting of German phone numbers (HO)]%
 \documentclass{ltxdoc}
 \usepackage{holtxdoc}
 \usepackage[ngerman,english]{babel}
 \begin{document}
-  \DocInput{telprint.dtx}
+  \DocInput{telprint.dtx}%
 \end{document}
 %</driver>
 % \fi
@@ -159,7 +159,7 @@ and the derived files
 % \GetFileInfo{telprint.drv}
 %
 % \title{The \xpackage{telprint} package}
-% \date{2006/08/16 v1.7}
+% \date{2007/04/11 v1.8}
 % \author{Heiko Oberdiek\\\xemail{oberdiek@uni-freiburg.de}}
 %
 % \maketitle
@@ -350,7 +350,7 @@ and the derived files
   \fi
 \expandafter\x\csname ver@telprint.sty\endcsname
 \ProvidesPackage{telprint}%
-  [2006/08/16 v1.7 Formatting of German phone numbers (HO)]
+  [2007/04/11 v1.8 Formatting of German phone numbers (HO)]
 %    \end{macrocode}
 %
 %    \begin{macrocode}
@@ -360,10 +360,12 @@ and the derived files
 %    \end{macrocode}
 %    \begin{macrocode}
 \ifx\DeclareRobustCommand\UnDeFiNeD
-  \def\DeclareRobustCommand*#1[1]{\def#1##1}
-  \def\TELreset{\let\DeclareRobustCommand=\UnDeFiNeD}
-  \immediate\write-1{Package `telprint' warning: %
-  Macros are not robust!}
+  \def\DeclareRobustCommand*#1[1]{\def#1##1}%
+  \def\TELreset{\let\DeclareRobustCommand=\UnDeFiNeD}%
+  \immediate\write-1{%
+    Package `telprint' warning: %
+    Macros are not robust!%
+  }%
 \else
   \let\TELreset=\relax
 \fi
@@ -423,14 +425,14 @@ and the derived files
   \expandafter\endgroup
   \ifx\0\empty
     \TELtoks=\expandafter{\the\TELtoks#1}%
-    \ifnum\TELswitch=0
+    \ifnum\TELswitch=0 %
       \def\TELx{\TELspace}\def\TELy{}%
     \else
       \def\TELx{}\def\TELy{\TELspace}%
     \fi
     \the\TELtoks
   \else
-    \ifnum\TELswitch=0
+    \ifnum\TELswitch=0 %
       \TELtoks=\expandafter{\the\TELtoks#1\TELx}%
       \def\TELswitch{1}%
     \else
@@ -509,13 +511,47 @@ and the derived files
 %    \end{macrocode}
 % \section{Installation}
 %
-% \paragraph{CTAN.} This package is available on
+% \subsection{Download}
+%
+% \paragraph{Package.} This package is available on
 % CTAN\footnote{\url{ftp://ftp.ctan.org/tex-archive/}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/telprint.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/telprint.pdf}] Documentation.
 % \end{description}
 %
+%
+% \paragraph{Bundle.} All the packages of the bundle `oberdiek'
+% are also available in a TDS compliant ZIP archive. There
+% the packages are already unpacked and the documentation files
+% are generated. The files and directories obey the TDS standard.
+% \begin{description}
+% \item[\CTAN{macros/latex/contrib/oberdiek/oberdiek-tds.zip}]
+% \end{description}
+%
+% \subsection{Bundle installation}
+%
+% \paragraph{Unpacking.} Unpack the \xfile{oberdiek-tds.zip} in the
+% TDS tree (also known as \xfile{texmf} tree) of your choice.
+% Example (linux):
+% \begin{quote}
+%   |unzip oberdiek-tds.zip -d ~/texmf|
+% \end{quote}
+%
+% \paragraph{Script installation.}
+% Check the directory \xfile{TDS:scripts/oberdiek/} for
+% scripts that need further installation steps.
+% Package \xpackage{attachfile2} comes with the Perl script
+% \xfile{pdfatfi.pl} that should be installed in such a way
+% that it can be called as \texttt{pdfatfi}.
+% Example (linux):
+% \begin{quote}
+%   |chmod +x scripts/oberdiek/pdfatfi.pl|\\
+%   |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
+% \end{quote}
+%
+% \subsection{Package installation}
+%
 % \paragraph{Unpacking.} The \xfile{.dtx} file is a self-extracting
 % \docstrip\ archive. The files are extracted by running the
 % \xfile{.dtx} through \plainTeX:
@@ -546,8 +582,10 @@ and the derived files
 % TDS installing feature, then some files can already be in the right
 % place, see the documentation of \docstrip.
 %
-% \paragraph{Refresh file databases.} If your \TeX~distribution
-% (\teTeX, \mikTeX, \dots) rely on file databases, you must refresh
+% \subsection{Refresh file name databases}
+%
+% If your \TeX~distribution
+% (\teTeX, \mikTeX, \dots) relies on file name databases, you must refresh
 % these. For example, \teTeX\ users run \verb|texhash| or
 % \verb|mktexlsr|.
 %
@@ -643,6 +681,10 @@ and the derived files
 %   \item
 %     New DTX framework.
 %   \end{Version}
+%   \begin{Version}{2007/04/11 v1.8}
+%   \item
+%     Line ends sanitized.
+%   \end{Version}
 % \end{History}
 %
 % \PrintIndex
diff --git a/Master/texmf-dist/source/latex/oberdiek/transparent.dtx b/Master/texmf-dist/source/latex/oberdiek/transparent.dtx
index 43e1e1efa9d..de34579b48a 100644
--- a/Master/texmf-dist/source/latex/oberdiek/transparent.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/transparent.dtx
@@ -57,7 +57,7 @@
 %
 %<*ignore>
 \begingroup
-  \def\x{LaTeX2e}
+  \def\x{LaTeX2e}%
 \expandafter\endgroup
 \ifcase 0\ifx\install y1\fi\expandafter
          \ifx\csname processbatchFile\endcsname\relax\else1\fi
@@ -131,11 +131,11 @@ and the derived files
 %<*driver>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{transparent.drv}%
-  [2007/01/08 v1.0 Using a pdfTeX's color stack for transparency (HO)]
+  [2007/01/08 v1.0 Using a pdfTeX's color stack for transparency (HO)]%
 \documentclass{ltxdoc}
 \usepackage{holtxdoc}
 \begin{document}
-  \DocInput{transparent.dtx}
+  \DocInput{transparent.dtx}%
 \end{document}
 %</driver>
 % \fi
@@ -219,7 +219,7 @@ Hello World
 %<*package>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{transparent}%
-  [2007/01/08 v1.0 Using a pdfTeX's color stack for transparency (HO)]
+  [2007/01/08 v1.0 Using a pdfTeX's color stack for transparency (HO)]%
 %    \end{macrocode}
 %
 % \subsection{Initial checks}
@@ -370,13 +370,47 @@ Hello World
 %    \end{macrocode}
 % \section{Installation}
 %
-% \paragraph{CTAN.} This package is available on
+% \subsection{Download}
+%
+% \paragraph{Package.} This package is available on
 % CTAN\footnote{\url{ftp://ftp.ctan.org/tex-archive/}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/transparent.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/transparent.pdf}] Documentation.
 % \end{description}
 %
+%
+% \paragraph{Bundle.} All the packages of the bundle `oberdiek'
+% are also available in a TDS compliant ZIP archive. There
+% the packages are already unpacked and the documentation files
+% are generated. The files and directories obey the TDS standard.
+% \begin{description}
+% \item[\CTAN{macros/latex/contrib/oberdiek/oberdiek-tds.zip}]
+% \end{description}
+%
+% \subsection{Bundle installation}
+%
+% \paragraph{Unpacking.} Unpack the \xfile{oberdiek-tds.zip} in the
+% TDS tree (also known as \xfile{texmf} tree) of your choice.
+% Example (linux):
+% \begin{quote}
+%   |unzip oberdiek-tds.zip -d ~/texmf|
+% \end{quote}
+%
+% \paragraph{Script installation.}
+% Check the directory \xfile{TDS:scripts/oberdiek/} for
+% scripts that need further installation steps.
+% Package \xpackage{attachfile2} comes with the Perl script
+% \xfile{pdfatfi.pl} that should be installed in such a way
+% that it can be called as \texttt{pdfatfi}.
+% Example (linux):
+% \begin{quote}
+%   |chmod +x scripts/oberdiek/pdfatfi.pl|\\
+%   |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
+% \end{quote}
+%
+% \subsection{Package installation}
+%
 % \paragraph{Unpacking.} The \xfile{.dtx} file is a self-extracting
 % \docstrip\ archive. The files are extracted by running the
 % \xfile{.dtx} through \plainTeX:
@@ -408,8 +442,10 @@ Hello World
 % TDS installing feature, then some files can already be in the right
 % place, see the documentation of \docstrip.
 %
-% \paragraph{Refresh file databases.} If your \TeX~distribution
-% (\teTeX, \mikTeX, \dots) rely on file databases, you must refresh
+% \subsection{Refresh file name databases}
+%
+% If your \TeX~distribution
+% (\teTeX, \mikTeX, \dots) relies on file name databases, you must refresh
 % these. For example, \teTeX\ users run \verb|texhash| or
 % \verb|mktexlsr|.
 %
diff --git a/Master/texmf-dist/source/latex/oberdiek/twoopt.dtx b/Master/texmf-dist/source/latex/oberdiek/twoopt.dtx
index 5803e364efc..f305431714e 100644
--- a/Master/texmf-dist/source/latex/oberdiek/twoopt.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/twoopt.dtx
@@ -55,7 +55,7 @@
 %
 %<*ignore>
 \begingroup
-  \def\x{LaTeX2e}
+  \def\x{LaTeX2e}%
 \expandafter\endgroup
 \ifcase 0\ifx\install y1\fi\expandafter
          \ifx\csname processbatchFile\endcsname\relax\else1\fi
@@ -126,11 +126,11 @@ and the derived files
 %<*driver>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{twoopt.drv}%
-  [2006/02/20 v1.4 Definitions with two optional arguments (HO)]
+  [2006/02/20 v1.4 Definitions with two optional arguments (HO)]%
 \documentclass{ltxdoc}
 \usepackage{holtxdoc}
 \begin{document}
-  \DocInput{twoopt.dtx}
+  \DocInput{twoopt.dtx}%
 \end{document}
 %</driver>
 % \fi
@@ -221,7 +221,7 @@ and the derived files
 %<*package>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{twoopt}
-  [2006/02/20 v1.4 Definitions with two optional arguments (HO)]
+  [2006/02/20 v1.4 Definitions with two optional arguments (HO)]%
 %    \end{macrocode}
 % \begin{macro}{\newcommandtwoopt}
 %    \begin{macrocode}
@@ -359,13 +359,47 @@ and the derived files
 %    \end{macrocode}
 % \section{Installation}
 %
-% \paragraph{CTAN.} This package is available on
+% \subsection{Download}
+%
+% \paragraph{Package.} This package is available on
 % CTAN\footnote{\url{ftp://ftp.ctan.org/tex-archive/}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/twoopt.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/twoopt.pdf}] Documentation.
 % \end{description}
 %
+%
+% \paragraph{Bundle.} All the packages of the bundle `oberdiek'
+% are also available in a TDS compliant ZIP archive. There
+% the packages are already unpacked and the documentation files
+% are generated. The files and directories obey the TDS standard.
+% \begin{description}
+% \item[\CTAN{macros/latex/contrib/oberdiek/oberdiek-tds.zip}]
+% \end{description}
+%
+% \subsection{Bundle installation}
+%
+% \paragraph{Unpacking.} Unpack the \xfile{oberdiek-tds.zip} in the
+% TDS tree (also known as \xfile{texmf} tree) of your choice.
+% Example (linux):
+% \begin{quote}
+%   |unzip oberdiek-tds.zip -d ~/texmf|
+% \end{quote}
+%
+% \paragraph{Script installation.}
+% Check the directory \xfile{TDS:scripts/oberdiek/} for
+% scripts that need further installation steps.
+% Package \xpackage{attachfile2} comes with the Perl script
+% \xfile{pdfatfi.pl} that should be installed in such a way
+% that it can be called as \texttt{pdfatfi}.
+% Example (linux):
+% \begin{quote}
+%   |chmod +x scripts/oberdiek/pdfatfi.pl|\\
+%   |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
+% \end{quote}
+%
+% \subsection{Package installation}
+%
 % \paragraph{Unpacking.} The \xfile{.dtx} file is a self-extracting
 % \docstrip\ archive. The files are extracted by running the
 % \xfile{.dtx} through \plainTeX:
@@ -396,8 +430,10 @@ and the derived files
 % TDS installing feature, then some files can already be in the right
 % place, see the documentation of \docstrip.
 %
-% \paragraph{Refresh file databases.} If your \TeX~distribution
-% (\teTeX, \mikTeX, \dots) rely on file databases, you must refresh
+% \subsection{Refresh file name databases}
+%
+% If your \TeX~distribution
+% (\teTeX, \mikTeX, \dots) relies on file name databases, you must refresh
 % these. For example, \teTeX\ users run \verb|texhash| or
 % \verb|mktexlsr|.
 %
diff --git a/Master/texmf-dist/source/latex/oberdiek/zref.dtx b/Master/texmf-dist/source/latex/oberdiek/zref.dtx
index 385577518c3..c8e9c2324d9 100644
--- a/Master/texmf-dist/source/latex/oberdiek/zref.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/zref.dtx
@@ -73,7 +73,7 @@
 %
 %<*ignore>
 \begingroup
-  \def\x{LaTeX2e}
+  \def\x{LaTeX2e}%
 \expandafter\endgroup
 \ifcase 0\ifx\install y1\fi\expandafter
          \ifx\csname processbatchFile\endcsname\relax\else1\fi
@@ -84,7 +84,7 @@
 \input docstrip.tex
 \Msg{************************************************************************}
 \Msg{* Installation}
-\Msg{* Package: zref 2007/02/18 v1.5 New reference scheme for LaTeX2e (HO)}
+\Msg{* Package: zref 2007/04/06 v1.6 New reference scheme for LaTeX2e (HO)}
 \Msg{************************************************************************}
 
 \keepsilent
@@ -166,16 +166,16 @@ and the derived files
 %<*driver>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{zref.drv}%
-  [2007/02/18 v1.5 New reference scheme for LaTeX2e (HO)]
+  [2007/04/06 v1.6 New reference scheme for LaTeX2e (HO)]%
 \documentclass{ltxdoc}
 \usepackage{holtxdoc}
 \begin{document}
-  \DocInput{zref.dtx}
+  \DocInput{zref.dtx}%
 \end{document}
 %</driver>
 % \fi
 %
-% \CheckSum{1468}
+% \CheckSum{1497}
 %
 % \CharacterTable
 %  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -196,7 +196,7 @@ and the derived files
 % \GetFileInfo{zref.drv}
 %
 % \title{The \xpackage{zref} package}
-% \date{2007/02/18 v1.5}
+% \date{2007/04/06 v1.6}
 % \author{Heiko Oberdiek\\\xemail{oberdiek@uni-freiburg.de}}
 %
 % \maketitle
@@ -1101,8 +1101,8 @@ The width of the first column is
 the height difference of the two baselines is
   \the\dimexpr \zposy{firstcol}sp - \zposy{secondline}sp\relax:\\
 \begin{tabular}{ll}
-\zsavepos{firstcol}Hello&\zsavepos{secondcol}World\\
-\zsavepos{secondline}Second line&foobar\\
+  \zsavepos{firstcol}Hello&\zsavepos{secondcol}World\\
+  \zsavepos{secondline}Second line&foobar\\
 \end{tabular}
 
 %    \end{macrocode}
@@ -1157,13 +1157,13 @@ the height difference of the two baselines is
 %<*package>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref}
-  [2007/02/18 v1.5 New reference scheme for LaTeX2e (HO)]
+  [2007/04/06 v1.6 New reference scheme for LaTeX2e (HO)]%
 %    \end{macrocode}
 %
 % \subsubsection{Load basic module}
 %
 %    \begin{macrocode}
-\RequirePackage{zref-base}[2007/02/18]
+\RequirePackage{zref-base}[2007/04/06]
 %    \end{macrocode}
 %    Abort package loading if \xpackage{zref-base} could not be
 %    loaded successfully.
@@ -1178,7 +1178,7 @@ the height difference of the two baselines is
 \def\ZREF@temp#1{%
   \DeclareOption{#1}{%
     \AtEndOfPackage{%
-      \RequirePackage{zref-#1}[2007/02/18]%
+      \RequirePackage{zref-#1}[2007/04/06]%
     }%
   }%
 }
@@ -1238,7 +1238,7 @@ the height difference of the two baselines is
 %<*base>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-base}%
-  [2007/02/18 Module base for zref (HO)]
+  [2007/04/06 v1.6 Module base for zref (HO)]%
 %    \end{macrocode}
 %
 % \subsubsection{Utilities}
@@ -1311,7 +1311,7 @@ the height difference of the two baselines is
     }%
     \endgroup
     \endinput
-  }{}
+  }{}%
 \endgroup
 %    \end{macrocode}
 %
@@ -1816,7 +1816,10 @@ the height difference of the two baselines is
 %    \begin{macrocode}
 \def\zref@require@unique{%
   \@ifundefined{c@zref@unique}{%
-    \newcounter{zref@unique}%
+    \begingroup
+      \let\@addtoreset\@gobbletwo
+      \newcounter{zref@unique}%
+    \endgroup
 %    \end{macrocode}
 %    \end{macro}
 %
@@ -1907,8 +1910,8 @@ the height difference of the two baselines is
 %<*user>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-user}%
-  [2007/02/18 v1.5 Module user for zref (HO)]
-\RequirePackage{zref-base}[2007/02/18]
+  [2007/04/06 v1.6 Module user for zref (HO)]%
+\RequirePackage{zref-base}[2007/04/06]
 \@ifundefined{ZREF@baseok}{\endinput}{}
 %    \end{macrocode}
 %
@@ -1982,8 +1985,8 @@ the height difference of the two baselines is
 %<*abspage>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-abspage}%
-  [2007/02/18 v1.5 Module abspage for zref (HO)]
-\RequirePackage{zref-base}[2007/02/18]
+  [2007/04/06 v1.6 Module abspage for zref (HO)]%
+\RequirePackage{zref-base}[2007/04/06]
 \@ifundefined{ZREF@baseok}{\endinput}{}
 %    \end{macrocode}
 %
@@ -1992,7 +1995,15 @@ the height difference of the two baselines is
 %    These are recorded by the help of package \xpackage{everyshi}.
 %    \begin{macrocode}
 \RequirePackage{everyshi}%
-\newcounter{abspage}%
+%    \end{macrocode}
+%    The counter \verb|abspage| must not go in the clear list
+%    of \verb|@ckpt| that is used to set counters in
+%    \xfile{.aux} files of included \TeX\ files.
+%    \begin{macrocode}
+\begingroup
+  \let\@addtoreset\@gobbletwo
+  \newcounter{abspage}%
+\endgroup
 \setcounter{abspage}{0}%
 \EveryShipout{%
   \stepcounter{abspage}%
@@ -2019,8 +2030,8 @@ the height difference of the two baselines is
 %<*counter>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-counter}%
-  [2007/02/18 v1.5 Module counter for zref (HO)]
-\RequirePackage{zref-base}[2007/02/18]
+  [2007/04/06 v1.6 Module counter for zref (HO)]%
+\RequirePackage{zref-base}[2007/04/06]
 \@ifundefined{ZREF@baseok}{\endinput}{}
 %    \end{macrocode}
 %
@@ -2056,8 +2067,8 @@ the height difference of the two baselines is
 %<*lastpage>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-lastpage}%
-  [2007/02/18 v1.5 Module lastpage for zref (HO)]
-\RequirePackage{zref-base}[2007/02/18]
+  [2007/04/06 v1.6 Module lastpage for zref (HO)]%
+\RequirePackage{zref-base}[2007/04/06]
 \@ifundefined{ZREF@baseok}{\endinput}{}
 %    \end{macrocode}
 %
@@ -2090,16 +2101,16 @@ the height difference of the two baselines is
 %<*totpages>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-totpages}%
-  [2007/02/18 v1.5 Module totpages for zref (HO)]
-\RequirePackage{zref-base}[2007/02/18]
+  [2007/04/06 v1.6 Module totpages for zref (HO)]%
+\RequirePackage{zref-base}[2007/04/06]
 \@ifundefined{ZREF@baseok}{\endinput}{}
 %    \end{macrocode}
 %
 %    The absolute page number of the last page is the total
 %    page number.
 %    \begin{macrocode}
-\RequirePackage{zref-abspage}[2007/02/18]
-\RequirePackage{zref-lastpage}[2007/02/18]
+\RequirePackage{zref-abspage}[2007/04/06]
+\RequirePackage{zref-lastpage}[2007/04/06]
 %    \end{macrocode}
 %
 %    \begin{macro}{\ztotpages}
@@ -2129,8 +2140,8 @@ the height difference of the two baselines is
 %<*perpage>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-perpage}%
-  [2007/02/18 v1.5 Module perpage for zref (HO)]
-\RequirePackage{zref-base}[2007/02/18]
+  [2007/04/06 v1.6 Module perpage for zref (HO)]%
+\RequirePackage{zref-base}[2007/04/06]
 \@ifundefined{ZREF@baseok}{\endinput}{}
 %    \end{macrocode}
 %
@@ -2142,7 +2153,7 @@ the height difference of the two baselines is
 %    For detecting changed pages module \xoption{abspage}
 %    is loaded.
 %    \begin{macrocode}
-\RequirePackage{zref-abspage}[2007/02/18]
+\RequirePackage{zref-abspage}[2007/04/06]
 %    \end{macrocode}
 %
 %    We group the properties for the needed references
@@ -2286,8 +2297,8 @@ the height difference of the two baselines is
 %<*titleref>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-titleref}%
-  [2007/02/18 v1.5 Module titleref for zref (HO)]
-\RequirePackage{zref-base}[2007/02/18]
+  [2007/04/06 v1.6 Module titleref for zref (HO)]%
+\RequirePackage{zref-base}[2007/04/06]
 \@ifundefined{ZREF@baseok}{\endinput}{}
 %    \end{macrocode}
 %
@@ -2534,6 +2545,30 @@ the height difference of the two baselines is
   }%
 %    \end{macrocode}
 %
+%    Class \xpackage{beamer}.
+%    \begin{macrocode}
+  \@ifclassloaded{beamer}{%
+    \ZREF@patch{beamer@section}{%
+      \long\def\beamer@section[#1]{%
+        \zref@titleref@setcurrent{#1}%
+        \ZREF@org@beamer@section[{#1}]%
+      }%
+    }%
+    \ZREF@patch{beamer@subsection}{%
+      \long\def\beamer@subsection[#1]{%
+        \zref@titleref@setcurrent{#1}%
+        \ZREF@org@beamer@subsection[{#1}]%
+      }%
+    }%
+    \ZREF@patch{beamer@subsubsection}{%
+      \long\def\beamer@subsubsection[#1]{%
+        \zref@titleref@setcurrent{#1}%
+        \ZREF@org@beamer@subsubsection[{#1}]%
+      }%
+    }%
+  }{}%
+%    \end{macrocode}
+%
 %    Package \xpackage{titlesec}.
 %    \begin{macrocode}
   \@ifpackageloaded{titlesec}{%
@@ -2558,8 +2593,8 @@ the height difference of the two baselines is
 %<*xr>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-xr}%
-  [2007/02/18 v1.5 Module xr for zref (HO)]
-\RequirePackage{zref-base}[2007/02/18]
+  [2007/04/06 v1.6 Module xr for zref (HO)]%
+\RequirePackage{zref-base}[2007/04/06]
 \@ifundefined{ZREF@baseok}{\endinput}{}
 %    \end{macrocode}
 %    \begin{macrocode}
@@ -2664,7 +2699,7 @@ the height difference of the two baselines is
     \begingroup
       \let\on@line\@empty
       \PackageInfo{zref/xr}{%
-        Statistics for `\ZREF@xr@file':
+        Statistics for `\ZREF@xr@file': %
         \ZREF@xr@found\space found, %
         \ZREF@xr@ignored\space ignored%
       }%
@@ -2902,8 +2937,8 @@ the height difference of the two baselines is
 %<*hyperref>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-hyperref}%
-  [2007/02/18 v1.5 Module hyperref for zref (HO)]
-\RequirePackage{zref-base}[2007/02/18]
+  [2007/04/06 v1.6 Module hyperref for zref (HO)]%
+\RequirePackage{zref-base}[2007/04/06]
 \@ifundefined{ZREF@baseok}{\endinput}{}
 %    \end{macrocode}
 %
@@ -2931,8 +2966,8 @@ the height difference of the two baselines is
 %<*savepos>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-savepos}%
-  [2007/02/18 v1.5 Module savepos for zref (HO)]
-\RequirePackage{zref-base}[2007/02/18]
+  [2007/04/06 v1.6 Module savepos for zref (HO)]%
+\RequirePackage{zref-base}[2007/04/06]
 \@ifundefined{ZREF@baseok}{\endinput}{}
 %    \end{macrocode}
 %
@@ -3037,15 +3072,15 @@ the height difference of the two baselines is
 %<*dotfill>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-dotfill}%
-  [2007/02/18 v1.5 Module dotfill for zref (HO)]
-\RequirePackage{zref-base}[2007/02/18]
+  [2007/04/06 v1.6 Module dotfill for zref (HO)]%
+\RequirePackage{zref-base}[2007/04/06]
 \@ifundefined{ZREF@baseok}{\endinput}{}
 %    \end{macrocode}
 %
 %    For measuring the width of \cs{zdotfill} we use the features
 %    provided by module \xoption{savepos}.
 %    \begin{macrocode}
-\RequirePackage{zref-savepos}[2007/02/18]
+\RequirePackage{zref-savepos}[2007/04/06]
 %    \end{macrocode}
 %    For automatically generated label names we use the unique
 %    counter of module \xoption{base}.
@@ -3126,13 +3161,47 @@ the height difference of the two baselines is
 %    \end{macrocode}
 % \section{Installation}
 %
-% \paragraph{CTAN.} This package is available on
+% \subsection{Download}
+%
+% \paragraph{Package.} This package is available on
 % CTAN\footnote{\url{ftp://ftp.ctan.org/tex-archive/}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/zref.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/zref.pdf}] Documentation.
 % \end{description}
 %
+%
+% \paragraph{Bundle.} All the packages of the bundle `oberdiek'
+% are also available in a TDS compliant ZIP archive. There
+% the packages are already unpacked and the documentation files
+% are generated. The files and directories obey the TDS standard.
+% \begin{description}
+% \item[\CTAN{macros/latex/contrib/oberdiek/oberdiek-tds.zip}]
+% \end{description}
+%
+% \subsection{Bundle installation}
+%
+% \paragraph{Unpacking.} Unpack the \xfile{oberdiek-tds.zip} in the
+% TDS tree (also known as \xfile{texmf} tree) of your choice.
+% Example (linux):
+% \begin{quote}
+%   |unzip oberdiek-tds.zip -d ~/texmf|
+% \end{quote}
+%
+% \paragraph{Script installation.}
+% Check the directory \xfile{TDS:scripts/oberdiek/} for
+% scripts that need further installation steps.
+% Package \xpackage{attachfile2} comes with the Perl script
+% \xfile{pdfatfi.pl} that should be installed in such a way
+% that it can be called as \texttt{pdfatfi}.
+% Example (linux):
+% \begin{quote}
+%   |chmod +x scripts/oberdiek/pdfatfi.pl|\\
+%   |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
+% \end{quote}
+%
+% \subsection{Package installation}
+%
 % \paragraph{Unpacking.} The \xfile{.dtx} file is a self-extracting
 % \docstrip\ archive. The files are extracted by running the
 % \xfile{.dtx} through \plainTeX:
@@ -3176,8 +3245,10 @@ the height difference of the two baselines is
 % TDS installing feature, then some files can already be in the right
 % place, see the documentation of \docstrip.
 %
-% \paragraph{Refresh file databases.} If your \TeX~distribution
-% (\teTeX, \mikTeX, \dots) rely on file databases, you must refresh
+% \subsection{Refresh file name databases}
+%
+% If your \TeX~distribution
+% (\teTeX, \mikTeX, \dots) relies on file name databases, you must refresh
 % these. For example, \teTeX\ users run \verb|texhash| or
 % \verb|mktexlsr|.
 %
@@ -3289,6 +3360,13 @@ the height difference of the two baselines is
 %   \item
 %     Modul savepos also supports Xe\TeX.
 %   \end{Version}
+%   \begin{Version}{2007/04/06 v1.6}
+%   \item
+%     Fix in modul abspage and base: Now counter |abspage| and |zref@unique|
+%     are not remembered by \cs{include}.
+%   \item
+%     Beamer support for module titleref.
+%   \end{Version}
 % \end{History}
 %
 % \PrintIndex