oberdiek update, kvoptions3.0 askinclude2.0 ... (24oct07)

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

68 files changed, 4526 insertions, 472 deletions

diff --git a/Master/texmf-dist/source/latex/oberdiek/accsupp.dtx b/Master/texmf-dist/source/latex/oberdiek/accsupp.dtx
index 39ace16bc8d..65bad3c8b26 100644
--- a/Master/texmf-dist/source/latex/oberdiek/accsupp.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/accsupp.dtx
@@ -142,7 +142,7 @@ and the derived files
 \ProvidesFile{accsupp.drv}%
   [2007/03/21 v0.1 Accessibility support by marked content (HO)]%
 \documentclass{ltxdoc}
-\usepackage{holtxdoc}
+\usepackage{holtxdoc}[2007/10/21]
 \begin{document}
   \DocInput{accsupp.dtx}%
 \end{document}
diff --git a/Master/texmf-dist/source/latex/oberdiek/aliascnt.dtx b/Master/texmf-dist/source/latex/oberdiek/aliascnt.dtx
index e7368483072..27b5cb3d8dc 100644
--- a/Master/texmf-dist/source/latex/oberdiek/aliascnt.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/aliascnt.dtx
@@ -128,7 +128,7 @@ and the derived files
 \ProvidesFile{aliascnt.drv}%
   [2006/09/25 v1.2 Alias counter (HO)]%
 \documentclass{ltxdoc}
-\usepackage{holtxdoc}
+\usepackage{holtxdoc}[2007/10/21]
 \begin{document}
   \DocInput{aliascnt.dtx}%
 \end{document}
diff --git a/Master/texmf-dist/source/latex/oberdiek/alphalph.dtx b/Master/texmf-dist/source/latex/oberdiek/alphalph.dtx
index 3a3d117ec0b..1082eb9626a 100644
--- a/Master/texmf-dist/source/latex/oberdiek/alphalph.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/alphalph.dtx
@@ -53,9 +53,9 @@
 % Installation:
 %    TDS:tex/generic/oberdiek/alphalph.sty
 %    TDS:doc/latex/oberdiek/alphalph.pdf
-%    TDS:doc/latex/oberdiek/alphalph-test1.tex
-%    TDS:doc/latex/oberdiek/alphalph-test2.tex
-%    TDS:doc/latex/oberdiek/alphalph-test3.tex
+%    TDS:doc/latex/oberdiek/test/alphalph-test1.tex
+%    TDS:doc/latex/oberdiek/test/alphalph-test2.tex
+%    TDS:doc/latex/oberdiek/test/alphalph-test3.tex
 %    TDS:source/latex/oberdiek/alphalph.dtx
 %
 %<*ignore>
@@ -71,7 +71,7 @@
 \input docstrip.tex
 \Msg{************************************************************************}
 \Msg{* Installation}
-\Msg{* Package: alphalph 2007/04/11 v2.0 Converting numbers to letters (HO)}
+\Msg{* Package: alphalph 2007/09/09 v2.0 Converting numbers to letters (HO)}
 \Msg{************************************************************************}
 
 \keepsilent
@@ -108,7 +108,7 @@ and the derived files
   \file{alphalph.drv}{\from{alphalph.dtx}{driver}}%
   \usedir{tex/generic/oberdiek}%
   \file{alphalph.sty}{\from{alphalph.dtx}{package}}%
-  \usedir{doc/latex/oberdiek}%
+  \usedir{doc/latex/oberdiek/test}%
   \file{alphalph-test1.tex}{\from{alphalph.dtx}{test1}}%
   \file{alphalph-test2.tex}{\from{alphalph.dtx}{test2,etex}}%
   \file{alphalph-test3.tex}{\from{alphalph.dtx}{test2,noetex}}%
@@ -137,10 +137,10 @@ and the derived files
 %<*driver>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{alphalph.drv}%
-  [2007/04/11 v2.0 Converting numbers to letters (HO)]%
+  [2007/09/09 v2.0 Converting numbers to letters (HO)]%
 \documentclass{ltxdoc}
-\usepackage{holtxdoc}
-\usepackage{alphalph}[2007/04/11]
+\usepackage{holtxdoc}[2007/10/21]
+\usepackage{alphalph}[2007/09/09]
 \makeatletter
 \newalphalph{\fnsymbolwrap}[wrap]{\@fnsymbol}{}
 \newcommand*{\fnsymbolsingle}[1]{%
@@ -193,7 +193,7 @@ and the derived files
 % \GetFileInfo{alphalph.drv}
 %
 % \title{The \xpackage{alphalph} package}
-% \date{2007/04/11 v2.0}
+% \date{2007/09/09 v2.0}
 % \author{Heiko Oberdiek\\\xemail{oberdiek@uni-freiburg.de}}
 %
 % \maketitle
@@ -605,7 +605,7 @@ and the derived files
   \fi
 \expandafter\x\csname ver@alphalph.sty\endcsname
 \ProvidesPackage{alphalph}%
-  [2007/04/11 v2.0 Converting numbers to letters (HO)]
+  [2007/09/09 v2.0 Converting numbers to letters (HO)]
 %    \end{macrocode}
 %
 % \subsection{Catcodes}
@@ -1306,7 +1306,7 @@ and the derived files
 }
 \DisableNumexpr
 %</noetex>
-\usepackage{alphalph}[2007/04/11]
+\usepackage{alphalph}[2007/09/09]
 %<noetex>\RestoreNumexpr
 \usepackage{qstest}
 \IncludeTests{*}
@@ -1586,9 +1586,9 @@ and the derived files
 % \begin{tabular}{@{}>{\ttfamily}l@{ $\rightarrow$ }>{\ttfamily}l@{}}
 %   alphalph.sty & tex/generic/oberdiek/alphalph.sty\\
 %   alphalph.pdf & doc/latex/oberdiek/alphalph.pdf\\
-%   alphalph-test1.tex & doc/latex/oberdiek/alphalph-test1.tex\\
-%   alphalph-test2.tex & doc/latex/oberdiek/alphalph-test2.tex\\
-%   alphalph-test3.tex & doc/latex/oberdiek/alphalph-test3.tex\\
+%   test/alphalph-test1.tex & doc/latex/oberdiek/test/alphalph-test1.tex\\
+%   test/alphalph-test2.tex & doc/latex/oberdiek/test/alphalph-test2.tex\\
+%   test/alphalph-test3.tex & doc/latex/oberdiek/test/alphalph-test3.tex\\
 %   alphalph.dtx & source/latex/oberdiek/alphalph.dtx\\
 % \end{tabular}^^A
 % }^^A
diff --git a/Master/texmf-dist/source/latex/oberdiek/askinclude.dtx b/Master/texmf-dist/source/latex/oberdiek/askinclude.dtx
new file mode 100644
index 00000000000..0edb027fdb0
--- /dev/null
+++ b/Master/texmf-dist/source/latex/oberdiek/askinclude.dtx
@@ -0,0 +1,2848 @@
+% \iffalse meta-comment
+%
+% Copyright (C) 1991-1994 by Pablo A. Straub
+% 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 askinclude.dtx
+% and the derived files
+%    askinclude.sty, askinclude.pdf, askinclude.ins, askinclude.drv,
+%    askinclude-a.tex, askinclude-b.tex, askinclude-c.tex,
+%    askinclude-test1.tex, askinclude-test2.tex,
+%    askinclude-test3.tex, askinclude-test4.tex,
+%    askinclude-test5.tex, askinclude-test6.tex,
+%    askinclude-test7.tex, askinclude-test8.tex,
+%    askinclude-test9.tex, askinclude-test10.tex,
+%    askinclude-test11.tex, askinclude-test12.tex,
+%    askinclude-test13.tex, askinclude-test14.tex,
+%    askinclude-test15.tex, askinclude-test16.tex,
+%    askinclude-test17.tex, askinclude-test18.tex,
+%    askinclude-test19.tex, askinclude-test20.tex,
+%    askinclude-test21.tex, askinclude-test22.tex,
+%    askinclude-test23.tex, askinclude-test24.tex.
+%
+% Distribution:
+%    CTAN:macros/latex/contrib/oberdiek/askinclude.dtx
+%    CTAN:macros/latex/contrib/oberdiek/askinclude.pdf
+%
+% Unpacking:
+%    (a) If askinclude.ins is present:
+%           tex askinclude.ins
+%    (b) Without askinclude.ins:
+%           tex askinclude.dtx
+%    (c) If you insist on using LaTeX
+%           latex \let\install=y\input{askinclude.dtx}
+%        (quote the arguments according to the demands of your shell)
+%
+% Documentation:
+%    (a) If askinclude.drv is present:
+%           latex askinclude.drv
+%    (b) Without askinclude.drv:
+%           latex askinclude.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 askinclude.dtx
+%       makeindex -s gind.ist askinclude.idx
+%       pdflatex askinclude.dtx
+%       makeindex -s gind.ist askinclude.idx
+%       pdflatex askinclude.dtx
+%
+% Installation:
+%    TDS:tex/latex/oberdiek/askinclude.sty
+%    TDS:doc/latex/oberdiek/askinclude.pdf
+%    TDS:doc/latex/oberdiek/test/askinclude-a.tex
+%    TDS:doc/latex/oberdiek/test/askinclude-b.tex
+%    TDS:doc/latex/oberdiek/test/askinclude-c.tex
+%    TDS:doc/latex/oberdiek/test/askinclude-test1.tex
+%    TDS:doc/latex/oberdiek/test/askinclude-test2.tex
+%    TDS:doc/latex/oberdiek/test/askinclude-test3.tex
+%    TDS:doc/latex/oberdiek/test/askinclude-test4.tex
+%    TDS:doc/latex/oberdiek/test/askinclude-test5.tex
+%    TDS:doc/latex/oberdiek/test/askinclude-test6.tex
+%    TDS:doc/latex/oberdiek/test/askinclude-test7.tex
+%    TDS:doc/latex/oberdiek/test/askinclude-test8.tex
+%    TDS:doc/latex/oberdiek/test/askinclude-test9.tex
+%    TDS:doc/latex/oberdiek/test/askinclude-test10.tex
+%    TDS:doc/latex/oberdiek/test/askinclude-test11.tex
+%    TDS:doc/latex/oberdiek/test/askinclude-test12.tex
+%    TDS:doc/latex/oberdiek/test/askinclude-test13.tex
+%    TDS:doc/latex/oberdiek/test/askinclude-test14.tex
+%    TDS:doc/latex/oberdiek/test/askinclude-test15.tex
+%    TDS:doc/latex/oberdiek/test/askinclude-test16.tex
+%    TDS:doc/latex/oberdiek/test/askinclude-test17.tex
+%    TDS:doc/latex/oberdiek/test/askinclude-test18.tex
+%    TDS:doc/latex/oberdiek/test/askinclude-test19.tex
+%    TDS:doc/latex/oberdiek/test/askinclude-test20.tex
+%    TDS:doc/latex/oberdiek/test/askinclude-test21.tex
+%    TDS:doc/latex/oberdiek/test/askinclude-test22.tex
+%    TDS:doc/latex/oberdiek/test/askinclude-test23.tex
+%    TDS:doc/latex/oberdiek/test/askinclude-test24.tex
+%    TDS:source/latex/oberdiek/askinclude.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: askinclude 2007/10/23 v2.0 Interactive asking of included files}
+\Msg{************************************************************************}
+
+\keepsilent
+\askforoverwritefalse
+
+\preamble
+
+This is a generated file.
+
+Copyright (C) 1991-1994 by Pablo A. Straub
+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 askinclude.dtx
+and the derived files
+   askinclude.sty, askinclude.pdf, askinclude.ins, askinclude.drv,
+   askinclude-a.tex, askinclude-b.tex, askinclude-c.tex,
+   askinclude-test1.tex, askinclude-test2.tex,
+   askinclude-test3.tex, askinclude-test4.tex,
+   askinclude-test5.tex, askinclude-test6.tex,
+   askinclude-test7.tex, askinclude-test8.tex,
+   askinclude-test9.tex, askinclude-test10.tex,
+   askinclude-test11.tex, askinclude-test12.tex,
+   askinclude-test13.tex, askinclude-test14.tex,
+   askinclude-test15.tex, askinclude-test16.tex,
+   askinclude-test17.tex, askinclude-test18.tex,
+   askinclude-test19.tex, askinclude-test20.tex,
+   askinclude-test21.tex, askinclude-test22.tex,
+   askinclude-test23.tex, askinclude-test24.tex.
+
+\endpreamble
+
+\generate{%
+  \file{askinclude.ins}{\from{askinclude.dtx}{install}}%
+  \file{askinclude.drv}{\from{askinclude.dtx}{driver}}%
+  \usedir{tex/latex/oberdiek}%
+  \file{askinclude.sty}{\from{askinclude.dtx}{package}}%
+  \usedir{doc/latex/oberdiek/test}%
+  \file{askinclude-a.tex}{\from{askinclude.dtx}{a}}%
+  \file{askinclude-b.tex}{\from{askinclude.dtx}{b}}%
+  \file{askinclude-c.tex}{\from{askinclude.dtx}{c}}%
+  \file{askinclude-test1.tex}{\from{askinclude.dtx}{test0,test1}}%
+  \file{askinclude-test2.tex}{\from{askinclude.dtx}{test0,test2}}%
+  \file{askinclude-test3.tex}{\from{askinclude.dtx}{test0,test3}}%
+  \file{askinclude-test4.tex}{\from{askinclude.dtx}{test0,test4}}%
+  \file{askinclude-test5.tex}{\from{askinclude.dtx}{test0,test5}}%
+  \file{askinclude-test6.tex}{\from{askinclude.dtx}{test0,test6}}%
+  \file{askinclude-test7.tex}{\from{askinclude.dtx}{test0,test7}}%
+  \file{askinclude-test8.tex}{\from{askinclude.dtx}{test0,test8}}%
+  \file{askinclude-test9.tex}{\from{askinclude.dtx}{test0,test9}}%
+  \file{askinclude-test10.tex}{\from{askinclude.dtx}{test0,test10}}%
+  \file{askinclude-test11.tex}{\from{askinclude.dtx}{test0,test11}}%
+  \file{askinclude-test12.tex}{\from{askinclude.dtx}{test0,test12}}%
+  \file{askinclude-test13.tex}{\from{askinclude.dtx}{test0,test13}}%
+  \file{askinclude-test14.tex}{\from{askinclude.dtx}{test0,test14}}%
+  \file{askinclude-test15.tex}{\from{askinclude.dtx}{test0,test15}}%
+  \file{askinclude-test16.tex}{\from{askinclude.dtx}{test0,test16}}%
+  \file{askinclude-test17.tex}{\from{askinclude.dtx}{test0,test17}}%
+  \file{askinclude-test18.tex}{\from{askinclude.dtx}{test0,test18}}%
+  \file{askinclude-test19.tex}{\from{askinclude.dtx}{test0,test19}}%
+  \file{askinclude-test20.tex}{\from{askinclude.dtx}{test0,test20}}%
+  \file{askinclude-test21.tex}{\from{askinclude.dtx}{test0,test21}}%
+  \file{askinclude-test22.tex}{\from{askinclude.dtx}{test0,test22}}%
+  \file{askinclude-test23.tex}{\from{askinclude.dtx}{test0,test23}}%
+  \file{askinclude-test24.tex}{\from{askinclude.dtx}{test0,test24}}%
+}
+
+\obeyspaces
+\Msg{************************************************************************}
+\Msg{*}
+\Msg{* To finish the installation you have to move the following}
+\Msg{* file into a directory searched by TeX:}
+\Msg{*}
+\Msg{*     askinclude.sty}
+\Msg{*}
+\Msg{* To produce the documentation run the file `askinclude.drv'}
+\Msg{* through LaTeX.}
+\Msg{*}
+\Msg{* Happy TeXing!}
+\Msg{*}
+\Msg{************************************************************************}
+
+\endbatchfile
+%</install>
+%<*ignore>
+\fi
+%</ignore>
+%<*driver>
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesFile{askinclude.drv}%
+  [2007/10/23 v2.0 Interactive asking of included files]%
+\documentclass{ltxdoc}
+\usepackage{holtxdoc}[2007/10/21]
+\usepackage[T1]{fontenc}
+\usepackage{lmodern}
+\begin{document}
+  \DocInput{askinclude.dtx}%
+\end{document}
+%</driver>
+% \fi
+%
+% \CheckSum{2022}
+%
+% \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{askinclude.drv}
+%
+% \title{The \xpackage{askinclude} package}
+% \date{2007/10/23 v2.0}
+% \author{
+%   Pablo A. Straub\\[1ex]
+%   Heiko Oberdiek (maintainer)\\\xemail{oberdiek@uni-freiburg.de}
+% }
+%
+% \maketitle
+%
+% \begin{abstract}
+% This package replaces \cs{includeonly} by an interactive user
+% interface.
+% \end{abstract}
+%
+% \tableofcontents
+%
+% \section{Documentation}
+%
+% \subsection{User interface}
+%
+% The \cs{include} feature of \LaTeX\ allows the division of
+% the text body in separate compilation units. It is page
+% based and stores counter settings in additional auxiliary
+% files. \cs{includeonly} limits the actually included files
+% to the ones, listed in its argument.
+%
+% Example:
+%\begin{quote}
+%\begin{verbatim}
+%\documentclass{report}
+%
+%\usepackage{askinclude}
+%
+% % Don't use \include in the preamble.
+% % Instead \input can be used or make a package
+%
+%\begin{document}
+%\include{title}
+%\include{introduction}
+%\include{summary}
+%\include{index}
+%\end{document}
+%\end{verbatim}
+%\end{quote}
+%
+% Package \xpackage{askinclude} adds an interactive user interface.
+% The user is asked which files he want to include and sets
+% \cs{includeonly} accordingly.
+%
+% The first time the package is used the question looks like:
+%\begin{quote}
+%\begin{verbatim}
+%***********************************
+%*** Package askinclude Question ***
+%***********************************
+%
+%Previous answer (noregexp):
+%     [*]
+%
+%Regular expressions:
+% --> [noregexp]  disabled
+%     [makematch] enabled, using package `makematch'
+%     [pdfmatch]  enabled, using pdfTeX's \pdfmatch
+%
+%Which files do you want to include?
+%     [foo,bar]   comma separated file or pattern list
+%     [*]         all files
+%     [-]         no files
+%     [?]         ask for each file
+%     []          use the previous answer
+%
+%\answer=chapter2,summary
+%\end{verbatim}
+%\end{quote}
+% Square brackets are used as quotation symbols,
+% they are not part of the answer.
+% The answer by the user follows in the last line after |\answer=|.
+% \begin{description}
+% \def\Item[#1]{\item[{[\texttt{#1}]:}]}
+% \Item[foo,bar]
+%   A comma separated file list (also one file only) is passed
+%   to macro \cs{includeonly} directly. If regular expression support
+%   is enabled, the entries in the list are interpreted as
+%   file name patterns that will be matched against the file names
+%   in \cs{include}, see \hyperref[sec:regexp]{section \ref*{sec:regexp}}.
+% \Item[*] This is a shortcut for specifying \emph{all} files.
+% \Item[-] This means \emph{none} of the files is included.
+% \Item[?] The switches in single asking mode.
+%   The user will be asked at each \cs{include}.
+%   See section \hyperref[sec:single]{section \ref*{sec:single}}.
+% \Item[] Just pressing return (empty string) uses the default
+%   answer, that was stored in the auxiliary file (\xfile{.aux})
+%   of the previous \LaTeX run with package \xpackage{askinclude}.
+%   Without previous runs the default is [|*|] for all files.
+% \Item[noregexp] Turns regular expression support off.
+% \Item[makematch] Enables regular expression support
+%   package \xpackage{makematch} provides.
+% \Item[pdfmatch] It is shown, if \pdfTeX~1.30 or later is used.
+%   It relies on an undocumented feature \cs{pdfmatch} that may
+%   change in future versions of \pdfTeX.
+% \end{description}
+% Package \xpackage{askinclude} remembers the files of \cs{include}
+% in the auxiliary file and the given answer. they are
+% presented at the next run
+% at the start of the question:
+%\begin{quote}
+%\begin{verbatim}
+%***********************************
+%*** Package askinclude Question ***
+%***********************************
+%
+%Files, found by previous run in \include:
+%     (-) title
+%     (-) introduction
+%     (-) chapter1
+%     (+) chapter2
+%     (-) chapter3
+%     (+) summary
+%
+%Previous answer (noregexp):
+%     [chapter2,summary]
+%...
+%\end{verbatim}
+%\end{quote}
+% |(+)| and |(-)| marks files that were and were not included in
+% the previous run. The file list and marks are not always correct.
+% For example, if \cs{include} statements are added or removed.
+% If the method of regular expression support is different,
+% then the marks only reflects the mode of the previous answer.
+%
+% \subsection{Single asking mode}
+% \label{sec:single}
+%
+% The special answer `|?|' trigger single asking mode,
+% at the next \cs{include} the user is asked again:
+%\begin{quote}
+%\begin{verbatim}
+%***********************************
+%*** Package askinclude Question ***
+%***********************************
+%
+%Include `title'? [y]es, [n]o, [A]ll, [N]one, [D]efault (n):
+%
+%\answer=
+%\end{verbatim}
+%\end{quote}
+% Use the letter inside the square brackets as answer.
+% An empty string uses the default answer, the letter in parentheses.
+% The answers are:
+% \begin{description}
+% \def\Item[#1]{\item[{[\texttt{#1}]:}]}
+% \Item[y] The file is included.
+% \Item[n] The file is excluded.
+% \Item[A] This file and all following files are included.
+% \Item[N] This file and all following files are excluded.
+% \Item[D] Use the default answer for this and all following files.
+% \end{description}
+% If the file is known from the previous run, then the
+% default is `|y|' or `|n|' corresponding to the mark
+% `|(+)|' or `|(-)|' in the list of previous files.
+% Otherwise `|y|' is used as default.
+%
+% \subsection{Regular expressions}
+% \label{sec:regexp}
+%
+% Three methods are available that can also set by package options:
+% \begin{description}
+% \def\Item[#1]{\item[\xoption{#1}:]}
+% \Item[noregexp] Regular expression support is disabled.
+% \Item[makematch] Use package \xpackage{makematch}.
+% \Item[pdfmatch] Use \pdfTeX's \cs{pdfmatch} if available.
+% \end{description}
+% Without options the value remembered in the auxiliary file
+% is used, otherwise the default is \xoption{noregexp}.
+%
+% \subsubsection{Method \xoption{makematch}}
+%
+% Package \xpackage{makematch} (part of \xpackage{qstest}), written
+% by David Kastrup provides pattern matching based on wildcards:
+% \begin{description}
+% \item[{[\texttt{*}]}:] The star matches zero or more characters.
+% Thus a lonely star machtes anything.
+% \item[{[\texttt{!}]}:] The exclamation mark at the begin of a
+% pattern negates it, thus the matching files are excluded.
+% \end{description}
+% The pattern list is evaluated for a file name from left to
+% right. Always a file name must match the whole pattern.
+% The file is included if it is matched by a pattern and
+% not excluded afterwards. Examples:
+% \begin{quote}
+% \def\no{\textrm{$\emptyset$}}
+% \begin{tabular}{>{\ttfamily}l|>{\ttfamily}l|>{\ttfamily}l}
+% \textrm{Pattern list} & \textrm{File names} & \textrm{Result}\\
+% \hline
+% foobar & foobar,dummy & foobar\\
+% foo*  & foobar,xfoobar & foobar\\
+% \relax *foo* & xfoobar & xfoobar\\
+% f*b*r & foobar  & foobar\\
+% \relax *     & any     & any\\
+% !foobar & foobar,other & other\\
+% !foo*   & xfoobar & xfoobar\\
+% in*,!*dex & intro,index & intro\\
+% !index,in* & intro,index & intro,index\\
+% \relax *,!chap2 & chap1,chap2,chap3 & chap1,chap3\\
+% \end{tabular}
+% \end{quote}
+% The example in the last line shows, how the behaviour of package
+% \xpackage{excludeonly} \cite{excludeonly} can be simulated.
+%
+% The documentation of package \xpackage{makematch} tells the
+% the empty pattern does not match anything. But if you answer
+% the question with an empty string the answer of the previous
+% run is used. Also curly braces are not reliable because the
+% can get stripped during the processing of the answer.
+% Using a pair of empty curly braces or the comma for two empty
+% patterns currently works, but this is specific for the current
+% implementation and may change in future. But the special
+% answer `-' is available.
+%
+% \subsubsection{Method \xoption{pdfmatch}}
+%
+% In \pdfTeX\ 1.30 the new primitive \cs{pdfmatch} was introduced.
+% It is not documented yet, because it was not decided if it remains
+% and which implementation of regular expressions should be used.
+% Thus the situation may change in later versions of \pdfTeX.
+% Currently (1.30 until 1.40) it uses a library for POSIX 1003.2 regular
+% expressions, see manual page ``regex(7)''.
+%
+% If a pattern in the pattern list is invalid, the package prints
+% a warning and removes the pattern from the list. Actually there
+% are two warnings, the other warning is generated by \pdfTeX\ itself.
+%
+% In opposite to \xoption{makematch} the pattern only needs to
+% match the specified part of the file name.
+% For matching the whole name, the symbols `|^|' and `|$|' for
+% begin and end of string must be included.
+%
+% Additionally an initial exclamation mark `|!|' implements the
+% same logic as method \xoption{makematch}. The match result is
+% inverted, the matched file excluded.
+%
+% Examples:
+% \begin{quote}
+% \def\no{\textrm{$\emptyset$}}
+% \begin{tabular}{>{\ttfamily}l|>{\ttfamily}l|>{\ttfamily}l}
+% \textrm{Pattern list} & \textrm{File names} & \textrm{Result}\\
+% \hline
+% foobar & foobar,dummy & foobar\\
+% foo.*  & foobar,xfoobar & foobar,xfoobar\\
+% |^|foo.* & foobar,xfoobar & foobar\\
+% foo|$| & foo,foobar & foo\\
+% fo?bar & fbar,fobar,foobar  & fbar,fobar\\
+% fo+bar & fbar,fobar,foobar  & fobar,foobar\\
+% fo*bar & fbar,fobar,foobar & fbar,fobar,foobar\\
+% chap3 & chap3,chap32 & chap1,chap3,chap32\\
+% chap[13] & chap1,chap2,chap3 & chap1,chap3\\
+% chap(1\string|3)|$| & chap1,chap3,chap33 & chap1,chap3\\
+% .*     & any     & any\\
+% !foobar & foobar,other & other\\
+% in.*,!dex & intro,index & intro\\
+% !index,in.* & intro,index & intro,index\\
+% .*,!chap2 & chap1,chap2,chap3 & chap1,chap3\\
+% .*,!bla & foo,bla,blabla & foo\\
+% .*,!|^|bla|$| & foo,bla,blabla & foo,blabla\\
+% \end{tabular}
+% \end{quote}
+% The example in the last line shows, how the behaviour of package
+% \xpackage{excludeonly} \cite{excludeonly} can be simulated.
+% As the third last line shows, that sometimes `|^|' and `|$|' can
+% be omitted, but this will not work always, shown in the second
+% last line.
+%
+% \subsection{History}
+%
+% Package \xpackage{askinclude} was invented by Pablo A. Straub in 1991
+% and maintained until 1994.
+% ^^A Email address: pablo.straub \symbol{64} gmail.com
+%
+% In October 2007 it was removed from ``TeX Live'' because of
+% the no-commercial license \cite{texlive}. Herbert Vo\ss\ initiated
+% a search for the author in the newsgroup \xnewsgroup{comp.text.tex}
+% \cite{newsthread} to ask him to change the license.
+%
+% It seems that the author could not be reached any more.
+% Joseph Wright suggested a reimplementation that I (HO) have done
+% as package \xpackage{askinc}. Soon it was enhanced by
+% feature requests.
+%
+% Then Ulrike Fischer found email addresses of the original author
+% and Jim Hefferon succeeded in contacting him. He allowed a change
+% of the license to LPPL and the transfer of the maintainership
+% to someone else.
+%
+% Thus I merged both packages as \xpackage{askinclude} in a new
+% major version 2. The license is LPPL.
+%
+% \subsection{New features of version 2}
+%
+% \begin{itemize}
+% \item License is now LPPL.
+% \item A list of \cs{include} files that are detected by the previous
+%   run is printed before the question.
+% \item If the special answer `|?|' is given, then the user is
+%   asked at each \cs{include}.
+% \item Support for regular expressions.
+% \item The remaining stuff in the \xfile{.aux} file does not
+%   cause errors, if the package is removed.
+% \item The use of \cs{includeonly} before the package loading time
+%   is detected and respected by taking precedence. After the package
+%   is loaded, \cs{includeonly} is disabled and prints a warning.
+% \end{itemize}
+%
+% \subsection{Compatibility to version 1}
+%
+% \begin{itemize}
+% \item The user interface of version 1 with its special answers
+%   `|*|', `|-|', and `' remain unchanged, but it is extended by
+%   version 2 with the special answer `|?|' and support for
+%   regular expressions can be enabled.
+% \item As reimplementation the internal macros have changed of course.
+% \item \xfile{.aux} files that are written by version 1.x will work
+%   with version 2.x because \cs{@includeonly} is recognized.
+% \item \LaTeX\ 2.09: The package works as \cs{documentstyle} option
+%   in compatibility mode of \LaTeXe. It is possible that it
+%   will not work in pure \LaTeX\ 2.09.
+% \end{itemize}
+%
+% \StopEventually{
+% }
+%
+% \section{Implementation}
+%
+% \subsection{Header and catcodes}
+%
+%    \begin{macrocode}
+%<*package>
+\NeedsTeXFormat{LaTeX2e}
+\expandafter\edef\csname AskInc@AtEnd\endcsname{%
+  \catcode64 \the\catcode64\relax
+}
+\catcode64 11 % @
+\def\TMP@EnsureCode#1#2{%
+  \edef\AskInc@AtEnd{%
+    \AskInc@AtEnd
+    \catcode#1 \the\catcode#1\relax
+  }%
+  \catcode#1 #2\relax
+}
+\TMP@EnsureCode{33}{12}% !
+\TMP@EnsureCode{39}{12}% '
+\TMP@EnsureCode{40}{12}% (
+\TMP@EnsureCode{41}{12}% )
+\TMP@EnsureCode{42}{12}% *
+\TMP@EnsureCode{43}{12}% +
+\TMP@EnsureCode{44}{12}% ,
+\TMP@EnsureCode{45}{12}% -
+\TMP@EnsureCode{46}{12}% .
+\TMP@EnsureCode{47}{12}% /
+\TMP@EnsureCode{58}{12}% :
+\TMP@EnsureCode{61}{12}% =
+\TMP@EnsureCode{62}{12}% >
+\TMP@EnsureCode{63}{12}% ?
+\TMP@EnsureCode{91}{12}% [
+\TMP@EnsureCode{93}{12}% ]
+\TMP@EnsureCode{96}{12}% `
+\ProvidesPackage{askinclude}%
+  [2007/10/23 v2.0 Interactive asking of included files]%
+%    \end{macrocode}
+%
+% \subsection{Delay action after preamble}
+%
+%    \begin{macro}{\AskInc@AtBeginDocument}
+%    Some actions such as \xfile{.aux} file writing cannot be
+%    performed in the preamble. \cs{AtBeginDocument} delays
+%    such action until |\begin{document}|. However \cs{AtBeginDocument}
+%    must not be used after that time (\cs{@onlypreamble}).
+%    Thus \cs{AskInc@AtBeginDocument} uses \cs{AtBeginDocument}
+%    in the preamble and afterwards executes the code immediately.
+%    \begin{macrocode}
+\AtBeginDocument{%
+  \let\AskInc@AtBeginDocument\@firstofone
+}
+\providecommand*{\AskInc@AtBeginDocument}{\AtBeginDocument}
+%    \end{macrocode}
+%    \end{macro}
+%
+% \subsection{Write entry in \xfile{.aux} file}
+%
+%    \begin{macro}{\AskInc@WriteAux}
+%    The first argument is written to the main \xfile{.aux} file
+%    and the second argument is executed if writing was possible.
+%    Remember \cs{nofiles} prevents writing to auxiliary files.
+%    \begin{macrocode}
+\def\AskInc@WriteAux#1#2{%
+  \AskInc@AtBeginDocument{%
+    \if@filesw
+      \immediate\write\@mainaux{#1}%
+      #2%
+    \fi
+  }%
+}
+%    \end{macrocode}
+%    \end{macro}
+%
+% \subsection{Remember \cs{include} files}
+%
+%    \begin{macro}{\AskInc@CharHash}
+%    \begin{macrocode}
+\edef\AskInc@CharHash{\string#}
+%    \end{macrocode}
+%    \end{macro}
+%
+%    \begin{macro}{\AskInc@WriteDefAddList}
+%    \begin{macrocode}
+\def\AskInc@WriteDefAddList{%
+  \AskInc@WriteAux{%
+%    \end{macrocode}
+%    \begin{macro}{\AskInc@AddList}
+%    \begin{macrocode}
+    \string\providecommand*\string\AskInc@AddList[2]{%
+      \string\ifcase\string\ifx\AskInc@CharHash1\string\@undefined
+                    \string\else
+                      \string\ifx\AskInc@CharHash1\string\relax
+                      \string\else
+                        \string\ifx\AskInc@CharHash1\string\@empty
+                        \string\else
+                          1%
+                        \string\fi
+                      \string\fi
+                    \string\fi
+                    0 %
+        \string\gdef\AskInc@CharHash1{\AskInc@CharHash2}%
+      \string\else
+        \string\g@addto@macro\AskInc@CharHash1{,\AskInc@CharHash2}%
+      \string\fi
+    }%
+%    \end{macrocode}
+%    \end{macro}
+%    \begin{macrocode}
+  }{%
+    \global\let\AskInc@WriteDefAddList\relax
+  }%
+}
+%    \end{macrocode}
+%    \end{macro}
+%    \begin{macro}{\AskInc@WriteDefAddFile}
+%    \begin{macrocode}
+\def\AskInc@WriteDefAddFile{%
+  \AskInc@WriteDefAddList
+  \AskInc@WriteAux{%
+%    \end{macrocode}
+%    \begin{macro}{\AskInc@AddFile}
+%    \begin{macrocode}
+    \string\providecommand\string\AskInc@AddFile{%
+      \string\AskInc@AddList\string\AskInc@Files
+    }%
+%    \end{macrocode}
+%    \end{macro}
+%    \begin{macrocode}
+  }{%
+    \global\let\AskInc@WriteDefAddFile\relax
+  }%
+}
+%    \end{macrocode}
+%    \end{macro}
+%    \begin{macro}{\AskInc@AddFile}
+%    \begin{macrocode}
+\AtBeginDocument{%
+  \global\let\AskInc@AddFile\@gobble
+}
+%    \end{macrocode}
+%    \end{macro}
+%    \begin{macro}{\AskInc@WriteAddFile}
+%    \begin{macrocode}
+\def\AskInc@WriteAddFile#1{%
+  \AskInc@WriteDefAddFile
+  \AskInc@WriteAux{%
+    \string\AskInc@AddFile{#1}%
+  }{}%
+}
+%    \end{macrocode}
+%    \end{macro}
+%    \begin{macro}{\AskInc@Files}
+%    \begin{macrocode}
+\providecommand*{\AskInc@Files}{}
+%    \end{macrocode}
+%    \end{macro}
+%
+%    \paragraph{Summary:}
+%    Now \cs{AskInc@Files} is always defined
+%    and either empty or contains a comma separated list of
+%    \cs{include} files of previous run.
+%
+%    The \cs{include} files are remembered by using
+%    \cs{AskInc@WriteAddFile} at each \cs{include}.
+%
+% \subsection{Redefine \cs{include}}
+%
+%    \begin{macro}{\AskInc@OrgInclude}
+%    \begin{macrocode}
+\newcommand{\AskInc@OrgInclude}{}
+\let\AskInc@OrgInclude\include
+%    \end{macrocode}
+%    \end{macro}
+%    \begin{macro}{\AskInc@AskFile}
+%    \begin{macrocode}
+\let\AskInc@AskFile\@gobble
+%    \end{macrocode}
+%    \end{macro}
+%    \begin{macro}{\AskInc@MatchFile}
+%    \begin{macrocode}
+\let\AskInc@MatchFile\@gobble
+%    \end{macrocode}
+%    \end{macro}
+%    \begin{macro}{\include}
+%    \begin{macrocode}
+\renewcommand*{\include}[1]{%
+  \AskInc@WriteAddFile{#1}%
+  \AskInc@AskFile{#1}%
+  \AskInc@MatchFile{#1}%
+  \AskInc@OrgInclude{#1}%
+}
+%    \end{macrocode}
+%    \end{macro}
+%
+% \subsection{Store answer and match method in \xfile{.aux} file}
+%
+%    \begin{macrocode}
+\AtEndOfPackage{%
+  \AtBeginDocument{%
+    \@ifundefined{AskInc@Answer}{}{%
+      \AskInc@WriteAux{%
+        \string\gdef\string\AskInc@Answer{\AskInc@Answer}%
+      }{}%
+    }%
+    \@ifundefined{AskInc@MatchMethod}{}{%
+      \AskInc@WriteAux{%
+        \string\gdef\string\AskInc@MatchMethod{\AskInc@MatchMethod}%
+      }{}%
+    }%
+  }%
+}
+%    \end{macrocode}
+%
+% \subsection{Support for \cs{@includeonly}}
+%
+%    \begin{macro}{\@includeonly}
+%    Macro \cs{@includeonly} is defined for compatiblity reasons only,
+%    if the \xfile{.aux} file was written by versions before 2 of package
+%    \xpackage{askinclude}.
+%    \begin{macrocode}
+\providecommand*{\@includeonly}[1]{%
+  \gdef\AskInc@Answer{#1}%
+  \ifx\AskInc@Answer\@empty
+    \gdef\AskInc@Answer{-}%
+  \fi
+  \global\let\AskInc@MatchMethod\@empty
+}
+%    \end{macrocode}
+%    \end{macro}
+%
+% \subsection{Stop if \cs{includeonly} is active}
+%
+%    If \cs{includeonly} is used before, the questions are skipped
+%    and the data in the main auxiliary file is preserved.
+%    \begin{macrocode}
+\if@partsw
+  \PackageWarningNoLine{askinclude}{%
+    Previous \string\includeonly\space detected,\MessageBreak
+    therefore asking for files is suppressed%
+  }%
+%    \end{macrocode}
+%    Dummy options.
+%    \begin{macrocode}
+  \DeclareOption{makematch}{}%
+  \DeclareOption{pdfmatch}{}%
+  \DeclareOption{noregexp}{}%
+  \ProcessOptions*%
+%    \end{macrocode}
+%    Preserve \cs{AskInc@MatchFiles}.
+%    \begin{macrocode}
+  \@ifundefined{AskInc@MatchFiles}{%
+  }{%
+    \ifx\AskInc@MatchMethod\@empty
+    \else
+      \AskInc@WriteAux{%
+        \string\gdef\string\AskInc@MatchFiles{\AskInc@MatchFiles}%
+      }{}%
+    \fi
+  }%
+  \AskInc@AtEnd
+  \expandafter\endinput
+\fi
+%    \end{macrocode}
+%
+% \subsection{\cs{includeonly}}
+%
+%    \begin{macro}{\AskInc@OrgIncludeOnly}
+%    \begin{macrocode}
+\newcommand{\AskInc@OrgIncludeOnly}{}%
+\let\AskInc@OrgIncludeOnly\includeonly
+%    \end{macrocode}
+%    \end{macro}
+%    \begin{macro}{\includeonly}
+%    \begin{macrocode}
+\renewcommand*{\includeonly}[1]{%
+  \PackageWarning{askinclude}{%
+    \string\includeonly\space is managed by package `askinclude',%
+    \MessageBreak
+    therefore it is ignored%
+  }%
+}
+%    \end{macrocode}
+%    \end{macro}
+%
+% \subsection{Options}
+%
+%    \begin{macro}{\AskInc@StringNoRegExp}
+%    \begin{macrocode}
+\def\AskInc@StringNoRegExp{noregexp}
+%    \end{macrocode}
+%    \end{macro}
+%    \begin{macro}{\AskInc@StringMakeMatch}
+%    \begin{macrocode}
+\def\AskInc@StringMakeMatch{makematch}
+%    \end{macrocode}
+%    \end{macro}
+%    \begin{macro}{\AskInc@StringPdfMatch}
+%    \begin{macrocode}
+\def\AskInc@StringPdfMatch{pdfmatch}
+%    \end{macrocode}
+%    \end{macro}
+%    \begin{macro}{\ifAskInc@PdfMatchAvailable}
+%    \begin{macrocode}
+\newif\ifAskInc@PdfMatchAvailable
+\begingroup\expandafter\expandafter\expandafter\endgroup
+\expandafter\ifx\csname pdfmatch\endcsname\relax
+\else
+  \AskInc@PdfMatchAvailabletrue
+\fi
+%    \end{macrocode}
+%    \end{macro}
+%    \begin{macrocode}
+\DeclareOption{makematch}{%
+  \let\AskInc@MatchOption\AskInc@StringMakeMatch
+}
+\ifAskInc@PdfMatchAvailable
+  \DeclareOption{pdfmatch}{%
+    \let\AskInc@MatchOption\AskInc@StringPdfMatch
+  }%
+\else
+  \DeclareOption{pdfmatch}{%
+    \PackageWarningNoLine{askinclude}{%
+      Option `pdfmatch' is not available because\MessageBreak
+      your pdfTeX does not provide \string\pdfmatch
+    }%
+  }%
+\fi
+\DeclareOption{noregexp}{%
+  \let\AskInc@MatchOption\@empty
+}
+\ProcessOptions*
+%    \end{macrocode}
+%
+% \subsection{Strings}
+%
+%    \begin{macro}{\AskInc@CharAsterisk}
+%    \begin{macrocode}
+\def\AskInc@CharAsterisk{*}
+%    \end{macrocode}
+%    \end{macro}
+%    \begin{macro}{\AskInc@CharMinus}
+%    \begin{macrocode}
+\def\AskInc@CharMinus{-}
+%    \end{macrocode}
+%    \end{macro}
+%    \begin{macro}{\AskInc@CharPlus}
+%    \begin{macrocode}
+\def\AskInc@CharPlus{+}
+%    \end{macrocode}
+%    \end{macro}
+%    \begin{macro}{\AskInc@CharQuestion}
+%    \begin{macrocode}
+\def\AskInc@CharQuestion{?}
+%    \end{macrocode}
+%    \end{macro}
+%    \begin{macro}{\AskInc@CharExclam}
+%    \begin{macrocode}
+\def\AskInc@CharExclam{!}
+%    \end{macrocode}
+%    \end{macro}
+%    \begin{macro}{\AskInc@CharYes}
+%    \begin{macrocode}
+\def\AskInc@CharYes{y}
+%    \end{macrocode}
+%    \end{macro}
+%    \begin{macro}{\AskInc@CharNo}
+%    \begin{macrocode}
+\def\AskInc@CharNo{n}
+%    \end{macrocode}
+%    \end{macro}
+%    \begin{macro}{\AskInc@CharAll}
+%    \begin{macrocode}
+\def\AskInc@CharAll{A}
+%    \end{macrocode}
+%    \end{macro}
+%    \begin{macro}{\AskInc@CharNone}
+%    \begin{macrocode}
+\def\AskInc@CharNone{N}
+%    \end{macrocode}
+%    \end{macro}
+%    \begin{macro}{\AskInc@CharDefault}
+%    \begin{macrocode}
+\def\AskInc@CharDefault{D}
+%    \end{macrocode}
+%    \end{macro}
+%
+% \subsection{Set defaults}
+%
+%    \begin{macro}{\AskInc@SanitizeAnswer}
+%    \begin{macrocode}
+\def\AskInc@SanitizeAnswer#1#2{%
+  \begingroup
+    \escapechar=`\\%
+    \edef\[{\string\[}%
+    \edef\]{\string\]}%
+    \edef\({\string\(}%
+    \edef\){\string\)}%
+    \edef\*{\string\*}%
+    \edef\+{\string\+}%
+    \edef\?{\string\?}%
+    \edef\|{\string\|}%
+    \edef\^{\string\^}%
+    \edef\${\string\$}%
+    \edef\{{\string\{}%
+    \edef\}{\string\}}%
+    \edef\.{\string\.}%
+    \xdef#1{%
+      \expandafter\expandafter\expandafter\zap@space
+      \expandafter#2\space\@empty
+    }%
+  \endgroup
+}
+%    \end{macrocode}
+%    \end{macro}
+%
+%    \begin{macrocode}
+\AtBeginDocument{%
+  \@ifundefined{AskInc@Answer}{%
+    \global\let\AskInc@Answer\AskInc@CharAsterisk
+  }{%
+    \AskInc@SanitizeAnswer\AskInc@Answer\AskInc@Answer
+  }%
+  \global\let\AskInc@PreviousAnswer\AskInc@Answer
+  \@ifundefined{AskInc@MatchMethod}{%
+    \global\let\AskInc@MatchMethod\@empty
+  }{}%
+  \global\let\AskInc@PreviousMatchMethod\AskInc@MatchMethod
+  \@ifundefined{AskInc@MatchOption}{%
+    \let\AskInc@MatchOption\AskInc@MatchMethod
+  }{}%
+  \ifx\AskInc@MatchOption\AskInc@StringPdfMatch
+    \ifAskInc@PdfMatchAvailable
+    \else
+      \let\AskInc@MatchOption\@empty
+    \fi
+  \fi
+  \@ifundefined{AskInc@MatchFiles}{%
+    \let\AskInc@MatchFiles\@empty
+  }{}%
+}
+%    \end{macrocode}
+%
+% \subsection{Questions}
+%
+% \subsubsection{Generic question header}
+%
+%    \begin{macro}{\AskInc@QuestionHeader}
+%    \begin{macrocode}
+\def\AskInc@QuestionHeader{%
+  \typeout{}%
+  \typeout{***********************************}%
+  \typeout{*** Package askinclude Question ***}%
+  \typeout{***********************************}%
+  \typeout{}%
+}
+%    \end{macrocode}
+%    \end{macro}
+%
+% \subsubsection{Display files}
+%
+%    \begin{macro}{\AskInc@TypeoutFiles}
+%    \begin{macrocode}
+\def\AskInc@TypeoutFiles{%
+  \global\let\AskInc@PreviousMatches\@empty
+  \ifx\AskInc@Files\@empty
+  \else
+    \typeout{Files, found by previous run in \string\include:}%
+    \@for\AskInc@File:=\AskInc@Files\do{%
+      \ifx\AskInc@Answer\AskInc@CharAsterisk
+        \let\AskInc@Mark\AskInc@CharPlus
+      \else
+        \let\AskInc@Mark\AskInc@CharMinus
+        \ifx\AskInc@Answer\AskInc@CharMinus
+        \else
+          \ifx\AskInc@MatchMethod\@empty
+            \expandafter\@firstoftwo
+          \else
+            \expandafter\@secondoftwo
+          \fi
+          {\@for\AskInc@Temp:=\AskInc@Answer}%
+          {\@for\AskInc@Temp:=\AskInc@MatchFiles}%
+          \do{%
+            \ifx\AskInc@File\AskInc@Temp
+              \let\AskInc@Mark\AskInc@CharPlus
+            \fi
+          }%
+        \fi
+      \fi
+      \typeout{ \@spaces(\AskInc@Mark) \AskInc@File}%
+      \ifx\AskInc@Mark\AskInc@CharPlus
+        \ifx\AskInc@PreviousMatches\@empty
+          \global\let\AskInc@PreviousMatches\AskInc@File
+        \else
+          \expandafter\g@addto@macro
+          \expandafter\AskInc@PreviousMatches{%
+            \expandafter,\AskInc@File
+          }%
+        \fi
+      \fi
+    }%
+    \typeout{}%
+  \fi
+}
+%    \end{macrocode}
+%    \end{macro}
+%
+% \subsubsection{Previous answer}
+%
+%    \begin{macro}{\AskInc@TypeoutPreviousAnswer}
+%    \begin{macrocode}
+\def\AskInc@TypeoutPreviousAnswer{%
+  \typeout{%
+    Previous answer (%
+    \ifx\AskInc@MatchMethod\@empty
+      noregexp%
+    \else
+      \AskInc@MatchMethod
+    \fi
+    ):%
+  }%
+  \typeout{ \@spaces[\AskInc@Answer]}%
+  \typeout{}%
+}
+%    \end{macrocode}
+%    \end{macro}
+%
+% \subsubsection{Current regular expression support}
+%
+%    \begin{macro}{\AskInc@TypeoutMatchMethod}
+%    \begin{macrocode}
+\def\AskInc@TypeoutMatchMethod{%
+  \typeout{Regular expressions:}%
+  \AskInc@TypeoutMethod\@empty{noregexp}{%
+    \space disabled%
+  }%
+  \AskInc@TypeoutMethod\AskInc@StringMakeMatch{makematch}{%
+    enabled, using package `makematch'%
+  }%
+  \ifAskInc@PdfMatchAvailable
+    \AskInc@TypeoutMethod\AskInc@StringPdfMatch{pdfmatch}{%
+      \space enabled, using pdfTeX's \string\pdfmatch
+    }%
+  \fi
+  \typeout{}%
+}
+%    \end{macrocode}
+%    \end{macro}
+%    \begin{macro}{\AskInc@TypeoutMethod}
+%    \begin{macrocode}
+\def\AskInc@TypeoutMethod#1#2#3{%
+  \typeout{%
+    \ifx#1\AskInc@MatchOption \space--> \else\@spaces\space\fi
+    [#2] #3% hash-ok
+  }%
+}
+%    \end{macrocode}
+%    \end{macro}
+%
+% \subsubsection{Main question text}
+%
+%    \begin{macro}{\AskInc@TypeoutMainQuestion}
+%    \begin{macrocode}
+\def\AskInc@TypeoutMainQuestion{%
+  \typeout{Which files do you want to include?}%
+  \typeout{ \@spaces[foo,bar] \space\space
+      comma separated file or pattern list}%
+  \typeout{ \@spaces[*] \@spaces\@spaces all files}%
+  \typeout{ \@spaces[-] \@spaces\@spaces no files}%
+  \typeout{ \@spaces[?] \@spaces\@spaces ask for each file}%
+}
+%    \end{macrocode}
+%    \end{macro}
+%
+% \subsubsection{Main question}
+%
+%    \begin{macro}{\AskInc@MainQuestion}
+%    \begin{macrocode}
+\def\AskInc@MainQuestion{%
+  \AskInc@QuestionHeader
+  \AskInc@TypeoutFiles
+  \AskInc@TypeoutPreviousAnswer
+  \AskInc@TypeoutMatchMethod
+  \AskInc@TypeoutMainQuestion
+  \begingroup
+    \@makeother\*%
+    \@makeother\-%
+    \@makeother\?%
+    \@makeother\,%
+    \@makeother\!%
+    \@makeother\^%
+    \@makeother\$%
+    \@makeother\(%
+    \@makeother\)%
+    \@makeother\+%
+    \@makeother\[%
+    \@makeother\]%
+    \@makeother\\%
+    \@makeother\|%
+    \@makeother\:%
+    \@makeother\.%
+    \typein[\answer]%
+        { \@spaces[] \space\@spaces\@spaces use the previous answer}%
+    \typeout{}%
+    \AskInc@SanitizeAnswer\AskInc@@Answer\answer
+  \endgroup
+  \let\AskInc@Next\AskInc@MainQuestion
+  \ifx\AskInc@@Answer\AskInc@StringNoRegExp
+    \let\AskInc@MatchOption\@empty
+  \else
+    \ifx\AskInc@@Answer\AskInc@StringMakeMatch
+      \let\AskInc@MatchOption\AskInc@StringMakeMatch
+    \else
+      \ifx\AskInc@@Answer\AskInc@StringPdfMatch
+        \ifAskInc@PdfMatchAvailable
+          \let\AskInc@MatchOption\AskInc@StringPdfMatch
+        \else
+          \PackageWarning{askinclude}{%
+            Method `pdfmatch' is not available because\MessageBreak
+            your pdfTeX does not provide \string\pdfmatch
+          }%
+          \let\AskInc@MatchOption\@empty
+        \fi
+      \else
+        \ifx\AskInc@@Answer\@empty
+          \global\let\AskInc@@Answer\AskInc@Answer
+        \fi
+        \let\AskInc@Next\AskInc@MainAnswer
+      \fi
+    \fi
+  \fi
+  \AskInc@Next
+}
+%    \end{macrocode}
+%    \end{macro}
+%
+% \subsection{Evaluate answer of main question}
+%
+%    \begin{macro}{\AskInc@MainAnswer}
+%    \begin{macrocode}
+\def\AskInc@MainAnswer{%
+  \ifx\AskInc@@Answer\AskInc@CharQuestion
+    \global\let\AskInc@Answer\@empty
+    \global\let\AskInc@MatchMethod\@empty
+    \global\let\AskInc@AskFile\AskInc@DoAskFile
+    \AskInc@OrgIncludeOnly{}%
+  \else
+    \global\let\AskInc@Answer\AskInc@@Answer
+    \ifx\AskInc@@Answer\AskInc@CharAsterisk
+      \global\let\AskInc@MatchMethod\@empty
+    \else
+      \ifx\AskInc@@Answer\AskInc@CharMinus
+        \global\let\AskInc@MatchMethod\@empty
+        \AskInc@OrgIncludeOnly{}%
+      \else
+        \global\let\AskInc@MatchMethod\AskInc@MatchOption
+        \ifx\AskInc@MatchOption\@empty
+          \expandafter\AskInc@OrgIncludeOnly\expandafter{%
+            \AskInc@Answer
+          }%
+        \else
+          \AskInc@MatchInit
+          \AskInc@OrgIncludeOnly{}%
+        \fi
+      \fi
+    \fi
+  \fi
+  \let\AskInc@Include\AskInc@DoInclude
+}
+%    \end{macrocode}
+%    \end{macro}
+%
+%    \begin{macro}{\AskInc@MatchInit}
+%    \begin{macrocode}
+\def\AskInc@MatchInit{%
+  \RequirePackage{kvsetkeys}[2007/09/29]%
+  \expandafter\comma@normalize\expandafter{\AskInc@Answer}%
+  \global\let\AskInc@MatchList\comma@list
+%    \end{macrocode}
+%    \begin{macro}{\AskInc@MatchFile}
+%    \begin{macrocode}
+  \def\AskInc@MatchFile##1{%
+    \AskInc@DoMatch{##1}{%
+      \AskInc@WriteAddMatch{##1}%
+      \ifx\@partlist\@empty
+        \gdef\@partlist{##1}%
+      \else
+        \g@addto@macro\@partlist{,##1}%
+      \fi
+    }%
+  }%
+%    \end{macrocode}
+%    \end{macro}
+%    \begin{macrocode}
+  \ifx\AskInc@MatchMethod\AskInc@StringMakeMatch
+    \AskInc@MakeMatchInit
+  \else
+    \AskInc@PdfMatchInit
+  \fi
+  \let\AskInc@MatchInit\@undefined
+}
+%    \end{macrocode}
+%    \end{macro}
+%    \begin{macro}{\AskInc@MakeMatchInit}
+%    \begin{macrocode}
+\def\AskInc@MakeMatchInit{%
+  \RequirePackage{makematch}%
+%    \end{macrocode}
+%    \begin{macro}{\AskInc@DoMatch}
+%    \begin{macrocode}
+  \def\AskInc@DoMatch##1{%
+    \def\AskInc@Temp{%
+      \MakeMatcher[,]\AskInc@Temp
+    }%
+    \expandafter\AskInc@Temp\expandafter{\AskInc@MatchList}%
+    \AskInc@Temp{{##1}}\@firstofone\@gobble
+  }%
+%    \end{macrocode}
+%    \end{macro}
+%    \begin{macrocode}
+  \let\AskInc@MakeMatchInit\@undefined
+}
+%    \end{macrocode}
+%    \end{macro}
+%    \begin{macro}{\AskInc@PdfMatchInit}
+%    \begin{macrocode}
+\def\AskInc@PdfMatchInit{%
+%    \end{macrocode}
+%    \begin{macro}{\ifAskInc@Found}
+%    \begin{macrocode}
+  \newif\ifAskInc@Found
+%    \end{macrocode}
+%    \end{macro}
+%    \begin{macro}{\AskInc@DoMatch}
+%    \begin{macrocode}
+  \def\AskInc@DoMatch##1{%
+    \AskInc@Foundfalse
+    \expandafter\comma@parse@normalized\expandafter
+    {\AskInc@MatchList}{\AskInc@CheckMatch{##1}}%
+    \ifAskInc@Found
+      \expandafter\@firstofone
+    \else
+      \expandafter\@gobble
+    \fi
+  }%
+%    \end{macrocode}
+%    \end{macro}
+%    \begin{macro}{\AskInc@CheckMatch}
+%    \begin{macrocode}
+  \def\AskInc@CheckMatch##1##2{%
+    \AskInc@@CheckMatch##2\@empty\@nil{##1}%
+  }%
+%    \end{macrocode}
+%    \end{macro}
+%    \begin{macro}{\AskInc@@CheckMatch}
+%    \begin{macrocode}
+  \def\AskInc@@CheckMatch##1##2\@nil##3{%
+    \def\AskInc@Temp{##1}%
+    \ifx\AskInc@Temp\AskInc@CharExclam
+      \ifcase\pdfmatch{##2}{##3}=1 %
+      \or
+        \AskInc@Foundfalse
+      \else
+        \AskInc@InvalidPattern{##2}{##1##2}%
+      \fi
+    \else
+      \ifcase\pdfmatch{##1##2}{##3} %
+      \or
+        \AskInc@Foundtrue
+      \else
+        \AskInc@InvalidPattern{##1##2}{##1##2}%
+      \fi
+    \fi
+  }%
+%    \end{macrocode}
+%    \end{macro}
+%    \begin{macro}{\AskInc@InvalidPattern}
+%    Prints a warning with the regular expression and
+%    removes it from the list to prevent further warnings
+%    for the same expression.
+%    \begin{macrocode}
+  \def\AskInc@InvalidPattern##1##2{%
+    \edef\AskInc@Temp{##1}%
+    \PackageWarningNoLine{askinclude}{%
+      Invalid pattern `\AskInc@Temp' for \string\pdfmatch
+    }%
+    \edef\AskInc@Temp{##2}%
+    \global\expandafter\let\expandafter\AskInc@MatchList
+    \expandafter\@empty
+    \expandafter\comma@parse@normalized\expandafter
+    {\AskInc@MatchList}\AskInc@FilterPattern
+  }%
+%    \end{macrocode}
+%    \end{macro}
+%    \begin{macro}{\AskInc@FilterPattern}
+%    \begin{macrocode}
+  \def\AskInc@FilterPattern##1{%
+    \edef\AskInc@Pattern{##1}%
+    \ifx\AskInc@Temp\AskInc@Pattern
+    \else
+      \ifx\AskInc@MatchList\@empty
+        \global\let\AskInc@MatchList\AskInc@Pattern
+      \else
+        \expandafter\g@addto@macro\expandafter\AskInc@MatchList{%
+          \expandafter,\AskInc@Pattern
+        }%
+      \fi
+    \fi
+  }%
+%    \end{macrocode}
+%    \end{macro}
+%    \begin{macrocode}
+  \let\AskInc@PdfMatchInit\@undefined
+}
+%    \end{macrocode}
+%    \end{macro}
+%
+%    \begin{macro}{\AskInc@WriteDefAddMatch}
+%    \begin{macrocode}
+\def\AskInc@WriteDefAddMatch{%
+  \AskInc@WriteDefAddList
+  \AskInc@WriteAux{%
+%    \end{macrocode}
+%    \begin{macro}{\AskInc@AddMatch}
+%    \begin{macrocode}
+    \string\providecommand\string\AskInc@AddMatch{%
+      \string\AskInc@AddList\string\AskInc@MatchFiles
+    }%
+%    \end{macrocode}
+%    \end{macro}
+%    \begin{macrocode}
+  }{%
+    \global\let\AskInc@WriteDefAddMatch\relax
+  }%
+}
+%    \end{macrocode}
+%    \end{macro}
+%    \begin{macro}{\AskInc@AddMatch}
+%    \begin{macrocode}
+\AtBeginDocument{%
+  \global\let\AskInc@AddMatch\@gobble
+}
+%    \end{macrocode}
+%    \end{macro}
+%    \begin{macro}{\AskInc@WriteAddMatch}
+%    \begin{macrocode}
+\def\AskInc@WriteAddMatch#1{%
+  \AskInc@WriteDefAddMatch
+  \AskInc@WriteAux{%
+    \string\AskInc@AddMatch{#1}%
+  }{}%
+}
+%    \end{macrocode}
+%    \end{macro}
+%
+%    \begin{macro}{\AskInc@SaveAnswer}
+%    \begin{macrocode}
+\def\AskInc@SaveAnswer{%
+  \AskInc@WriteAux{%
+      \string\gdef\string\AskInc@Answer{\AskInc@Answer}%
+  }{}%
+}
+%    \end{macrocode}
+%    \end{macro}
+%
+% \subsection{Ask for each file}
+%
+%    \begin{macro}{\AskInc@PreviousAnswer}
+%    \begin{macrocode}
+\@ifundefined{AskInc@PreviousAnswer}{%
+  \let\AskInc@PreviousAnswer\AskInc@CharAsterisk
+}{}
+%    \end{macrocode}
+%    \end{macro}
+%    \begin{macro}{\AskInc@PreviousMatchMethod}
+%    \begin{macrocode}
+\@ifundefined{AskInc@PreviousMatchMethod}{%
+  \let\AskInc@PreviousMatchMethod\@empty
+}{}
+%    \end{macrocode}
+%    \end{macro}
+%    \begin{macro}{\AskInc@DoAskFile}
+%    \begin{macrocode}
+\def\AskInc@DoAskFile#1{%
+  \edef\AskInc@File{#1}%
+  \ifx\AskInc@PreviousAnswer\AskInc@CharAsterisk
+    \let\AskInc@Default\AskInc@CharYes
+  \else
+    \let\AskInc@Default\AskInc@CharNo
+    \ifx\AskInc@PreviousAnswer\AskInc@CharMinus
+    \else
+      \ifx\AskInc@PreviousMatchMethod\@empty
+        \expandafter\@firstoftwo
+      \else
+        \expandafter\@secondoftwo
+      \fi
+      {\@for\AskInc@Temp:=\AskInc@PreviousAnswer}%
+      {\@for\AskInc@Temp:=\AskInc@MatchFiles}%
+      \do{%
+        \ifx\AskInc@Temp\AskInc@File
+          \let\AskInc@Default\AskInc@CharYes
+        \fi
+      }%
+    \fi
+    \ifx\AskInc@Default\AskInc@CharNo
+      \let\AskInc@Default\AskInc@CharYes
+      \@for\AskInc@Temp:=\AskInc@Files\do{%
+        \ifx\AskInc@Temp\AskInc@File
+          \let\AskInc@Default\AskInc@CharNo
+        \fi
+      }%
+    \fi
+  \fi
+  \let\AskInc@@QuestionHeader\AskInc@QuestionHeader
+  \AskInc@AskQuestion
+  \ifx\AskInc@AskResult\AskInc@CharYes
+    \ifx\AskInc@Answer\@empty
+      \gdef\AskInc@Answer{#1}%
+    \else
+      \g@addto@macro\AskInc@Answer{,#1}%
+    \fi
+    \AskInc@SaveAnswer
+    \let\@partlist\AskInc@Answer
+  \fi
+}
+%    \end{macrocode}
+%    \end{macro}
+%    \begin{macro}{\AskInc@AskQuestion}
+%    \begin{macrocode}
+\def\AskInc@AskQuestion{%
+  \let\AskInc@Temp\answer
+  \AskInc@@QuestionHeader
+  \let\AskInc@@QuestionHeader\relax
+  \typein[\answer]{%
+    Include `\AskInc@File'? [y]es, [n]o, [A]ll, [N]one, [D]efault %
+    (\AskInc@Default):%
+  }%
+  \typeout{}%
+  \let\AskInc@AskResult\answer
+  \let\answer\AskInc@Temp
+  \ifx\AskInc@AskResult\@empty
+    \let\AskInc@AskResult\AskInc@Default
+    \let\AskInc@Next\relax
+  \else
+    \ifx\AskInc@AskResult\AskInc@CharYes
+      \let\AskInc@Next\relax
+    \else
+      \ifx\AskInc@AskResult\AskInc@CharNo
+        \let\AskInc@Next\relax
+      \else
+        \ifx\AskInc@AskResult\AskInc@CharAll
+          \gdef\AskInc@AskQuestion{%
+            \let\AskInc@AskResult\AskInc@CharYes
+          }%
+        \else
+          \ifx\AskInc@AskResult\AskInc@CharNone
+            \gdef\AskInc@AskQuestion{%
+              \let\AskInc@AskResult\AskInc@CharNo
+            }%
+          \else
+            \ifx\AskInc@AskResult\AskInc@CharDefault
+              \gdef\AskInc@AskQuestion{%
+                \let\AskInc@AskResult\AskInc@Default
+              }%
+            \else
+              \PackageWarningNoLine{askinclude}{%
+                Invalid answer [\AskInc@AskResult].\MessageBreak
+                Answer must be one letter out of [ynAND]%
+              }%
+            \fi
+          \fi
+        \fi
+        \let\AskInc@Next\AskInc@AskQuestion
+      \fi
+    \fi
+  \fi
+  \AskInc@Next
+}
+%    \end{macrocode}
+%    \end{macro}
+%
+%    \begin{macrocode}
+\AtBeginDocument{\AskInc@MainQuestion}
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+\AskInc@AtEnd
+%</package>
+%    \end{macrocode}
+%
+% \section{Test}
+%
+% \subsection{Included files}
+%
+%    \begin{macrocode}
+%<*a>
+\chapter{Chapter A}
+\let\filea=Y
+%</a>
+%    \end{macrocode}
+%    \begin{macrocode}
+%<*b>
+\chapter{Chapter B}
+\let\fileb=Y
+%</b>
+%    \end{macrocode}
+%    \begin{macrocode}
+%<*c>
+\chapter{Chapter C}
+\let\filec=Y
+%</c>
+%    \end{macrocode}
+%
+% \subsection{Special test setup}
+%
+%    \begin{macrocode}
+%<*test18>
+\includeonly{askinclude-b}
+%</test18>
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+%<*test20|test21|test22>
+\let\AtBeginDocumentMode=N%
+%</test20|test21|test22>
+%    \end{macrocode}
+%
+% \subsection{Common start}
+%
+%    \begin{macrocode}
+%<*test0>
+\ifx\CompatibilityMode Y%
+  \documentstyle[filecontents,qstest,askinclude]{book}%
+\else
+  \documentclass{book}%
+  \usepackage{filecontents}%
+  \usepackage{qstest}%
+%<*test1>
+  \makeatletter
+  \def\RestoreCatcodes{}%
+  \count@=0 %
+  \loop
+    \edef\RestoreCatcodes{%
+      \RestoreCatcodes
+      \catcode\the\count@=\the\catcode\count@\relax
+    }%
+  \ifnum\count@<255 %
+    \advance\count@\@ne
+  \repeat
+  \def\RangeCatcodeInvalid#1#2{%
+    \count@=#1\relax
+    \loop
+      \catcode\count@=15 %
+    \ifnum\count@<#2\relax
+      \advance\count@\@ne
+    \repeat
+  }%
+  \def\Test#1\EndTest{%
+    \RangeCatcodeInvalid{0}{47}%
+    \RangeCatcodeInvalid{58}{64}%
+    \RangeCatcodeInvalid{91}{96}%
+    \RangeCatcodeInvalid{123}{255}%
+    \catcode`\@=12 %
+    \catcode`\\=0 %
+    \catcode`\{=1 %
+    \catcode`\}=2 %
+    \catcode`\#=6 %
+    \catcode`\[=12 %
+    \catcode`\]=12 %
+    \catcode`\%=14 %
+    \catcode`\ =10 %
+    \catcode13=5 %
+    #1\relax
+    \RestoreCatcodes
+    \makeatother
+  }%
+  \Test
+%</test1>
+%<*!test1>
+  \ifx\AtBeginDocumentMode Y%
+    \AtBeginDocument{%
+      \usepackage{askinclude}[2007/10/23]%
+    }%
+  \else
+%</!test1>
+    \usepackage{askinclude}[2007/10/23]%
+%<*!test1>
+  \fi
+%</!test1>
+%<*test1>
+  \EndTest
+%</test1>
+\fi
+\IncludeTests{*}
+\LogTests{log}{*}{*}
+\makeatletter
+\let\org@typein\typein
+\def\typein[#1]#2{%
+  \ifx\@Stack\@StackEmpty
+    \begin{qstest}{StackNonEmpty}{StackNonEmpty}%
+      \Expect{Error: empty stack}{}%
+    \end{qstest}%
+    \org@typein[{#1}]{#2}%
+  \else
+    \edef#1{%
+      \unexpanded\expandafter\expandafter\expandafter{%
+        \expandafter\@car\@Stack\@nil
+      }%
+    }%
+    \xdef\@Stack{%
+      \unexpanded\expandafter\expandafter\expandafter{%
+        \expandafter\@cdr\@Stack\@nil
+      }%
+    }%
+    \typeout{}%
+    \typeout{\string#1=#1}%
+  \fi
+}
+\def\@StackEmpty{\BOTTOM}
+\let\@Stack\@StackEmpty
+\newcommand*{\Stack}[1]{%
+  \def\@Stack{#1\BOTTOM}%
+}
+\AtEndDocument{%
+  \begin{qstest}{StackUsed}{StackUsed}%
+    \Expect*{%
+      \ifx\@Stack\@StackEmpty
+      \else
+        Error: Unused stack entries%
+      \fi
+    }{}%
+  \end{qstest}%
+}
+\newcommand*{\CheckInclude}[2]{%
+  \include{askinclude-#1}%
+  \begin{qstest}{CheckInclude-#1}{CheckInclude-#1}%
+    \Expect*{%
+      \expandafter\ifx\csname file#1\endcsname Ytrue\else false\fi
+    }{#2}%
+  \end{qstest}%
+}
+\def\@EndChecks{}
+\AtBeginDocument{%
+  \AtEndDocument{%
+    \if@filesw
+      \immediate\write\@mainaux{\string\@EndChecks}%
+    \fi
+  }%
+}
+\newcommand*{\CheckAnswer}[1]{%
+  \gdef\AnswerText{#1}%
+  \g@addto@macro\@EndChecks{\@CheckAnswer}%
+}
+\def\@CheckAnswer{%
+  \begin{qstest}{CheckAnswer}{CheckAnswer}%
+    \Expect*{\unexpanded\expandafter{\AskInc@Answer}}%
+           *{\unexpanded\expandafter{\AnswerText}}%
+  \end{qstest}%
+}
+\newcommand*{\CheckMatchMethod}[1]{%
+  \gdef\MatchMethodText{#1}%
+  \g@addto@macro\@EndChecks{\@CheckMatchMethod}%
+}
+\def\@CheckMatchMethod{%
+  \begin{qstest}{CheckMatchMethod}{CheckMatchMethod}%
+    \Expect*{\unexpanded\expandafter{\AskInc@MatchMethod}}%
+           *{\unexpanded\expandafter{\MatchMethodText}}%
+  \end{qstest}%
+}
+\def\@CheckAux{%
+  \begin{qstest}{CheckAux}{CheckAux}%
+    \def\GetFileContents##1{%
+      \pdfunescapehex{%
+        \pdffiledump length\pdffilesize{##1}{##1}%
+      }%
+    }%
+    \Expect*{\GetFileContents{\jobname.aux}}%
+           *{\GetFileContents{\jobname-aux.aux}}%
+  \end{qstest}%
+}
+\g@addto@macro\@EndChecks{\@CheckAux}
+\let\org@filec@ntents\filec@ntents
+\def\filec@ntents{%
+  \catcode`\|=0 %
+  \org@filec@ntents
+}
+\begingroup
+  \endlinechar=-1 %
+  \catcode`\|=0 %
+  \@makeother\#%
+  \@makeother\\%
+  |gdef|AddList{%
+    \providecommand*\AskInc@AddList[2]{%
+      \ifcase\ifx#1\@undefined
+             \else\ifx#1\relax
+             \else\ifx#1\@empty
+             \else1\fi\fi\fi0 %
+        \gdef#1{#2}%
+      \else
+        \g@addto@macro#1{,#2}%
+      \fi
+    }%
+  }%
+  |gdef|AddFile{%
+    \providecommand\AskInc@AddFile{%
+      \AskInc@AddList\AskInc@Files
+    }%
+  }%
+  |gdef|AddMatch{%
+    \providecommand\AskInc@AddMatch{%
+      \AskInc@AddList\AskInc@MatchFiles
+    }%
+  }%
+|endgroup
+%</test0>
+%    \end{macrocode}
+%
+% \subsection{First run tests}
+%
+%    \begin{macrocode}
+%<*test1>
+\Stack{{}}
+\CheckAnswer{*}
+\begin{filecontents*}{\jobname.aux}
+\relax
+\end{filecontents*}
+\begin{filecontents*}{\jobname-aux.aux}
+\relax|space
+\gdef\AskInc@Answer{*}
+\gdef\AskInc@MatchMethod{}
+|AddList
+|AddFile
+\AskInc@AddFile{askinclude-a}
+\@input{askinclude-a.aux}
+\AskInc@AddFile{askinclude-b}
+\@input{askinclude-b.aux}
+\AskInc@AddFile{askinclude-c}
+\@input{askinclude-c.aux}
+\@EndChecks
+\end{filecontents*}
+\begin{document}
+\CheckInclude{a}{true}
+\CheckInclude{b}{true}
+\CheckInclude{c}{true}
+%</test1>
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+%<*test2>
+\Stack{*}
+\CheckAnswer{*}
+\begin{filecontents*}{\jobname.aux}
+\relax
+\end{filecontents*}
+\begin{filecontents*}{\jobname-aux.aux}
+\relax|space
+\gdef\AskInc@Answer{*}
+\gdef\AskInc@MatchMethod{}
+|AddList
+|AddFile
+\AskInc@AddFile{askinclude-a}
+\@input{askinclude-a.aux}
+\AskInc@AddFile{askinclude-b}
+\@input{askinclude-b.aux}
+\AskInc@AddFile{askinclude-c}
+\@input{askinclude-c.aux}
+\@EndChecks
+\end{filecontents*}
+\begin{document}
+\CheckInclude{a}{true}
+\CheckInclude{b}{true}
+\CheckInclude{c}{true}
+%</test2>
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+%<*test3>
+\Stack{-}%
+\CheckAnswer{-}
+\begin{filecontents*}{\jobname.aux}
+\relax
+\end{filecontents*}
+\begin{filecontents*}{\jobname-aux.aux}
+\relax|space
+\gdef\AskInc@Answer{-}
+\gdef\AskInc@MatchMethod{}
+|AddList
+|AddFile
+\AskInc@AddFile{askinclude-a}
+\@input{askinclude-a.aux}
+\AskInc@AddFile{askinclude-b}
+\@input{askinclude-b.aux}
+\AskInc@AddFile{askinclude-c}
+\@input{askinclude-c.aux}
+\@EndChecks
+\end{filecontents*}
+\begin{document}
+\CheckInclude{a}{false}
+\CheckInclude{b}{false}
+\CheckInclude{c}{false}
+%</test3>
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+%<*test4>
+\Stack{{askinclude-b}}
+\CheckAnswer{askinclude-b}
+\begin{filecontents*}{\jobname.aux}
+\relax
+\end{filecontents*}
+\begin{filecontents*}{\jobname-aux.aux}
+\relax|space
+\gdef\AskInc@Answer{askinclude-b}
+\gdef\AskInc@MatchMethod{}
+|AddList
+|AddFile
+\AskInc@AddFile{askinclude-a}
+\@input{askinclude-a.aux}
+\AskInc@AddFile{askinclude-b}
+\@input{askinclude-b.aux}
+\AskInc@AddFile{askinclude-c}
+\@input{askinclude-c.aux}
+\@EndChecks
+\end{filecontents*}
+\begin{document}
+\CheckInclude{a}{false}
+\CheckInclude{b}{true}
+\CheckInclude{c}{false}
+%</test4>
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+%<*test5>
+\Stack{{askinclude-a,askinclude-c}}
+\CheckAnswer{askinclude-a,askinclude-c}
+\begin{filecontents*}{\jobname.aux}
+\relax
+\end{filecontents*}
+\begin{filecontents*}{\jobname-aux.aux}
+\relax|space
+\gdef\AskInc@Answer{askinclude-a,askinclude-c}
+\gdef\AskInc@MatchMethod{}
+|AddList
+|AddFile
+\AskInc@AddFile{askinclude-a}
+\@input{askinclude-a.aux}
+\AskInc@AddFile{askinclude-b}
+\@input{askinclude-b.aux}
+\AskInc@AddFile{askinclude-c}
+\@input{askinclude-c.aux}
+\@EndChecks
+\end{filecontents*}
+\begin{document}
+\CheckInclude{a}{true}
+\CheckInclude{b}{false}
+\CheckInclude{c}{true}
+%</test5>
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+%<*test6>
+\Stack{?yny}
+\CheckAnswer{askinclude-a,askinclude-c}
+\begin{filecontents*}{\jobname.aux}
+\relax
+\end{filecontents*}
+\begin{filecontents*}{\jobname-aux.aux}
+\relax|space
+\gdef\AskInc@Answer{}
+\gdef\AskInc@MatchMethod{}
+|AddList
+|AddFile
+\AskInc@AddFile{askinclude-a}
+\gdef\AskInc@Answer{askinclude-a}
+\@input{askinclude-a.aux}
+\AskInc@AddFile{askinclude-b}
+\@input{askinclude-b.aux}
+\AskInc@AddFile{askinclude-c}
+\gdef\AskInc@Answer{askinclude-a,askinclude-c}
+\@input{askinclude-c.aux}
+\@EndChecks
+\end{filecontents*}
+\begin{document}
+\CheckInclude{a}{true}
+\CheckInclude{b}{false}
+\CheckInclude{c}{true}
+%</test6>
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+%<*test7>
+\Stack{?yA}
+\CheckAnswer{askinclude-a,askinclude-b,askinclude-c}
+\begin{filecontents*}{\jobname.aux}
+\relax
+\end{filecontents*}
+\begin{filecontents*}{\jobname-aux.aux}
+\relax|space
+\gdef\AskInc@Answer{}
+\gdef\AskInc@MatchMethod{}
+|AddList
+|AddFile
+\AskInc@AddFile{askinclude-a}
+\gdef\AskInc@Answer{askinclude-a}
+\@input{askinclude-a.aux}
+\AskInc@AddFile{askinclude-b}
+\gdef\AskInc@Answer{askinclude-a,askinclude-b}
+\@input{askinclude-b.aux}
+\AskInc@AddFile{askinclude-c}
+\gdef\AskInc@Answer{askinclude-a,askinclude-b,askinclude-c}
+\@input{askinclude-c.aux}
+\@EndChecks
+\end{filecontents*}
+\begin{document}
+\CheckInclude{a}{true}
+\CheckInclude{b}{true}
+\CheckInclude{c}{true}
+%</test7>
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+%<*test8>
+\Stack{?yD}
+\CheckAnswer{askinclude-a,askinclude-b,askinclude-c}
+\begin{filecontents*}{\jobname.aux}
+\relax
+\end{filecontents*}
+\begin{filecontents*}{\jobname-aux.aux}
+\relax|space
+\gdef\AskInc@Answer{}
+\gdef\AskInc@MatchMethod{}
+|AddList
+|AddFile
+\AskInc@AddFile{askinclude-a}
+\gdef\AskInc@Answer{askinclude-a}
+\@input{askinclude-a.aux}
+\AskInc@AddFile{askinclude-b}
+\gdef\AskInc@Answer{askinclude-a,askinclude-b}
+\@input{askinclude-b.aux}
+\AskInc@AddFile{askinclude-c}
+\gdef\AskInc@Answer{askinclude-a,askinclude-b,askinclude-c}
+\@input{askinclude-c.aux}
+\@EndChecks
+\end{filecontents*}
+\begin{document}
+\CheckInclude{a}{true}
+\CheckInclude{b}{true}
+\CheckInclude{c}{true}
+%</test8>
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+%<*test9>
+\Stack{?yN}
+\CheckAnswer{askinclude-a}
+\begin{filecontents*}{\jobname.aux}
+\relax
+\end{filecontents*}
+\begin{filecontents*}{\jobname-aux.aux}
+\relax|space
+\gdef\AskInc@Answer{}
+\gdef\AskInc@MatchMethod{}
+|AddList
+|AddFile
+\AskInc@AddFile{askinclude-a}
+\gdef\AskInc@Answer{askinclude-a}
+\@input{askinclude-a.aux}
+\AskInc@AddFile{askinclude-b}
+\@input{askinclude-b.aux}
+\AskInc@AddFile{askinclude-c}
+\@input{askinclude-c.aux}
+\@EndChecks
+\end{filecontents*}
+\begin{document}
+\CheckInclude{a}{true}
+\CheckInclude{b}{false}
+\CheckInclude{c}{false}
+%</test9>
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+%<*test10>
+\Stack{?{}N}
+\CheckAnswer{askinclude-a}
+\begin{filecontents*}{\jobname.aux}
+\relax
+\end{filecontents*}
+\begin{filecontents*}{\jobname-aux.aux}
+\relax|space
+\gdef\AskInc@Answer{}
+\gdef\AskInc@MatchMethod{}
+|AddList
+|AddFile
+\AskInc@AddFile{askinclude-a}
+\gdef\AskInc@Answer{askinclude-a}
+\@input{askinclude-a.aux}
+\AskInc@AddFile{askinclude-b}
+\@input{askinclude-b.aux}
+\AskInc@AddFile{askinclude-c}
+\@input{askinclude-c.aux}
+\@EndChecks
+\end{filecontents*}
+\begin{document}
+\CheckInclude{a}{true}
+\CheckInclude{b}{false}
+\CheckInclude{c}{false}
+%</test10>
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+%<*test11>
+\Stack{?xxyxxN}
+\CheckAnswer{askinclude-a}
+\begin{filecontents*}{\jobname.aux}
+\relax
+\end{filecontents*}
+\begin{filecontents*}{\jobname-aux.aux}
+\relax|space
+\gdef\AskInc@Answer{}
+\gdef\AskInc@MatchMethod{}
+|AddList
+|AddFile
+\AskInc@AddFile{askinclude-a}
+\gdef\AskInc@Answer{askinclude-a}
+\@input{askinclude-a.aux}
+\AskInc@AddFile{askinclude-b}
+\@input{askinclude-b.aux}
+\AskInc@AddFile{askinclude-c}
+\@input{askinclude-c.aux}
+\@EndChecks
+\end{filecontents*}
+\begin{document}
+\CheckInclude{a}{true}
+\CheckInclude{b}{false}
+\CheckInclude{c}{false}
+%</test11>
+%    \end{macrocode}
+%
+% \subsection{Second run tests}
+%
+%    \begin{macrocode}
+%<*test12>
+\Stack{{}}
+\CheckAnswer{askinclude-b}
+\begin{filecontents*}{\jobname.aux}
+\gdef\AskInc@Answer{askinclude-b}
+\gdef\AskInc@MatchMethod{}
+|AddList
+|AddFile
+\AskInc@AddFile{askinclude-a}
+\AskInc@AddFile{askinclude-b}
+\AskInc@AddFile{askinclude-c}
+\end{filecontents*}
+\begin{filecontents*}{\jobname-aux.aux}
+\relax|space
+\gdef\AskInc@Answer{askinclude-b}
+\gdef\AskInc@MatchMethod{}
+|AddList
+|AddFile
+\AskInc@AddFile{askinclude-a}
+\@input{askinclude-a.aux}
+\AskInc@AddFile{askinclude-b}
+\@input{askinclude-b.aux}
+\AskInc@AddFile{askinclude-c}
+\@input{askinclude-c.aux}
+\@EndChecks
+\end{filecontents*}
+\begin{document}
+\CheckInclude{a}{false}
+\CheckInclude{b}{true}
+\CheckInclude{c}{false}
+%</test12>
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+%<*test13>
+\Stack{{}}
+\CheckAnswer{askinclude-b}
+\begin{filecontents*}{\jobname.aux}
+\gdef\AskInc@Answer{askinclude-b}
+\gdef\AskInc@MatchMethod{}
+|AddList
+|AddFile
+\AskInc@AddFile{askinclude-a}
+\AskInc@AddFile{askinclude-b}
+\end{filecontents*}
+\begin{filecontents*}{\jobname-aux.aux}
+\relax|space
+\gdef\AskInc@Answer{askinclude-b}
+\gdef\AskInc@MatchMethod{}
+|AddList
+|AddFile
+\AskInc@AddFile{askinclude-a}
+\@input{askinclude-a.aux}
+\AskInc@AddFile{askinclude-b}
+\@input{askinclude-b.aux}
+\AskInc@AddFile{askinclude-c}
+\@input{askinclude-c.aux}
+\@EndChecks
+\end{filecontents*}
+\begin{document}
+\CheckInclude{a}{false}
+\CheckInclude{b}{true}
+\CheckInclude{c}{false}
+%</test13>
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+%<*test14>
+\Stack{{}}
+\CheckAnswer{*}
+\begin{filecontents*}{\jobname.aux}
+\gdef\AskInc@Answer{*}
+\gdef\AskInc@MatchMethod{}
+|AddList
+|AddFile
+\AskInc@AddFile{askinclude-a}
+\AskInc@AddFile{askinclude-b}
+\end{filecontents*}
+\begin{filecontents*}{\jobname-aux.aux}
+\relax|space
+\gdef\AskInc@Answer{*}
+\gdef\AskInc@MatchMethod{}
+|AddList
+|AddFile
+\AskInc@AddFile{askinclude-a}
+\@input{askinclude-a.aux}
+\AskInc@AddFile{askinclude-b}
+\@input{askinclude-b.aux}
+\AskInc@AddFile{askinclude-c}
+\@input{askinclude-c.aux}
+\@EndChecks
+\end{filecontents*}
+\begin{document}
+\CheckInclude{a}{true}
+\CheckInclude{b}{true}
+\CheckInclude{c}{true}
+%</test14>
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+%<*test15>
+\Stack{?D}
+\CheckAnswer{askinclude-a,askinclude-c}
+\begin{filecontents*}{\jobname.aux}
+\gdef\AskInc@Answer{askinclude-a}
+\gdef\AskInc@MatchMethod{}
+|AddList
+|AddFile
+\AskInc@AddFile{askinclude-a}
+\AskInc@AddFile{askinclude-b}
+\end{filecontents*}
+\begin{filecontents*}{\jobname-aux.aux}
+\relax|space
+\gdef\AskInc@Answer{}
+\gdef\AskInc@MatchMethod{}
+|AddList
+|AddFile
+\AskInc@AddFile{askinclude-a}
+\gdef\AskInc@Answer{askinclude-a}
+\@input{askinclude-a.aux}
+\AskInc@AddFile{askinclude-b}
+\@input{askinclude-b.aux}
+\AskInc@AddFile{askinclude-c}
+\gdef\AskInc@Answer{askinclude-a,askinclude-c}
+\@input{askinclude-c.aux}
+\@EndChecks
+\end{filecontents*}
+\begin{document}
+\CheckInclude{a}{true}
+\CheckInclude{b}{false}
+\CheckInclude{c}{true}
+%</test15>
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+%<*test16>
+\Stack{?A}
+\CheckAnswer{askinclude-a,askinclude-b,askinclude-c}
+\begin{filecontents*}{\jobname.aux}
+\gdef\AskInc@Answer{askinclude-a}
+\gdef\AskInc@MatchMethod{}
+|AddList
+|AddFile
+\AskInc@AddFile{askinclude-a}
+\AskInc@AddFile{askinclude-b}
+\end{filecontents*}
+\begin{filecontents*}{\jobname-aux.aux}
+\relax|space
+\gdef\AskInc@Answer{}
+\gdef\AskInc@MatchMethod{}
+|AddList
+|AddFile
+\AskInc@AddFile{askinclude-a}
+\gdef\AskInc@Answer{askinclude-a}
+\@input{askinclude-a.aux}
+\AskInc@AddFile{askinclude-b}
+\gdef\AskInc@Answer{askinclude-a,askinclude-b}
+\@input{askinclude-b.aux}
+\AskInc@AddFile{askinclude-c}
+\gdef\AskInc@Answer{askinclude-a,askinclude-b,askinclude-c}
+\@input{askinclude-c.aux}
+\@EndChecks
+\end{filecontents*}
+\begin{document}
+\CheckInclude{a}{true}
+\CheckInclude{b}{true}
+\CheckInclude{c}{true}
+%</test16>
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+%<*test17>
+\Stack{?N}
+\CheckAnswer{}
+\begin{filecontents*}{\jobname.aux}
+\gdef\AskInc@Answer{askinclude-a}
+\gdef\AskInc@MatchMethod{}
+|AddList
+|AddFile
+\AskInc@AddFile{askinclude-a}
+\AskInc@AddFile{askinclude-b}
+\end{filecontents*}
+\begin{filecontents*}{\jobname-aux.aux}
+\relax|space
+\gdef\AskInc@Answer{}
+\gdef\AskInc@MatchMethod{}
+|AddList
+|AddFile
+\AskInc@AddFile{askinclude-a}
+\@input{askinclude-a.aux}
+\AskInc@AddFile{askinclude-b}
+\@input{askinclude-b.aux}
+\AskInc@AddFile{askinclude-c}
+\@input{askinclude-c.aux}
+\@EndChecks
+\end{filecontents*}
+\begin{document}
+\CheckInclude{a}{false}
+\CheckInclude{b}{false}
+\CheckInclude{c}{false}
+%</test17>
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+%<*test18>
+\Stack{}
+\CheckAnswer{askinclude-a}
+\begin{filecontents*}{\jobname.aux}
+\gdef\AskInc@Answer{askinclude-a}
+\gdef\AskInc@MatchMethod{}
+|AddList
+|AddFile
+\AskInc@AddFile{askinclude-a}
+\AskInc@AddFile{askinclude-b}
+\end{filecontents*}
+\begin{filecontents*}{\jobname-aux.aux}
+\relax|space
+\gdef\AskInc@Answer{askinclude-a}
+\gdef\AskInc@MatchMethod{}
+|AddList
+|AddFile
+\AskInc@AddFile{askinclude-a}
+\@input{askinclude-a.aux}
+\AskInc@AddFile{askinclude-b}
+\@input{askinclude-b.aux}
+\AskInc@AddFile{askinclude-c}
+\@input{askinclude-c.aux}
+\@EndChecks
+\end{filecontents*}
+\begin{document}
+\CheckInclude{a}{false}
+\CheckInclude{b}{true}
+\CheckInclude{c}{false}
+%</test18>
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+%<*test19>
+\Stack{?N}
+\CheckAnswer{}
+\begin{filecontents*}{\jobname.aux}
+\gdef\AskInc@Answer{askinclude-a}
+\gdef\AskInc@MatchMethod{}
+|AddList
+|AddFile
+\AskInc@AddFile{askinclude-a}
+\AskInc@AddFile{askinclude-b}
+\end{filecontents*}
+\begin{filecontents*}{\jobname-aux.aux}
+\relax|space
+\gdef\AskInc@Answer{}
+\gdef\AskInc@MatchMethod{}
+|AddList
+|AddFile
+\AskInc@AddFile{askinclude-a}
+\@input{askinclude-a.aux}
+\AskInc@AddFile{askinclude-b}
+\@input{askinclude-b.aux}
+\AskInc@AddFile{askinclude-c}
+\@input{askinclude-c.aux}
+\@EndChecks
+\end{filecontents*}
+\ifx\AtBeginDocumentMode Y%
+  \AtBeginDocument{\includeonly{askinclude-b}}%
+\else
+  \includeonly{askinclude-b}%
+\fi
+\begin{document}
+\CheckInclude{a}{false}
+\CheckInclude{b}{false}
+\CheckInclude{c}{false}
+%</test19>
+%    \end{macrocode}
+%
+% \subsection{Compatibility for changing from old to new}
+%
+%    \begin{macrocode}
+%<*test20>
+\Stack{{}}
+\CheckAnswer{*}
+\begin{filecontents*}{\jobname.aux}
+\@includeonly{*}
+\end{filecontents*}
+\begin{filecontents*}{\jobname-aux.aux}
+\relax|space
+\gdef\AskInc@Answer{*}
+\gdef\AskInc@MatchMethod{}
+|AddList
+|AddFile
+\AskInc@AddFile{askinclude-a}
+\@input{askinclude-a.aux}
+\AskInc@AddFile{askinclude-b}
+\@input{askinclude-b.aux}
+\AskInc@AddFile{askinclude-c}
+\@input{askinclude-c.aux}
+\@EndChecks
+\end{filecontents*}
+\begin{document}
+\CheckInclude{a}{true}
+\CheckInclude{b}{true}
+\CheckInclude{c}{true}
+%</test20>
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+%<*test21>
+\Stack{{}}
+\CheckAnswer{-}
+\begin{filecontents*}{\jobname.aux}
+\@includeonly{}
+\end{filecontents*}
+\begin{filecontents*}{\jobname-aux.aux}
+\relax|space
+\gdef\AskInc@Answer{-}
+\gdef\AskInc@MatchMethod{}
+|AddList
+|AddFile
+\AskInc@AddFile{askinclude-a}
+\@input{askinclude-a.aux}
+\AskInc@AddFile{askinclude-b}
+\@input{askinclude-b.aux}
+\AskInc@AddFile{askinclude-c}
+\@input{askinclude-c.aux}
+\@EndChecks
+\end{filecontents*}
+\begin{document}
+\CheckInclude{a}{false}
+\CheckInclude{b}{false}
+\CheckInclude{c}{false}
+%</test21>
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+%<*test22>
+\Stack{{}}
+\CheckAnswer{askinclude-a,askinclude-c}
+\begin{filecontents*}{\jobname.aux}
+\@includeonly{askinclude-a,askinclude-c}
+\end{filecontents*}
+\begin{filecontents*}{\jobname-aux.aux}
+\relax|space
+\gdef\AskInc@Answer{askinclude-a,askinclude-c}
+\gdef\AskInc@MatchMethod{}
+|AddList
+|AddFile
+\AskInc@AddFile{askinclude-a}
+\@input{askinclude-a.aux}
+\AskInc@AddFile{askinclude-b}
+\@input{askinclude-b.aux}
+\AskInc@AddFile{askinclude-c}
+\@input{askinclude-c.aux}
+\@EndChecks
+\end{filecontents*}
+\begin{document}
+\CheckInclude{a}{true}
+\CheckInclude{b}{false}
+\CheckInclude{c}{true}
+%</test22>
+%    \end{macrocode}
+%
+% \subsection{Regular expressions}
+%
+%    \begin{macrocode}
+%<*test23>
+\Stack{{makematch}{*,!askinclude-b}}
+\CheckAnswer{*,!askinclude-b}
+\CheckMatchMethod{makematch}
+\begin{filecontents*}{\jobname.aux}
+\relax
+\end{filecontents*}
+\begin{filecontents*}{\jobname-aux.aux}
+\relax|space
+\gdef\AskInc@Answer{*,!askinclude-b}
+\gdef\AskInc@MatchMethod{makematch}
+|AddList
+|AddFile
+\AskInc@AddFile{askinclude-a}
+|AddMatch
+\AskInc@AddMatch{askinclude-a}
+\@input{askinclude-a.aux}
+\AskInc@AddFile{askinclude-b}
+\@input{askinclude-b.aux}
+\AskInc@AddFile{askinclude-c}
+\AskInc@AddMatch{askinclude-c}
+\@input{askinclude-c.aux}
+\@EndChecks
+\end{filecontents*}
+\begin{document}
+\CheckInclude{a}{true}
+\CheckInclude{b}{false}
+\CheckInclude{c}{true}
+%</test23>
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+%<*test24>
+\Stack{{pdfmatch}{.,!askinclude-b}}
+\CheckAnswer{.,!askinclude-b}
+\CheckMatchMethod{pdfmatch}
+\begin{filecontents*}{\jobname.aux}
+\relax
+\end{filecontents*}
+\begin{filecontents*}{\jobname-aux.aux}
+\relax|space
+\gdef\AskInc@Answer{.,!askinclude-b}
+\gdef\AskInc@MatchMethod{pdfmatch}
+|AddList
+|AddFile
+\AskInc@AddFile{askinclude-a}
+|AddMatch
+\AskInc@AddMatch{askinclude-a}
+\@input{askinclude-a.aux}
+\AskInc@AddFile{askinclude-b}
+\@input{askinclude-b.aux}
+\AskInc@AddFile{askinclude-c}
+\AskInc@AddMatch{askinclude-c}
+\@input{askinclude-c.aux}
+\@EndChecks
+\end{filecontents*}
+\begin{document}
+\CheckInclude{a}{true}
+\CheckInclude{b}{false}
+\CheckInclude{c}{true}
+%</test24>
+%    \end{macrocode}
+%
+%
+% \subsection{Common end}
+%
+%    \begin{macrocode}
+%<*test0>
+\end{document}
+%</test0>
+%    \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/askinclude.dtx}] The source file.
+% \item[\CTAN{macros/latex/contrib/oberdiek/askinclude.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}
+% \emph{TDS} refers to the standard ``A Directory Structure
+% for \TeX\ Files'' (\CTAN{tds/tds.pdf}). Directories
+% with \xfile{texmf} in their name are usually organized this way.
+%
+% \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 askinclude.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}
+% \def\t{^^A
+% \begin{tabular}{@{}>{\ttfamily}l@{ $\rightarrow$ }>{\ttfamily}l@{}}
+%   askinclude.sty & tex/latex/oberdiek/askinclude.sty\\
+%   askinclude.pdf & doc/latex/oberdiek/askinclude.pdf\\
+%   test/askinclude-a.tex & doc/latex/oberdiek/test/askinclude-a.tex\\
+%   test/askinclude-b.tex & doc/latex/oberdiek/test/askinclude-b.tex\\
+%   test/askinclude-c.tex & doc/latex/oberdiek/test/askinclude-c.tex\\
+%   test/askinclude-test1.tex & doc/latex/oberdiek/test/askinclude-test1.tex\\
+%   test/askinclude-test2.tex & doc/latex/oberdiek/test/askinclude-test2.tex\\
+%   test/askinclude-test3.tex & doc/latex/oberdiek/test/askinclude-test3.tex\\
+%   test/askinclude-test4.tex & doc/latex/oberdiek/test/askinclude-test4.tex\\
+%   test/askinclude-test5.tex & doc/latex/oberdiek/test/askinclude-test5.tex\\
+%   test/askinclude-test6.tex & doc/latex/oberdiek/test/askinclude-test6.tex\\
+%   test/askinclude-test7.tex & doc/latex/oberdiek/test/askinclude-test7.tex\\
+%   test/askinclude-test8.tex & doc/latex/oberdiek/test/askinclude-test8.tex\\
+%   test/askinclude-test9.tex & doc/latex/oberdiek/test/askinclude-test9.tex\\
+%   test/askinclude-test10.tex & doc/latex/oberdiek/test/askinclude-test10.tex\\
+%   test/askinclude-test11.tex & doc/latex/oberdiek/test/askinclude-test11.tex\\
+%   test/askinclude-test12.tex & doc/latex/oberdiek/test/askinclude-test12.tex\\
+%   test/askinclude-test13.tex & doc/latex/oberdiek/test/askinclude-test13.tex\\
+%   test/askinclude-test14.tex & doc/latex/oberdiek/test/askinclude-test14.tex\\
+%   test/askinclude-test15.tex & doc/latex/oberdiek/test/askinclude-test15.tex\\
+%   test/askinclude-test16.tex & doc/latex/oberdiek/test/askinclude-test16.tex\\
+%   test/askinclude-test17.tex & doc/latex/oberdiek/test/askinclude-test17.tex\\
+%   test/askinclude-test18.tex & doc/latex/oberdiek/test/askinclude-test18.tex\\
+%   test/askinclude-test19.tex & doc/latex/oberdiek/test/askinclude-test19.tex\\
+%   test/askinclude-test20.tex & doc/latex/oberdiek/test/askinclude-test20.tex\\
+%   test/askinclude-test21.tex & doc/latex/oberdiek/test/askinclude-test21.tex\\
+%   test/askinclude-test22.tex & doc/latex/oberdiek/test/askinclude-test22.tex\\
+%   test/askinclude-test23.tex & doc/latex/oberdiek/test/askinclude-test23.tex\\
+%   test/askinclude-test24.tex & doc/latex/oberdiek/test/askinclude-test24.tex\\
+%   askinclude.dtx & source/latex/oberdiek/askinclude.dtx\\
+% \end{tabular}^^A
+% }^^A
+% \sbox0{\t}^^A
+% \ifdim\wd0>\linewidth
+%   \begingroup
+%     \advance\linewidth by\leftmargin
+%     \advance\linewidth by\rightmargin
+%   \edef\x{\endgroup
+%     \def\noexpand\lw{\the\linewidth}^^A
+%   }\x
+%   \def\lwbox{^^A
+%     \leavevmode
+%     \hbox to \linewidth{^^A
+%       \kern-\leftmargin\relax
+%       \hss
+%       \usebox0
+%       \hss
+%       \kern-\rightmargin\relax
+%     }^^A
+%   }^^A
+%   \ifdim\wd0>\lw
+%     \sbox0{\small\t}^^A
+%     \ifdim\wd0>\linewidth
+%       \ifdim\wd0>\lw
+%         \sbox0{\footnotesize\t}^^A
+%         \ifdim\wd0>\linewidth
+%           \ifdim\wd0>\lw
+%             \sbox0{\scriptsize\t}^^A
+%             \ifdim\wd0>\linewidth
+%               \ifdim\wd0>\lw
+%                 \sbox0{\tiny\t}^^A
+%                 \ifdim\wd0>\linewidth
+%                   \lwbox
+%                 \else
+%                   \usebox0
+%                 \fi
+%               \else
+%                 \lwbox
+%               \fi
+%             \else
+%               \usebox0
+%             \fi
+%           \else
+%             \lwbox
+%           \fi
+%         \else
+%           \usebox0
+%         \fi
+%       \else
+%         \lwbox
+%       \fi
+%     \else
+%       \usebox0
+%     \fi
+%   \else
+%     \lwbox
+%   \fi
+% \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 askinclude.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{askinclude.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 askinclude.dtx
+%makeindex -s gind.ist askinclude.idx
+%pdflatex askinclude.dtx
+%makeindex -s gind.ist askinclude.idx
+%pdflatex askinclude.dtx
+%\end{verbatim}
+% \end{quote}
+%
+% \section{Acknowledgement}
+%
+% \begin{description}
+% \item[Tom Scavo]
+%   suggested saving the include file list
+%   from the previous run and a simplified user interface.
+% \item[Joseph Wright] suggested questions for each \cs{include}.
+% \end{description}
+%
+% \begin{thebibliography}{9}
+% \bibitem{texlive}
+%   Posting in mailing list \verb|texlive@tug.org|\\
+%   From: Robin Fairbairns\\
+%   Subject: licence on includeonly.sty\\
+%   Date: Sat Oct 13 13:28:47 CEST 2007\\
+%   \url{http://www.tug.org/pipermail/tex-live/2007-October/014928.html}
+%
+% \bibitem{newsthread}
+%   Thread in newsgroup \xnewsgroup{comp.text.tex}\\
+%   From: Herbert Voss\\
+%   Subject: askinclude.sty\\
+%   Date: Mon, 15 Oct 2007 10:06:45 +0200\\
+%   Message-ID: \verb|fev72m$b35$02$2@news.t-online.com|\\
+%   \url{http://groups.google.com/group/comp.text.tex/browse_thread/thread/728a3e73c04c6789/349e31865c40d00c?\#349e31865c40d00c}
+%
+% \bibitem{makematch}
+%   David Kastrup:
+%   \textit{makematch.sty: Pattern matching with wildcards};
+%   2007/02/23;
+%   \CTAN{macros/latex/contrib/qstest/makematch.dtx}.
+%
+% \bibitem{excludeonly}
+%   Daniel H. Luecking, Donald Arsenau:
+%   \textit{excludeonly.sty: eponymous command opposite to \cs{includeonly}};
+%   2003/03/14;
+%   \CTAN{macros/latex/contrib/misc/excludeonly.sty}.
+%
+% \end{thebibliography}
+%
+% \begin{History}
+%   \begin{Version}{1991/11/05 v0.95}
+%   \item
+%     First beta-test version (asked two questions).
+%   \end{Version}
+%   \begin{Version}{1991/11/05 v0.99}
+%   \item
+%     Second beta-test version (asks one question; uses `|*|' and `|-|').
+%   \end{Version}
+%   \begin{Version}{1991/11/07 v1.0}
+%   \item
+%     Changed prompts (sent to \xnewsgroup{comp.text.tex}).
+%   \end{Version}
+%   \begin{Version}{1991/12/13 v1.1}
+%   \item
+%     \textit{Unknown}.
+%   \end{Version}
+%   \begin{Version}{1994/11/02 v1.2e}
+%   \item
+%     Two small changes to run under LaTeX2e [RF].
+%   \item
+%     Additional documentation [TRS].
+%   \end{Version}
+%   \begin{Version}{2007/10/15 v1.0 (askinc)}
+%   \item
+%     Reimplementation, published as \xpackage{askinc} in
+%     newsgroup \xnewsgroup{comp.text.tex}.
+%   \item
+%     Listing of included files, collected from the previous run before
+%     the question.
+%   \item
+%     No error message by \xfile{.aux} file if package is removed.
+%   \end{Version}
+%   \begin{Version}{2007/10/23 v2.0}
+%   \item
+%     The next version of \xpackage{askinc} becomes
+%     version 2.0 of \xpackage{askinclude}.
+%   \item
+%     `|?|' added for questioning each file.
+%   \item
+%     \cs{includeonly} has precedence until package loading.
+%     Then it is disabled by a warning.
+%   \item
+%     Documentation rewritten/added.
+%   \item
+%     Tests added.
+%   \end{Version}
+% \end{History}
+%
+% \PrintIndex
+%
+% \Finale
+\endinput
diff --git a/Master/texmf-dist/source/latex/oberdiek/atbegshi.dtx b/Master/texmf-dist/source/latex/oberdiek/atbegshi.dtx
index 8709755cd7f..39c56ce0ecc 100644
--- a/Master/texmf-dist/source/latex/oberdiek/atbegshi.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/atbegshi.dtx
@@ -54,9 +54,9 @@
 %    TDS:tex/generic/oberdiek/atbegshi.sty
 %    TDS:doc/latex/oberdiek/atbegshi.pdf
 %    TDS:doc/latex/oberdiek/atbegshi-example.tex
-%    TDS:doc/latex/oberdiek/atbegshi-test1.tex
-%    TDS:doc/latex/oberdiek/atbegshi-test2.tex
-%    TDS:doc/latex/oberdiek/atbegshi-test3.tex
+%    TDS:doc/latex/oberdiek/test/atbegshi-test1.tex
+%    TDS:doc/latex/oberdiek/test/atbegshi-test2.tex
+%    TDS:doc/latex/oberdiek/test/atbegshi-test3.tex
 %    TDS:source/latex/oberdiek/atbegshi.dtx
 %
 %<*ignore>
@@ -111,6 +111,7 @@ and the derived files
   \file{atbegshi.sty}{\from{atbegshi.dtx}{package}}%
   \usedir{doc/latex/oberdiek}%
   \file{atbegshi-example.tex}{\from{atbegshi.dtx}{example}}%
+  \usedir{doc/latex/oberdiek/test}%
   \file{atbegshi-test1.tex}{\from{atbegshi.dtx}{test1}}%
   \file{atbegshi-test2.tex}{\from{atbegshi.dtx}{test2}}%
   \file{atbegshi-test3.tex}{\from{atbegshi.dtx}{test3}}%
@@ -141,7 +142,7 @@ and the derived files
 \ProvidesFile{atbegshi.drv}%
   [2007/09/09 v1.6 At begin shipout hook (HO)]%
 \documentclass{ltxdoc}
-\usepackage{holtxdoc}
+\usepackage{holtxdoc}[2007/10/21]
 \begin{document}
   \DocInput{atbegshi.dtx}%
 \end{document}
@@ -1732,9 +1733,9 @@ Hello World
 %   atbegshi.sty & tex/generic/oberdiek/atbegshi.sty\\
 %   atbegshi.pdf & doc/latex/oberdiek/atbegshi.pdf\\
 %   atbegshi-example.tex & doc/latex/oberdiek/atbegshi-example.tex\\
-%   atbegshi-test1.tex & doc/latex/oberdiek/atbegshi-test1.tex\\
-%   atbegshi-test2.tex & doc/latex/oberdiek/atbegshi-test2.tex\\
-%   atbegshi-test3.tex & doc/latex/oberdiek/atbegshi-test3.tex\\
+%   test/atbegshi-test1.tex & doc/latex/oberdiek/test/atbegshi-test1.tex\\
+%   test/atbegshi-test2.tex & doc/latex/oberdiek/test/atbegshi-test2.tex\\
+%   test/atbegshi-test3.tex & doc/latex/oberdiek/test/atbegshi-test3.tex\\
 %   atbegshi.dtx & source/latex/oberdiek/atbegshi.dtx\\
 % \end{tabular}^^A
 % }^^A
diff --git a/Master/texmf-dist/source/latex/oberdiek/atenddvi.dtx b/Master/texmf-dist/source/latex/oberdiek/atenddvi.dtx
index 8c2455e655e..4068ec09ca1 100644
--- a/Master/texmf-dist/source/latex/oberdiek/atenddvi.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/atenddvi.dtx
@@ -128,7 +128,7 @@ and the derived files
 \ProvidesFile{atenddvi.drv}%
   [2007/04/17 v1.1 At end DVI hook (HO)]%
 \documentclass{ltxdoc}
-\usepackage{holtxdoc}
+\usepackage{holtxdoc}[2007/10/21]
 \begin{document}
   \DocInput{atenddvi.dtx}%
 \end{document}
diff --git a/Master/texmf-dist/source/latex/oberdiek/attachfile2.dtx b/Master/texmf-dist/source/latex/oberdiek/attachfile2.dtx
index 4f52381c348..456571eff25 100644
--- a/Master/texmf-dist/source/latex/oberdiek/attachfile2.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/attachfile2.dtx
@@ -140,7 +140,7 @@ and the derived files
 \ProvidesFile{attachfile2.drv}%
   [2007/04/11 v2.3 attach files into PDF (HO)]%
 \documentclass{ltxdoc}
-\usepackage{holtxdoc}
+\usepackage{holtxdoc}[2007/10/21]
 \AtBeginDocument{%
   \csname @ifpackageloaded\endcsname{dtx-attach}{%
     \embedfile[%
diff --git a/Master/texmf-dist/source/latex/oberdiek/auxhook.dtx b/Master/texmf-dist/source/latex/oberdiek/auxhook.dtx
index 8aa39aca79e..562a9b08efb 100644
--- a/Master/texmf-dist/source/latex/oberdiek/auxhook.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/auxhook.dtx
@@ -66,7 +66,7 @@
 \input docstrip.tex
 \Msg{************************************************************************}
 \Msg{* Installation}
-\Msg{* Package: auxhook 2006/04/06 v1.1 Hooks for auxiliary files (HO)}
+\Msg{* Package: auxhook 2007/04/06 v1.1 Hooks for auxiliary files (HO)}
 \Msg{************************************************************************}
 
 \keepsilent
@@ -126,9 +126,9 @@ and the derived files
 %<*driver>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{auxhook.drv}%
-  [2006/04/06 v1.1 Hooks for auxiliary files (HO)]%
+  [2007/04/06 v1.1 Hooks for auxiliary files (HO)]%
 \documentclass{ltxdoc}
-\usepackage{holtxdoc}
+\usepackage{holtxdoc}[2007/10/21]
 \begin{document}
   \DocInput{auxhook.dtx}%
 \end{document}
@@ -156,7 +156,7 @@ and the derived files
 % \GetFileInfo{auxhook.drv}
 %
 % \title{The \xpackage{auxhook} package}
-% \date{2006/04/06 v1.1}
+% \date{2007/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/04/06 v1.1 Hooks for auxiliary files (HO)]%
+  [2007/04/06 v1.1 Hooks for auxiliary files (HO)]%
 %    \end{macrocode}
 %
 % \subsection{Hook setup}
diff --git a/Master/texmf-dist/source/latex/oberdiek/bigintcalc.dtx b/Master/texmf-dist/source/latex/oberdiek/bigintcalc.dtx
index 28432ecc585..7faef5ce447 100644
--- a/Master/texmf-dist/source/latex/oberdiek/bigintcalc.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/bigintcalc.dtx
@@ -53,9 +53,9 @@
 % Installation:
 %    TDS:tex/generic/oberdiek/bigintcalc.sty
 %    TDS:doc/latex/oberdiek/bigintcalc.pdf
-%    TDS:doc/latex/oberdiek/bigintcalc-test1.tex
-%    TDS:doc/latex/oberdiek/bigintcalc-test2.tex
-%    TDS:doc/latex/oberdiek/bigintcalc-test3.tex
+%    TDS:doc/latex/oberdiek/test/bigintcalc-test1.tex
+%    TDS:doc/latex/oberdiek/test/bigintcalc-test2.tex
+%    TDS:doc/latex/oberdiek/test/bigintcalc-test3.tex
 %    TDS:source/latex/oberdiek/bigintcalc.dtx
 %
 %<*ignore>
@@ -108,7 +108,7 @@ and the derived files
   \file{bigintcalc.drv}{\from{bigintcalc.dtx}{driver}}%
   \usedir{tex/generic/oberdiek}%
   \file{bigintcalc.sty}{\from{bigintcalc.dtx}{package}}%
-  \usedir{doc/latex/oberdiek}%
+  \usedir{doc/latex/oberdiek/test}%
   \file{bigintcalc-test1.tex}{\from{bigintcalc.dtx}{test1}}%
   \file{bigintcalc-test2.tex}{\from{bigintcalc.dtx}{test2,etex}}%
   \file{bigintcalc-test3.tex}{\from{bigintcalc.dtx}{test2,noetex}}%
@@ -139,7 +139,7 @@ and the derived files
 \ProvidesFile{bigintcalc.drv}%
   [2007/09/27 v1.0 Expandable big integer calculations (HO)]%
 \documentclass{ltxdoc}
-\usepackage{holtxdoc}
+\usepackage{holtxdoc}[2007/10/21]
 \usepackage{wasysym}
 \let\iint\relax
 \let\iiint\relax
@@ -4235,9 +4235,9 @@ $ \BIC@Temp 9{18\or27\or36\or45\or54\or63\or72\or81}%
 % \begin{tabular}{@{}>{\ttfamily}l@{ $\rightarrow$ }>{\ttfamily}l@{}}
 %   bigintcalc.sty & tex/generic/oberdiek/bigintcalc.sty\\
 %   bigintcalc.pdf & doc/latex/oberdiek/bigintcalc.pdf\\
-%   bigintcalc-test1.tex & doc/latex/oberdiek/bigintcalc-test1.tex\\
-%   bigintcalc-test2.tex & doc/latex/oberdiek/bigintcalc-test2.tex\\
-%   bigintcalc-test3.tex & doc/latex/oberdiek/bigintcalc-test3.tex\\
+%   test/bigintcalc-test1.tex & doc/latex/oberdiek/test/bigintcalc-test1.tex\\
+%   test/bigintcalc-test2.tex & doc/latex/oberdiek/test/bigintcalc-test2.tex\\
+%   test/bigintcalc-test3.tex & doc/latex/oberdiek/test/bigintcalc-test3.tex\\
 %   bigintcalc.dtx & source/latex/oberdiek/bigintcalc.dtx\\
 % \end{tabular}^^A
 % }^^A
diff --git a/Master/texmf-dist/source/latex/oberdiek/bitset.dtx b/Master/texmf-dist/source/latex/oberdiek/bitset.dtx
index d9fc8439905..830cf24f26c 100644
--- a/Master/texmf-dist/source/latex/oberdiek/bitset.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/bitset.dtx
@@ -52,9 +52,9 @@
 % Installation:
 %    TDS:tex/generic/oberdiek/bitset.sty
 %    TDS:doc/latex/oberdiek/bitset.pdf
-%    TDS:doc/latex/oberdiek/bitset-test1.tex
-%    TDS:doc/latex/oberdiek/bitset-test2.tex
-%    TDS:doc/latex/oberdiek/bitset-test3.tex
+%    TDS:doc/latex/oberdiek/test/bitset-test1.tex
+%    TDS:doc/latex/oberdiek/test/bitset-test2.tex
+%    TDS:doc/latex/oberdiek/test/bitset-test3.tex
 %    TDS:source/latex/oberdiek/bitset.dtx
 %
 %<*ignore>
@@ -106,7 +106,7 @@ and the derived files
   \file{bitset.drv}{\from{bitset.dtx}{driver}}%
   \usedir{tex/generic/oberdiek}%
   \file{bitset.sty}{\from{bitset.dtx}{package}}%
-  \usedir{doc/latex/oberdiek}%
+  \usedir{doc/latex/oberdiek/test}%
   \file{bitset-test1.tex}{\from{bitset.dtx}{test1}}%
   \file{bitset-test2.tex}{\from{bitset.dtx}{test2,etex}}%
   \file{bitset-test3.tex}{\from{bitset.dtx}{test2,noetex}}%
@@ -137,7 +137,7 @@ and the derived files
 \ProvidesFile{bitset.drv}%
   [2007/09/28 v1.0 Data type bit set (HO)]%
 \documentclass{ltxdoc}
-\usepackage{holtxdoc}
+\usepackage{holtxdoc}[2007/10/21]
 \usepackage{amstext}
 \usepackage[T1]{fontenc}
 \usepackage{lmodern}
@@ -3937,9 +3937,9 @@ and the derived files
 % \begin{tabular}{@{}>{\ttfamily}l@{ $\rightarrow$ }>{\ttfamily}l@{}}
 %   bitset.sty & tex/generic/oberdiek/bitset.sty\\
 %   bitset.pdf & doc/latex/oberdiek/bitset.pdf\\
-%   bitset-test1.tex & doc/latex/oberdiek/bitset-test1.tex\\
-%   bitset-test2.tex & doc/latex/oberdiek/bitset-test2.tex\\
-%   bitset-test3.tex & doc/latex/oberdiek/bitset-test3.tex\\
+%   test/bitset-test1.tex & doc/latex/oberdiek/test/bitset-test1.tex\\
+%   test/bitset-test2.tex & doc/latex/oberdiek/test/bitset-test2.tex\\
+%   test/bitset-test3.tex & doc/latex/oberdiek/test/bitset-test3.tex\\
 %   bitset.dtx & source/latex/oberdiek/bitset.dtx\\
 % \end{tabular}^^A
 % }^^A
diff --git a/Master/texmf-dist/source/latex/oberdiek/bmpsize.dtx b/Master/texmf-dist/source/latex/oberdiek/bmpsize.dtx
index 1531bd66606..b85d24db910 100644
--- a/Master/texmf-dist/source/latex/oberdiek/bmpsize.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/bmpsize.dtx
@@ -73,7 +73,7 @@
 \input docstrip.tex
 \Msg{************************************************************************}
 \Msg{* Installation}
-\Msg{* Package: bmpsize 2007/04/29 v1.3 Extract size and resolution data from bitmap files (HO)}
+\Msg{* Package: bmpsize 2007/05/01 v1.3 Extract size and resolution data from bitmap files (HO)}
 \Msg{************************************************************************}
 
 \keepsilent
@@ -142,9 +142,9 @@ and the derived files
 %<*driver>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{bmpsize.drv}%
-  [2007/04/29 v1.3 Extract size and resolution data from bitmap files (HO)]%
+  [2007/05/01 v1.3 Extract size and resolution data from bitmap files (HO)]%
 \documentclass{ltxdoc}
-\usepackage{holtxdoc}
+\usepackage{holtxdoc}[2007/10/21]
 \begin{document}
   \DocInput{bmpsize.dtx}%
 \end{document}
@@ -172,7 +172,7 @@ and the derived files
 % \GetFileInfo{bmpsize.drv}
 %
 % \title{The \xpackage{bmpsize} package}
-% \date{2007/04/29 v1.3}
+% \date{2007/05/01 v1.3}
 % \author{Heiko Oberdiek\\\xemail{oberdiek@uni-freiburg.de}}
 %
 % \maketitle
@@ -368,7 +368,7 @@ and the derived files
 %    \begin{macrocode}
 %<*base>
 \ProvidesPackage{bmpsize-base}%
-  [2007/04/29 v1.3 Basic part of bmpsize (HO)]%
+  [2007/05/01 v1.3 Basic part of bmpsize (HO)]%
 %    \end{macrocode}
 %    Modules of package \xpackage{fp} are used for calculations.
 %    \begin{macrocode}
@@ -3015,7 +3015,7 @@ and the derived files
 %    \begin{macrocode}
 %<*package>
 \ProvidesPackage{bmpsize}%
-  [2007/04/29 v1.3 Extract size and resolution data from bitmap files (HO)]%
+  [2007/05/01 v1.3 Extract size and resolution data from bitmap files (HO)]%
 \RequirePackage{ifpdf}
 \ifpdf
   \PackageInfo{bmpsize}{Superseded by pdfTeX in PDF mode}%
@@ -3188,7 +3188,7 @@ and the derived files
 %    \begin{macrocode}
 %<*dvips>
 \ProvidesFile{bmpsize-dvips.def}%
-  [2007/04/29 v1.3 Graphics bitmap driver for dvips (HO)]%
+  [2007/05/01 v1.3 Graphics bitmap driver for dvips (HO)]%
 %    \end{macrocode}
 %    Ensure correct catcodes.
 %    \begin{macrocode}
@@ -3311,11 +3311,11 @@ and the derived files
 %    \begin{macrocode}
 %<*dvipdfm>
 \ProvidesFile{bmpsize-dvipdfm.def}%
-  [2007/04/29 v1.3 Graphics bitmap driver for dvipdfm (HO)]%
+  [2007/05/01 v1.3 Graphics bitmap driver for dvipdfm (HO)]%
 %</dvipdfm>
 %<*dvipdfmx>
 \ProvidesFile{bmpsize-dvipdfmx.def}%
-  [2007/04/29 v1.3 Graphics bitmap driver for dvipdfmx (HO)]%
+  [2007/05/01 v1.3 Graphics bitmap driver for dvipdfmx (HO)]%
 %</dvipdfmx>
 %<*dvipdfm|dvipdfmx>
 %    \end{macrocode}
diff --git a/Master/texmf-dist/source/latex/oberdiek/bookmark.dtx b/Master/texmf-dist/source/latex/oberdiek/bookmark.dtx
index e19f342e983..00bc1fc8eea 100644
--- a/Master/texmf-dist/source/latex/oberdiek/bookmark.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/bookmark.dtx
@@ -151,7 +151,7 @@ and the derived files
 \ProvidesFile{bookmark.drv}%
   [2007/09/25 v1.2 PDF bookmarks (HO)]%
 \documentclass{ltxdoc}
-\usepackage{holtxdoc}
+\usepackage{holtxdoc}[2007/10/21]
 \begin{document}
   \DocInput{bookmark.dtx}%
 \end{document}
diff --git a/Master/texmf-dist/source/latex/oberdiek/catchfile.dtx b/Master/texmf-dist/source/latex/oberdiek/catchfile.dtx
index ca87b190bad..8185adb83d8 100644
--- a/Master/texmf-dist/source/latex/oberdiek/catchfile.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/catchfile.dtx
@@ -53,9 +53,9 @@
 % Installation:
 %    TDS:tex/generic/oberdiek/catchfile.sty
 %    TDS:doc/latex/oberdiek/catchfile.pdf
-%    TDS:doc/latex/oberdiek/catchfile-test1.tex
-%    TDS:doc/latex/oberdiek/catchfile-test2.tex
-%    TDS:doc/latex/oberdiek/catchfile-test3.tex
+%    TDS:doc/latex/oberdiek/test/catchfile-test1.tex
+%    TDS:doc/latex/oberdiek/test/catchfile-test2.tex
+%    TDS:doc/latex/oberdiek/test/catchfile-test3.tex
 %    TDS:source/latex/oberdiek/catchfile.dtx
 %
 %<*ignore>
@@ -108,7 +108,7 @@ and the derived files
   \file{catchfile.drv}{\from{catchfile.dtx}{driver}}%
   \usedir{tex/generic/oberdiek}%
   \file{catchfile.sty}{\from{catchfile.dtx}{package}}%
-  \usedir{doc/latex/oberdiek}%
+  \usedir{doc/latex/oberdiek/test}%
   \file{catchfile-test1.tex}{\from{catchfile.dtx}{test1}}%
   \file{catchfile-test2.tex}{\from{catchfile.dtx}{test2}}%
   \file{catchfile-test3.tex}{\from{catchfile.dtx}{test3}}%
@@ -139,7 +139,7 @@ and the derived files
 \ProvidesFile{catchfile.drv}%
   [2007/09/09 v1.1 Catches the contents of a file (HO)]%
 \documentclass{ltxdoc}
-\usepackage{holtxdoc}
+\usepackage{holtxdoc}[2007/10/21]
 \begin{document}
   \DocInput{catchfile.dtx}%
 \end{document}
@@ -659,9 +659,9 @@ and the derived files
 % \begin{tabular}{@{}>{\ttfamily}l@{ $\rightarrow$ }>{\ttfamily}l@{}}
 %   catchfile.sty & tex/generic/oberdiek/catchfile.sty\\
 %   catchfile.pdf & doc/latex/oberdiek/catchfile.pdf\\
-%   catchfile-test1.tex & doc/latex/oberdiek/catchfile-test1.tex\\
-%   catchfile-test2.tex & doc/latex/oberdiek/catchfile-test2.tex\\
-%   catchfile-test3.tex & doc/latex/oberdiek/catchfile-test3.tex\\
+%   test/catchfile-test1.tex & doc/latex/oberdiek/test/catchfile-test1.tex\\
+%   test/catchfile-test2.tex & doc/latex/oberdiek/test/catchfile-test2.tex\\
+%   test/catchfile-test3.tex & doc/latex/oberdiek/test/catchfile-test3.tex\\
 %   catchfile.dtx & source/latex/oberdiek/catchfile.dtx\\
 % \end{tabular}^^A
 % }^^A
diff --git a/Master/texmf-dist/source/latex/oberdiek/centernot.dtx b/Master/texmf-dist/source/latex/oberdiek/centernot.dtx
index d83553b6df3..ccbb7a66c75 100644
--- a/Master/texmf-dist/source/latex/oberdiek/centernot.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/centernot.dtx
@@ -128,7 +128,7 @@ and the derived files
 \ProvidesFile{centernot.drv}%
   [2007/05/31 v1.1 Centers the not symbol horizontally (HO)]%
 \documentclass{ltxdoc}
-\usepackage{holtxdoc}
+\usepackage{holtxdoc}[2007/10/21]
 \usepackage{centernot}
 \usepackage{amssymb}
 \DeclareFontFamily{U}{matha}{\hyphenchar\font45}
diff --git a/Master/texmf-dist/source/latex/oberdiek/chemarr.dtx b/Master/texmf-dist/source/latex/oberdiek/chemarr.dtx
index 5a598a4d72d..d86dfb2f54a 100644
--- a/Master/texmf-dist/source/latex/oberdiek/chemarr.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/chemarr.dtx
@@ -133,7 +133,7 @@ and the derived files
 \ProvidesFile{chemarr.drv}%
   [2006/02/20 v1.2 Chemical reaction arrows (HO)]%
 \documentclass{ltxdoc}
-\usepackage{holtxdoc}
+\usepackage{holtxdoc}[2007/10/21]
 \usepackage{chemarr}
 \begin{document}
   \DocInput{chemarr.dtx}%
diff --git a/Master/texmf-dist/source/latex/oberdiek/classlist.dtx b/Master/texmf-dist/source/latex/oberdiek/classlist.dtx
index 17fa2ef4ede..0993f2c3b93 100644
--- a/Master/texmf-dist/source/latex/oberdiek/classlist.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/classlist.dtx
@@ -128,7 +128,7 @@ and the derived files
 \ProvidesFile{classlist.drv}%
   [2006/02/20 v1.2 Record loaded classes (HO)]%
 \documentclass{ltxdoc}
-\usepackage{holtxdoc}
+\usepackage{holtxdoc}[2007/10/21]
 \begin{document}
   \DocInput{classlist.dtx}%
 \end{document}
diff --git a/Master/texmf-dist/source/latex/oberdiek/colonequals.dtx b/Master/texmf-dist/source/latex/oberdiek/colonequals.dtx
index fab1da60832..cc1f04f34bd 100644
--- a/Master/texmf-dist/source/latex/oberdiek/colonequals.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/colonequals.dtx
@@ -128,7 +128,7 @@ and the derived files
 \ProvidesFile{colonequals.drv}%
   [2006/08/01 v1.0 Colon equals symbols (HO)]%
 \documentclass{ltxdoc}
-\usepackage{holtxdoc}
+\usepackage{holtxdoc}[2007/10/21]
 \usepackage{colonequals}
 \usepackage{array}
 \usepackage{capt-of}
diff --git a/Master/texmf-dist/source/latex/oberdiek/dvipscol.dtx b/Master/texmf-dist/source/latex/oberdiek/dvipscol.dtx
index 3494cb322bd..0d479a144a0 100644
--- a/Master/texmf-dist/source/latex/oberdiek/dvipscol.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/dvipscol.dtx
@@ -128,7 +128,7 @@ and the derived files
 \ProvidesFile{dvipscol.drv}%
   [2006/02/20 v1.1 Fix for dvips.def (HO)]%
 \documentclass{ltxdoc}
-\usepackage{holtxdoc}
+\usepackage{holtxdoc}[2007/10/21]
 \begin{document}
   \DocInput{dvipscol.dtx}%
 \end{document}
diff --git a/Master/texmf-dist/source/latex/oberdiek/embedfile.dtx b/Master/texmf-dist/source/latex/oberdiek/embedfile.dtx
index c2ce95e1f4a..2d29417de97 100644
--- a/Master/texmf-dist/source/latex/oberdiek/embedfile.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/embedfile.dtx
@@ -56,9 +56,9 @@
 %    TDS:tex/latex/oberdiek/dtx-attach.sty
 %    TDS:doc/latex/oberdiek/embedfile.pdf
 %    TDS:doc/latex/oberdiek/embedfile-example-plain.tex
-%    TDS:doc/latex/oberdiek/embedfile-test1.tex
-%    TDS:doc/latex/oberdiek/embedfile-test2.tex
-%    TDS:doc/latex/oberdiek/embedfile-test3.tex
+%    TDS:doc/latex/oberdiek/test/embedfile-test1.tex
+%    TDS:doc/latex/oberdiek/test/embedfile-test2.tex
+%    TDS:doc/latex/oberdiek/test/embedfile-test3.tex
 %    TDS:source/latex/oberdiek/embedfile.dtx
 %
 %<*ignore>
@@ -115,6 +115,7 @@ and the derived files
   \file{dtx-attach.sty}{\from{embedfile.dtx}{dtxattach}}%
   \usedir{doc/latex/oberdiek}%
   \file{embedfile-example-plain.tex}{\from{embedfile.dtx}{exampleplain}}%
+  \usedir{doc/latex/oberdiek/test}%
   \file{embedfile-test1.tex}{\from{embedfile.dtx}{test1}}%
   \file{embedfile-test2.tex}{\from{embedfile.dtx}{test2}}%
   \file{embedfile-test3.tex}{\from{embedfile.dtx}{test3}}%
@@ -145,7 +146,7 @@ and the derived files
 \ProvidesFile{embedfile.drv}%
   [2007/09/09 v1.2 embed files into PDF (HO)]%
 \documentclass{ltxdoc}
-\usepackage{holtxdoc}
+\usepackage{holtxdoc}[2007/10/21]
 \begin{document}
   \DocInput{embedfile.dtx}%
 \end{document}
@@ -984,9 +985,9 @@ Test (plain-\TeX): {\tt embedfile.dtx} should be embedded.%
 %   dtx-attach.sty & tex/latex/oberdiek/dtx-attach.sty\\
 %   embedfile.pdf & doc/latex/oberdiek/embedfile.pdf\\
 %   embedfile-example-plain.tex & doc/latex/oberdiek/embedfile-example-plain.tex\\
-%   embedfile-test1.tex & doc/latex/oberdiek/embedfile-test1.tex\\
-%   embedfile-test2.tex & doc/latex/oberdiek/embedfile-test2.tex\\
-%   embedfile-test3.tex & doc/latex/oberdiek/embedfile-test3.tex\\
+%   test/embedfile-test1.tex & doc/latex/oberdiek/test/embedfile-test1.tex\\
+%   test/embedfile-test2.tex & doc/latex/oberdiek/test/embedfile-test2.tex\\
+%   test/embedfile-test3.tex & doc/latex/oberdiek/test/embedfile-test3.tex\\
 %   embedfile.dtx & source/latex/oberdiek/embedfile.dtx\\
 % \end{tabular}^^A
 % }^^A
diff --git a/Master/texmf-dist/source/latex/oberdiek/engord.dtx b/Master/texmf-dist/source/latex/oberdiek/engord.dtx
index a5398f82a4a..2a35d9e6287 100644
--- a/Master/texmf-dist/source/latex/oberdiek/engord.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/engord.dtx
@@ -53,7 +53,7 @@
 % Installation:
 %    TDS:tex/generic/oberdiek/engord.sty
 %    TDS:doc/latex/oberdiek/engord.pdf
-%    TDS:doc/latex/oberdiek/engord-test1.tex
+%    TDS:doc/latex/oberdiek/test/engord-test1.tex
 %    TDS:source/latex/oberdiek/engord.dtx
 %
 %<*ignore>
@@ -106,7 +106,7 @@ and the derived files
   \file{engord.drv}{\from{engord.dtx}{driver}}%
   \usedir{tex/generic/oberdiek}%
   \file{engord.sty}{\from{engord.dtx}{package}}%
-  \usedir{doc/latex/oberdiek}%
+  \usedir{doc/latex/oberdiek/test}%
   \file{engord-test1.tex}{\from{engord.dtx}{test1}}%
 }
 
@@ -135,7 +135,7 @@ and the derived files
 \ProvidesFile{engord.drv}%
   [2007/09/20 v1.6 Provides English ordinal numbers (HO)]%
 \documentclass{ltxdoc}
-\usepackage{holtxdoc}
+\usepackage{holtxdoc}[2007/10/21]
 \begin{document}
   \DocInput{engord.dtx}%
 \end{document}
@@ -699,7 +699,7 @@ and the derived files
 % \begin{tabular}{@{}>{\ttfamily}l@{ $\rightarrow$ }>{\ttfamily}l@{}}
 %   engord.sty & tex/generic/oberdiek/engord.sty\\
 %   engord.pdf & doc/latex/oberdiek/engord.pdf\\
-%   engord-test1.tex & doc/latex/oberdiek/engord-test1.tex\\
+%   test/engord-test1.tex & doc/latex/oberdiek/test/engord-test1.tex\\
 %   engord.dtx & source/latex/oberdiek/engord.dtx\\
 % \end{tabular}^^A
 % }^^A
diff --git a/Master/texmf-dist/source/latex/oberdiek/epstopdf.dtx b/Master/texmf-dist/source/latex/oberdiek/epstopdf.dtx
index 05430f0de5a..c1057bc7edb 100644
--- a/Master/texmf-dist/source/latex/oberdiek/epstopdf.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/epstopdf.dtx
@@ -53,7 +53,7 @@
 % Installation:
 %    TDS:tex/latex/oberdiek/epstopdf.sty
 %    TDS:doc/latex/oberdiek/epstopdf.pdf
-%    TDS:doc/latex/oberdiek/epstopdf-test1.tex
+%    TDS:doc/latex/oberdiek/test/epstopdf-test1.tex
 %    TDS:source/latex/oberdiek/epstopdf.dtx
 %
 %<*ignore>
@@ -106,7 +106,7 @@ and the derived files
   \file{epstopdf.drv}{\from{epstopdf.dtx}{driver}}%
   \usedir{tex/latex/oberdiek}%
   \file{epstopdf.sty}{\from{epstopdf.dtx}{package}}%
-  \usedir{doc/latex/oberdiek}%
+  \usedir{doc/latex/oberdiek/test}%
   \file{epstopdf-test1.tex}{\from{epstopdf.dtx}{test1}}%
 }
 
@@ -135,7 +135,7 @@ and the derived files
 \ProvidesFile{epstopdf.drv}%
   [2007/10/02 v1.5 Conversion with epstopdf on the fly (HO)]%
 \documentclass{ltxdoc}
-\usepackage{holtxdoc}
+\usepackage{holtxdoc}[2007/10/21]
 \begin{document}
   \DocInput{epstopdf.dtx}%
 \end{document}
@@ -883,7 +883,7 @@ and the derived files
 % \begin{tabular}{@{}>{\ttfamily}l@{ $\rightarrow$ }>{\ttfamily}l@{}}
 %   epstopdf.sty & tex/latex/oberdiek/epstopdf.sty\\
 %   epstopdf.pdf & doc/latex/oberdiek/epstopdf.pdf\\
-%   epstopdf-test1.tex & doc/latex/oberdiek/epstopdf-test1.tex\\
+%   test/epstopdf-test1.tex & doc/latex/oberdiek/test/epstopdf-test1.tex\\
 %   epstopdf.dtx & source/latex/oberdiek/epstopdf.dtx\\
 % \end{tabular}^^A
 % }^^A
diff --git a/Master/texmf-dist/source/latex/oberdiek/etexcmds.dtx b/Master/texmf-dist/source/latex/oberdiek/etexcmds.dtx
index d2e94c4b67f..0d989897b1d 100644
--- a/Master/texmf-dist/source/latex/oberdiek/etexcmds.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/etexcmds.dtx
@@ -53,10 +53,10 @@
 % Installation:
 %    TDS:tex/generic/oberdiek/etexcmds.sty
 %    TDS:doc/latex/oberdiek/etexcmds.pdf
-%    TDS:doc/latex/oberdiek/etexcmds-test1.tex
-%    TDS:doc/latex/oberdiek/etexcmds-test2.tex
-%    TDS:doc/latex/oberdiek/etexcmds-test3.tex
-%    TDS:doc/latex/oberdiek/etexcmds-test4.tex
+%    TDS:doc/latex/oberdiek/test/etexcmds-test1.tex
+%    TDS:doc/latex/oberdiek/test/etexcmds-test2.tex
+%    TDS:doc/latex/oberdiek/test/etexcmds-test3.tex
+%    TDS:doc/latex/oberdiek/test/etexcmds-test4.tex
 %    TDS:source/latex/oberdiek/etexcmds.dtx
 %
 %<*ignore>
@@ -72,7 +72,7 @@
 \input docstrip.tex
 \Msg{************************************************************************}
 \Msg{* Installation}
-\Msg{* Package: etexcmds 2007/09/09 v1.1 Providing prefix for e-TeX command names (HO)}
+\Msg{* Package: etexcmds 2007/09/09 v1.1 Prefix for e-TeX command names (HO)}
 \Msg{************************************************************************}
 
 \keepsilent
@@ -109,7 +109,7 @@ and the derived files
   \file{etexcmds.drv}{\from{etexcmds.dtx}{driver}}%
   \usedir{tex/generic/oberdiek}%
   \file{etexcmds.sty}{\from{etexcmds.dtx}{package}}%
-  \usedir{doc/latex/oberdiek}%
+  \usedir{doc/latex/oberdiek/test}%
   \file{etexcmds-test1.tex}{\from{etexcmds.dtx}{test1}}%
   \file{etexcmds-test2.tex}{\from{etexcmds.dtx}{test2}}%
   \file{etexcmds-test3.tex}{\from{etexcmds.dtx}{test3}}%
@@ -139,9 +139,9 @@ and the derived files
 %<*driver>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{etexcmds.drv}%
-  [2007/09/09 v1.1 Providing prefix for e-TeX command names (HO)]%
+  [2007/09/09 v1.1 Prefix for e-TeX command names (HO)]%
 \documentclass{ltxdoc}
-\usepackage{holtxdoc}
+\usepackage{holtxdoc}[2007/10/21]
 \begin{document}
   \DocInput{etexcmds.dtx}%
 \end{document}
@@ -271,7 +271,7 @@ and the derived files
   \fi
 \expandafter\x\csname ver@etexcmds.sty\endcsname
 \ProvidesPackage{etexcmds}%
-  [2007/09/09 v1.1 Providing prefix for e-TeX command names (HO)]
+  [2007/09/09 v1.1 Prefix for e-TeX command names (HO)]
 %    \end{macrocode}
 %
 % \subsection{Catcodes}
@@ -529,10 +529,10 @@ and the derived files
 % \begin{tabular}{@{}>{\ttfamily}l@{ $\rightarrow$ }>{\ttfamily}l@{}}
 %   etexcmds.sty & tex/generic/oberdiek/etexcmds.sty\\
 %   etexcmds.pdf & doc/latex/oberdiek/etexcmds.pdf\\
-%   etexcmds-test1.tex & doc/latex/oberdiek/etexcmds-test1.tex\\
-%   etexcmds-test2.tex & doc/latex/oberdiek/etexcmds-test2.tex\\
-%   etexcmds-test3.tex & doc/latex/oberdiek/etexcmds-test3.tex\\
-%   etexcmds-test4.tex & doc/latex/oberdiek/etexcmds-test4.tex\\
+%   test/etexcmds-test1.tex & doc/latex/oberdiek/test/etexcmds-test1.tex\\
+%   test/etexcmds-test2.tex & doc/latex/oberdiek/test/etexcmds-test2.tex\\
+%   test/etexcmds-test3.tex & doc/latex/oberdiek/test/etexcmds-test3.tex\\
+%   test/etexcmds-test4.tex & doc/latex/oberdiek/test/etexcmds-test4.tex\\
 %   etexcmds.dtx & source/latex/oberdiek/etexcmds.dtx\\
 % \end{tabular}^^A
 % }^^A
diff --git a/Master/texmf-dist/source/latex/oberdiek/flags.dtx b/Master/texmf-dist/source/latex/oberdiek/flags.dtx
index 39631fb0ea9..f9be7467a64 100644
--- a/Master/texmf-dist/source/latex/oberdiek/flags.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/flags.dtx
@@ -128,7 +128,7 @@ and the derived files
 \ProvidesFile{flags.drv}%
   [2007/09/30 v0.4 Flag setting in bit fields (HO)]%
 \documentclass{ltxdoc}
-\usepackage{holtxdoc}
+\usepackage{holtxdoc}[2007/10/21]
 \begin{document}
   \DocInput{flags.dtx}%
 \end{document}
diff --git a/Master/texmf-dist/source/latex/oberdiek/grfext.dtx b/Master/texmf-dist/source/latex/oberdiek/grfext.dtx
index 643ed026f97..48b3d7e2ccc 100644
--- a/Master/texmf-dist/source/latex/oberdiek/grfext.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/grfext.dtx
@@ -52,8 +52,8 @@
 % Installation:
 %    TDS:tex/latex/oberdiek/grfext.sty
 %    TDS:doc/latex/oberdiek/grfext.pdf
-%    TDS:doc/latex/oberdiek/grfext-test1.tex
-%    TDS:doc/latex/oberdiek/grfext-test2.tex
+%    TDS:doc/latex/oberdiek/test/grfext-test1.tex
+%    TDS:doc/latex/oberdiek/test/grfext-test2.tex
 %    TDS:source/latex/oberdiek/grfext.dtx
 %
 %<*ignore>
@@ -105,7 +105,7 @@ and the derived files
   \file{grfext.drv}{\from{grfext.dtx}{driver}}%
   \usedir{tex/latex/oberdiek}%
   \file{grfext.sty}{\from{grfext.dtx}{package}}%
-  \usedir{doc/latex/oberdiek}%
+  \usedir{doc/latex/oberdiek/test}%
   \file{grfext-test1.tex}{\from{grfext.dtx}{test1}}%
   \file{grfext-test2.tex}{\from{grfext.dtx}{test2}}%
 }
@@ -135,7 +135,7 @@ and the derived files
 \ProvidesFile{grfext.drv}%
   [2007/09/30 v1.0 Managing graphics extensions (HO)]%
 \documentclass{ltxdoc}
-\usepackage{holtxdoc}
+\usepackage{holtxdoc}[2007/10/21]
 \begin{document}
   \DocInput{grfext.dtx}%
 \end{document}
@@ -830,8 +830,8 @@ and the derived files
 % \begin{tabular}{@{}>{\ttfamily}l@{ $\rightarrow$ }>{\ttfamily}l@{}}
 %   grfext.sty & tex/latex/oberdiek/grfext.sty\\
 %   grfext.pdf & doc/latex/oberdiek/grfext.pdf\\
-%   grfext-test1.tex & doc/latex/oberdiek/grfext-test1.tex\\
-%   grfext-test2.tex & doc/latex/oberdiek/grfext-test2.tex\\
+%   test/grfext-test1.tex & doc/latex/oberdiek/test/grfext-test1.tex\\
+%   test/grfext-test2.tex & doc/latex/oberdiek/test/grfext-test2.tex\\
 %   grfext.dtx & source/latex/oberdiek/grfext.dtx\\
 % \end{tabular}^^A
 % }^^A
diff --git a/Master/texmf-dist/source/latex/oberdiek/grffile.dtx b/Master/texmf-dist/source/latex/oberdiek/grffile.dtx
index 0f5dc8745ff..a41250581b5 100644
--- a/Master/texmf-dist/source/latex/oberdiek/grffile.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/grffile.dtx
@@ -128,7 +128,7 @@ and the derived files
 \ProvidesFile{grffile.drv}%
   [2007/08/16 v1.5 Extended file name support for graphics (HO)]%
 \documentclass{ltxdoc}
-\usepackage{holtxdoc}
+\usepackage{holtxdoc}[2007/10/21]
 \begin{document}
   \DocInput{grffile.dtx}%
 \end{document}
diff --git a/Master/texmf-dist/source/latex/oberdiek/holtxdoc.dtx b/Master/texmf-dist/source/latex/oberdiek/holtxdoc.dtx
index dac8723d0f9..a77c3cae342 100644
--- a/Master/texmf-dist/source/latex/oberdiek/holtxdoc.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/holtxdoc.dtx
@@ -1,6 +1,6 @@
 % \iffalse meta-comment
 %
-% Copyright (C) 1999-2006 by Heiko Oberdiek <oberdiek@uni-freiburg.de>
+% Copyright (C) 1999-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
@@ -66,7 +66,7 @@
 \input docstrip.tex
 \Msg{************************************************************************}
 \Msg{* Installation}
-\Msg{* Package: holtxdoc 2006/06/02 v0.7 Private additional ltxdoc support (HO)}
+\Msg{* Package: holtxdoc 2007/10/21 v0.8 Private additional ltxdoc support (HO)}
 \Msg{************************************************************************}
 
 \keepsilent
@@ -76,7 +76,7 @@
 
 This is a generated file.
 
-Copyright (C) 1999-2006 by Heiko Oberdiek <oberdiek@uni-freiburg.de>
+Copyright (C) 1999-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{holtxdoc.drv}%
-  [2006/06/02 v0.7 Private additional ltxdoc support (HO)]%
+  [2007/10/21 v0.8 Private additional ltxdoc support (HO)]%
 \documentclass{ltxdoc}
-\usepackage{holtxdoc}
+\usepackage{holtxdoc}[2007/10/21]
 \begin{document}
   \DocInput{holtxdoc.dtx}%
 \end{document}
 %</driver>
 % \fi
 %
-% \CheckSum{240}
+% \CheckSum{266}
 %
 % \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{holtxdoc.drv}
 %
 % \title{The \xpackage{holtxdoc} package}
-% \date{2006/06/02 v0.7}
+% \date{2007/10/21 v0.8}
 % \author{Heiko Oberdiek\\\xemail{oberdiek@uni-freiburg.de}}
 %
 % \maketitle
@@ -196,7 +196,7 @@ and the derived files
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{holtxdoc}%
-  [2006/06/02 v0.7 Private additional ltxdoc support (HO)]
+  [2007/10/21 v0.8 Private additional ltxdoc support (HO)]
 %    \end{macrocode}
 %
 %    \begin{macrocode}
@@ -352,6 +352,24 @@ and the derived files
 \providecommand*{\eTeX}{\mbox{$\varepsilon$-\TeX}}
 \providecommand*{\pdfTeX}{pdf\TeX}
 \providecommand*{\pdfLaTeX}{pdf\LaTeX}
+\def\@temp#1#2{%
+  \providecommand*{#1}{%
+    \begingroup
+      X%
+      \@ifundefined{rotatebox}{e}{%
+        \lower0.5ex\hbox{%
+          \setbox0=\hbox{E}%
+          \dimen0=\ht0 %
+          \advance\dimen0 by \dp0 %
+          \raise\dimen0\hbox{\rotatebox{180}{\box0}}%
+        }%
+      }%
+      #2%
+    \endgroup
+  }%
+}
+\@temp\XeTeX\TeX
+\@temp\XeLaTeX\LaTeX
 \providecommand*{\teTeX}{te\TeX}
 \providecommand*{\mikTeX}{mik\TeX}
 \providecommand*{\MakeIndex}{\textsl{MakeIndex}}
@@ -594,6 +612,10 @@ and the derived files
 %   \item
 %     Major change: most is put into a new package \xpackage{hypdoc}.
 %   \end{Version}
+%   \begin{Version}{2007/10/21 v0.8}
+%   \item
+%     \cs{XeTeX} and \cs{XeLaTeX} added.
+%   \end{Version}
 % \end{History}
 %
 % \PrintIndex
diff --git a/Master/texmf-dist/source/latex/oberdiek/hycolor.dtx b/Master/texmf-dist/source/latex/oberdiek/hycolor.dtx
index 582f287166d..6773beb52f7 100644
--- a/Master/texmf-dist/source/latex/oberdiek/hycolor.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/hycolor.dtx
@@ -52,8 +52,8 @@
 % 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:doc/latex/oberdiek/test/hycolor-test1.tex
+%    TDS:doc/latex/oberdiek/test/hycolor-test2.tex
 %    TDS:source/latex/oberdiek/hycolor.dtx
 %
 %<*ignore>
@@ -105,7 +105,7 @@ and the derived files
   \file{hycolor.drv}{\from{hycolor.dtx}{driver}}%
   \usedir{tex/latex/oberdiek}%
   \file{hycolor.sty}{\from{hycolor.dtx}{package}}%
-  \usedir{doc/latex/oberdiek}%
+  \usedir{doc/latex/oberdiek/test}%
   \file{hycolor-test1.tex}{\from{hycolor.dtx}{test,test1}}%
   \file{hycolor-test2.tex}{\from{hycolor.dtx}{test,test2}}%
 }
@@ -135,7 +135,7 @@ and the derived files
 \ProvidesFile{hycolor.drv}%
   [2007/04/11 v1.1 Code for color options of hyperref/bookmark (HO)]%
 \documentclass{ltxdoc}
-\usepackage{holtxdoc}
+\usepackage{holtxdoc}[2007/10/21]
 \usepackage[ruled]{algorithm2e}
 
 \makeatletter
@@ -1397,8 +1397,8 @@ and the derived files
 % \begin{tabular}{@{}>{\ttfamily}l@{ $\rightarrow$ }>{\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\\
+%   test/hycolor-test1.tex & doc/latex/oberdiek/test/hycolor-test1.tex\\
+%   test/hycolor-test2.tex & doc/latex/oberdiek/test/hycolor-test2.tex\\
 %   hycolor.dtx & source/latex/oberdiek/hycolor.dtx\\
 % \end{tabular}^^A
 % }^^A
diff --git a/Master/texmf-dist/source/latex/oberdiek/hypbmsec.dtx b/Master/texmf-dist/source/latex/oberdiek/hypbmsec.dtx
index 2bd47a42786..ff602303c20 100644
--- a/Master/texmf-dist/source/latex/oberdiek/hypbmsec.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/hypbmsec.dtx
@@ -130,7 +130,7 @@ and the derived files
 \ProvidesFile{hypbmsec.drv}%
   [2007/04/11 v2.4 Bookmarks in sectioning commands (HO)]%
 \documentclass{ltxdoc}
-\usepackage{holtxdoc}
+\usepackage{holtxdoc}[2007/10/21]
 \begin{document}
   \DocInput{hypbmsec.dtx}%
 \end{document}
diff --git a/Master/texmf-dist/source/latex/oberdiek/hypcap.dtx b/Master/texmf-dist/source/latex/oberdiek/hypcap.dtx
index aee84cf8f25..fcf8afc7be0 100644
--- a/Master/texmf-dist/source/latex/oberdiek/hypcap.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/hypcap.dtx
@@ -130,7 +130,7 @@ and the derived files
 \ProvidesFile{hypcap.drv}%
   [2007/04/09 v1.7 Adjusting anchors of captions (HO)]%
 \documentclass{ltxdoc}
-\usepackage{holtxdoc}
+\usepackage{holtxdoc}[2007/10/21]
 \begin{document}
   \DocInput{hypcap.dtx}%
 \end{document}
diff --git a/Master/texmf-dist/source/latex/oberdiek/hypdestopt.dtx b/Master/texmf-dist/source/latex/oberdiek/hypdestopt.dtx
index 426adabbeb1..10546cac666 100644
--- a/Master/texmf-dist/source/latex/oberdiek/hypdestopt.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/hypdestopt.dtx
@@ -128,7 +128,7 @@ and the derived files
 \ProvidesFile{hypdestopt.drv}%
   [2006/06/01 v2.0 Hyperref destination optimizer (HO)]%
 \documentclass{ltxdoc}
-\usepackage{holtxdoc}
+\usepackage{holtxdoc}[2007/10/21]
 \begin{document}
   \DocInput{hypdestopt.dtx}%
 \end{document}
diff --git a/Master/texmf-dist/source/latex/oberdiek/hypdoc.dtx b/Master/texmf-dist/source/latex/oberdiek/hypdoc.dtx
index b5909672545..a591f297412 100644
--- a/Master/texmf-dist/source/latex/oberdiek/hypdoc.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/hypdoc.dtx
@@ -130,7 +130,7 @@ and the derived files
 \ProvidesFile{hypdoc.drv}%
   [2007/04/11 v1.5 Hyper extensions for doc.sty (HO)]%
 \documentclass{ltxdoc}
-\usepackage{holtxdoc}
+\usepackage{holtxdoc}[2007/10/21]
 \begin{document}
   \DocInput{hypdoc.dtx}%
 \end{document}
diff --git a/Master/texmf-dist/source/latex/oberdiek/ifdraft.dtx b/Master/texmf-dist/source/latex/oberdiek/ifdraft.dtx
index 1a9383cc958..6a5332ac4e5 100644
--- a/Master/texmf-dist/source/latex/oberdiek/ifdraft.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/ifdraft.dtx
@@ -130,7 +130,7 @@ and the derived files
 \ProvidesFile{ifdraft.drv}%
   [2006/02/20 v1.2 Switch for option draft (HO)]%
 \documentclass{ltxdoc}
-\usepackage{holtxdoc}
+\usepackage{holtxdoc}[2007/10/21]
 \begin{document}
   \DocInput{ifdraft.dtx}%
 \end{document}
diff --git a/Master/texmf-dist/source/latex/oberdiek/iflang.dtx b/Master/texmf-dist/source/latex/oberdiek/iflang.dtx
index 94a700a37b5..198e19160f7 100644
--- a/Master/texmf-dist/source/latex/oberdiek/iflang.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/iflang.dtx
@@ -53,11 +53,11 @@
 % 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:doc/latex/oberdiek/iflang-test4.tex
-%    TDS:doc/latex/oberdiek/iflang-test5.tex
+%    TDS:doc/latex/oberdiek/test/iflang-test1.tex
+%    TDS:doc/latex/oberdiek/test/iflang-test2.tex
+%    TDS:doc/latex/oberdiek/test/iflang-test3.tex
+%    TDS:doc/latex/oberdiek/test/iflang-test4.tex
+%    TDS:doc/latex/oberdiek/test/iflang-test5.tex
 %    TDS:source/latex/oberdiek/iflang.dtx
 %
 %<*ignore>
@@ -110,7 +110,7 @@ and the derived files
   \file{iflang.drv}{\from{iflang.dtx}{driver}}%
   \usedir{tex/generic/oberdiek}%
   \file{iflang.sty}{\from{iflang.dtx}{package}}%
-  \usedir{doc/latex/oberdiek}%
+  \usedir{doc/latex/oberdiek/test}%
   \file{iflang-test1.tex}{\from{iflang.dtx}{test1}}%
   \file{iflang-test2.tex}{\from{iflang.dtx}{test2}}%
   \file{iflang-test3.tex}{\from{iflang.dtx}{test3}}%
@@ -143,7 +143,7 @@ and the derived files
 \ProvidesFile{iflang.drv}%
   [2007/09/09 v1.4 Language checks (HO)]%
 \documentclass{ltxdoc}
-\usepackage{holtxdoc}
+\usepackage{holtxdoc}[2007/10/21]
 \begin{document}
   \DocInput{iflang.dtx}%
 \end{document}
@@ -918,11 +918,11 @@ and the derived files
 % \begin{tabular}{@{}>{\ttfamily}l@{ $\rightarrow$ }>{\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-test4.tex & doc/latex/oberdiek/iflang-test4.tex\\
-%   iflang-test5.tex & doc/latex/oberdiek/iflang-test5.tex\\
+%   test/iflang-test1.tex & doc/latex/oberdiek/test/iflang-test1.tex\\
+%   test/iflang-test2.tex & doc/latex/oberdiek/test/iflang-test2.tex\\
+%   test/iflang-test3.tex & doc/latex/oberdiek/test/iflang-test3.tex\\
+%   test/iflang-test4.tex & doc/latex/oberdiek/test/iflang-test4.tex\\
+%   test/iflang-test5.tex & doc/latex/oberdiek/test/iflang-test5.tex\\
 %   iflang.dtx & source/latex/oberdiek/iflang.dtx\\
 % \end{tabular}^^A
 % }^^A
diff --git a/Master/texmf-dist/source/latex/oberdiek/ifpdf.dtx b/Master/texmf-dist/source/latex/oberdiek/ifpdf.dtx
index 51c1870ecb6..44b9b080985 100644
--- a/Master/texmf-dist/source/latex/oberdiek/ifpdf.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/ifpdf.dtx
@@ -53,7 +53,7 @@
 % Installation:
 %    TDS:tex/generic/oberdiek/ifpdf.sty
 %    TDS:doc/latex/oberdiek/ifpdf.pdf
-%    TDS:doc/latex/oberdiek/ifpdf-test1.tex
+%    TDS:doc/latex/oberdiek/test/ifpdf-test1.tex
 %    TDS:source/latex/oberdiek/ifpdf.dtx
 %
 %<*ignore>
@@ -106,7 +106,7 @@ and the derived files
   \file{ifpdf.drv}{\from{ifpdf.dtx}{driver}}%
   \usedir{tex/generic/oberdiek}%
   \file{ifpdf.sty}{\from{ifpdf.dtx}{package}}%
-  \usedir{doc/latex/oberdiek}%
+  \usedir{doc/latex/oberdiek/test}%
   \file{ifpdf-test1.tex}{\from{ifpdf.dtx}{test1}}%
 }
 
@@ -135,7 +135,7 @@ and the derived files
 \ProvidesFile{ifpdf.drv}%
   [2007/09/09 v1.5 Provides the ifpdf switch (HO)]%
 \documentclass{ltxdoc}
-\usepackage{holtxdoc}
+\usepackage{holtxdoc}[2007/10/21]
 \begin{document}
   \DocInput{ifpdf.dtx}%
 \end{document}
@@ -599,7 +599,7 @@ and the derived files
 % \begin{tabular}{@{}>{\ttfamily}l@{ $\rightarrow$ }>{\ttfamily}l@{}}
 %   ifpdf.sty & tex/generic/oberdiek/ifpdf.sty\\
 %   ifpdf.pdf & doc/latex/oberdiek/ifpdf.pdf\\
-%   ifpdf-test1.tex & doc/latex/oberdiek/ifpdf-test1.tex\\
+%   test/ifpdf-test1.tex & doc/latex/oberdiek/test/ifpdf-test1.tex\\
 %   ifpdf.dtx & source/latex/oberdiek/ifpdf.dtx\\
 % \end{tabular}^^A
 % }^^A
diff --git a/Master/texmf-dist/source/latex/oberdiek/ifvtex.dtx b/Master/texmf-dist/source/latex/oberdiek/ifvtex.dtx
index 3b81603977f..ea42506f008 100644
--- a/Master/texmf-dist/source/latex/oberdiek/ifvtex.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/ifvtex.dtx
@@ -53,7 +53,7 @@
 % Installation:
 %    TDS:tex/generic/oberdiek/ifvtex.sty
 %    TDS:doc/latex/oberdiek/ifvtex.pdf
-%    TDS:doc/latex/oberdiek/ifvtex-test1.tex
+%    TDS:doc/latex/oberdiek/test/ifvtex-test1.tex
 %    TDS:source/latex/oberdiek/ifvtex.dtx
 %
 %<*ignore>
@@ -106,7 +106,7 @@ and the derived files
   \file{ifvtex.drv}{\from{ifvtex.dtx}{driver}}%
   \usedir{tex/generic/oberdiek}%
   \file{ifvtex.sty}{\from{ifvtex.dtx}{package}}%
-  \usedir{doc/latex/oberdiek}%
+  \usedir{doc/latex/oberdiek/test}%
   \file{ifvtex-test1.tex}{\from{ifvtex.dtx}{test1}}%
 }
 
@@ -135,7 +135,7 @@ and the derived files
 \ProvidesFile{ifvtex.drv}%
   [2007/09/09 v1.3 Switches for detecting VTeX and its modes (HO)]%
 \documentclass{ltxdoc}
-\usepackage{holtxdoc}
+\usepackage{holtxdoc}[2007/10/21]
 \begin{document}
   \DocInput{ifvtex.dtx}%
 \end{document}
@@ -546,7 +546,7 @@ and the derived files
 % \begin{tabular}{@{}>{\ttfamily}l@{ $\rightarrow$ }>{\ttfamily}l@{}}
 %   ifvtex.sty & tex/generic/oberdiek/ifvtex.sty\\
 %   ifvtex.pdf & doc/latex/oberdiek/ifvtex.pdf\\
-%   ifvtex-test1.tex & doc/latex/oberdiek/ifvtex-test1.tex\\
+%   test/ifvtex-test1.tex & doc/latex/oberdiek/test/ifvtex-test1.tex\\
 %   ifvtex.dtx & source/latex/oberdiek/ifvtex.dtx\\
 % \end{tabular}^^A
 % }^^A
diff --git a/Master/texmf-dist/source/latex/oberdiek/infwarerr.dtx b/Master/texmf-dist/source/latex/oberdiek/infwarerr.dtx
index 6d9adc0fae2..62ddbf4a7e6 100644
--- a/Master/texmf-dist/source/latex/oberdiek/infwarerr.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/infwarerr.dtx
@@ -53,9 +53,9 @@
 % Installation:
 %    TDS:tex/generic/oberdiek/infwarerr.sty
 %    TDS:doc/latex/oberdiek/infwarerr.pdf
-%    TDS:doc/latex/oberdiek/infwarerr-test1.tex
-%    TDS:doc/latex/oberdiek/infwarerr-test2.tex
-%    TDS:doc/latex/oberdiek/infwarerr-test3.tex
+%    TDS:doc/latex/oberdiek/test/infwarerr-test1.tex
+%    TDS:doc/latex/oberdiek/test/infwarerr-test2.tex
+%    TDS:doc/latex/oberdiek/test/infwarerr-test3.tex
 %    TDS:source/latex/oberdiek/infwarerr.dtx
 %
 %<*ignore>
@@ -108,7 +108,7 @@ and the derived files
   \file{infwarerr.drv}{\from{infwarerr.dtx}{driver}}%
   \usedir{tex/generic/oberdiek}%
   \file{infwarerr.sty}{\from{infwarerr.dtx}{package}}%
-  \usedir{doc/latex/oberdiek}%
+  \usedir{doc/latex/oberdiek/test}%
   \file{infwarerr-test1.tex}{\from{infwarerr.dtx}{test1}}%
   \file{infwarerr-test2.tex}{\from{infwarerr.dtx}{test2}}%
   \file{infwarerr-test3.tex}{\from{infwarerr.dtx}{test3}}%
@@ -139,7 +139,7 @@ and the derived files
 \ProvidesFile{infwarerr.drv}%
   [2007/09/09 v1.2 Providing info/warning/message (HO)]%
 \documentclass{ltxdoc}
-\usepackage{holtxdoc}
+\usepackage{holtxdoc}[2007/10/21]
 \begin{document}
   \DocInput{infwarerr.dtx}%
 \end{document}
@@ -934,9 +934,9 @@ and the derived files
 % \begin{tabular}{@{}>{\ttfamily}l@{ $\rightarrow$ }>{\ttfamily}l@{}}
 %   infwarerr.sty & tex/generic/oberdiek/infwarerr.sty\\
 %   infwarerr.pdf & doc/latex/oberdiek/infwarerr.pdf\\
-%   infwarerr-test1.tex & doc/latex/oberdiek/infwarerr-test1.tex\\
-%   infwarerr-test2.tex & doc/latex/oberdiek/infwarerr-test2.tex\\
-%   infwarerr-test3.tex & doc/latex/oberdiek/infwarerr-test3.tex\\
+%   test/infwarerr-test1.tex & doc/latex/oberdiek/test/infwarerr-test1.tex\\
+%   test/infwarerr-test2.tex & doc/latex/oberdiek/test/infwarerr-test2.tex\\
+%   test/infwarerr-test3.tex & doc/latex/oberdiek/test/infwarerr-test3.tex\\
 %   infwarerr.dtx & source/latex/oberdiek/infwarerr.dtx\\
 % \end{tabular}^^A
 % }^^A
diff --git a/Master/texmf-dist/source/latex/oberdiek/inputenx.dtx b/Master/texmf-dist/source/latex/oberdiek/inputenx.dtx
index 002832059c4..bc39dfd4523 100644
--- a/Master/texmf-dist/source/latex/oberdiek/inputenx.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/inputenx.dtx
@@ -235,7 +235,7 @@ and the derived files
 \ProvidesFile{inputenx.drv}%
   [2007/08/16 v1.3 Enhanced input encoding handling (HO)]%
 \documentclass{ltxdoc}
-\usepackage{holtxdoc}
+\usepackage{holtxdoc}[2007/10/21]
 \usepackage{longtable}
 \begin{document}
   \DocInput{inputenx.dtx}%
diff --git a/Master/texmf-dist/source/latex/oberdiek/intcalc.dtx b/Master/texmf-dist/source/latex/oberdiek/intcalc.dtx
index 30cee2ecbee..4d06f648ad4 100644
--- a/Master/texmf-dist/source/latex/oberdiek/intcalc.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/intcalc.dtx
@@ -53,10 +53,10 @@
 % Installation:
 %    TDS:tex/generic/oberdiek/intcalc.sty
 %    TDS:doc/latex/oberdiek/intcalc.pdf
-%    TDS:doc/latex/oberdiek/intcalc-test1.tex
-%    TDS:doc/latex/oberdiek/intcalc-test2.tex
-%    TDS:doc/latex/oberdiek/intcalc-test3.tex
-%    TDS:doc/latex/oberdiek/intcalc-test4.tex
+%    TDS:doc/latex/oberdiek/test/intcalc-test1.tex
+%    TDS:doc/latex/oberdiek/test/intcalc-test2.tex
+%    TDS:doc/latex/oberdiek/test/intcalc-test3.tex
+%    TDS:doc/latex/oberdiek/test/intcalc-test4.tex
 %    TDS:source/latex/oberdiek/intcalc.dtx
 %
 %<*ignore>
@@ -109,7 +109,7 @@ and the derived files
   \file{intcalc.drv}{\from{intcalc.dtx}{driver}}%
   \usedir{tex/generic/oberdiek}%
   \file{intcalc.sty}{\from{intcalc.dtx}{package}}%
-  \usedir{doc/latex/oberdiek}%
+  \usedir{doc/latex/oberdiek/test}%
   \file{intcalc-test1.tex}{\from{intcalc.dtx}{test1}}%
   \file{intcalc-test2.tex}{\from{intcalc.dtx}{test2,etex}}%
   \file{intcalc-test3.tex}{\from{intcalc.dtx}{test2,noetex}}%
@@ -141,7 +141,7 @@ and the derived files
 \ProvidesFile{intcalc.drv}%
   [2007/09/27 v1.1 Expandable integer calculations (HO)]%
 \documentclass{ltxdoc}
-\usepackage{holtxdoc}
+\usepackage{holtxdoc}[2007/10/21]
 \usepackage{wasysym}
 \let\iint\relax
 \let\iiint\relax
@@ -4000,10 +4000,10 @@ and the derived files
 % \begin{tabular}{@{}>{\ttfamily}l@{ $\rightarrow$ }>{\ttfamily}l@{}}
 %   intcalc.sty & tex/generic/oberdiek/intcalc.sty\\
 %   intcalc.pdf & doc/latex/oberdiek/intcalc.pdf\\
-%   intcalc-test1.tex & doc/latex/oberdiek/intcalc-test1.tex\\
-%   intcalc-test2.tex & doc/latex/oberdiek/intcalc-test2.tex\\
-%   intcalc-test3.tex & doc/latex/oberdiek/intcalc-test3.tex\\
-%   intcalc-test4.tex & doc/latex/oberdiek/intcalc-test4.tex\\
+%   test/intcalc-test1.tex & doc/latex/oberdiek/test/intcalc-test1.tex\\
+%   test/intcalc-test2.tex & doc/latex/oberdiek/test/intcalc-test2.tex\\
+%   test/intcalc-test3.tex & doc/latex/oberdiek/test/intcalc-test3.tex\\
+%   test/intcalc-test4.tex & doc/latex/oberdiek/test/intcalc-test4.tex\\
 %   intcalc.dtx & source/latex/oberdiek/intcalc.dtx\\
 % \end{tabular}^^A
 % }^^A
diff --git a/Master/texmf-dist/source/latex/oberdiek/kvoptions.dtx b/Master/texmf-dist/source/latex/oberdiek/kvoptions.dtx
index 9148014c921..e7b9e0a0f57 100644
--- a/Master/texmf-dist/source/latex/oberdiek/kvoptions.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/kvoptions.dtx
@@ -18,7 +18,8 @@
 % This work consists of the main source file kvoptions.dtx
 % and the derived files
 %    kvoptions.sty, kvoptions.pdf, kvoptions.ins, kvoptions.drv,
-%    example-mycolorsetup.sty, kvoptions-test1.tex.
+%    kvoptions-patch.sty, example-mycolorsetup.sty,
+%    kvoptions-test1.tex, kvoptions-test2.tex.
 %
 % Distribution:
 %    CTAN:macros/latex/contrib/oberdiek/kvoptions.dtx
@@ -52,9 +53,11 @@
 %
 % Installation:
 %    TDS:tex/latex/oberdiek/kvoptions.sty
+%    TDS:tex/latex/oberdiek/kvoptions-patch.sty
 %    TDS:doc/latex/oberdiek/kvoptions.pdf
 %    TDS:doc/latex/oberdiek/example-mycolorsetup.sty
-%    TDS:doc/latex/oberdiek/kvoptions-test1.tex
+%    TDS:doc/latex/oberdiek/test/kvoptions-test1.tex
+%    TDS:doc/latex/oberdiek/test/kvoptions-test2.tex
 %    TDS:source/latex/oberdiek/kvoptions.dtx
 %
 %<*ignore>
@@ -70,7 +73,7 @@
 \input docstrip.tex
 \Msg{************************************************************************}
 \Msg{* Installation}
-\Msg{* Package: kvoptions 2007/10/02 v2.8 Connects package keyval with LaTeX options (HO)}
+\Msg{* Package: kvoptions 2007/10/18 v3.0 Keyval support for LaTeX options (HO)}
 \Msg{************************************************************************}
 
 \keepsilent
@@ -98,7 +101,8 @@ This Current Maintainer of this work is Heiko Oberdiek.
 This work consists of the main source file kvoptions.dtx
 and the derived files
    kvoptions.sty, kvoptions.pdf, kvoptions.ins, kvoptions.drv,
-   example-mycolorsetup.sty, kvoptions-test1.tex.
+   kvoptions-patch.sty, example-mycolorsetup.sty,
+   kvoptions-test1.tex, kvoptions-test2.tex.
 
 \endpreamble
 
@@ -107,18 +111,21 @@ and the derived files
   \file{kvoptions.drv}{\from{kvoptions.dtx}{driver}}%
   \usedir{tex/latex/oberdiek}%
   \file{kvoptions.sty}{\from{kvoptions.dtx}{package}}%
+  \file{kvoptions-patch.sty}{\from{kvoptions.dtx}{patch}}%
   \usedir{doc/latex/oberdiek}%
   \file{example-mycolorsetup.sty}{\from{kvoptions.dtx}{example}}%
+  \usedir{doc/latex/oberdiek/test}%
   \file{kvoptions-test1.tex}{\from{kvoptions.dtx}{test1}}%
+  \file{kvoptions-test2.tex}{\from{kvoptions.dtx}{test2}}%
 }
 
 \obeyspaces
 \Msg{************************************************************************}
 \Msg{*}
 \Msg{* To finish the installation you have to move the following}
-\Msg{* file into a directory searched by TeX:}
+\Msg{* files into a directory searched by TeX:}
 \Msg{*}
-\Msg{*     kvoptions.sty}
+\Msg{*     kvoptions.sty, kvoptions-patch.sty}
 \Msg{*}
 \Msg{* To produce the documentation run the file `kvoptions.drv'}
 \Msg{* through LaTeX.}
@@ -135,16 +142,16 @@ and the derived files
 %<*driver>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{kvoptions.drv}%
-  [2007/10/02 v2.8 Connects package keyval with LaTeX options (HO)]%
+  [2007/10/18 v3.0 Keyval support for LaTeX options (HO)]%
 \documentclass{ltxdoc}
-\usepackage{holtxdoc}
+\usepackage{holtxdoc}[2007/10/21]
 \begin{document}
   \DocInput{kvoptions.dtx}%
 \end{document}
 %</driver>
 % \fi
 %
-% \CheckSum{1741}
+% \CheckSum{1866}
 %
 % \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
@@ -165,7 +172,7 @@ and the derived files
 % \GetFileInfo{kvoptions.drv}
 %
 % \title{The \xpackage{kvoptions} package}
-% \date{2007/10/02 v2.8}
+% \date{2007/10/18 v3.0}
 % \author{Heiko Oberdiek\\\xemail{oberdiek@uni-freiburg.de}}
 %
 % \maketitle
@@ -641,7 +648,7 @@ and the derived files
     % Package identification
     % -----------------------
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{example-mycolorsetup}[2007/10/02 Managing my colors]
+\ProvidesPackage{example-mycolorsetup}[2007/10/18 Managing my colors]
 
 \RequirePackage{ifpdf}
 \RequirePackage{kvoptions}
@@ -749,7 +756,9 @@ and the derived files
 % Thus package and class authors, stay with |\RequirePackage{kvoptions}|
 % without options.
 %
-% \subsection{Option \xoption{patch}}
+% Option \xoption{patch} loads package \xpackage{kvoptions-patch}.
+%
+% \subsection{Package \xpackage{kvoptions-patch}}
 %
 % \LaTeX's system of package/class options has some severe limitations
 % that especially affects the value part if options are used as
@@ -852,31 +861,33 @@ and the derived files
 % \section{Limitations}
 %
 % \subsection{Compatibility}
-% \subsubsection{Option \xoption{patch} vs. package \xpackage{xkvltxp}}
+% \subsubsection{Package \xpackage{kvoptions-patch} vs. package \xpackage{xkvltxp}}
 %
 % Package \xpackage{xkvltxp} from the \xpackage{xkeyval} project
-% has the same goal as \xpackage{kvoptions}'s
-% option \xoption{patch} and patches \LaTeX's kernel commands.
+% has the same goal as package \xpackage{kvoptions-patch}
+% and to patch \LaTeX's kernel commands in order to get better support
+% for key value options.
 % Of course they cannot be used both. The user must decide, which
-% method he prefers. Package \xpackage{kvoptions} drops option
-% \xoption{patch} if it detects that \xpackage{xkvltxp} is
+% method he prefers. Package \xpackage{kvoptions-patch} aborts itself,
+% if it detects that \xpackage{xkvltxp} is
 % already loaded.
 %
-% However both \emph{packages} can be used together, example:
+% However package \xpackage{xkvltxp} and \xpackage{kvoptions}
+% can be used together, example:
 % \begin{quote}
 % |\usepackage{xkvltxp}|\\
 % |\usepackage[...]{foobar} % |\texttt{\itshape foobar using kvoptions}
 % \end{quote}
 % The other way should work, too.
 %
-% Package \xpackage{kvoptions} tries to catch more situations
+% Package \xpackage{kvoptions-patch} tries to catch more situations
 % and to be more robust.
 % For example, during the comparison of options it normalizes
 % them by removing spaces around |=| and the value. Thus the
 % following is not reported as option clash:
 % \begin{quote}
 %\begin{verbatim}
-%\RequirePackage[patch]{kvoptions}
+%\RequirePackage{kvoptions-patch}
 %\documentclass{article}
 %
 %\usepackage[scaled=0.7]{helvet}
@@ -903,9 +914,9 @@ and the derived files
 % |\usepackage[0.95]{helvet}|
 % \end{quote}
 %
-% \subsubsection{Option list parsing with option \xoption{patch}}
+% \subsubsection{Option list parsing with package \xpackage{kvoptions-patch}}
 %
-% With option \xoption{patch} the range of possible values
+% With package \xpackage{kvoptions-patch} the range of possible values
 % in key value specifications is much large, for example
 % the comma can be used, if enclosed in curly braces.
 %
@@ -922,7 +933,7 @@ and the derived files
 %
 % Example:
 % \begin{quote}
-% |\RequirePackage[patch]{kvoptions}|\\
+% |\RequirePackage{kvoptions-patch}|\\
 % |\documentclass[a={a,b,c},b]{article}|\\
 % |\begin{document}|\\
 % |\end{document}|
@@ -1002,7 +1013,7 @@ and the derived files
   \fi
 \expandafter\x\csname ver@kvoptions.sty\endcsname
 \ProvidesPackage{kvoptions}%
-  [2007/10/02 v2.8 Connects package keyval with LaTeX options (HO)]
+  [2007/10/18 v3.0 Keyval support for LaTeX options (HO)]
 %    \end{macrocode}
 %
 % \paragraph{Catcodes}
@@ -1027,6 +1038,7 @@ and the derived files
 \TMP@EnsureCode{41}{12}% )
 \TMP@EnsureCode{42}{12}% *
 \TMP@EnsureCode{44}{12}% ,
+\TMP@EnsureCode{45}{12}% -
 \TMP@EnsureCode{46}{12}% .
 \TMP@EnsureCode{47}{12}% /
 \TMP@EnsureCode{58}{12}% :
@@ -1081,7 +1093,11 @@ and the derived files
 %    \end{macrocode}
 %
 %    \begin{macrocode}
-\DeclareOption{patch}{\catcode\tw@=9 }
+\DeclareOption{patch}{%
+  \AtEndOfPackage{%
+    \RequirePackage{kvoptions-patch}[2007/10/18]%
+  }%
+}
 %    \end{macrocode}
 %
 %    Optionen auswerten:
@@ -1630,17 +1646,26 @@ and the derived files
         \@ifundefined{KV@#1@\expandafter\KVO@getkey
                       \KVO@CurrentOption=\@nil}{%
         }{%
-          \edef\KVO@temp{%
-^^B         \etex@unexpanded\expandafter{%
+          \ifx\KVO@Patch Y%
+            \edef\KVO@temp{%
+              \etex@unexpanded\expandafter{%
+                \KVO@temp
+              }%
+              ,%
+              \etex@unexpanded\expandafter{%
+                \KVO@CurrentOption
+              }%
+              ,%
+            }%
+            \@onelevel@sanitize\KVO@CurrentOption
+          \else
+            \edef\KVO@temp{%
               \KVO@temp
-^^B         }%
-            ,%
-^^B         \etex@unexpanded\expandafter{%
+              ,%
               \KVO@CurrentOption
-^^B         }%
-            ,%
-          }%
-^^B       \@onelevel@sanitize\KVO@CurrentOption
+              ,%
+            }%
+          \fi
           \@expandtwoargs\@removeelement\KVO@CurrentOption
             \@unusedoptionlist\@unusedoptionlist
         }%
@@ -1671,7 +1696,9 @@ and the derived files
 %    \end{macrocode}
 %    A class puts not used options in the unused option list.
 %    \begin{macrocode}
-^^B         \@onelevel@sanitize\CurrentOption
+            \ifx\KVO@Patch Y%
+              \@onelevel@sanitize\CurrentOption
+            \fi
             \ifx\@unusedoptionlist\@empty
               \global\let\@unusedoptionlist\CurrentOption
             \else
@@ -1794,43 +1821,76 @@ and the derived files
   \def\ProcessKeyvalOptions{%
     \@ifstar{}\@gobble
   }%
-  \catcode\tw@=14 %
 \fi
 %    \end{macrocode}
 %
-% \subsection{Patch}
-%
-%    Caution: docstrip stops at \cs{endinput} if it starts a line.
 %    \begin{macrocode}
-^^B\@gobbletwo
-\KVO@AtEnd\endinput
+\KVO@AtEnd
+%</package>
 %    \end{macrocode}
+%
+% \subsection{Package \xpackage{kvoptions-patch}}
+%
 %    \begin{macrocode}
-\PackageInfo{kvoptions}{Patching LaTeX's option system}
+%<*patch>
+\NeedsTeXFormat{LaTeX2e}
+\expandafter\edef\csname KVO@AtEnd\endcsname{%
+  \catcode64 \the\catcode64\relax
+}
+\catcode64 11 % @
+\def\TMP@EnsureCode#1#2{%
+  \edef\KVO@AtEnd{%
+    \KVO@AtEnd
+    \catcode#1 \the\catcode#1\relax
+  }%
+  \catcode#1 #2\relax
+}
+\TMP@EnsureCode{39}{12}% '
+\TMP@EnsureCode{40}{12}% (
+\TMP@EnsureCode{41}{12}% )
+\TMP@EnsureCode{43}{12}% +
+\TMP@EnsureCode{44}{12}% ,
+\TMP@EnsureCode{45}{12}% -
+\TMP@EnsureCode{46}{12}% .
+\TMP@EnsureCode{47}{12}% /
+\TMP@EnsureCode{58}{12}% :
+\TMP@EnsureCode{60}{12}% <
+\TMP@EnsureCode{61}{12}% =
+\TMP@EnsureCode{62}{12}% >
+\TMP@EnsureCode{91}{12}% [
+\TMP@EnsureCode{93}{12}% ]
+\TMP@EnsureCode{96}{12}% `
+\TMP@EnsureCode{124}{12}% |
+\edef\KVO@AtEnd{%
+  \KVO@AtEnd
+  \noexpand\endinput
+}
+\ProvidesPackage{kvoptions-patch}%
+  [2007/10/18 v3.0 LaTeX patch for keyval options (HO)]%
 %    \end{macrocode}
 %
 %    Check for \eTeX.
 %    \begin{macrocode}
 \begingroup\expandafter\expandafter\expandafter\endgroup
 \expandafter\ifx\csname eTeXversion\endcsname\relax
-  \PackageWarningNoLine{kvoptions}{%
-    Option `patch' ignored, because e-TeX is missing%
+  \PackageWarningNoLine{kvoptions-patch}{%
+    Package loading is aborted, because e-TeX is missing%
   }%
-  \expandafter\endinput
+  \expandafter\KVO@AtEnd
 \fi
 %    \end{macrocode}
 %
 %    Package \xpackage{etexcmds} for \cs{etex@unexpanded}.
 %    \begin{macrocode}
-\RequirePackage{etexcmds}
+\RequirePackage{etexcmds}[2007/09/09]
 \ifetex@unexpanded
 \else
-  \PackageError{kvoptions}{%
+  \PackageError{kvoptions-patch}{%
     Could not find eTeX's \string\unexpanded.\MessageBreak
     Try adding \string\RequirePackage\string{etexcmds\string} %
     before \string\documentclass%
   }\@ehd
-  \expandafter\endinput
+  \expandafter\KVO@AtEnd
 \fi
 %    \end{macrocode}
 %
@@ -1840,9 +1900,9 @@ and the derived files
   \PackageWarningNoLine{kvoptions}{%
     Option `patch' cannot be used together with\MessageBreak
     package `xkvltxp' that is already loaded.\MessageBreak
-    Therefore option `patch' will be ignored%
+    Therefore package loading is aborted%
   }%
-  \endinput
+  \KVO@AtEnd
 }{}
 %    \end{macrocode}
 %
@@ -2295,9 +2355,15 @@ and the derived files
 \fi
 %    \end{macrocode}
 %
+%    \begin{macro}{\KVO@Patch}
 %    \begin{macrocode}
-KVO@AtEnd
-%</package>
+\let\KVO@Patch=Y
+%    \end{macrocode}
+%    \end{macro}
+%
+%    \begin{macrocode}
+\KVO@AtEnd
+%</patch>
 %    \end{macrocode}
 %
 % \section{Test}
@@ -2362,6 +2428,54 @@ KVO@AtEnd
 %</test1>
 %    \end{macrocode}
 %
+%    \begin{macrocode}
+%<*test2>
+\NeedsTeXFormat{LaTeX2e}
+\makeatletter
+\catcode`\@=11 %
+\def\RestoreCatcodes{}
+\count@=0 %
+\loop
+  \edef\RestoreCatcodes{%
+    \RestoreCatcodes
+    \catcode\the\count@=\the\catcode\count@\relax
+  }%
+\ifnum\count@<255 %
+  \advance\count@\@ne
+\repeat
+
+\def\RangeCatcodeInvalid#1#2{%
+  \count@=#1\relax
+  \loop
+    \catcode\count@=15 %
+  \ifnum\count@<#2\relax
+    \advance\count@\@ne
+  \repeat
+}
+\def\Test#1{%
+  \RangeCatcodeInvalid{0}{47}%
+  \RangeCatcodeInvalid{58}{64}%
+  \RangeCatcodeInvalid{91}{96}%
+  \RangeCatcodeInvalid{123}{255}%
+  \catcode`\@=12 %
+  \catcode`\\=0 %
+  \catcode`\{=1 %
+  \catcode`\}=2 %
+  \catcode`\#=6 %
+  \catcode`\[=12 %
+  \catcode`\]=12 %
+  \catcode`\%=14 %
+  \catcode`\ =10 %
+  \catcode13=5 %
+  #1\relax
+  \RestoreCatcodes
+}
+\Test{\RequirePackage{kvoptions-patch}}%
+\Test{\RequirePackage{kvoptions}}%
+\csname @@end\endcsname
+%</test2>
+%    \end{macrocode}
+%
 % \section{Installation}
 %
 % \subsection{Download}
@@ -2422,9 +2536,11 @@ KVO@AtEnd
 % \def\t{^^A
 % \begin{tabular}{@{}>{\ttfamily}l@{ $\rightarrow$ }>{\ttfamily}l@{}}
 %   kvoptions.sty & tex/latex/oberdiek/kvoptions.sty\\
+%   kvoptions-patch.sty & tex/latex/oberdiek/kvoptions-patch.sty\\
 %   kvoptions.pdf & doc/latex/oberdiek/kvoptions.pdf\\
 %   example-mycolorsetup.sty & doc/latex/oberdiek/example-mycolorsetup.sty\\
-%   kvoptions-test1.tex & doc/latex/oberdiek/kvoptions-test1.tex\\
+%   test/kvoptions-test1.tex & doc/latex/oberdiek/test/kvoptions-test1.tex\\
+%   test/kvoptions-test2.tex & doc/latex/oberdiek/test/kvoptions-test2.tex\\
 %   kvoptions.dtx & source/latex/oberdiek/kvoptions.dtx\\
 % \end{tabular}^^A
 % }^^A
@@ -2647,6 +2763,14 @@ KVO@AtEnd
 %   \item
 %     Typos in documentation fixed (Axel Sommerfeldt).
 %   \end{Version}
+%   \begin{Version}{2007/10/11 v2.9}
+%   \item
+%     Bug fix for option \xoption{patch}.
+%   \end{Version}
+%   \begin{Version}{2007/10/18 v3.0}
+%   \item
+%     New package \xpackage{kvoptions-patch}.
+%   \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 7c4bd21a780..6874e793d32 100644
--- a/Master/texmf-dist/source/latex/oberdiek/kvsetkeys.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/kvsetkeys.dtx
@@ -54,9 +54,9 @@
 %    TDS:tex/generic/oberdiek/kvsetkeys.sty
 %    TDS:doc/latex/oberdiek/kvsetkeys.pdf
 %    TDS:doc/latex/oberdiek/kvsetkeys-example.tex
-%    TDS:doc/latex/oberdiek/kvsetkeys-test1.tex
-%    TDS:doc/latex/oberdiek/kvsetkeys-test2.tex
-%    TDS:doc/latex/oberdiek/kvsetkeys-test3.tex
+%    TDS:doc/latex/oberdiek/test/kvsetkeys-test1.tex
+%    TDS:doc/latex/oberdiek/test/kvsetkeys-test2.tex
+%    TDS:doc/latex/oberdiek/test/kvsetkeys-test3.tex
 %    TDS:source/latex/oberdiek/kvsetkeys.dtx
 %
 %<*ignore>
@@ -111,6 +111,7 @@ and the derived files
   \file{kvsetkeys.sty}{\from{kvsetkeys.dtx}{package}}%
   \usedir{doc/latex/oberdiek}%
   \file{kvsetkeys-example.tex}{\from{kvsetkeys.dtx}{example}}%
+  \usedir{doc/latex/oberdiek/test}%
   \file{kvsetkeys-test1.tex}{\from{kvsetkeys.dtx}{test1}}%
   \file{kvsetkeys-test2.tex}{\from{kvsetkeys.dtx}{test2}}%
   \file{kvsetkeys-test3.tex}{\from{kvsetkeys.dtx}{test2,noetex}}%
@@ -141,7 +142,7 @@ and the derived files
 \ProvidesFile{kvsetkeys.drv}%
   [2007/09/29 v1.3 Key value parser with default handler support (HO)]%
 \documentclass{ltxdoc}
-\usepackage{holtxdoc}
+\usepackage{holtxdoc}[2007/10/21]
 \begin{document}
   \DocInput{kvsetkeys.dtx}%
 \end{document}
@@ -382,7 +383,7 @@ and the derived files
 % Macro \cs{comma@parse} first normalizes the comma separated list
 % and then parses the list by calling \cs{comma@parse@normalized}.
 %
-% \begin{declcs}{comma@parse@normalized}\,\M{normalized comma list}%
+% \begin{declcs}{comma@parse@normalized}\,\M{normalized comma list}^^A
 %   \,\M{processor}
 % \end{declcs}
 % The list is parsed. Empty entries are ignored. \meta{processor}
@@ -1378,9 +1379,9 @@ $     \expandafter\ifx\csname KV@#1@#2@default\endcsname\relax
 %   kvsetkeys.sty & tex/generic/oberdiek/kvsetkeys.sty\\
 %   kvsetkeys.pdf & doc/latex/oberdiek/kvsetkeys.pdf\\
 %   kvsetkeys-example.tex & doc/latex/oberdiek/kvsetkeys-example.tex\\
-%   kvsetkeys-test1.tex & doc/latex/oberdiek/kvsetkeys-test1.tex\\
-%   kvsetkeys-test2.tex & doc/latex/oberdiek/kvsetkeys-test2.tex\\
-%   kvsetkeys-test3.tex & doc/latex/oberdiek/kvsetkeys-test3.tex\\
+%   test/kvsetkeys-test1.tex & doc/latex/oberdiek/test/kvsetkeys-test1.tex\\
+%   test/kvsetkeys-test2.tex & doc/latex/oberdiek/test/kvsetkeys-test2.tex\\
+%   test/kvsetkeys-test3.tex & doc/latex/oberdiek/test/kvsetkeys-test3.tex\\
 %   kvsetkeys.dtx & source/latex/oberdiek/kvsetkeys.dtx\\
 % \end{tabular}^^A
 % }^^A
@@ -1528,7 +1529,7 @@ $     \expandafter\ifx\csname KV@#1@#2@default\endcsname\relax
 %   \item
 %     Catcode section rewritten.
 %   \end{Version}
-%   \begin{Version}{2007/09/29 v1.4}
+%   \begin{Version}{2007/09/29 v1.3}
 %   \item
 %     Normalizing and parsing of comma separated lists added.
 %   \item
diff --git a/Master/texmf-dist/source/latex/oberdiek/listingsutf8.dtx b/Master/texmf-dist/source/latex/oberdiek/listingsutf8.dtx
new file mode 100644
index 00000000000..a576c700e48
--- /dev/null
+++ b/Master/texmf-dist/source/latex/oberdiek/listingsutf8.dtx
@@ -0,0 +1,729 @@
+% \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 listingsutf8.dtx
+% and the derived files
+%    listingsutf8.sty, listingsutf8.pdf, listingsutf8.ins, listingsutf8.drv,
+%    listingsutf8-test1.tex, listingsutf8-test2.tex,
+%    listingsutf8-test3.tex, listingsutf8-test4.tex,
+%    listingsutf8-test5.tex.
+%
+% Distribution:
+%    CTAN:macros/latex/contrib/oberdiek/listingsutf8.dtx
+%    CTAN:macros/latex/contrib/oberdiek/listingsutf8.pdf
+%
+% Unpacking:
+%    (a) If listingsutf8.ins is present:
+%           tex listingsutf8.ins
+%    (b) Without listingsutf8.ins:
+%           tex listingsutf8.dtx
+%    (c) If you insist on using LaTeX
+%           latex \let\install=y\input{listingsutf8.dtx}
+%        (quote the arguments according to the demands of your shell)
+%
+% Documentation:
+%    (a) If listingsutf8.drv is present:
+%           latex listingsutf8.drv
+%    (b) Without listingsutf8.drv:
+%           latex listingsutf8.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 listingsutf8.dtx
+%       makeindex -s gind.ist listingsutf8.idx
+%       pdflatex listingsutf8.dtx
+%       makeindex -s gind.ist listingsutf8.idx
+%       pdflatex listingsutf8.dtx
+%
+% Installation:
+%    TDS:tex/latex/oberdiek/listingsutf8.sty
+%    TDS:doc/latex/oberdiek/listingsutf8.pdf
+%    TDS:doc/latex/oberdiek/test/listingsutf8-test1.tex
+%    TDS:doc/latex/oberdiek/test/listingsutf8-test2.tex
+%    TDS:doc/latex/oberdiek/test/listingsutf8-test3.tex
+%    TDS:doc/latex/oberdiek/test/listingsutf8-test4.tex
+%    TDS:doc/latex/oberdiek/test/listingsutf8-test5.tex
+%    TDS:source/latex/oberdiek/listingsutf8.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: listingsutf8 2007/10/22 v1.0 Adding support for UTF-8 to listings (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 listingsutf8.dtx
+and the derived files
+   listingsutf8.sty, listingsutf8.pdf, listingsutf8.ins, listingsutf8.drv,
+   listingsutf8-test1.tex, listingsutf8-test2.tex,
+   listingsutf8-test3.tex, listingsutf8-test4.tex,
+   listingsutf8-test5.tex.
+
+\endpreamble
+
+\generate{%
+  \file{listingsutf8.ins}{\from{listingsutf8.dtx}{install}}%
+  \file{listingsutf8.drv}{\from{listingsutf8.dtx}{driver}}%
+  \usedir{tex/latex/oberdiek}%
+  \file{listingsutf8.sty}{\from{listingsutf8.dtx}{package}}%
+  \usedir{doc/latex/oberdiek/test}%
+  \file{listingsutf8-test1.tex}{\from{listingsutf8.dtx}{test1}}%
+  \file{listingsutf8-test2.tex}{\from{listingsutf8.dtx}{test2,utf8}}%
+  \file{listingsutf8-test3.tex}{\from{listingsutf8.dtx}{test3,utf8x}}%
+  \file{listingsutf8-test4.tex}{\from{listingsutf8.dtx}{test4,utf8,noetex}}%
+  \file{listingsutf8-test5.tex}{\from{listingsutf8.dtx}{test5,utf8x,noetex}}%
+}
+
+\obeyspaces
+\Msg{************************************************************************}
+\Msg{*}
+\Msg{* To finish the installation you have to move the following}
+\Msg{* file into a directory searched by TeX:}
+\Msg{*}
+\Msg{*     listingsutf8.sty}
+\Msg{*}
+\Msg{* To produce the documentation run the file `listingsutf8.drv'}
+\Msg{* through LaTeX.}
+\Msg{*}
+\Msg{* Happy TeXing!}
+\Msg{*}
+\Msg{************************************************************************}
+
+\endbatchfile
+%</install>
+%<*ignore>
+\fi
+%</ignore>
+%<*driver>
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesFile{listingsutf8.drv}%
+  [2007/10/22 v1.0 Adding support for UTF-8 to listings (HO)]%
+\documentclass{ltxdoc}
+\usepackage{holtxdoc}[2007/10/21]
+\begin{document}
+  \DocInput{listingsutf8.dtx}%
+\end{document}
+%</driver>
+% \fi
+%
+% \CheckSum{230}
+%
+% \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{listingsutf8.drv}
+%
+% \title{The \xpackage{listingsutf8} package}
+% \date{2007/10/22 v1.0}
+% \author{Heiko Oberdiek\\\xemail{oberdiek@uni-freiburg.de}}
+%
+% \maketitle
+%
+% \begin{abstract}
+% Package \xpackage{listings} does not support files with multi-byte
+% encodings such as UTF-8. In case of \cs{lstinputlisting} a simple
+% workaround is possible if an one-byte encoding exists that the file
+% can be converted to. Also \eTeX\ and \pdfTeX\ regardless of its mode
+% are required.
+% \end{abstract}
+%
+% \tableofcontents
+%
+% \section{Documentation}
+%
+% \subsection{User interface}
+%
+% Load this package after or instead of package \xpackage{listings}
+% \cite{listings}.
+% The package does not define own options and passes given options to
+% package \xpackage{listings}.
+%
+% The syntax of package \xpackage{listings}' key \xoption{inputencoding}
+% is extended:
+% \begin{quote}
+%   |inputencoding=utf8/|\meta{one-byte-encoding}\\
+%   Example: |inputencoding=utf8/latin1|
+% \end{quote}
+% That means the file is encoded in UTF-8 and can
+% be converted to the given \meta{one-byte-encoding}.
+% The available encodings for \meta{one-byte-encoding} are
+% listed in section ``1.2 Supported encodings'' of
+% package \xpackage{stringenc}'s documentation \cite{stringenc}.
+% Of course, the encoding must encode its characters with
+% one byte exactly. This excludes the unicode encodings
+% (\xoption{utf8}, \xoption{utf16}, \dots).
+%
+% Only \cs{lstinputlisting} is supported by the syntax extension
+% of key \xoption{inputencoding}.
+%
+% Internally package \xpackage{listingsutf8} reads the file as binary file
+% via primitives of \pdfTeX\ (\cs{pdffiledump}). Then the file
+% contents is converted as string using package \xpackage{stringenc} and
+% finally the string is read as virtual file by \eTeX's \cs{scantokens}.
+%
+% \subsection{Future}
+%
+% Workarounds are not provided for
+% \begin{itemize}
+% \item \cs{lstinline}
+% \item Environment |lstlisting|.
+% \item Environments defined by \cs{lstnewenvironment}.
+% \end{itemize}
+% Perhaps someone will find time to extend package \xpackage{listings}
+% with full native support for UTF-8. Then this package would become obsolete.
+%
+% \StopEventually{
+% }
+%
+% \section{Implementation}
+%
+%    \begin{macrocode}
+%<*package>
+%    \end{macrocode}
+%
+% \subsection{Catcodes and identification}
+%
+%    \begin{macrocode}
+\expandafter\edef\csname lstU@AtEnd\endcsname{%
+  \catcode64 \the\catcode64\relax
+}
+\catcode64 11 % @
+\def\TMP@EnsureCode#1#2{%
+  \edef\lstU@AtEnd{%
+    \lstU@AtEnd
+    \catcode#1 \the\catcode#1\relax
+  }%
+  \catcode#1 #2\relax
+}
+\TMP@EnsureCode{10}{12}% ^^J
+\TMP@EnsureCode{33}{12}% !
+\TMP@EnsureCode{36}{3}% $
+\TMP@EnsureCode{38}{4}% &
+\TMP@EnsureCode{39}{12}% '
+\TMP@EnsureCode{40}{12}% (
+\TMP@EnsureCode{41}{12}% )
+\TMP@EnsureCode{42}{12}% *
+\TMP@EnsureCode{43}{12}% +
+\TMP@EnsureCode{44}{12}% ,
+\TMP@EnsureCode{45}{12}% -
+\TMP@EnsureCode{46}{12}% .
+\TMP@EnsureCode{47}{12}% /
+\TMP@EnsureCode{58}{12}% :
+\TMP@EnsureCode{60}{12}% <
+\TMP@EnsureCode{61}{12}% =
+\TMP@EnsureCode{62}{12}% >
+\TMP@EnsureCode{94}{7}% ^ (superscript)
+\TMP@EnsureCode{95}{8}% _ (subscript)
+\TMP@EnsureCode{96}{12}% `
+\TMP@EnsureCode{124}{12}% |
+\TMP@EnsureCode{126}{13}% ~ (active)
+\g@addto@macro\lstU@AtEnd{\endinput}
+%    \end{macrocode}
+%
+%    Package identification.
+%    \begin{macrocode}
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{listingsutf8}%
+  [2007/10/22 v1.0 Adding support for UTF-8 to listings (HO)]
+%    \end{macrocode}
+%
+% \subsection{Package options}
+%
+% Just pass options to package listings.
+%
+%    \begin{macrocode}
+\DeclareOption*{%
+  \PassOptionsToPackage\CurrentOption{listings}%
+}
+\ProcessOptions*
+%    \end{macrocode}
+%    Key \xoption{inputencoding} was introduced in version
+%    2002/04/01 v1.0 of package \xpackage{listings}.
+%    \begin{macrocode}
+\RequirePackage{listings}[2002/04/01]
+%    \end{macrocode}
+%    Ensure that \cs{inputencoding} is provided.
+%    \begin{macrocode}
+\AtBeginDocument{%
+  \@ifundefined{inputencoding}{%
+    \RequirePackage{inputenc}%
+  }{}%
+}
+%    \end{macrocode}
+%
+% \subsection{Check prerequisites}
+%
+%    \begin{macrocode}
+\def\lstU@temp#1#2{%
+  \begingroup\expandafter\expandafter\expandafter\endgroup
+  \expandafter\ifx\csname #1\endcsname\relax
+    \PackageWarningNoLine{listingsutf8}{%
+      Package loading is aborted because of missing %
+      \@backslashchar#1.\MessageBreak
+      #2%
+    }%
+    \expandafter\lstU@AtEnd
+  \fi
+}
+\lstU@temp{scantokens}{It is provided by e-TeX}
+\lstU@temp{pdfunescapehex}{It is provided by pdfTeX >= 1.30}
+\lstU@temp{pdffiledump}{It is provided by pdfTeX >= 1.30}
+\lstU@temp{pdffilesize}{It is provided by pdfTeX >= 1.30}
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+\RequirePackage{stringenc}[2007/10/22]
+%    \end{macrocode}
+%
+% \subsection{Add support for UTF-8}
+%
+%    \begin{macro}{\iflstU@utfviii}
+%    \begin{macrocode}
+\newif\iflstU@utfviii
+%    \end{macrocode}
+%    \end{macro}
+%
+%    \begin{macro}{\lstU@inputenc}
+%    \begin{macrocode}
+\def\lstU@inputenc#1{%
+  \expandafter\lstU@@inputenc#1utf8/utf8/\@nil
+}
+%    \end{macrocode}
+%    \end{macro}
+%    \begin{macro}{\lstU@@inputenc}
+\def\lstU@@inputenc#1utf8/#2utf8/#3\@nil{%
+  \ifx\\#1\\%
+    \lstU@utfviiitrue
+    \def\lst@inputenc{#2}%
+  \else
+    \lstU@utfviiifalse
+  \fi
+}
+%    \begin{macrocode}
+%    \end{macrocode}
+%    \end{macro}
+%
+%    \begin{macrocode}
+\lst@Key{inputencoding}\relax{%
+  \def\lst@inputenc{#1}%
+  \lstU@inputenc{#1}%
+}
+%    \end{macrocode}
+%
+% \subsubsection{Conversion}
+%
+%    \begin{macro}{\lstU@input}
+%    \begin{macrocode}
+\def\lstU@input#1{%
+  \iflstU@utfviii
+    \edef\lstU@text{%
+      \pdfunescapehex{%
+        \pdffiledump length\pdffilesize{#1}{#1}%
+      }%
+    }%
+    \StringEncodingConvert\lstU@text\lstU@text{utf8}\lst@inputenc
+    \def\lstU@temp{%
+      \scantokens\expandafter{\lstU@text}%
+    }%
+  \else
+    \def\lstU@temp{%
+      \input{#1}%
+    }%
+  \fi
+  \lstU@temp
+}
+%    \end{macrocode}
+%    \end{macro}
+%
+% \subsubsection{Patch \cs{lst@InputListing}}
+%
+%    \begin{macrocode}
+\def\lstU@temp#1\def\lst@next#2#3\@nil{%
+  \def\lst@InputListing##1{%
+    #1%
+    \def\lst@next{\lstU@input{##1}}%
+    #3%
+  }%
+}
+\expandafter\lstU@temp\lst@InputListing{#1}\@nil
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+\lstU@AtEnd
+%</package>
+%    \end{macrocode}
+%
+% \section{Test}
+%
+% \subsection{Catcode checks for loading}
+%
+%    \begin{macrocode}
+%<*test1>
+%    \end{macrocode}
+%    \begin{macrocode}
+\NeedsTeXFormat{LaTeX2e}
+\documentclass{minimal}
+\makeatletter
+\def\RestoreCatcodes{}
+\count@=0 %
+\loop
+  \edef\RestoreCatcodes{%
+    \RestoreCatcodes
+    \catcode\the\count@=\the\catcode\count@\relax
+  }%
+\ifnum\count@<255 %
+  \advance\count@\@ne
+\repeat
+
+\def\RangeCatcodeInvalid#1#2{%
+  \count@=#1\relax
+  \loop
+    \catcode\count@=15 %
+  \ifnum\count@<#2\relax
+    \advance\count@\@ne
+  \repeat
+}
+\def\Test{%
+  \RangeCatcodeInvalid{0}{47}%
+  \RangeCatcodeInvalid{58}{64}%
+  \RangeCatcodeInvalid{91}{96}%
+  \RangeCatcodeInvalid{123}{127}%
+  \catcode`\@=12 %
+  \catcode`\\=0 %
+  \catcode`\{=1 %
+  \catcode`\}=2 %
+  \catcode`\#=6 %
+  \catcode`\[=12 %
+  \catcode`\]=12 %
+  \catcode`\%=14 %
+  \catcode`\ =10 %
+  \catcode13=5 %
+  \RequirePackage{listingsutf8}[2007/10/22]\relax
+  \RestoreCatcodes
+}
+\Test
+\csname @@end\endcsname
+\end
+%    \end{macrocode}
+%    \begin{macrocode}
+%</test1>
+%    \end{macrocode}
+%
+% \subsection{Test example for latin1}
+%
+%    \begin{macrocode}
+%<*test2>
+%    \end{macrocode}
+%    \begin{macrocode}
+\NeedsTeXFormat{LaTeX2e}
+\documentclass{minimal}
+\usepackage{filecontents}
+\def\do#1{%
+  \ifx#1\^%
+  \else
+    \noexpand\do\noexpand#1%
+  \fi
+}
+\expandafter\let\expandafter\dospecials\expandafter\empty
+\expandafter\edef\expandafter\dospecials\expandafter{\dospecials}
+\begin{filecontents*}{ExampleUTF8.java}
+public class ExampleUTF8 {
+    public static String testString =
+        "Umlauts: " +
+        "^^c3^^84^^c3^^96^^c3^^9c^^c3^^a4^^c3^^b6^^c3^^bc^^c3^^9f";
+    public static void main(String[] args) {
+        System.out.println(testString);
+    }
+}
+\end{filecontents*}
+\usepackage{listingsutf8}[2007/10/22]
+\def\Text{%
+  Umlauts: %
+  ^^c3^^84^^c3^^96^^c3^^9c^^c3^^a4^^c3^^b6^^c3^^bc^^c3^^9f%
+}
+\begin{document}
+\lstinputlisting[%
+  language=Java,%
+  inputencoding=utf8/latin1,%
+]{ExampleUTF8.java}
+\end{document}
+%</test2>
+%    \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/listingsutf8.dtx}] The source file.
+% \item[\CTAN{macros/latex/contrib/oberdiek/listingsutf8.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}
+% \emph{TDS} refers to the standard ``A Directory Structure
+% for \TeX\ Files'' (\CTAN{tds/tds.pdf}). Directories
+% with \xfile{texmf} in their name are usually organized this way.
+%
+% \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 listingsutf8.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}
+% \def\t{^^A
+% \begin{tabular}{@{}>{\ttfamily}l@{ $\rightarrow$ }>{\ttfamily}l@{}}
+%   listingsutf8.sty & tex/latex/oberdiek/listingsutf8.sty\\
+%   listingsutf8.pdf & doc/latex/oberdiek/listingsutf8.pdf\\
+%   test/listingsutf8-test1.tex & doc/latex/oberdiek/test/listingsutf8-test1.tex\\
+%   test/listingsutf8-test2.tex & doc/latex/oberdiek/test/listingsutf8-test2.tex\\
+%   test/listingsutf8-test3.tex & doc/latex/oberdiek/test/listingsutf8-test3.tex\\
+%   test/listingsutf8-test4.tex & doc/latex/oberdiek/test/listingsutf8-test4.tex\\
+%   test/listingsutf8-test5.tex & doc/latex/oberdiek/test/listingsutf8-test5.tex\\
+%   listingsutf8.dtx & source/latex/oberdiek/listingsutf8.dtx\\
+% \end{tabular}^^A
+% }^^A
+% \sbox0{\t}^^A
+% \ifdim\wd0>\linewidth
+%   \begingroup
+%     \advance\linewidth by\leftmargin
+%     \advance\linewidth by\rightmargin
+%   \edef\x{\endgroup
+%     \def\noexpand\lw{\the\linewidth}^^A
+%   }\x
+%   \def\lwbox{^^A
+%     \leavevmode
+%     \hbox to \linewidth{^^A
+%       \kern-\leftmargin\relax
+%       \hss
+%       \usebox0
+%       \hss
+%       \kern-\rightmargin\relax
+%     }^^A
+%   }^^A
+%   \ifdim\wd0>\lw
+%     \sbox0{\small\t}^^A
+%     \ifdim\wd0>\linewidth
+%       \ifdim\wd0>\lw
+%         \sbox0{\footnotesize\t}^^A
+%         \ifdim\wd0>\linewidth
+%           \ifdim\wd0>\lw
+%             \sbox0{\scriptsize\t}^^A
+%             \ifdim\wd0>\linewidth
+%               \ifdim\wd0>\lw
+%                 \sbox0{\tiny\t}^^A
+%                 \ifdim\wd0>\linewidth
+%                   \lwbox
+%                 \else
+%                   \usebox0
+%                 \fi
+%               \else
+%                 \lwbox
+%               \fi
+%             \else
+%               \usebox0
+%             \fi
+%           \else
+%             \lwbox
+%           \fi
+%         \else
+%           \usebox0
+%         \fi
+%       \else
+%         \lwbox
+%       \fi
+%     \else
+%       \usebox0
+%     \fi
+%   \else
+%     \lwbox
+%   \fi
+% \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 listingsutf8.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{listingsutf8.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 listingsutf8.dtx
+%makeindex -s gind.ist listingsutf8.idx
+%pdflatex listingsutf8.dtx
+%makeindex -s gind.ist listingsutf8.idx
+%pdflatex listingsutf8.dtx
+%\end{verbatim}
+% \end{quote}
+%
+% \begin{thebibliography}{9}
+%
+% \bibitem{inputenc}
+%   Alan Jeffrey, Frank Mittelbach,
+%   \textit{inputenc.sty}, 2006/05/05 v1.1b.
+%   \CTAN{macros/latex/base/inputenc.dtx}
+%
+% \bibitem{listings}
+%   Carsten Heinz, Brooks Moses:
+%  \textit{The \xpackage{listings} package};
+%   2007/02/22;\\
+%   \CTAN{macros/latex/contrib/listings/}.
+%
+% \bibitem{stringenc}
+%   Heiko Oberdiek:
+%   \textit{The \xpackage{stringenc} package};
+%   2007/10/22;\\
+%   \CTAN{macros/latex/contrib/oberdiek/stringenc.pdf}.
+%
+% \end{thebibliography}
+%
+% \begin{History}
+%   \begin{Version}{2007/10/22 v1.0}
+%   \item
+%     First version.
+%   \end{Version}
+% \end{History}
+%
+% \PrintIndex
+%
+% \Finale
+\endinput
diff --git a/Master/texmf-dist/source/latex/oberdiek/makerobust.dtx b/Master/texmf-dist/source/latex/oberdiek/makerobust.dtx
index 3783bafc84f..f8de9a5af37 100644
--- a/Master/texmf-dist/source/latex/oberdiek/makerobust.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/makerobust.dtx
@@ -133,7 +133,7 @@ and the derived files
 \ProvidesFile{makerobust.drv}%
   [2006/03/18 v1.0 Making a macro robust (HO)]%
 \documentclass{ltxdoc}
-\usepackage{holtxdoc}
+\usepackage{holtxdoc}[2007/10/21]
 \begin{document}
   \DocInput{makerobust.dtx}%
 \end{document}
diff --git a/Master/texmf-dist/source/latex/oberdiek/oberdiek.ins b/Master/texmf-dist/source/latex/oberdiek/oberdiek.ins
index 457d7bd9523..74b779e4a00 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/10/04
+% 2007/10/24
 %
 % Copyright (C) 1999, 2001, 2006 by
 %    Heiko Oberdiek <oberdiek@uni-freiburg.de>
@@ -25,6 +25,7 @@
 \batchinput{accsupp.dtx}
 \batchinput{aliascnt.dtx}
 \batchinput{alphalph.dtx}
+\batchinput{askinclude.dtx}
 \batchinput{atbegshi.dtx}
 \batchinput{atenddvi.dtx}
 \batchinput{attachfile2.dtx}
@@ -61,6 +62,7 @@
 \batchinput{intcalc.dtx}
 \batchinput{kvoptions.dtx}
 \batchinput{kvsetkeys.dtx}
+\batchinput{listingsutf8.dtx}
 \batchinput{makerobust.dtx}
 \batchinput{pagesel.dtx}
 \batchinput{pdfcol.dtx}
diff --git a/Master/texmf-dist/source/latex/oberdiek/oberdiek.tex b/Master/texmf-dist/source/latex/oberdiek/oberdiek.tex
index aa6297aebfa..bcd3be97d9e 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/10/04}
+\newcommand*{\Date}{2007/10/24}
 
 % Copyright (C) 2006 by
 %    Heiko Oberdiek <oberdiek@uni-freiburg.de>
@@ -160,7 +160,9 @@
 [\entrysep]
 \entry{aliascnt}{2006/09/25}{1.2}{Alias counter}%
 [\entrysep]
-\entry{alphalph}{2007/04/11}{2.0}{Converting numbers to letters}%
+\entry{alphalph}{2007/09/09}{2.0}{Converting numbers to letters}%
+[\entrysep]
+\entry{askinclude}{2007/10/23}{2.0}{Interactive asking of included files}%
 [\entrysep]
 \entry{atbegshi}{2007/09/09}{1.6}{At begin shipout hook}%
 [\entrysep]
@@ -168,13 +170,13 @@
 [\entrysep]
 \entry{attachfile2}{2007/04/11}{2.3}{attach files into PDF}%
 [\entrysep]
-\entry{auxhook}{2006/04/06}{1.1}{Hooks for auxiliary files}%
+\entry{auxhook}{2007/04/06}{1.1}{Hooks for auxiliary files}%
 [\entrysep]
 \entry{bigintcalc}{2007/09/27}{1.0}{Expandable big integer calculations}%
 [\entrysep]
 \entry{bitset}{2007/09/28}{1.0}{Data type bit set}%
 [\entrysep]
-\entry{bmpsize}{2007/04/29}{1.3}{Extract size and resolution data from bitmap files}%
+\entry{bmpsize}{2007/05/01}{1.3}{Extract size and resolution data from bitmap files}%
 [\entrysep]
 \entry{bookmark}{2007/09/25}{1.2}{PDF bookmarks}%
 [\entrysep]
@@ -196,7 +198,7 @@
 [\entrysep]
 \entry{epstopdf}{2007/10/02}{1.5}{Conversion with epstopdf on the fly}%
 [\entrysep]
-\entry{etexcmds}{2007/09/09}{1.1}{Providing prefix for e-TeX command names}%
+\entry{etexcmds}{2007/09/09}{1.1}{Prefix for e-TeX command names}%
 [\entrysep]
 \entry{flags}{2007/09/30}{0.4}{Flag setting in bit fields}%
 [\entrysep]
@@ -204,7 +206,7 @@
 [\entrysep]
 \entry{grffile}{2007/08/16}{1.5}{Extended file name support for graphics}%
 [\entrysep]
-\entry{holtxdoc}{2006/06/02}{0.7}{Private additional ltxdoc support}%
+\entry{holtxdoc}{2007/10/21}{0.8}{Private additional ltxdoc support}%
 [\entrysep]
 \entry{hycolor}{2007/04/11}{1.1}{Code for color options of hyperref/bookmark}%
 [\entrysep]
@@ -230,10 +232,12 @@
 [\entrysep]
 \entry{intcalc}{2007/09/27}{1.1}{Expandable integer calculations}%
 [\entrysep]
-\entry{kvoptions}{2007/10/02}{2.8}{Connects package keyval with \LaTeX{} options}%
+\entry{kvoptions}{2007/10/18}{3.0}{Keyval support for \LaTeX{} options}%
 [\entrysep]
 \entry{kvsetkeys}{2007/09/29}{1.3}{Key value parser with default handler support}%
 [\entrysep]
+\entry{listingsutf8}{2007/10/22}{1.0}{Adding support for UTF-8 to listings}%
+[\entrysep]
 \entry{makerobust}{2006/03/18}{1.0}{Making a macro robust}%
 [\entrysep]
 \entry{pagesel}{2007/04/12}{1.7}{Selecting shipout output pages}%
@@ -252,7 +256,7 @@
 [\entrysep]
 \entry{pdfescape}{2007/09/09}{1.6}{Provides hex, PDF name and string conversions}%
 [\entrysep]
-\entry{pdflscape}{2007/04/17}{0.8}{Landscape pages in PDF}%
+\entry{pdflscape}{2007/10/21}{0.9}{Landscape pages in PDF}%
 [\entrysep]
 \entry{picture}{2007/04/11}{1.1}{Dimens for picture macros}%
 [\entrysep]
@@ -270,7 +274,7 @@
 [\entrysep]
 \entry{stackrel}{2007/05/06}{1.1}{Adding subscript option to stackrel}%
 [\entrysep]
-\entry{stringenc}{2007/09/09}{1.2}{Converts strings between encodings}%
+\entry{stringenc}{2007/10/22}{1.3}{Converts strings between encodings}%
 [\entrysep]
 \entry{tabularht}{2007/04/11}{2.5}{Tabular with height specification}%
 [\entrysep]
@@ -318,6 +322,15 @@ set of symbols. Both \LaTeX\ and \plainTeX are supported.
 \tocinclude{alphalph}
 
 \newpage
+\subsection{\pkgsectformat{askinclude}}
+\label{askinclude}
+\begin{abstract}
+This package replaces \cs{includeonly} by an interactive user
+interface.
+\end{abstract}
+\tocinclude{askinclude}
+
+\newpage
 \subsection{\pkgsectformat{atbegshi}}
 \label{atbegshi}
 \begin{abstract}
@@ -695,6 +708,18 @@ only one level of curly braces is removed from the values.
 \tocinclude{kvsetkeys}
 
 \newpage
+\subsection{\pkgsectformat{listingsutf8}}
+\label{listingsutf8}
+\begin{abstract}
+Package \xpackage{listings} does not support files with multi-byte
+encodings such as UTF-8. In case of \cs{lstinputlisting} a simple
+workaround is possible if an one-byte encoding exists that the file
+can be converted to. Also \eTeX\ and \pdfTeX\ regardless of its mode
+are required.
+\end{abstract}
+\tocinclude{listingsutf8}
+
+\newpage
 \subsection{\pkgsectformat{makerobust}}
 \label{makerobust}
 \begin{abstract}
diff --git a/Master/texmf-dist/source/latex/oberdiek/pagesel.dtx b/Master/texmf-dist/source/latex/oberdiek/pagesel.dtx
index f1c0b78606e..8a150b9832e 100644
--- a/Master/texmf-dist/source/latex/oberdiek/pagesel.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/pagesel.dtx
@@ -130,7 +130,7 @@ and the derived files
 \ProvidesFile{pagesel.drv}%
   [2007/04/12 v1.7 Selecting shipout output pages (HO)]%
 \documentclass{ltxdoc}
-\usepackage{holtxdoc}
+\usepackage{holtxdoc}[2007/10/21]
 \begin{document}
   \DocInput{pagesel.dtx}%
 \end{document}
diff --git a/Master/texmf-dist/source/latex/oberdiek/pdfcol.dtx b/Master/texmf-dist/source/latex/oberdiek/pdfcol.dtx
index 76caa82f6b4..d69476b87fd 100644
--- a/Master/texmf-dist/source/latex/oberdiek/pdfcol.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/pdfcol.dtx
@@ -52,9 +52,9 @@
 % Installation:
 %    TDS:tex/generic/oberdiek/pdfcol.sty
 %    TDS:doc/latex/oberdiek/pdfcol.pdf
-%    TDS:doc/latex/oberdiek/pdfcol-test1.tex
-%    TDS:doc/latex/oberdiek/pdfcol-test2.tex
-%    TDS:doc/latex/oberdiek/pdfcol-test3.tex
+%    TDS:doc/latex/oberdiek/test/pdfcol-test1.tex
+%    TDS:doc/latex/oberdiek/test/pdfcol-test2.tex
+%    TDS:doc/latex/oberdiek/test/pdfcol-test3.tex
 %    TDS:source/latex/oberdiek/pdfcol.dtx
 %
 %<*ignore>
@@ -106,7 +106,7 @@ and the derived files
   \file{pdfcol.drv}{\from{pdfcol.dtx}{driver}}%
   \usedir{tex/generic/oberdiek}%
   \file{pdfcol.sty}{\from{pdfcol.dtx}{package}}%
-  \usedir{doc/latex/oberdiek}%
+  \usedir{doc/latex/oberdiek/test}%
   \file{pdfcol-test1.tex}{\from{pdfcol.dtx}{test1}}%
   \file{pdfcol-test2.tex}{\from{pdfcol.dtx}{test2}}%
   \file{pdfcol-test3.tex}{\from{pdfcol.dtx}{test3}}%
@@ -137,7 +137,7 @@ and the derived files
 \ProvidesFile{pdfcol.drv}%
   [2007/09/09 v1.0 Maintaining additional color stacks for pdfTeX (HO)]%
 \documentclass{ltxdoc}
-\usepackage{holtxdoc}
+\usepackage{holtxdoc}[2007/10/21]
 \begin{document}
   \DocInput{pdfcol.dtx}%
 \end{document}
@@ -806,9 +806,9 @@ and the derived files
 % \begin{tabular}{@{}>{\ttfamily}l@{ $\rightarrow$ }>{\ttfamily}l@{}}
 %   pdfcol.sty & tex/generic/oberdiek/pdfcol.sty\\
 %   pdfcol.pdf & doc/latex/oberdiek/pdfcol.pdf\\
-%   pdfcol-test1.tex & doc/latex/oberdiek/pdfcol-test1.tex\\
-%   pdfcol-test2.tex & doc/latex/oberdiek/pdfcol-test2.tex\\
-%   pdfcol-test3.tex & doc/latex/oberdiek/pdfcol-test3.tex\\
+%   test/pdfcol-test1.tex & doc/latex/oberdiek/test/pdfcol-test1.tex\\
+%   test/pdfcol-test2.tex & doc/latex/oberdiek/test/pdfcol-test2.tex\\
+%   test/pdfcol-test3.tex & doc/latex/oberdiek/test/pdfcol-test3.tex\\
 %   pdfcol.dtx & source/latex/oberdiek/pdfcol.dtx\\
 % \end{tabular}^^A
 % }^^A
diff --git a/Master/texmf-dist/source/latex/oberdiek/pdfcolfoot.dtx b/Master/texmf-dist/source/latex/oberdiek/pdfcolfoot.dtx
index 2b30d204b11..ac48a468900 100644
--- a/Master/texmf-dist/source/latex/oberdiek/pdfcolfoot.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/pdfcolfoot.dtx
@@ -52,7 +52,7 @@
 % Installation:
 %    TDS:tex/latex/oberdiek/pdfcolfoot.sty
 %    TDS:doc/latex/oberdiek/pdfcolfoot.pdf
-%    TDS:doc/latex/oberdiek/pdfcolfoot-test1.tex
+%    TDS:doc/latex/oberdiek/test/pdfcolfoot-test1.tex
 %    TDS:source/latex/oberdiek/pdfcolfoot.dtx
 %
 %<*ignore>
@@ -104,7 +104,7 @@ and the derived files
   \file{pdfcolfoot.drv}{\from{pdfcolfoot.dtx}{driver}}%
   \usedir{tex/latex/oberdiek}%
   \file{pdfcolfoot.sty}{\from{pdfcolfoot.dtx}{package}}%
-  \usedir{doc/latex/oberdiek}%
+  \usedir{doc/latex/oberdiek/test}%
   \file{pdfcolfoot-test1.tex}{\from{pdfcolfoot.dtx}{test1}}%
 }
 
@@ -133,7 +133,7 @@ and the derived files
 \ProvidesFile{pdfcolfoot.drv}%
   [2007/09/09 v1.1 pdfTeX's color stack for footnotes (HO)]%
 \documentclass{ltxdoc}
-\usepackage{holtxdoc}
+\usepackage{holtxdoc}[2007/10/21]
 \begin{document}
   \DocInput{pdfcolfoot.dtx}%
 \end{document}
@@ -560,7 +560,7 @@ and the derived files
 % \begin{tabular}{@{}>{\ttfamily}l@{ $\rightarrow$ }>{\ttfamily}l@{}}
 %   pdfcolfoot.sty & tex/latex/oberdiek/pdfcolfoot.sty\\
 %   pdfcolfoot.pdf & doc/latex/oberdiek/pdfcolfoot.pdf\\
-%   pdfcolfoot-test1.tex & doc/latex/oberdiek/pdfcolfoot-test1.tex\\
+%   test/pdfcolfoot-test1.tex & doc/latex/oberdiek/test/pdfcolfoot-test1.tex\\
 %   pdfcolfoot.dtx & source/latex/oberdiek/pdfcolfoot.dtx\\
 % \end{tabular}^^A
 % }^^A
diff --git a/Master/texmf-dist/source/latex/oberdiek/pdfcolmk.dtx b/Master/texmf-dist/source/latex/oberdiek/pdfcolmk.dtx
index 387a2a58298..ebead70a6e9 100644
--- a/Master/texmf-dist/source/latex/oberdiek/pdfcolmk.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/pdfcolmk.dtx
@@ -130,7 +130,7 @@ and the derived files
 \ProvidesFile{pdfcolmk.drv}%
   [2007/04/11 v1.1 PDFtex COLor MarK (HO)]%
 \documentclass{ltxdoc}
-\usepackage{holtxdoc}
+\usepackage{holtxdoc}[2007/10/21]
 \begin{document}
   \DocInput{pdfcolmk.dtx}%
 \end{document}
diff --git a/Master/texmf-dist/source/latex/oberdiek/pdfcolparallel.dtx b/Master/texmf-dist/source/latex/oberdiek/pdfcolparallel.dtx
index 55f23261284..0d8218248df 100644
--- a/Master/texmf-dist/source/latex/oberdiek/pdfcolparallel.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/pdfcolparallel.dtx
@@ -52,7 +52,7 @@
 % Installation:
 %    TDS:tex/latex/oberdiek/pdfcolparallel.sty
 %    TDS:doc/latex/oberdiek/pdfcolparallel.pdf
-%    TDS:doc/latex/oberdiek/pdfcolparallel-test1.tex
+%    TDS:doc/latex/oberdiek/test/pdfcolparallel-test1.tex
 %    TDS:source/latex/oberdiek/pdfcolparallel.dtx
 %
 %<*ignore>
@@ -104,7 +104,7 @@ and the derived files
   \file{pdfcolparallel.drv}{\from{pdfcolparallel.dtx}{driver}}%
   \usedir{tex/latex/oberdiek}%
   \file{pdfcolparallel.sty}{\from{pdfcolparallel.dtx}{package}}%
-  \usedir{doc/latex/oberdiek}%
+  \usedir{doc/latex/oberdiek/test}%
   \file{pdfcolparallel-test1.tex}{\from{pdfcolparallel.dtx}{test1}}%
 }
 
@@ -133,7 +133,7 @@ and the derived files
 \ProvidesFile{pdfcolparallel.drv}%
   [2007/09/09 v1.0 Color stacks support for parallel (HO)]%
 \documentclass{ltxdoc}
-\usepackage{holtxdoc}
+\usepackage{holtxdoc}[2007/10/21]
 \begin{document}
   \DocInput{pdfcolparallel.dtx}%
 \end{document}
@@ -742,7 +742,7 @@ and the derived files
 % \begin{tabular}{@{}>{\ttfamily}l@{ $\rightarrow$ }>{\ttfamily}l@{}}
 %   pdfcolparallel.sty & tex/latex/oberdiek/pdfcolparallel.sty\\
 %   pdfcolparallel.pdf & doc/latex/oberdiek/pdfcolparallel.pdf\\
-%   pdfcolparallel-test1.tex & doc/latex/oberdiek/pdfcolparallel-test1.tex\\
+%   test/pdfcolparallel-test1.tex & doc/latex/oberdiek/test/pdfcolparallel-test1.tex\\
 %   pdfcolparallel.dtx & source/latex/oberdiek/pdfcolparallel.dtx\\
 % \end{tabular}^^A
 % }^^A
diff --git a/Master/texmf-dist/source/latex/oberdiek/pdfcolparcolumns.dtx b/Master/texmf-dist/source/latex/oberdiek/pdfcolparcolumns.dtx
index c52373c9e25..adba2682e21 100644
--- a/Master/texmf-dist/source/latex/oberdiek/pdfcolparcolumns.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/pdfcolparcolumns.dtx
@@ -52,7 +52,7 @@
 % Installation:
 %    TDS:tex/latex/oberdiek/pdfcolparcolumns.sty
 %    TDS:doc/latex/oberdiek/pdfcolparcolumns.pdf
-%    TDS:doc/latex/oberdiek/pdfcolparcolumns-test1.tex
+%    TDS:doc/latex/oberdiek/test/pdfcolparcolumns-test1.tex
 %    TDS:source/latex/oberdiek/pdfcolparcolumns.dtx
 %
 %<*ignore>
@@ -104,7 +104,7 @@ and the derived files
   \file{pdfcolparcolumns.drv}{\from{pdfcolparcolumns.dtx}{driver}}%
   \usedir{tex/latex/oberdiek}%
   \file{pdfcolparcolumns.sty}{\from{pdfcolparcolumns.dtx}{package}}%
-  \usedir{doc/latex/oberdiek}%
+  \usedir{doc/latex/oberdiek/test}%
   \file{pdfcolparcolumns-test1.tex}{\from{pdfcolparcolumns.dtx}{test1}}%
 }
 
@@ -133,7 +133,7 @@ and the derived files
 \ProvidesFile{pdfcolparcolumns.drv}%
   [2007/09/09 v1.1 Color stacks support for parcolumns (HO)]%
 \documentclass{ltxdoc}
-\usepackage{holtxdoc}
+\usepackage{holtxdoc}[2007/10/21]
 \begin{document}
   \DocInput{pdfcolparcolumns.dtx}%
 \end{document}
@@ -527,7 +527,7 @@ and the derived files
 % \begin{tabular}{@{}>{\ttfamily}l@{ $\rightarrow$ }>{\ttfamily}l@{}}
 %   pdfcolparcolumns.sty & tex/latex/oberdiek/pdfcolparcolumns.sty\\
 %   pdfcolparcolumns.pdf & doc/latex/oberdiek/pdfcolparcolumns.pdf\\
-%   pdfcolparcolumns-test1.tex & doc/latex/oberdiek/pdfcolparcolumns-test1.tex\\
+%   test/pdfcolparcolumns-test1.tex & doc/latex/oberdiek/test/pdfcolparcolumns-test1.tex\\
 %   pdfcolparcolumns.dtx & source/latex/oberdiek/pdfcolparcolumns.dtx\\
 % \end{tabular}^^A
 % }^^A
diff --git a/Master/texmf-dist/source/latex/oberdiek/pdfcrypt.dtx b/Master/texmf-dist/source/latex/oberdiek/pdfcrypt.dtx
index 4512d07ab15..79eb8647984 100644
--- a/Master/texmf-dist/source/latex/oberdiek/pdfcrypt.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/pdfcrypt.dtx
@@ -130,7 +130,7 @@ and the derived files
 \ProvidesFile{pdfcrypt.drv}%
   [2007/04/26 v1.0 Setting pdf encryption (HO)]%
 \documentclass{ltxdoc}
-\usepackage{holtxdoc}
+\usepackage{holtxdoc}[2007/10/21]
 \begin{document}
   \DocInput{pdfcrypt.dtx}%
 \end{document}
diff --git a/Master/texmf-dist/source/latex/oberdiek/pdfescape.dtx b/Master/texmf-dist/source/latex/oberdiek/pdfescape.dtx
index e5c75987403..b23233f9a16 100644
--- a/Master/texmf-dist/source/latex/oberdiek/pdfescape.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/pdfescape.dtx
@@ -53,10 +53,10 @@
 % Installation:
 %    TDS:tex/generic/oberdiek/pdfescape.sty
 %    TDS:doc/latex/oberdiek/pdfescape.pdf
-%    TDS:doc/latex/oberdiek/pdfescape-test1.tex
-%    TDS:doc/latex/oberdiek/pdfescape-test2.tex
-%    TDS:doc/latex/oberdiek/pdfescape-test3.tex
-%    TDS:doc/latex/oberdiek/pdfescape-test4.tex
+%    TDS:doc/latex/oberdiek/test/pdfescape-test1.tex
+%    TDS:doc/latex/oberdiek/test/pdfescape-test2.tex
+%    TDS:doc/latex/oberdiek/test/pdfescape-test3.tex
+%    TDS:doc/latex/oberdiek/test/pdfescape-test4.tex
 %    TDS:source/latex/oberdiek/pdfescape.dtx
 %
 %<*ignore>
@@ -109,7 +109,7 @@ and the derived files
   \file{pdfescape.drv}{\from{pdfescape.dtx}{driver}}%
   \usedir{tex/generic/oberdiek}%
   \file{pdfescape.sty}{\from{pdfescape.dtx}{package}}%
-  \usedir{doc/latex/oberdiek}%
+  \usedir{doc/latex/oberdiek/test}%
   \file{pdfescape-test1.tex}{\from{pdfescape.dtx}{test1}}%
   \file{pdfescape-test2.tex}{\from{pdfescape.dtx}{test2}}%
   \file{pdfescape-test3.tex}{\from{pdfescape.dtx}{test3}}%
@@ -141,7 +141,7 @@ and the derived files
 \ProvidesFile{pdfescape.drv}%
   [2007/09/09 v1.6 Provides hex, PDF name and string conversions (HO)]%
 \documentclass{ltxdoc}
-\usepackage{holtxdoc}
+\usepackage{holtxdoc}[2007/10/21]
 \begin{document}
   \DocInput{pdfescape.dtx}%
 \end{document}
@@ -1729,10 +1729,10 @@ and the derived files
 % \begin{tabular}{@{}>{\ttfamily}l@{ $\rightarrow$ }>{\ttfamily}l@{}}
 %   pdfescape.sty & tex/generic/oberdiek/pdfescape.sty\\
 %   pdfescape.pdf & doc/latex/oberdiek/pdfescape.pdf\\
-%   pdfescape-test1.tex & doc/latex/oberdiek/pdfescape-test1.tex\\
-%   pdfescape-test2.tex & doc/latex/oberdiek/pdfescape-test2.tex\\
-%   pdfescape-test3.tex & doc/latex/oberdiek/pdfescape-test3.tex\\
-%   pdfescape-test4.tex & doc/latex/oberdiek/pdfescape-test4.tex\\
+%   test/pdfescape-test1.tex & doc/latex/oberdiek/test/pdfescape-test1.tex\\
+%   test/pdfescape-test2.tex & doc/latex/oberdiek/test/pdfescape-test2.tex\\
+%   test/pdfescape-test3.tex & doc/latex/oberdiek/test/pdfescape-test3.tex\\
+%   test/pdfescape-test4.tex & doc/latex/oberdiek/test/pdfescape-test4.tex\\
 %   pdfescape.dtx & source/latex/oberdiek/pdfescape.dtx\\
 % \end{tabular}^^A
 % }^^A
diff --git a/Master/texmf-dist/source/latex/oberdiek/pdflscape.dtx b/Master/texmf-dist/source/latex/oberdiek/pdflscape.dtx
index b0d102478bd..df1dfd2abf3 100644
--- a/Master/texmf-dist/source/latex/oberdiek/pdflscape.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/pdflscape.dtx
@@ -17,7 +17,11 @@
 %
 % This work consists of the main source file pdflscape.dtx
 % and the derived files
-%    pdflscape.sty, pdflscape.pdf, pdflscape.ins, pdflscape.drv.
+%    pdflscape.sty, pdflscape.pdf, pdflscape.ins, pdflscape.drv,
+%    pdflscape-test1.tex, pdflscape-test2.tex,
+%    pdflscape-test3.tex, pdflscape-test4.tex,
+%    pdflscape-test5.tex, pdflscape-test6.tex,
+%    pdflscape-test6.txt, ExtractRotate.java.
 %
 % Distribution:
 %    CTAN:macros/latex/contrib/oberdiek/pdflscape.dtx
@@ -52,6 +56,14 @@
 % Installation:
 %    TDS:tex/latex/oberdiek/pdflscape.sty
 %    TDS:doc/latex/oberdiek/pdflscape.pdf
+%    TDS:doc/latex/oberdiek/test/pdflscape-test1.tex
+%    TDS:doc/latex/oberdiek/test/pdflscape-test2.tex
+%    TDS:doc/latex/oberdiek/test/pdflscape-test3.tex
+%    TDS:doc/latex/oberdiek/test/pdflscape-test4.tex
+%    TDS:doc/latex/oberdiek/test/pdflscape-test5.tex
+%    TDS:doc/latex/oberdiek/test/pdflscape-test6.tex
+%    TDS:doc/latex/oberdiek/test/pdflscape-test6.txt
+%    TDS:doc/latex/oberdiek/test/ExtractRotate.java
 %    TDS:source/latex/oberdiek/pdflscape.dtx
 %
 %<*ignore>
@@ -67,7 +79,7 @@
 \input docstrip.tex
 \Msg{************************************************************************}
 \Msg{* Installation}
-\Msg{* Package: pdflscape 2007/04/17 v0.8 Landscape pages in PDF (HO)}
+\Msg{* Package: pdflscape 2007/10/21 v0.9 Landscape pages in PDF (HO)}
 \Msg{************************************************************************}
 
 \keepsilent
@@ -94,7 +106,11 @@ This Current Maintainer of this work is Heiko Oberdiek.
 
 This work consists of the main source file pdflscape.dtx
 and the derived files
-   pdflscape.sty, pdflscape.pdf, pdflscape.ins, pdflscape.drv.
+   pdflscape.sty, pdflscape.pdf, pdflscape.ins, pdflscape.drv,
+   pdflscape-test1.tex, pdflscape-test2.tex,
+   pdflscape-test3.tex, pdflscape-test4.tex,
+   pdflscape-test5.tex, pdflscape-test6.tex,
+   pdflscape-test6.txt, ExtractRotate.java.
 
 \endpreamble
 
@@ -103,6 +119,17 @@ and the derived files
   \file{pdflscape.drv}{\from{pdflscape.dtx}{driver}}%
   \usedir{tex/latex/oberdiek}%
   \file{pdflscape.sty}{\from{pdflscape.dtx}{package}}%
+  \usedir{doc/latex/oberdiek/test}%
+  \file{pdflscape-test1.tex}{\from{pdflscape.dtx}{test0,test1}}%
+  \file{pdflscape-test2.tex}{\from{pdflscape.dtx}{test0,test2}}%
+  \file{pdflscape-test3.tex}{\from{pdflscape.dtx}{test0,test3}}%
+  \file{pdflscape-test4.tex}{\from{pdflscape.dtx}{test0,test4}}%
+  \file{pdflscape-test5.tex}{\from{pdflscape.dtx}{test5}}%
+  \file{pdflscape-test6.tex}{\from{pdflscape.dtx}{test6}}%
+  \nopreamble
+  \nopostamble
+  \file{pdflscape-test6.txt}{\from{pdflscape.dtx}{result6}}%
+  \file{ExtractRotate.java}{\from{pdflscape.dtx}{ExtractRotate}}%
 }
 
 \obeyspaces
@@ -128,16 +155,17 @@ and the derived files
 %<*driver>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{pdflscape.drv}%
-  [2007/04/17 v0.8 Landscape pages in PDF (HO)]%
+  [2007/10/21 v0.9 Landscape pages in PDF (HO)]%
 \documentclass{ltxdoc}
-\usepackage{holtxdoc}
+\usepackage{holtxdoc}[2007/10/21]
+\usepackage{graphics}
 \begin{document}
   \DocInput{pdflscape.dtx}%
 \end{document}
 %</driver>
 % \fi
 %
-% \CheckSum{344}
+% \CheckSum{473}
 %
 % \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 +186,7 @@ and the derived files
 % \GetFileInfo{pdflscape.drv}
 %
 % \title{The \xpackage{pdflscape} package}
-% \date{2007/04/17 v0.8}
+% \date{2007/10/21 v0.9}
 % \author{Heiko Oberdiek\\\xemail{oberdiek@uni-freiburg.de}}
 %
 % \maketitle
@@ -224,35 +252,44 @@ and the derived files
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{pdflscape}%
-  [2007/04/17 v0.8 Landscape pages in PDF (HO)]
+  [2007/10/21 v0.9 Landscape pages in PDF (HO)]
 %    \end{macrocode}
 %
 % \subsection{Driver options}
 %
 %    \begin{macrocode}
+\let\PLS@option\@empty
 \let\PLS@driver\@empty
-\DeclareOption{pdftex}{%
-  \PassOptionsToPackage\CurrentOption{lscape}%
-  \def\PLS@driver{pdftex}%
-}
-\DeclareOption{dvips}{%
-  \PassOptionsToPackage\CurrentOption{lscape}%
-  \def\PLS@driver{dvips}%
-}
-\DeclareOption{dvipsone}{%
-  \PassOptionsToPackage\CurrentOption{lscape}%
-  \def\PLS@driver{dvips}%
-}
-\DeclareOption{pctexps}{%
-  \PassOptionsToPackage\CurrentOption{lscape}%
-  \def\PLS@driver{dvips}%
+\def\PLS@temp#1#2{%
+  \DeclareOption{#1}{%
+    \let\PLS@option\CurrentOption
+    \def\PLS@driver{#2}%
+  }%
 }
-\DeclareOption{dvipdfm}{%
-  \PassOptionsToPackage\CurrentOption{dvipdfm}%
-  \def\PLS@driver{dvipdfm}%
+\PLS@temp{pdftex}{pdftex}
+\PLS@temp{dvips}{dvips}
+\PLS@temp{dvipsone}{dvips}
+\PLS@temp{pctexps}{dvips}
+\PLS@temp{dvipdfm}{dvipdfm}
+\PLS@temp{dvipdfmx}{dvipdfm}
+\PLS@temp{xetex}{dvipdfm}
+\let\PLS@temp\@empty
+\DeclareOption*{%
+  \ifx\PLS@temp\@empty
+    \let\PLS@temp\CurrentOption
+  \else
+    \edef\PLS@temp{\PLS@temp,\CurrentOption}%
+  \fi
 }
-\DeclareOption*{\PassOptionsToPackage\CurrentOption{lscape}}
-\ProcessOptions
+\ProcessOptions*
+\ifx\PLS@option\@empty
+\else
+  \expandafter\PassOptionsToPackage\expandafter{\PLS@option}{lscape}%
+\fi
+\ifx\PLS@temp\@empty
+\else
+  \expandafter\PassOptionsToPackage\expandafter{\PLS@temp}{lscape}%
+\fi
 \RequirePackage{lscape}
 %    \end{macrocode}
 %
@@ -261,25 +298,17 @@ and the derived files
 % \subsubsection{Driver \xoption{pdftex}}
 %
 %    \begin{macrocode}
+\RequirePackage{ifpdf}[2006/02/20]
 \def\PLS@temp{pdftex}
-\ifnum 1=0\ifx\pdfoutput\@undefined
-          \else
-            \ifx\pdfoutput\relax
-            \else
-              \ifnum\pdfoutput>0 %
-                1%
-              \fi
-            \fi
-          \fi
-          \space
+\ifpdf
   \ifx\PLS@driver\@empty
     \let\PLS@driver\PLS@temp
-    \PackageInfo{pdflscape}{Auto-detected driver: `\PLS@temp'}%
+    \PackageInfo{pdflscape}{Auto-detected driver: \PLS@temp}%
   \fi
   \ifx\PLS@driver\PLS@temp
   \else
     \PackageError{pdflscape}{%
-      The driver option `\PLS@driver' is not compatible\MessageBreak
+      The driver option `\PLS@option' is not compatible\MessageBreak
       with pdfTeX in PDF mode, using driver `pdftex' instead%
     }\@ehc
     \let\PLS@driver\PLS@temp
@@ -287,58 +316,77 @@ and the derived files
 \fi
 %    \end{macrocode}
 %
-% \subsubsection{Driver \xoption{dvips}}
+% \subsubsection{Driver \xoption{xetex}}
 %
 %    \begin{macrocode}
-\def\PLS@temp{dvips}
-\ifnum 1=0\ifx\Gin@PS@raw\@undefined
-          \else
-            \ifx\Gin@PS@raw\relax
-            \else
-              \ifx\Gin@PS@raw\@empty
-              \else
-                1%
-              \fi
-            \fi
-          \fi
-          \space
+\RequirePackage{ifxetex}%
+\def\PLS@temp{dvipdfm}
+\ifxetex
   \ifx\PLS@driver\@empty
     \let\PLS@driver\PLS@temp
-    \PackageInfo{pdflscape}{Auto-detected driver: `\PLS@temp'}%
+    \PackageInfo{pdflscape}{%
+      Auto-detected driver: \PLS@temp\space(xetex)%
+    }%
   \fi
   \ifx\PLS@driver\PLS@temp
   \else
     \PackageError{pdflscape}{%
-      The driver option `\PLS@driver' is not compatible\MessageBreak
-      with detected PostScript driver,\MessageBreak
-      Will try using driver `dvips'%
+      The driver option `\PLS@option' is not compatible\MessageBreak
+      with XeTeX, using driver for XeTeX (dvipdfm) instead%
     }\@ehc
     \let\PLS@driver\PLS@temp
   \fi
 \fi
 %    \end{macrocode}
 %
-% \subsubsection{Driver \xoption{dvipdfm}}
+% \subsubsection{Detect driver based on \cs{Gin@driver}}
 %
 %    \begin{macrocode}
-\def\PLS@temp{dvipdfm.def}
-\ifx\PLS@temp\Gin@driver
-  \def\PLS@temp{dvipdfm}%
+\def\PLS@temp#1#2{%
   \ifx\PLS@driver\@empty
-    \let\PLS@driver\PLS@temp
-    \PackageInfo{pdflscape}{Auto-detected driver: `\PLS@temp'}%
+    \begingroup
+      \def\PLS@temp{#1.def}%
+    \expandafter\endgroup
+    \ifx\PLS@temp\Gin@driver
+      \def\PLS@driver{#2}%
+      \PackageInfo{pdflscape}{%
+        Auto-detected driver: \PLS@driver\space(#1)%
+      }%
+    \fi
   \fi
-  \ifx\PLS@driver\PLS@temp
-  \else
-    \PackageError{pdflscape}{%
-      Graphics driver `dvipdfm.def' is loaded, but this\MessageBreak
-      is incompatible with driver `\PLS@driver'.\MessageBreak
-      Will try using driver `dvipdfm'%
-    }\@ehc
+}
+\PLS@temp{dvipdfm}{dvipdfm}
+\PLS@temp{dvipdfmx}{dvipdfm}
+\PLS@temp{dvips}{dvips}
+\PLS@temp{dvipsone}{dvips}
+\PLS@temp{pctexps}{dvips}
+%    \end{macrocode}
+%
+% \subsubsection{Driver \xoption{dvips}}
+%
+%    \begin{macrocode}
+\ifx\PLS@driver\@empty
+  \def\PLS@temp{dvips}%
+  \ifnum 1=0\ifx\Gin@PS@raw\@undefined
+            \else
+              \ifx\Gin@PS@raw\relax
+              \else
+                \ifx\Gin@PS@raw\@empty
+                \else
+                  1%
+                \fi
+              \fi
+            \fi
+            \space
     \let\PLS@driver\PLS@temp
+    \PackageInfo{pdflscape}{%
+      Auto-detected driver: \PLS@temp\space(PostScript)%
+    }%
   \fi
 \fi
-
+%    \end{macrocode}
+%
+%    \begin{macrocode}
 \ifx\PLS@driver\@empty
   \PackageError{pdflscape}{%
     Neither pdfTeX, PostScript, nor dvipdfm driver found%
@@ -506,10 +554,10 @@ and the derived files
     \count@=#1\relax
   \fi
 %    \end{macrocode}
-%    Normalise to interval -360 $<$ |\count@| $<$ 360.
+%    Normalize to interval -360 $<$ |\count@| $<$ 360.
 %    \begin{macrocode}
-  \@whilenum\count@>359\do{\addtocounter\count@ -360 }%
-  \@whilenum\count@<-359\do{\addtocounter\count@ 360 }%
+  \@whilenum\count@>359\do{\advance\count@ -360 }%
+  \@whilenum\count@<-359\do{\advance\count@ 360 }%
 %    \end{macrocode}
 %    Check values: 0, +/-90, +/-180, +/-270
 %    \begin{macrocode}
@@ -534,6 +582,216 @@ and the derived files
 %</package>
 %    \end{macrocode}
 %
+% \section{Test}
+%
+% \subsection{Driver detection tests}
+%    \begin{macrocode}
+%<*test0>
+\NeedsTeXFormat{LaTeX2e}
+\documentclass{minimal}
+\usepackage{qstest}
+\IncludeTests{*}
+\LogTests{log}{*}{*}
+%</test0>
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+%<*test1>
+\usepackage{ifpdf}
+\ifpdf
+  \def\ExpectDriver{pdftex}%
+\fi
+\usepackage{ifxetex}%
+\ifxetex
+  \def\ExpectDriver{dvipdfm}%
+\fi
+\usepackage{pdflscape}[2007/10/21]
+%</test1>
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+%<*test2>
+\def\ExpectDriver{pdftex}
+\usepackage[pdftex]{pdflscape}[2007/10/21]
+%</test2>
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+%<*test3>
+\def\ExpectDriver{dvipdfm}
+\usepackage[dvipdfmx]{pdflscape}[2007/10/21]
+%</test3>
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+%<*test4>
+\def\ExpectDriver{dvips}
+\usepackage[dvipsone]{graphics}
+\usepackage{pdflscape}[2007/10/21]
+%</test4>
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+%<*test0>
+\begin{document}
+\begin{qstest}{driver}{driver}
+  \makeatletter
+  \Expect*{\PLS@driver}*{\ExpectDriver}%
+\end{qstest}
+\end{document}
+%</test0>
+%    \end{macrocode}
+%
+% \subsection{Test for \cs{PLS@CheckAngle}}
+%
+%    \begin{macrocode}
+%<*test5>
+\NeedsTeXFormat{LaTeX2e}
+\documentclass{minimal}
+\usepackage{qstest}
+\IncludeTests{*}
+\LogTests{log}{*}{*}
+\usepackage{pdflscape}[2007/10/21]
+\begin{document}
+\begin{qstest}{checkangle}{checkangle}
+  \makeatletter
+  \def\Result{%
+    \def\ResultString{\the\count@}%
+  }%
+  \def\PackageError#1#2#3{%
+    \def\Result{%
+      \def\ResultString{error}%
+    }%
+  }%
+  \def\Test#1#2{%
+    \begingroup
+      \PLS@CheckAngle{#1}%
+      \Result
+      \Expect*{\ResultString}{#2}%
+    \endgroup
+  }%
+  \Test{0}{0}%
+  \Test{90}{90}%
+  \Test{180}{180}%
+  \Test{270}{270}%
+  \Test{360}{0}%
+  \Test{450}{90}%
+  \Test{540}{180}%
+  \Test{630}{270}%
+  \Test{720}{0}%
+  \Test{3600}{0}%
+  \Test{3690}{90}%
+  \Test{-90}{270}%
+  \Test{-180}{180}%
+  \Test{-270}{-90}%
+  \Test{-360}{0}%
+  \Test{-450}{270}%
+  \Test{540}{180}%
+  \Test{-630}{90}%
+  \Test{-720}{0}%
+  \Test{-3600}{0}%
+  \Test{-3690}{270}%
+  \Test{1}{error}%
+  \Test{-1}{error}%
+  \Test{123}{error}%
+\end{qstest}
+\end{document}
+%</test5>
+%    \end{macrocode}
+%
+% \subsection{Test for rotate}
+%
+%    \begin{macrocode}
+%<*test6>
+\NeedsTeXFormat{LaTeX2e}
+\documentclass{article}
+\usepackage{pdflscape}[2007/10/21]
+\begin{document}
+\section{Portrait page}
+\begin{landscape}
+\section{Landscape page}
+Foo bar foo bar foo bar foo bar foo bar
+foo bar foo bar foo bar foo bar foo bar.
+\end{landscape}
+\section{Portrait Section}
+Foo bar
+\begin{landscape}
+\section{Again Landscape Section}
+\newpage
+\section{Second Page of Landscape Section}
+\end{landscape}
+\section{Second Last Portrait Page}
+\newpage
+\section{Last Portrait Page}
+\end{document}
+%</test6>
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+%<*result6>
+/Page 1 /Rotate 0
+/Page 2 /Rotate 90
+/Page 3 /Rotate 0
+/Page 4 /Rotate 90
+/Page 5 /Rotate 90
+/Page 6 /Rotate 0
+/Page 7 /Rotate 0
+%</result6>
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+%<*ExtractRotate>
+/**
+ * ExtractRotate.java
+ *
+ * Copyright (C) 2007 by Heiko Oberdiek <oberdiek@uni-freiburg.de>
+ *
+ * Requires: PDFBox (http://www.pdfbox.org/)
+ *
+ * Syntax: java ExtractRotate <pdffile> <textfile>
+ *
+ * The <pdffile> is analyzed and for each page its rotation
+ * setting is printed in the <textfile>. Example:
+ *   /Page 1 /Rotate 0
+ *   /Page 2 /Rotate 90
+ */
+import java.io.FileInputStream;
+import java.io.FileWriter;
+import org.pdfbox.pdfparser.PDFParser;
+import org.pdfbox.pdmodel.PDDocument;
+import org.pdfbox.pdmodel.PDDocumentCatalog;
+import org.pdfbox.pdmodel.PDPage;
+
+public class ExtractRotate {
+
+    public static void main(String[] args) {
+        try {
+            String infile = args[0];
+            String outfile = args[1];
+            FileWriter out = new FileWriter(outfile);
+            PDFParser parser =
+                    new PDFParser(new FileInputStream(infile));
+            parser.parse();
+            PDDocument document = parser.getPDDocument();
+            PDDocumentCatalog catalog = document.getDocumentCatalog();
+            int i = 0;
+            for (Object page: catalog.getAllPages()) {
+                i++;
+                out.write("/Page " + i + " " + "/Rotate "
+                        + ((PDPage)page).findRotation() + "\n");
+            }
+            document.close();
+            out.close();
+        }
+        catch (Exception e) {
+            e.printStackTrace();
+            System.exit(1);
+        }
+    }
+}
+%</ExtractRotate>
+%    \end{macrocode}
+%
 % \section{Installation}
 %
 % \subsection{Download}
@@ -595,6 +853,14 @@ and the derived files
 % \begin{tabular}{@{}>{\ttfamily}l@{ $\rightarrow$ }>{\ttfamily}l@{}}
 %   pdflscape.sty & tex/latex/oberdiek/pdflscape.sty\\
 %   pdflscape.pdf & doc/latex/oberdiek/pdflscape.pdf\\
+%   test/pdflscape-test1.tex & doc/latex/oberdiek/test/pdflscape-test1.tex\\
+%   test/pdflscape-test2.tex & doc/latex/oberdiek/test/pdflscape-test2.tex\\
+%   test/pdflscape-test3.tex & doc/latex/oberdiek/test/pdflscape-test3.tex\\
+%   test/pdflscape-test4.tex & doc/latex/oberdiek/test/pdflscape-test4.tex\\
+%   test/pdflscape-test5.tex & doc/latex/oberdiek/test/pdflscape-test5.tex\\
+%   test/pdflscape-test6.tex & doc/latex/oberdiek/test/pdflscape-test6.tex\\
+%   test/pdflscape-test6.txt & doc/latex/oberdiek/test/pdflscape-test6.txt\\
+%   test/ExtractRotate.java & doc/latex/oberdiek/test/ExtractRotate.java\\
 %   pdflscape.dtx & source/latex/oberdiek/pdflscape.dtx\\
 % \end{tabular}^^A
 % }^^A
@@ -759,6 +1025,12 @@ and the derived files
 %   \item
 %     Package \xpackage{atbegshi} replaces \xpackage{everyshi}.
 %   \end{Version}
+%   \begin{Version}{2007/10/21 v0.9}
+%   \item
+%     Driver detection for \XeTeX\ added.
+%   \item
+%     Fix for rotation angles $\le$~-360 or $\ge$~360.
+%   \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 7e02a938c18..0f08e628798 100644
--- a/Master/texmf-dist/source/latex/oberdiek/picture.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/picture.dtx
@@ -133,7 +133,7 @@ and the derived files
 \ProvidesFile{picture.drv}%
   [2007/04/11 v1.1 Dimens for picture macros (HO)]%
 \documentclass{ltxdoc}
-\usepackage{holtxdoc}
+\usepackage{holtxdoc}[2007/10/21]
 \begin{document}
   \DocInput{picture.dtx}%
 \end{document}
diff --git a/Master/texmf-dist/source/latex/oberdiek/pmboxdraw.dtx b/Master/texmf-dist/source/latex/oberdiek/pmboxdraw.dtx
index dd2d9c394e7..61724bfb5a8 100644
--- a/Master/texmf-dist/source/latex/oberdiek/pmboxdraw.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/pmboxdraw.dtx
@@ -132,7 +132,7 @@ and the derived files
 \ProvidesFile{pmboxdraw.drv}%
   [2006/05/03 v1.0 Poor man's box drawing characters (HO)]%
 \documentclass{ltxdoc}
-\usepackage{holtxdoc}
+\usepackage{holtxdoc}[2007/10/21]
 \usepackage{color}
 \usepackage{pmboxdraw}
 \usepackage{longtable}
@@ -1887,7 +1887,7 @@ and the derived files
 % \end{thebibliography}
 %
 % \begin{History}
-%   \begin{Version}{2006/03/14 v1.0}
+%   \begin{Version}{2006/05/03 v1.0}
 %   \item
 %     First version.
 %   \end{Version}
diff --git a/Master/texmf-dist/source/latex/oberdiek/refcount.dtx b/Master/texmf-dist/source/latex/oberdiek/refcount.dtx
index bd224367a77..48a03af9956 100644
--- a/Master/texmf-dist/source/latex/oberdiek/refcount.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/refcount.dtx
@@ -130,7 +130,7 @@ and the derived files
 \ProvidesFile{refcount.drv}%
   [2006/02/20 v3.0 Data extraction from references (HO)]%
 \documentclass{ltxdoc}
-\usepackage{holtxdoc}
+\usepackage{holtxdoc}[2007/10/21]
 \begin{document}
   \DocInput{refcount.dtx}%
 \end{document}
diff --git a/Master/texmf-dist/source/latex/oberdiek/selinput.dtx b/Master/texmf-dist/source/latex/oberdiek/selinput.dtx
index bfb5daca727..ab7cfcc13b6 100644
--- a/Master/texmf-dist/source/latex/oberdiek/selinput.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/selinput.dtx
@@ -53,11 +53,11 @@
 % Installation:
 %    TDS:tex/latex/oberdiek/selinput.sty
 %    TDS:doc/latex/oberdiek/selinput.pdf
-%    TDS:doc/latex/oberdiek/selinput-test1.tex
-%    TDS:doc/latex/oberdiek/selinput-test2.tex
-%    TDS:doc/latex/oberdiek/selinput-test3.tex
-%    TDS:doc/latex/oberdiek/selinput-test4.tex
-%    TDS:doc/latex/oberdiek/selinput-test5.tex
+%    TDS:doc/latex/oberdiek/test/selinput-test1.tex
+%    TDS:doc/latex/oberdiek/test/selinput-test2.tex
+%    TDS:doc/latex/oberdiek/test/selinput-test3.tex
+%    TDS:doc/latex/oberdiek/test/selinput-test4.tex
+%    TDS:doc/latex/oberdiek/test/selinput-test5.tex
 %    TDS:source/latex/oberdiek/selinput.dtx
 %
 %<*ignore>
@@ -110,7 +110,7 @@ and the derived files
   \file{selinput.drv}{\from{selinput.dtx}{driver}}%
   \usedir{tex/latex/oberdiek}%
   \file{selinput.sty}{\from{selinput.dtx}{package}}%
-  \usedir{doc/latex/oberdiek}%
+  \usedir{doc/latex/oberdiek/test}%
   \file{selinput-test1.tex}{\from{selinput.dtx}{test,test1}}%
   \file{selinput-test2.tex}{\from{selinput.dtx}{test,test2}}%
   \file{selinput-test3.tex}{\from{selinput.dtx}{test,test3}}%
@@ -143,7 +143,7 @@ and the derived files
 \ProvidesFile{selinput.drv}%
   [2007/09/09 v1.2 Select input encoding (HO)]%
 \documentclass{ltxdoc}
-\usepackage{holtxdoc}
+\usepackage{holtxdoc}[2007/10/21]
 \usepackage[T1]{fontenc}
 \usepackage{textcomp}
 \usepackage{lmodern}
@@ -811,11 +811,11 @@ and the derived files
 % \begin{tabular}{@{}>{\ttfamily}l@{ $\rightarrow$ }>{\ttfamily}l@{}}
 %   selinput.sty & tex/latex/oberdiek/selinput.sty\\
 %   selinput.pdf & doc/latex/oberdiek/selinput.pdf\\
-%   selinput-test1.tex & doc/latex/oberdiek/selinput-test1.tex\\
-%   selinput-test2.tex & doc/latex/oberdiek/selinput-test2.tex\\
-%   selinput-test3.tex & doc/latex/oberdiek/selinput-test3.tex\\
-%   selinput-test4.tex & doc/latex/oberdiek/selinput-test4.tex\\
-%   selinput-test5.tex & doc/latex/oberdiek/selinput-test5.tex\\
+%   test/selinput-test1.tex & doc/latex/oberdiek/test/selinput-test1.tex\\
+%   test/selinput-test2.tex & doc/latex/oberdiek/test/selinput-test2.tex\\
+%   test/selinput-test3.tex & doc/latex/oberdiek/test/selinput-test3.tex\\
+%   test/selinput-test4.tex & doc/latex/oberdiek/test/selinput-test4.tex\\
+%   test/selinput-test5.tex & doc/latex/oberdiek/test/selinput-test5.tex\\
 %   selinput.dtx & source/latex/oberdiek/selinput.dtx\\
 % \end{tabular}^^A
 % }^^A
diff --git a/Master/texmf-dist/source/latex/oberdiek/setouterhbox.dtx b/Master/texmf-dist/source/latex/oberdiek/setouterhbox.dtx
index 039f226328e..c2d4316d91b 100644
--- a/Master/texmf-dist/source/latex/oberdiek/setouterhbox.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/setouterhbox.dtx
@@ -55,8 +55,8 @@
 %    TDS:tex/generic/oberdiek/setouterhbox.sty
 %    TDS:doc/latex/oberdiek/setouterhbox.pdf
 %    TDS:doc/latex/oberdiek/setouterhbox-example.tex
-%    TDS:doc/latex/oberdiek/setouterhbox-test1.tex
-%    TDS:doc/latex/oberdiek/setouterhbox-test2.tex
+%    TDS:doc/latex/oberdiek/test/setouterhbox-test1.tex
+%    TDS:doc/latex/oberdiek/test/setouterhbox-test2.tex
 %    TDS:source/latex/oberdiek/setouterhbox.dtx
 %
 %<*ignore>
@@ -112,6 +112,7 @@ and the derived files
   \file{setouterhbox.sty}{\from{setouterhbox.dtx}{package}}%
   \usedir{doc/latex/oberdiek}%
   \file{setouterhbox-example.tex}{\from{setouterhbox.dtx}{example}}%
+  \usedir{doc/latex/oberdiek/test}%
   \file{setouterhbox-test1.tex}{\from{setouterhbox.dtx}{test1}}%
   \file{setouterhbox-test2.tex}{\from{setouterhbox.dtx}{test2}}%
 }
@@ -141,7 +142,7 @@ and the derived files
 \ProvidesFile{setouterhbox.drv}%
   [2007/09/09 v1.7 Set hbox in outer horizontal mode (HO)]%
 \documentclass{ltxdoc}
-\usepackage{holtxdoc}
+\usepackage{holtxdoc}[2007/10/21]
 \begin{document}
   \DocInput{setouterhbox.dtx}%
 \end{document}
@@ -869,8 +870,8 @@ by/a/very_long_long_long_path.html}%
 %   setouterhbox.sty & tex/generic/oberdiek/setouterhbox.sty\\
 %   setouterhbox.pdf & doc/latex/oberdiek/setouterhbox.pdf\\
 %   setouterhbox-example.tex & doc/latex/oberdiek/setouterhbox-example.tex\\
-%   setouterhbox-test1.tex & doc/latex/oberdiek/setouterhbox-test1.tex\\
-%   setouterhbox-test2.tex & doc/latex/oberdiek/setouterhbox-test2.tex\\
+%   test/setouterhbox-test1.tex & doc/latex/oberdiek/test/setouterhbox-test1.tex\\
+%   test/setouterhbox-test2.tex & doc/latex/oberdiek/test/setouterhbox-test2.tex\\
 %   setouterhbox.dtx & source/latex/oberdiek/setouterhbox.dtx\\
 % \end{tabular}^^A
 % }^^A
diff --git a/Master/texmf-dist/source/latex/oberdiek/settobox.dtx b/Master/texmf-dist/source/latex/oberdiek/settobox.dtx
index 31ea14d36a4..c9cf4d226e8 100644
--- a/Master/texmf-dist/source/latex/oberdiek/settobox.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/settobox.dtx
@@ -135,7 +135,7 @@ and the derived files
 \ProvidesFile{settobox.drv}%
   [2007/04/11 v1.3 Getting box sizes (HO)]%
 \documentclass{ltxdoc}
-\usepackage{holtxdoc}
+\usepackage{holtxdoc}[2007/10/21]
 \usepackage{calc}
 \usepackage{settobox}
 \begin{document}
diff --git a/Master/texmf-dist/source/latex/oberdiek/soulutf8.dtx b/Master/texmf-dist/source/latex/oberdiek/soulutf8.dtx
index 567ec5de4ad..c55e366e27d 100644
--- a/Master/texmf-dist/source/latex/oberdiek/soulutf8.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/soulutf8.dtx
@@ -53,11 +53,11 @@
 % Installation:
 %    TDS:tex/generic/oberdiek/soulutf8.sty
 %    TDS:doc/latex/oberdiek/soulutf8.pdf
-%    TDS:doc/latex/oberdiek/soulutf8-test1.tex
-%    TDS:doc/latex/oberdiek/soulutf8-test2.tex
-%    TDS:doc/latex/oberdiek/soulutf8-test3.tex
-%    TDS:doc/latex/oberdiek/soulutf8-test4.tex
-%    TDS:doc/latex/oberdiek/soulutf8-test5.tex
+%    TDS:doc/latex/oberdiek/test/soulutf8-test1.tex
+%    TDS:doc/latex/oberdiek/test/soulutf8-test2.tex
+%    TDS:doc/latex/oberdiek/test/soulutf8-test3.tex
+%    TDS:doc/latex/oberdiek/test/soulutf8-test4.tex
+%    TDS:doc/latex/oberdiek/test/soulutf8-test5.tex
 %    TDS:source/latex/oberdiek/soulutf8.dtx
 %
 %<*ignore>
@@ -110,7 +110,7 @@ and the derived files
   \file{soulutf8.drv}{\from{soulutf8.dtx}{driver}}%
   \usedir{tex/generic/oberdiek}%
   \file{soulutf8.sty}{\from{soulutf8.dtx}{package}}%
-  \usedir{doc/latex/oberdiek}%
+  \usedir{doc/latex/oberdiek/test}%
   \file{soulutf8-test1.tex}{\from{soulutf8.dtx}{test1}}%
   \file{soulutf8-test2.tex}{\from{soulutf8.dtx}{test2,utf8}}%
   \file{soulutf8-test3.tex}{\from{soulutf8.dtx}{test3,utf8x}}%
@@ -143,7 +143,7 @@ and the derived files
 \ProvidesFile{soulutf8.drv}%
   [2007/09/09 v1.0 Adding support for UTF-8 to soul (HO)]%
 \documentclass{ltxdoc}
-\usepackage{holtxdoc}
+\usepackage{holtxdoc}[2007/10/21]
 \begin{document}
   \DocInput{soulutf8.dtx}%
 \end{document}
@@ -1602,11 +1602,11 @@ and the derived files
 % \begin{tabular}{@{}>{\ttfamily}l@{ $\rightarrow$ }>{\ttfamily}l@{}}
 %   soulutf8.sty & tex/generic/oberdiek/soulutf8.sty\\
 %   soulutf8.pdf & doc/latex/oberdiek/soulutf8.pdf\\
-%   soulutf8-test1.tex & doc/latex/oberdiek/soulutf8-test1.tex\\
-%   soulutf8-test2.tex & doc/latex/oberdiek/soulutf8-test2.tex\\
-%   soulutf8-test3.tex & doc/latex/oberdiek/soulutf8-test3.tex\\
-%   soulutf8-test4.tex & doc/latex/oberdiek/soulutf8-test4.tex\\
-%   soulutf8-test5.tex & doc/latex/oberdiek/soulutf8-test5.tex\\
+%   test/soulutf8-test1.tex & doc/latex/oberdiek/test/soulutf8-test1.tex\\
+%   test/soulutf8-test2.tex & doc/latex/oberdiek/test/soulutf8-test2.tex\\
+%   test/soulutf8-test3.tex & doc/latex/oberdiek/test/soulutf8-test3.tex\\
+%   test/soulutf8-test4.tex & doc/latex/oberdiek/test/soulutf8-test4.tex\\
+%   test/soulutf8-test5.tex & doc/latex/oberdiek/test/soulutf8-test5.tex\\
 %   soulutf8.dtx & source/latex/oberdiek/soulutf8.dtx\\
 % \end{tabular}^^A
 % }^^A
diff --git a/Master/texmf-dist/source/latex/oberdiek/stackrel.dtx b/Master/texmf-dist/source/latex/oberdiek/stackrel.dtx
index e260b98cebe..e6a0943d07c 100644
--- a/Master/texmf-dist/source/latex/oberdiek/stackrel.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/stackrel.dtx
@@ -128,7 +128,7 @@ and the derived files
 \ProvidesFile{stackrel.drv}%
   [2007/05/06 v1.1 Adding subscript option to stackrel (HO)]%
 \documentclass{ltxdoc}
-\usepackage{holtxdoc}
+\usepackage{holtxdoc}[2007/10/21]
 \usepackage{amsmath}
 \usepackage{stackrel}
 \begin{document}
diff --git a/Master/texmf-dist/source/latex/oberdiek/stringenc.dtx b/Master/texmf-dist/source/latex/oberdiek/stringenc.dtx
index d39c7fafd83..fb8ea6bca77 100644
--- a/Master/texmf-dist/source/latex/oberdiek/stringenc.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/stringenc.dtx
@@ -102,8 +102,8 @@
 %    TDS:tex/generic/oberdiek/se-cp1251.def
 %    TDS:tex/generic/oberdiek/se-cp1257.def
 %    TDS:doc/latex/oberdiek/stringenc.pdf
-%    TDS:doc/latex/oberdiek/stringenc-test1.tex
-%    TDS:doc/latex/oberdiek/stringenc-test2.tex
+%    TDS:doc/latex/oberdiek/test/stringenc-test1.tex
+%    TDS:doc/latex/oberdiek/test/stringenc-test2.tex
 %    TDS:source/latex/oberdiek/stringenc.dtx
 %
 %<*ignore>
@@ -119,7 +119,7 @@
 \input docstrip.tex
 \Msg{************************************************************************}
 \Msg{* Installation}
-\Msg{* Package: stringenc 2007/09/09 v1.2 Converts strings between encodings (HO)}
+\Msg{* Package: stringenc 2007/10/22 v1.3 Converts strings between encodings (HO)}
 \Msg{************************************************************************}
 
 \keepsilent
@@ -205,7 +205,7 @@ and the derived files
   \file{se-cp1250.def}{\from{stringenc.dtx}{general,cp1250}}%
   \file{se-cp1251.def}{\from{stringenc.dtx}{general,cp1251}}%
   \file{se-cp1257.def}{\from{stringenc.dtx}{general,cp1257}}%
-  \usedir{doc/latex/oberdiek}%
+  \usedir{doc/latex/oberdiek/test}%
   \file{stringenc-test1.tex}{\from{stringenc.dtx}{test1}}%
   \file{stringenc-test2.tex}{\from{stringenc.dtx}{test2}}%
 }
@@ -244,9 +244,9 @@ and the derived files
 %<*driver>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{stringenc.drv}%
-  [2007/09/09 v1.2 Converts strings between encodings (HO)]%
+  [2007/10/22 v1.3 Converts strings between encodings (HO)]%
 \documentclass{ltxdoc}
-\usepackage{holtxdoc}
+\usepackage{holtxdoc}[2007/10/21]
 \usepackage{longtable}
 \begin{document}
   \DocInput{stringenc.dtx}%
@@ -254,7 +254,7 @@ and the derived files
 %</driver>
 % \fi
 %
-% \CheckSum{5882}
+% \CheckSum{5894}
 %
 % \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
@@ -275,7 +275,7 @@ and the derived files
 % \GetFileInfo{stringenc.drv}
 %
 % \title{The \xpackage{stringenc} package}
-% \date{2007/09/09 v1.2}
+% \date{2007/10/22 v1.3}
 % \author{Heiko Oberdiek\\\xemail{oberdiek@uni-freiburg.de}}
 %
 % \maketitle
@@ -342,8 +342,9 @@ and the derived files
 % \begin{declcs}{StringEncodingConvertTest}
 %   \M{cmd} \M{string} \M{from} \M{to} \M{success} \M{failure}
 % \end{declcs}
-% If the converted string does not interest in case of an
-% error, then \cs{StringEncodingConvertTest} is more efficient,
+% Macro \cs{StringEncodingConvertTest} is more efficient
+% than \cs{StringEncodingConvert} if the converted string
+% does not interest in case of an error,
 % because the conversion stops at the first error.
 % If \meta{string} can be successfully converted from encoding
 % \meta{from} to encoding \meta{to}, then macro \meta{cmd} contains
@@ -351,6 +352,11 @@ and the derived files
 % code \meta{failure} is executed, the contents of \meta{cmd} is
 % undefined.
 %
+% \begin{declcs}{StringEncodingList}
+% \end{declcs}
+% Macro \cs{StringEncodingList} contains a comma separated
+% list of supported encodings (without alias names).
+%
 % \subsection{Supported encodings}
 %
 % \begin{longtable}{@{}ll@{}}
@@ -461,7 +467,7 @@ and the derived files
   \fi
 \expandafter\x\csname ver@stringenc.sty\endcsname
 \ProvidesPackage{stringenc}%
-  [2007/09/09 v1.2 Converts strings between encodings (HO)]
+  [2007/10/22 v1.3 Converts strings between encodings (HO)]
 %    \end{macrocode}
 %
 % \subsection{Catcodes}
@@ -752,23 +758,15 @@ and the derived files
 \def\StringEncodingLoad#1{%
   \begingroup
     \catcode32=10 % space/space
-    \catcode34=12 % "
     \catcode35=6  % #/parameter
     \catcode37=14 % percent/comment character
-    \catcode45=12 % -
-    \catcode46=12 % .
-    \catcode47=12 % /
-    \catcode58=12 % :
-    \catcode60=12 % <
-    \catcode61=12 % =
-    \catcode62=12 % >
-    \catcode64=11 % @
-    \catcode91=12 % [
     \catcode92=0  % backslash/escape character
-    \catcode93=12 % ]
     \catcode123=1 % {/beginning of group
     \catcode125=2 % }/end of group
     \endlinechar=-1 %
+    \SE@MakeLetters @ABCDEFGHIKLMNOPRSTU%
+                    abcdefghiklmnoprstuvwxyz\relax
+    \SE@MakeOthers "-./:<=>[]0123456789\relax
     \expandafter\ifx\csname ProvidesFile\endcsname\relax
       \def\ProvidesFile##1[##2]{%
         \immediate\write-1{File: ##1 ##2}%
@@ -780,6 +778,29 @@ and the derived files
 %    \end{macrocode}
 %    \end{macro}
 %
+%    \begin{macro}{\SE@MakeLetters}
+%    \begin{macrocode}
+\def\SE@MakeLetters#1{%
+  \ifx#1\relax
+  \else
+    \catcode`#1=11 %
+    \expandafter\SE@MakeLetters
+  \fi
+}
+%    \end{macrocode}
+%    \end{macro}
+%    \begin{macro}{\SE@MakeOthers}
+%    \begin{macrocode}
+\def\SE@MakeOthers#1{%
+  \ifx#1\relax
+  \else
+    \catcode`#1=12 %
+    \expandafter\SE@MakeOthers
+  \fi
+}
+%    \end{macrocode}
+%    \end{macro}
+%
 %    \begin{macro}{\SE@InputIfFileExists}
 %    \begin{macrocode}
 \begingroup\expandafter\expandafter\expandafter\endgroup
@@ -1342,9 +1363,9 @@ $ \fi
 \SE@temp{nextstep}
 %    \end{macrocode}
 %
-%    \begin{macro}{\SE@EncodingFileList}
+%    \begin{macro}{\StringEncodingList}
 %    \begin{macrocode}
-\def\SE@EncodingFileList{%
+\def\StringEncodingList{%
   ascii,%
   cp437,%
   cp850,%
@@ -1397,8 +1418,8 @@ $ \fi
 %
 %    \begin{macrocode}
 %<*utf32>
-%<utf32be>\ProvidesFile{se-utf32be.def}[2007/09/09 v1.2 stringenc: UTF-32BE]
-%<utf32le>\ProvidesFile{se-utf32le.def}[2007/09/09 v1.2 stringenc: UTF-32LE]
+%<utf32be>\ProvidesFile{se-utf32be.def}[2007/10/22 v1.3 stringenc: UTF-32BE]
+%<utf32le>\ProvidesFile{se-utf32le.def}[2007/10/22 v1.3 stringenc: UTF-32LE]
 %    \end{macrocode}
 %
 %    \begin{macrocode}
@@ -1556,7 +1577,7 @@ $ \fi
 %
 %    \begin{macrocode}
 %<*utf8>
-\ProvidesFile{se-utf8.def}[2007/09/09 v1.2 stringenc: UTF-8]
+\ProvidesFile{se-utf8.def}[2007/10/22 v1.3 stringenc: UTF-8]
 %    \end{macrocode}
 %
 %    \noindent
@@ -1896,7 +1917,7 @@ $ \fi
 %
 %    \begin{macrocode}
 %<*utf16le>
-\ProvidesFile{se-utf16le.def}[2007/09/09 v1.2 stringenc: UTF-16LE]
+\ProvidesFile{se-utf16le.def}[2007/10/22 v1.3 stringenc: UTF-16LE]
 %    \end{macrocode}
 %
 %    \begin{macrocode}
@@ -1936,7 +1957,7 @@ $ \fi
 %
 %    \begin{macrocode}
 %<*pdfdoc>
-\ProvidesFile{se-pdfdoc.def}[2007/09/09 v1.2 stringenc: PDFDocEncoding]
+\ProvidesFile{se-pdfdoc.def}[2007/10/22 v1.3 stringenc: PDFDocEncoding]
 %    \end{macrocode}
 %
 %    Pass ranges 32..126 and 160..255 through and use
@@ -2067,7 +2088,7 @@ $ \fi
 %
 %    \begin{macrocode}
 %<*iso-8859-1>
-\ProvidesFile{se-iso-8859-1.def}[2007/09/09 v1.2 stringenc: ISO-8859-1]
+\ProvidesFile{se-iso-8859-1.def}[2007/10/22 v1.3 stringenc: ISO-8859-1]
 %    \end{macrocode}
 %
 %    Excluded area: 0x80..0x9F
@@ -2137,7 +2158,7 @@ $ \fi
 %
 %    \begin{macrocode}
 %<*cp1252>
-\ProvidesFile{se-cp1252.def}[2007/09/09 v1.2 stringenc: cp1252]
+\ProvidesFile{se-cp1252.def}[2007/10/22 v1.3 stringenc: cp1252]
 %    \end{macrocode}
 %
 %    \begin{macrocode}
@@ -2238,7 +2259,7 @@ $ \fi
 %
 %    \begin{macrocode}
 %<*ascii>
-\ProvidesFile{se-ascii.def}[2007/09/09 v1.2 stringenc: US-ASCII]
+\ProvidesFile{se-ascii.def}[2007/10/22 v1.3 stringenc: US-ASCII]
 %    \end{macrocode}
 %
 %    \begin{macrocode}
@@ -2287,123 +2308,123 @@ $ \fi
 %
 %    \begin{macrocode}
 %<*iso-8859-2>
-\ProvidesFile{se-iso-8859-2.def}[2007/09/09 v1.2 stringenc: ISO-8859-2]
+\ProvidesFile{se-iso-8859-2.def}[2007/10/22 v1.3 stringenc: ISO-8859-2]
 \def\SE@this{iso-8859-2}
 %</iso-8859-2>
 %<*iso-8859-3>
-\ProvidesFile{se-iso-8859-3.def}[2007/09/09 v1.2 stringenc: ISO-8859-3]
+\ProvidesFile{se-iso-8859-3.def}[2007/10/22 v1.3 stringenc: ISO-8859-3]
 \def\SE@this{iso-8859-3}
 %</iso-8859-3>
 %<*iso-8859-4>
-\ProvidesFile{se-iso-8859-4.def}[2007/09/09 v1.2 stringenc: ISO-8859-4]
+\ProvidesFile{se-iso-8859-4.def}[2007/10/22 v1.3 stringenc: ISO-8859-4]
 \def\SE@this{iso-8859-4}
 %</iso-8859-4>
 %<*iso-8859-5>
-\ProvidesFile{se-iso-8859-5.def}[2007/09/09 v1.2 stringenc: ISO-8859-5]
+\ProvidesFile{se-iso-8859-5.def}[2007/10/22 v1.3 stringenc: ISO-8859-5]
 \def\SE@this{iso-8859-5}
 %</iso-8859-5>
 %<*iso-8859-6>
-\ProvidesFile{se-iso-8859-6.def}[2007/09/09 v1.2 stringenc: ISO-8859-6]
+\ProvidesFile{se-iso-8859-6.def}[2007/10/22 v1.3 stringenc: ISO-8859-6]
 \def\SE@this{iso-8859-6}
 %</iso-8859-6>
 %<*iso-8859-7>
-\ProvidesFile{se-iso-8859-7.def}[2007/09/09 v1.2 stringenc: ISO-8859-7]
+\ProvidesFile{se-iso-8859-7.def}[2007/10/22 v1.3 stringenc: ISO-8859-7]
 \def\SE@this{iso-8859-7}
 %</iso-8859-7>
 %<*iso-8859-8>
-\ProvidesFile{se-iso-8859-8.def}[2007/09/09 v1.2 stringenc: ISO-8859-8]
+\ProvidesFile{se-iso-8859-8.def}[2007/10/22 v1.3 stringenc: ISO-8859-8]
 \def\SE@this{iso-8859-8}
 %</iso-8859-8>
 %<*iso-8859-9>
-\ProvidesFile{se-iso-8859-9.def}[2007/09/09 v1.2 stringenc: ISO-8859-9]
+\ProvidesFile{se-iso-8859-9.def}[2007/10/22 v1.3 stringenc: ISO-8859-9]
 \def\SE@this{iso-8859-9}
 %</iso-8859-9>
 %<*iso-8859-10>
-\ProvidesFile{se-iso-8859-10.def}[2007/09/09 v1.2 stringenc: ISO-8859-10]
+\ProvidesFile{se-iso-8859-10.def}[2007/10/22 v1.3 stringenc: ISO-8859-10]
 \def\SE@this{iso-8859-10}
 %</iso-8859-10>
 %<*iso-8859-11>
-\ProvidesFile{se-iso-8859-11.def}[2007/09/09 v1.2 stringenc: ISO-8859-11]
+\ProvidesFile{se-iso-8859-11.def}[2007/10/22 v1.3 stringenc: ISO-8859-11]
 \def\SE@this{iso-8859-11}
 %</iso-8859-11>
 %<*iso-8859-13>
-\ProvidesFile{se-iso-8859-13.def}[2007/09/09 v1.2 stringenc: ISO-8859-13]
+\ProvidesFile{se-iso-8859-13.def}[2007/10/22 v1.3 stringenc: ISO-8859-13]
 \def\SE@this{iso-8859-13}
 %</iso-8859-13>
 %<*iso-8859-14>
-\ProvidesFile{se-iso-8859-14.def}[2007/09/09 v1.2 stringenc: ISO-8859-14]
+\ProvidesFile{se-iso-8859-14.def}[2007/10/22 v1.3 stringenc: ISO-8859-14]
 \def\SE@this{iso-8859-14}
 %</iso-8859-14>
 %<*iso-8859-15>
-\ProvidesFile{se-iso-8859-15.def}[2007/09/09 v1.2 stringenc: ISO-8859-15]
+\ProvidesFile{se-iso-8859-15.def}[2007/10/22 v1.3 stringenc: ISO-8859-15]
 \def\SE@this{iso-8859-15}
 %</iso-8859-15>
 %<*iso-8859-16>
-\ProvidesFile{se-iso-8859-16.def}[2007/09/09 v1.2 stringenc: ISO-8859-16]
+\ProvidesFile{se-iso-8859-16.def}[2007/10/22 v1.3 stringenc: ISO-8859-16]
 \def\SE@this{iso-8859-16}
 %</iso-8859-16>
 %<*koi8-r>
-\ProvidesFile{se-koi8-r.def}[2007/09/09 v1.2 stringenc: KOI8-R]
+\ProvidesFile{se-koi8-r.def}[2007/10/22 v1.3 stringenc: KOI8-R]
 \def\SE@this{koi8-r}
 %</koi8-r>
 %<*nextstep>
-\ProvidesFile{se-nextstep.def}[2007/09/09 v1.2 stringenc: NextStep]
+\ProvidesFile{se-nextstep.def}[2007/10/22 v1.3 stringenc: NextStep]
 \def\SE@this{nextstep}
 %</nextstep>
 %<*mac-centeuro>
-\ProvidesFile{se-mac-centeuro.def}[2007/09/09 v1.2 stringenc: Mac OS Central European]
+\ProvidesFile{se-mac-centeuro.def}[2007/10/22 v1.3 stringenc: Mac OS Central European]
 \def\SE@this{mac-centeuro}
 %</mac-centeuro>
 %<*mac-cyrillic>
-\ProvidesFile{se-mac-cyrillic.def}[2007/09/09 v1.2 stringenc: Mac OS Cyrillic]
+\ProvidesFile{se-mac-cyrillic.def}[2007/10/22 v1.3 stringenc: Mac OS Cyrillic]
 \def\SE@this{mac-cyrillic}
 %</mac-cyrillic>
 %<*mac-roman>
-\ProvidesFile{se-mac-roman.def}[2007/09/09 v1.2 stringenc: Mac OS Roman]
+\ProvidesFile{se-mac-roman.def}[2007/10/22 v1.3 stringenc: Mac OS Roman]
 \def\SE@this{mac-roman}
 %</mac-roman>
 %<*dec-mcs>
-\ProvidesFile{se-dec-mcs.def}[2007/09/09 v1.2 stringenc: DEC-MCS]
+\ProvidesFile{se-dec-mcs.def}[2007/10/22 v1.3 stringenc: DEC-MCS]
 \def\SE@this{dec-mcs}
 %</dec-mcs>
 %<*cp437>
-\ProvidesFile{se-cp437.def}[2007/09/09 v1.2 stringenc: cp437]
+\ProvidesFile{se-cp437.def}[2007/10/22 v1.3 stringenc: cp437]
 \def\SE@this{cp437}
 %</cp437>
 %<*cp850>
-\ProvidesFile{se-cp850.def}[2007/09/09 v1.2 stringenc: cp850]
+\ProvidesFile{se-cp850.def}[2007/10/22 v1.3 stringenc: cp850]
 \def\SE@this{cp850}
 %</cp850>
 %<*cp852>
-\ProvidesFile{se-cp852.def}[2007/09/09 v1.2 stringenc: cp852]
+\ProvidesFile{se-cp852.def}[2007/10/22 v1.3 stringenc: cp852]
 \def\SE@this{cp852}
 %</cp852>
 %<*cp855>
-\ProvidesFile{se-cp855.def}[2007/09/09 v1.2 stringenc: cp855]
+\ProvidesFile{se-cp855.def}[2007/10/22 v1.3 stringenc: cp855]
 \def\SE@this{cp855}
 %</cp855>
 %<*cp858>
-\ProvidesFile{se-cp858.def}[2007/09/09 v1.2 stringenc: cp858]
+\ProvidesFile{se-cp858.def}[2007/10/22 v1.3 stringenc: cp858]
 \def\SE@this{cp858}
 %</cp858>
 %<*cp865>
-\ProvidesFile{se-cp865.def}[2007/09/09 v1.2 stringenc: cp865]
+\ProvidesFile{se-cp865.def}[2007/10/22 v1.3 stringenc: cp865]
 \def\SE@this{cp865}
 %</cp865>
 %<*cp866>
-\ProvidesFile{se-cp866.def}[2007/09/09 v1.2 stringenc: cp866]
+\ProvidesFile{se-cp866.def}[2007/10/22 v1.3 stringenc: cp866]
 \def\SE@this{cp866}
 %</cp866>
 %<*cp1250>
-\ProvidesFile{se-cp1250.def}[2007/09/09 v1.2 stringenc: cp1250]
+\ProvidesFile{se-cp1250.def}[2007/10/22 v1.3 stringenc: cp1250]
 \def\SE@this{cp1250}
 %</cp1250>
 %<*cp1251>
-\ProvidesFile{se-cp1251.def}[2007/09/09 v1.2 stringenc: cp1251]
+\ProvidesFile{se-cp1251.def}[2007/10/22 v1.3 stringenc: cp1251]
 \def\SE@this{cp1251}
 %</cp1251>
 %<*cp1257>
-\ProvidesFile{se-cp1257.def}[2007/09/09 v1.2 stringenc: cp1257]
+\ProvidesFile{se-cp1257.def}[2007/10/22 v1.3 stringenc: cp1257]
 \def\SE@this{cp1257}
 %</cp1257>
 %    \end{macrocode}
@@ -5877,10 +5898,10 @@ $ \fi
   \repeat
 }
 \def\Test{%
-  \RangeCatcodeInvalid{0}{47}
-  \RangeCatcodeInvalid{58}{64}
-  \RangeCatcodeInvalid{91}{96}
-  \RangeCatcodeInvalid{123}{255}
+  \RangeCatcodeInvalid{0}{47}%
+  \RangeCatcodeInvalid{58}{64}%
+  \RangeCatcodeInvalid{91}{96}%
+  \RangeCatcodeInvalid{123}{255}%
   \catcode`\@=12 %
   \catcode`\\=0 %
   \catcode`\{=1 %
@@ -5891,7 +5912,7 @@ $ \fi
   \catcode`\%=14 %
   \catcode`\ =10 %
   \catcode13=5 %
-  \usepackage{stringenc}[2007/09/09]%
+  \usepackage{stringenc}[2007/10/22]%
   \RestoreCatcodes
 }
 \Test
@@ -5904,22 +5925,23 @@ $ \fi
 \IncludeTests{*}
 \LogTests{log}{*}{*}
 \def\Test#1{%
-  \begin{qstest}{loading}{loading}
-    \RangeCatcodeInvalid{0}{47}%
-    % 0-9
-    \RangeCatcodeInvalid{58}{64}%
-    % A-Z
-    \RangeCatcodeInvalid{91}{96}%
-    % a-z
-    \RangeCatcodeInvalid{123}{255}%
+  \begin{qstest}{loading}{loading}%
+%    \RangeCatcodeInvalid{0}{47}%
+%    % 0-9
+%    \RangeCatcodeInvalid{58}{64}%
+%    % A-Z
+%    \RangeCatcodeInvalid{91}{96}%
+%    % a-z
+%    \RangeCatcodeInvalid{123}{255}%
     \setbox0=\hbox{%
       \def\par{p}%
+      \RangeCatcodeInvalid{0}{255}%
       \StringEncodingLoad{#1}%
     }%
-    \Expect*{\the\wd0}{0.0pt}
-  \end{qstest}
+    \Expect*{\the\wd0}{0.0pt}%
+  \end{qstest}%
 }
-\@for\x:=\SE@EncodingFileList\do{%
+\@for\x:=\StringEncodingList\do{%
   \Test\x
 }
 \@@end
@@ -5941,7 +5963,7 @@ $ \fi
   \let\SavedNumexpr\numexpr
   \let\numexpr\relax
 \fi
-\usepackage{stringenc}[2007/09/09]
+\usepackage{stringenc}[2007/10/22]
 \ifx\plainmode Y
   \let\numexpr\SavedNumexpr
 \fi
@@ -5957,7 +5979,7 @@ $ \fi
   \x
 }
 \def\TestTest#1#2#3#4#5|#6|#7\NIL{%
-  \begin{qstest}{encodings}{encodings, conversion}
+  \begin{qstest}{encodings}{encodings, conversion}%
     \setbox0=\hbox{%
       \def\par{p}%
       \EdefUnescapeHex\IN{#4}%
@@ -5973,8 +5995,8 @@ $ \fi
         }%
       }%
     }%
-    \Expect*{\the\wd0}{0.0pt}
-  \end{qstest}
+    \Expect*{\the\wd0}{0.0pt}%
+  \end{qstest}%
 }
 
 \def\AllBytesLow{%
@@ -6403,8 +6425,8 @@ $ \fi
 %   se-cp1251.def & tex/generic/oberdiek/se-cp1251.def\\
 %   se-cp1257.def & tex/generic/oberdiek/se-cp1257.def\\
 %   stringenc.pdf & doc/latex/oberdiek/stringenc.pdf\\
-%   stringenc-test1.tex & doc/latex/oberdiek/stringenc-test1.tex\\
-%   stringenc-test2.tex & doc/latex/oberdiek/stringenc-test2.tex\\
+%   test/stringenc-test1.tex & doc/latex/oberdiek/test/stringenc-test1.tex\\
+%   test/stringenc-test2.tex & doc/latex/oberdiek/test/stringenc-test2.tex\\
 %   stringenc.dtx & source/latex/oberdiek/stringenc.dtx\\
 % \end{tabular}^^A
 % }^^A
@@ -6536,11 +6558,17 @@ $ \fi
 %   \item
 %     Fixes for cp850, cp852, nextstep.
 %   \end{Version}
-%   \begin{Version}{2007/08/27 v1.2}
+%   \begin{Version}{2007/09/09 v1.2}
 %   \item
 %     Uses \cs{EdefSanitize} instead of \cs{PE@sanitize}
 %     from package \xpackage{pdfescape} (2007/08/27 v1.5).
 %   \end{Version}
+%   \begin{Version}{2007/10/22 v1.3}
+%   \item
+%     \cs{StringEncodingList} added.
+%   \item
+%     Safer encoding file loading by ensuring all used catcodes.
+%   \end{Version}
 % \end{History}
 %
 % \PrintIndex
diff --git a/Master/texmf-dist/source/latex/oberdiek/tabularht.dtx b/Master/texmf-dist/source/latex/oberdiek/tabularht.dtx
index cd59cea4ddb..3dcdd52f5b5 100644
--- a/Master/texmf-dist/source/latex/oberdiek/tabularht.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/tabularht.dtx
@@ -137,7 +137,7 @@ and the derived files
 \ProvidesFile{tabularht.drv}%
   [2007/04/11 v2.5 Tabular with height specification (HO)]%
 \documentclass{ltxdoc}
-\usepackage{holtxdoc}
+\usepackage{holtxdoc}[2007/10/21]
 \begin{document}
   \DocInput{tabularht.dtx}%
 \end{document}
diff --git a/Master/texmf-dist/source/latex/oberdiek/tabularkv.dtx b/Master/texmf-dist/source/latex/oberdiek/tabularkv.dtx
index 1a5549aa69d..d555412de81 100644
--- a/Master/texmf-dist/source/latex/oberdiek/tabularkv.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/tabularkv.dtx
@@ -133,7 +133,7 @@ and the derived files
 \ProvidesFile{tabularkv.drv}%
   [2006/02/20 v1.1 Key value interface for tabular parameters (HO)]%
 \documentclass{ltxdoc}
-\usepackage{holtxdoc}
+\usepackage{holtxdoc}[2007/10/21]
 \begin{document}
   \DocInput{tabularkv.dtx}%
 \end{document}
diff --git a/Master/texmf-dist/source/latex/oberdiek/telprint.dtx b/Master/texmf-dist/source/latex/oberdiek/telprint.dtx
index 12c7b3a636a..b6d8ea642d4 100644
--- a/Master/texmf-dist/source/latex/oberdiek/telprint.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/telprint.dtx
@@ -53,7 +53,7 @@
 % Installation:
 %    TDS:tex/generic/oberdiek/telprint.sty
 %    TDS:doc/latex/oberdiek/telprint.pdf
-%    TDS:doc/latex/oberdiek/telprint-test1.tex
+%    TDS:doc/latex/oberdiek/test/telprint-test1.tex
 %    TDS:source/latex/oberdiek/telprint.dtx
 %
 %<*ignore>
@@ -106,7 +106,7 @@ and the derived files
   \file{telprint.drv}{\from{telprint.dtx}{driver}}%
   \usedir{tex/generic/oberdiek}%
   \file{telprint.sty}{\from{telprint.dtx}{package}}%
-  \usedir{doc/latex/oberdiek}%
+  \usedir{doc/latex/oberdiek/test}%
   \file{telprint-test1.tex}{\from{telprint.dtx}{test1}}%
 }
 
@@ -135,7 +135,7 @@ and the derived files
 \ProvidesFile{telprint.drv}%
   [2007/09/09 v1.9 Formatting of German phone numbers (HO)]%
 \documentclass{ltxdoc}
-\usepackage{holtxdoc}
+\usepackage{holtxdoc}[2007/10/21]
 \usepackage[ngerman,english]{babel}
 \begin{document}
   \DocInput{telprint.dtx}%
@@ -673,7 +673,7 @@ and the derived files
 % \begin{tabular}{@{}>{\ttfamily}l@{ $\rightarrow$ }>{\ttfamily}l@{}}
 %   telprint.sty & tex/generic/oberdiek/telprint.sty\\
 %   telprint.pdf & doc/latex/oberdiek/telprint.pdf\\
-%   telprint-test1.tex & doc/latex/oberdiek/telprint-test1.tex\\
+%   test/telprint-test1.tex & doc/latex/oberdiek/test/telprint-test1.tex\\
 %   telprint.dtx & source/latex/oberdiek/telprint.dtx\\
 % \end{tabular}^^A
 % }^^A
diff --git a/Master/texmf-dist/source/latex/oberdiek/transparent.dtx b/Master/texmf-dist/source/latex/oberdiek/transparent.dtx
index 296430a90d4..9e063029efa 100644
--- a/Master/texmf-dist/source/latex/oberdiek/transparent.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/transparent.dtx
@@ -133,7 +133,7 @@ and the derived files
 \ProvidesFile{transparent.drv}%
   [2007/01/08 v1.0 Using a pdfTeX's color stack for transparency (HO)]%
 \documentclass{ltxdoc}
-\usepackage{holtxdoc}
+\usepackage{holtxdoc}[2007/10/21]
 \begin{document}
   \DocInput{transparent.dtx}%
 \end{document}
diff --git a/Master/texmf-dist/source/latex/oberdiek/twoopt.dtx b/Master/texmf-dist/source/latex/oberdiek/twoopt.dtx
index df7c0658b6b..f242bf8f3dc 100644
--- a/Master/texmf-dist/source/latex/oberdiek/twoopt.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/twoopt.dtx
@@ -128,7 +128,7 @@ and the derived files
 \ProvidesFile{twoopt.drv}%
   [2006/02/20 v1.4 Definitions with two optional arguments (HO)]%
 \documentclass{ltxdoc}
-\usepackage{holtxdoc}
+\usepackage{holtxdoc}[2007/10/21]
 \begin{document}
   \DocInput{twoopt.dtx}%
 \end{document}
diff --git a/Master/texmf-dist/source/latex/oberdiek/zref.dtx b/Master/texmf-dist/source/latex/oberdiek/zref.dtx
index 538670f6955..a91ef3dcf88 100644
--- a/Master/texmf-dist/source/latex/oberdiek/zref.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/zref.dtx
@@ -168,7 +168,7 @@ and the derived files
 \ProvidesFile{zref.drv}%
   [2007/05/28 v2.1 New reference scheme for LaTeX2e (HO)]%
 \documentclass{ltxdoc}
-\usepackage{holtxdoc}
+\usepackage{holtxdoc}[2007/10/21]
 \begin{document}
   \DocInput{zref.dtx}%
 \end{document}