vhistory update (1mar09)

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

15 files changed, 116 insertions, 117 deletions

diff --git a/Master/texmf-dist/doc/latex/vhistory/CHANGES b/Master/texmf-dist/doc/latex/vhistory/CHANGES
index 7d4dc7806e7..2d7ff34b12a 100644
--- a/Master/texmf-dist/doc/latex/vhistory/CHANGES
+++ b/Master/texmf-dist/doc/latex/vhistory/CHANGES
@@ -1,10 +1,5 @@
-2007-07-21: Bugfix: owncaptions is now working again

-            New function: option hideauthorcolumn

-            Improvement: usage of markboth or markright, respectively

-            Bugfix: usage of \immediate when writing to files

-            Improvement: no more unnecessary \tabcolsep

-            Special thanks to Christian and Sergio for their bug reports and

-            improvements.

-2006-01-09: Implementation of \listset changed. It now works within an \edef,

-            but the element \empty is no longer allowed in a set.

+2009-03-01: Bug solved that occured when the first two letters of an element
+            of a set were identical.
+2006-01-09: Implementation of \listset changed. It now works within an \edef,
+            but the element \empty is no longer allowed in a set.
 2005-08-13: Documentation: Reference to LPPL added.
\ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/vhistory/README b/Master/texmf-dist/doc/latex/vhistory/README
index f66983581a5..67535885e03 100644
--- a/Master/texmf-dist/doc/latex/vhistory/README
+++ b/Master/texmf-dist/doc/latex/vhistory/README
@@ -1,37 +1,37 @@
-See below for German version.

-

-This folder contains the files of the LaTeX packages "vhistory" and "sets".

-User documentation can be found in the subdirectory doc.  An example for

-vhistory can be found there, too.

-

-All feedback is welcome!  Please use the address mentioned in the

-documentation.

-

-REQUIREMENTS:

-Requirements are listed in the user documentation.

-

-LICENSE:

-The material in this directory and all of its subdirectories is subject

-to the LaTeX Project Public License.  See

-http://www.ctan.org/tex-archive/help/Catalogue/licenses.lppl.html for

-the details of that license.

-

-==============================================================================

-GERMAN VERSION:

-

-Dieser Ordner enthaelt die Dateien der LaTeX-Pakete "vhistory" und "sets".

-Die Dokumentation befindet sich im Unterverzeichnis doc. Ein Beispiel für

-die Verwendung von vhistory (in englischer Sprache) befindet sich ebenfalls

-in diesem Verzeichnis.

-

-Rueckmeldung ueber Fehler oder Verbesserungsvorschlaege an die in der

-Dokumentation angegebene Adresse sind stets willkommen.

-

-SYSTEMANFORDERUNGEN:

-Die Benutzerdokumentation listet alle benoetigten Pakete auf.

-

-LIZENZ:

-Das gesamte Material dieses Verzeichnisses und all seiner Unterverzeichnisse

-steht unter der LaTeX Project Public License. Diese kann in englischer Sprache

-unter http://www.ctan.org/tex-archive/help/Catalogue/licenses.lppl.html

+See below for German version.
+
+This folder contains the files of the LaTeX packages "vhistory" and "sets".
+User documentation can be found in the subdirectory doc.  An example for
+vhistory can be found there, too.
+
+All feedback is welcome!  Please use the address mentioned in the
+documentation.
+
+REQUIREMENTS:
+Requirements are listed in the user documentation.
+
+LICENSE:
+The material in this directory and all of its subdirectories is subject
+to the LaTeX Project Public License.  See
+http://www.ctan.org/tex-archive/help/Catalogue/licenses.lppl.html for
+the details of that license.
+
+==============================================================================
+GERMAN VERSION:
+
+Dieser Ordner enthaelt die Dateien der LaTeX-Pakete "vhistory" und "sets".
+Die Dokumentation befindet sich im Unterverzeichnis doc. Ein Beispiel für
+die Verwendung von vhistory (in englischer Sprache) befindet sich ebenfalls
+in diesem Verzeichnis.
+
+Rueckmeldung ueber Fehler oder Verbesserungsvorschlaege an die in der
+Dokumentation angegebene Adresse sind stets willkommen.
+
+SYSTEMANFORDERUNGEN:
+Die Benutzerdokumentation listet alle benoetigten Pakete auf.
+
+LIZENZ:
+Das gesamte Material dieses Verzeichnisses und all seiner Unterverzeichnisse
+steht unter der LaTeX Project Public License. Diese kann in englischer Sprache
+unter http://www.ctan.org/tex-archive/help/Catalogue/licenses.lppl.html
 eingesehen werden.
\ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/vhistory/de_vhistory.tex b/Master/texmf-dist/doc/latex/vhistory/de_vhistory.tex
index 0a98259eb36..e7313996f19 100644
--- a/Master/texmf-dist/doc/latex/vhistory/de_vhistory.tex
+++ b/Master/texmf-dist/doc/latex/vhistory/de_vhistory.tex
@@ -1,5 +1,5 @@
 \section{Das Paket vhistory}
-Sinn und Zweck dieses Pakets wurde bereits ausführlich in Abschnitt~\ref{einleitung} beschrieben. Ich sagte ja, dass es sich lohnt, die Einleitung zu lesen. Hier soll nun ausführlich erklärt werden, wie man mit vhistory arbeitet.
+Sinn und Zweck dieses Pakets wurde bereits ausführlich in Abschnitt \ref{einleitung} beschrieben. Ich sagte ja, dass es sich lohnt, die Einleitung zu lesen. Hier soll nun ausführlich erklärt werden, wie man mit vhistory arbeitet.
 
 \subsection{Laden des Pakets}\label{laden}
 Das Paket wird wie üblich in der Präambel mit dem Befehl\\
@@ -13,9 +13,7 @@ Das Paket vhistory versteht einige Optionen, um sein Verhalten anzupassen. Diese
 
 \paragraph{tocentry:} Mit dieser Option wird veranlasst, dass die Versionshistorie im Inhaltsverzeichnis aufgeführt wird. Normalerweise wird dieser Eintrag nicht erzeugt. Ist die Option nochapter aktiviert hat tocentry keine Funktion. Hier sind Sie selbst für eventuelle Einträge in das Inhaltsverzeichnis verantwortlich.
 
-\paragraph{owncaptions:} vhistory unterstützt die Sprachen Deutsch und Englisch. Verwenden Sie eine nicht unterstützte Sprache, werden die Überschriften (z.\,B. "`Versionshistorie"' oder "`Änderungen"') in Englisch ausgegeben. In diesem Fall möchten Sie vielleicht die Überschriften selbst verändern. Die Option own\-capt\-ions unterstützt Sie dabei. Näheres zu diesem Thema finden Sie in Unterabschnitt~\ref{sprachen}.
-
-\paragraph{hideauthorcolumn:} Wenn das zu erstellende Dokument nur einen Autor hat, ist die Spalte "`Autor(en)"' in der Versionshistorie eventuell unerwünscht. Mit dieser Option wird die Anzeige der Spalte unterdrückt. Die Syntax aller anderen Befehle ändert sich nicht. Insbesondere kann auch weiterhin eine Liste aller Autoren ausgegeben werden.
+\paragraph{owncaptions:} vhistory unterstützt die Sprachen Deutsch und Englisch. Verwenden Sie eine nicht unterstützte Sprache, werden die Überschriften (z.\,B. "`Versionshistorie"' oder "`Änderungen"') in Englisch ausgegeben. In diesem Fall möchten Sie vielleicht die Überschriften selbst verändern. Die Option own\-capt\-ions unterstützt Sie dabei. Näheres zu diesem Thema finden Sie in Unterabschnitt \ref{sprachen}.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \subsection{Verwendung}\label{verwendung}
@@ -50,12 +48,12 @@ Der Befehl ist ebenfalls ab der Einbindung des Pakets verfügbar.
 \subsubsection{Liste aller Autoren ausgeben}
 An eine Liste der Autoren kommen Sie auf zwei Wege. Über das Kommando\\
 \mbox{}\hspace{2em}\verb|\vhAllAuthorsSet|\\
-können Sie sich die Autoren als Menge wie in Abschnitt~\ref{sets} beschrieben zurückgeben lassen. Der weitaus einfachere Weg liegt im Kommando\\
+können Sie sich die Autoren als Menge wie in Abschnitt \ref{sets} beschrieben zurückgeben lassen. Der weitaus einfachere Weg liegt im Kommando\\
 \mbox{}\hspace{2em}\verb|\vhListAllAuthors|.
 
 Dieses Kommando gibt eine alphabetisch sortierte Liste der Autoren aus. Die einzelnen Einträge werden durch Kommata getrennt. Soll stattdessen ein anderes Trennzeichen -- beispielsweise \texttt{\&} zur Ausgabe in einer Tabelle -- verwendet werden, können sie den Befehl\\
 \mbox{}\hspace{2em}\verb|\setsepararator|\\
-aus dem Paket sets umdefinieren (siehe auch Abschnitt~\ref{inspektoren}).
+aus dem Paket sets umdefinieren (siehe auch Abschnitt \ref{inspektoren}).
 
 Manchmal möchten Sie vielleicht, dass die Autorenliste komplette Namen statt Kürzeln enthält, zum Beispiel
 "`Jochen Wer\-ten\-au\-er"' statt des Kürzels "`JW"', das in der Versionshistorie Verwendung findet. Indem Sie das Kommando\\
@@ -66,9 +64,16 @@ In der Versionshistorie wird weiterhin der Text ``JW'' angezeigt, aber das Komma
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \subsection{Sprachunterstützung}\label{sprachen}
-Wie schon in Abschnitt~\ref{laden} erwähnt unterstützt vhistory die Sprachen Deutsch und Englisch. Die sprachabhängigen Texte mit ihren Voreinstellungen sind in Tabelle~\ref{tab:sprachen} aufgelistet. Soll das Dokument in einer Sprache verfasst werden, die vhistory nicht unterstützt, wird die englische Variante gewählt.
+Wie schon in Abschnitt \ref{laden} erwähnt unterstützt vhistory die Sprachen Deutsch und Englisch. Die sprachabhängigen Texte mit ihren Voreinstellungen sind in Tabelle \ref{tab:sprachen} aufgelistet. Soll das Dokument in einer Sprache verfasst werden, die vhistory nicht unterstützt, wird die englische Variante gewählt.
+
+Mit der Paketoption "`owncaptions"' können eigene Überschriften verwendet werden. Die Option veranlasst vhistory dazu, die Kommandos, die die Überschriften enthalten, mit den Varianten der aktuell gewählten Sprache vorzubelegen. Deshalb ist es sinnvoll, in diesem Fall Pakete wie babel oder ngerman vor vhistory zu laden.
+
+Über das Kommando\\
+\mbox{}\hspace{2em}\verb|\renewcommand{<Kommando>}{<gewünschter Text>}|\\
+kann eine Überschrift verändert werden. Wollen Sie beispielsweise statt "`Änderungen"' lieber "`Verbesserungen"' verwenden, schreiben Sie\\
+\mbox{}\hspace{2em}\verb|\renewcommand{\vhchangename}{Verbesserungen}|.
 
-\begin{table}
+\begin{table}%[htb]
 \begin{center}
 \begin{tabular}{|l|l|l|}\hline
 \textbf{Kommando} & \textbf{Deutsch} & \textbf{Englisch}\\ \hline
@@ -83,13 +88,7 @@ Wie schon in Abschnitt~\ref{laden} erwähnt unterstützt vhistory die Sprachen Deu
 \end{center}
 \end{table}
 
-Mit der Paketoption "`owncaptions"' können eigene Überschriften verwendet werden. Die Option veranlasst vhistory dazu, die Kommandos, die die Überschriften enthalten, mit den Varianten der aktuell gewählten Sprache vorzubelegen. Deshalb ist es sinnvoll, in diesem Fall Pakete wie babel oder ngerman vor vhistory zu laden.
-
-Über das Kommando\\
-\mbox{}\hspace{2em}\verb|\renewcommand{<Kommando>}{<gewünschter Text>}|\\
-kann eine Überschrift verändert werden. Wollen Sie beispielsweise statt "`Änderungen"' lieber "`Verbesserungen"' verwenden, schreiben Sie\\
-\mbox{}\hspace{2em}\verb|\renewcommand{\vhchangename}{Verbesserungen}|.
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \subsection{Beispiel}
-\input{de_beispiel}
+%Abbildung \ref{abb:beispiel} zeigt ein kurzes Beispiel für die Verwendung von vhistory.
+\input{de_beispiel}
\ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/vhistory/en_introduction.tex b/Master/texmf-dist/doc/latex/vhistory/en_introduction.tex
index d0b95ef129e..123f7608d88 100644
--- a/Master/texmf-dist/doc/latex/vhistory/en_introduction.tex
+++ b/Master/texmf-dist/doc/latex/vhistory/en_introduction.tex
@@ -18,11 +18,11 @@ From my own experience I know, that the list of authors is practically never cor
 
 Therefore it would be nice, if the author of a document only had to take care of the history of versions. The informations on title-page and in footers should be generated from the history of versions automatically.
 
-These requirements cannot be implemented without any effort because the titlepage for instance is processed by \LaTeX\ before the history of versions is even read. 
+These requirements cannot be implemented without any effort, because the titlepage for instance is processed by \LaTeX\ before the history of versions is even read. 
 All relevant data therefore has to be written to a file and read again before processing the titlepage. As for some applications even the moment when the aux-file is read is too late, an own file with the extension hst is created.
 The table containing the history of versions needs an own file, too, but this topic will be discussed later.
 
 
-Another problem is the list of authors. This list cannot be created be simply concatenating the author entries because this would result in duplicate entries. At this time the package sets was born allowing to manage simple sets of text. At every entry in the history of versions, the set of authors is merged with the set of authors given at this entry. The alphabetically sorted set of authors can then be printed wherever one likes---normally on the tile-page.
+Another problem is the list of authors. This list cannot be created be simply concatenating the author entries, because this would result in duplicate entries. At this time the package sets was born allowing to manage simple sets of text. At every entry in the history of versions, the set of authors is merged with the set of authors given at this entry. The alphabetically sorted set of authors can then be printed wherever one likes---normally on the tile-page.
 
-The following to sections describe the two packages in more detail and explain, how to use them. I decided not to repeat anything of source code here. Those who are interested can take a look at the sources. I tried to structure and comment the sources in a way that makes it readable for humans.
+The following to sections describe the two packages in more detail and explain, how to use them. I decided not to repeat anything of source code here. Those who are interested can take a look at the sources. I tried to structure and comment the sources in a way that makes it readable for humans.
\ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/vhistory/en_sets.tex b/Master/texmf-dist/doc/latex/vhistory/en_sets.tex
index df14b3bdf88..2702db5bfa5 100644
--- a/Master/texmf-dist/doc/latex/vhistory/en_sets.tex
+++ b/Master/texmf-dist/doc/latex/vhistory/en_sets.tex
@@ -72,7 +72,7 @@ If you determine the size of set $L$, the result\sizeofset{\sL}\is{mycounter}---
 
 \paragraph{Testing for membership:}By using the command\\
 \mbox{}\hspace{2em}\verb$\iselementofset{$$e$\verb$}{$$S$\verb$}$\\
-you can check, whether $e \in S$ is true. The effort is $O(1)$ because all work is done by the pattern matching of \TeX. The sequence\\
+you can check, whether $e \in S$ is true. The effort is $O(1)$, because all work is done by the pattern matching of \TeX. The sequence\\
 \mbox{}\hspace{2em}\verb$\if \iselementofset{Bob}{\sC}Yes\else No\fi$\\
 would result in the output ``\if \iselementofset{Bob}{\sC}Yes\else No\fi'', the same test with set $D$ in ``\if \iselementofset{Bob}{\sD}Yes\else No\fi''.
 
@@ -138,7 +138,7 @@ After execution of the command, $R$ contains the sorted set. The sorting is done
 
 At sorting, the elements are compared as they are, i.\,e. possibly contained macros are not expanded but compared by their name (including the backslash).
 
-\paragraph{Removing duplicates:} The operations \emph{only} works on sorted sets! You actually will not need it very often because the creation of a set using \verb|\newset| does the work automatically (by using this macro). However, I decided to make this macro available to public; probably sometimes someone really needs it.
+\paragraph{Removing duplicates:} The operations \emph{only} works on sorted sets! You actually will not need it very often, because the creation of a set using \verb|\newset| does the work automatically (by using this macro). However, I decided to make this macro available to public; probably sometimes someone really needs it.
 Duplicate removal is called with:\\
 \mbox{}\hspace{2em}\verb|\deleteduplicates{|$S$\verb|}{|$R$\verb|}|,\\
 with $R$ being the result set and $S$ being the sorted set, whose duplicates shall be removed.
@@ -173,4 +173,4 @@ The given complexity classes can help you to arrange a set of operations in the
   \caption{Complexity classes of set operations}%
   \label{tab:complexity}%
   \end{center}
-\end{table}
+\end{table}
\ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/vhistory/en_vhistory.tex b/Master/texmf-dist/doc/latex/vhistory/en_vhistory.tex
index fa869305ef5..a5c974eb6c4 100644
--- a/Master/texmf-dist/doc/latex/vhistory/en_vhistory.tex
+++ b/Master/texmf-dist/doc/latex/vhistory/en_vhistory.tex
@@ -17,12 +17,10 @@ Vhistory understands several options to control its behaviour. These are listed
 
 \paragraph{owncaptions:} vhistory supports the languages English and German. If you use an unsopported language, all captions (like ``History of versions'' or ``Chan\-ges'') will be in English. In this case you might want to change captions yourself. The option own\-capt\-ions supports you in this case. More information on this topic can be found in subsection \ref{languages}.
 
-\paragraph{hideauthorcolumn:} If the document to create will only have one author, the column ``autor(s)'' in the history of versions is maybe unwanted. By using this option, you suppress the display of the column. The syntax of all other commands remains unchanged. In particular it is still possible to print a list of all authors.
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \subsection{Usage}\label{usage}
 The Usage of vhistory is rather easy and is to be described in this subsection.
-It is important to know that vhistory needs to runs of \LaTeX\ because some data is written to external files.
+It is important to know that vhistory needs to runs of \LaTeX, because some data is written to external files.
 
 \subsubsection{Creating the history of versions}\label{begin}
 The history of versions is an environment:\\
@@ -95,4 +93,4 @@ to get the desired result.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \subsection{Example}
-\input{en_example}
+\input{en_example}
\ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/vhistory/vh_set_example.pdf b/Master/texmf-dist/doc/latex/vhistory/vh_set_example.pdf
index 117bff29db8..5bf6b439403 100644
--- a/Master/texmf-dist/doc/latex/vhistory/vh_set_example.pdf
+++ b/Master/texmf-dist/doc/latex/vhistory/vh_set_example.pdf
diff --git a/Master/texmf-dist/doc/latex/vhistory/vh_set_example.tex b/Master/texmf-dist/doc/latex/vhistory/vh_set_example.tex
index ab7a02aad5b..c34a44394b7 100644
--- a/Master/texmf-dist/doc/latex/vhistory/vh_set_example.tex
+++ b/Master/texmf-dist/doc/latex/vhistory/vh_set_example.tex
@@ -5,23 +5,23 @@
 %
 
 \documentclass{scrartcl}
-\usepackage{hyperref, vhistory}
+\usepackage{vhistory, hyperref}
+
+\newcommand{\docTitle}{}
 
-%% Setting up headers and footers
 \usepackage{scrpage2}
 \pagestyle{scrheadings}
+
 \ifoot{An example for vhistory---Version \vhCurrentVersion}
 \cfoot[]{}
 \ofoot[\thepage]{\thepage}
 
 \begin{document}
 
-%% Shortcuts for author names
 \newcommand{\JW}{Jochen Wertenauer}
 \newcommand{\PF}{Peter Foo}
 \newcommand{\MB}{Mary Bar}
 
-%% Title
 {\renewcommand{\setseparator}{ \and }
 \title{An example for vhistory}
 \author{\vhListAllAuthorsLong}
@@ -29,7 +29,6 @@
 \maketitle
 }
 
-%% History of versions
 \begin{versionhistory}
   \vhEntry{1.0}{22/01/04}{JW|PF}{Creation}
   \vhEntry{1.1}{23/01/04}{JW|MB}{Error correction}
@@ -50,4 +49,4 @@ more bla bla bla
 \section{bla bla}
 even more bla bla.
 
-\end{document}
+\end{document}
\ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/vhistory/vh_sets_de.pdf b/Master/texmf-dist/doc/latex/vhistory/vh_sets_de.pdf
index 3e214205e07..6e1cf1669c0 100644
--- a/Master/texmf-dist/doc/latex/vhistory/vh_sets_de.pdf
+++ b/Master/texmf-dist/doc/latex/vhistory/vh_sets_de.pdf
diff --git a/Master/texmf-dist/doc/latex/vhistory/vh_sets_de.tex b/Master/texmf-dist/doc/latex/vhistory/vh_sets_de.tex
index 3e632e73c54..4c07fb60f13 100644
--- a/Master/texmf-dist/doc/latex/vhistory/vh_sets_de.tex
+++ b/Master/texmf-dist/doc/latex/vhistory/vh_sets_de.tex
@@ -13,14 +13,13 @@
 \usepackage[english,ngerman]{babel} 
 \usepackage{graphicx, mparhack, fixltx2e, ellipsis, sets}
 \usepackage[newcommands]{ragged2e} % verbesserter Flattersatz
-\usepackage{microtype} % Optischer Randausgleich, ... 
 
 %----------------  Schriften  ------------------------------------------------
 \usepackage{mathpazo} % Palatino
-\usepackage[scaled=0.95]{helvet} % Sansserif-Schrift: Helvetica
-\usepackage[scaled=0.885]{luximono}		% TeleType-Schrift: Luxi Mono
+\usepackage[scaled=0.95]{helvet} % Sansserif-Schrift: Frutiger
+\usepackage{courier}								% TeleType-Schrift Courier
 
-\usepackage{setspace}	% 1.05-facher Zeilenabstand wegen Palatino
+\usepackage{setspace}								% 1.05-facher Zeilenabstand wegen Palatino
 \linespread{1.05}
 
 \usepackage[T1]{fontenc}						% T1-Schriften verwenden
diff --git a/Master/texmf-dist/doc/latex/vhistory/vh_sets_en.pdf b/Master/texmf-dist/doc/latex/vhistory/vh_sets_en.pdf
index 438b210c9e0..18875266dc5 100644
--- a/Master/texmf-dist/doc/latex/vhistory/vh_sets_en.pdf
+++ b/Master/texmf-dist/doc/latex/vhistory/vh_sets_en.pdf
diff --git a/Master/texmf-dist/doc/latex/vhistory/vh_sets_en.tex b/Master/texmf-dist/doc/latex/vhistory/vh_sets_en.tex
index c0f39fe8e59..eedec562ddc 100644
--- a/Master/texmf-dist/doc/latex/vhistory/vh_sets_en.tex
+++ b/Master/texmf-dist/doc/latex/vhistory/vh_sets_en.tex
@@ -8,12 +8,11 @@
 
 \usepackage{graphicx, mparhack, fixltx2e, ellipsis, sets}
 \usepackage[newcommands]{ragged2e}
-\usepackage{microtype}
 
 %----------------  Fonts  ----------------------------------------------------
 \usepackage{mathpazo} % Palatino
 \usepackage[scaled=0.95]{helvet} % 
-\usepackage[scaled=0.885]{luximono}		% TeleType font: Luxi Mono
+\usepackage{courier}				% TeleType font: Courier
 
 \usepackage{setspace}				% line spread 1.05 (because of Palatino)
 \linespread{1.05}
diff --git a/Master/texmf-dist/tex/latex/vhistory/sets.sty b/Master/texmf-dist/tex/latex/vhistory/sets.sty
index 8c5de82fa42..4042752545c 100644
--- a/Master/texmf-dist/tex/latex/vhistory/sets.sty
+++ b/Master/texmf-dist/tex/latex/vhistory/sets.sty
@@ -3,8 +3,8 @@
 %% FILE: sets.sty                                                           %%
 %%                                                                          %%
 %% AUTHOR: Jochen Wertenauer                                                %%
-%% VERSION: 1.1                                                             %%
-%% DATE: 2006-01-09                                                         %%
+%% VERSION: 1.2                                                             %%
+%% DATE: 2009-03-01                                                         %%
 %%                                                                          %%
 %% LICENSE: This program may be distributed and/or modified under the       %%
 %% conditions of the LaTeX Project Public License, either version 1.2       %%
@@ -53,16 +53,18 @@
 
 %% Helper Methods ------------------------------------------------------------
 
-\let \xpa \expandafter
-\def \xxpa{\xpa\xpa\xpa}
+\let \sets@xpa \expandafter
+\def \sets@xxpa{\sets@xpa\sets@xpa\sets@xpa}
+
+\def \sets@empty{\empty}
 
 %% Appends #1 to the definition of macro #2.
-\def \sets@append #1\to#2{\xpa \def \xpa #2\xpa{#2#1}}
+\def \sets@append #1\to#2{\sets@xpa \def \sets@xpa #2\sets@xpa{#2#1}}
 
 %% Removes the first character of the content of #2 and stores the result in
-%% #1. Note that \xpa\xpa\xpa cannot be replaced by \xxpa here!
+%% #1. Note that \sets@xpa\sets@xpa\sets@xpa cannot be replaced by \sets@xxpa here!
 \def \sets@gobblefirst #1#2{%
-  \xxpa \def \xpa\xpa\xpa #1\xpa\xpa\xpa {\xpa\@gobble #2}}
+  \sets@xxpa \def \sets@xpa\sets@xpa\sets@xpa #1\sets@xpa\sets@xpa\sets@xpa {\sets@xpa\@gobble #2}}
 
 %% Deletes everthing to the next occurance of > inludung the >.
 \def \sets@erasetobrace #1>{}
@@ -75,7 +77,7 @@
 %%   \if ...
 %% \repeat  
 \def \sets@loop #1\repeat{%
-  \def \iterate {#1\xpa \iterate\fi}%
+  \def \iterate {#1\sets@xpa \iterate\fi}%
   \iterate \let\iterate\relax}
 
 \long\def \sets@ReturnFi #1\fi{\fi #1}
@@ -97,11 +99,11 @@
 %% The macros are based on a sort algorithm by Klaus Lagally.
 \def \sets@compStrings #1#2{%
   \def \sets@CSti{#1}%
-  \edef\sets@ctempi{\xpa\sets@erasetobrace\meaning \sets@CSti}%
+  \edef\sets@ctempi{\sets@xpa\sets@erasetobrace\meaning \sets@CSti}%
   \def \sets@CStii{#2}%
-  \edef\sets@ctempii{\xpa\sets@erasetobrace\meaning \sets@CStii}%
+  \edef\sets@ctempii{\sets@xpa\sets@erasetobrace\meaning \sets@CStii}%
   \sets@lessfalse\sets@greaterfalse
-  \xxpa\sets@compI \xpa\sets@ctempi\xpa|\xpa\\\sets@ctempii|\relax
+  \sets@xxpa\sets@compI \sets@xpa\sets@ctempi\sets@xpa|\sets@xpa\\\sets@ctempii|\relax
 }
 
 
@@ -151,7 +153,7 @@
 %% Stores the size of set #1 in the LaTeX counter #2. #2 has to be existing.
 \def \sizeofset #1\is#2{%
   \setcounter{#2}{0}%
-  \xpa\sets@sizeofset #1|\endset{#2}%
+  \sets@xpa\sets@sizeofset #1|\endset{#2}%
 }
 
 % Helper method for \sizeofset. Recursively calls itself. Implemented straight
@@ -173,15 +175,16 @@
 %% Printing a set ------------------------------------------------------------
 
 %% The content of this macro will be used to separate the elements of the set.
-\def \setseparator{,\ } 
+\def \setseparator{, } 
 
 %% Prints the contents of set #1. Elements will be separated by \setseparator.
-\def \listset #1{\xpa\sets@listset #1|\empty\endset}
+\def \listset #1{\sets@xpa\sets@listset #1|\empty\endset}
 
 %% Helper method for \listset.
 \def \sets@listset #1|#2\endset{%
   #1%
-  \ifx #2\empty{}\else
+  \def\temps@t{#2}%
+  \ifx \temps@t\sets@empty{}\else
     \setseparator
     \sets@ReturnFi{\sets@listset #2\endset}%
   \fi
@@ -208,7 +211,7 @@
       \endgroup
       \sets@Returntrue
     \fi}%
-  \xpa\lookup \xpa |#2|#1|\endset%
+  \sets@xpa\lookup \sets@xpa |#2|#1|\endset%
 }
 %-----------------------------------------------------------------------------
 
@@ -218,7 +221,7 @@
 
 %% This macro finds alle duplicate elements in the SORTED set #1 and removes
 %% them. The result set (still sorted) is stored in #2.
-\def \deleteduplicates #1#2{\xpa\sets@duplicates#1|\endset#2}
+\def \deleteduplicates #1#2{\sets@xpa\sets@duplicates#1|\endset#2}
 
 %% Helper method for \deleteduplicates. Does some preparations and catches the
 %% special case of an set with size <= 1. Parameter #3 is the result set.
@@ -292,7 +295,7 @@
 \def \sets@sortset #1#2{%
   \let \sorttemps@t #1%
   \sets@loop
-    \xpa\sets@bubblesortRun \sorttemps@t|\endset\sorttemps@t
+    \sets@xpa\sets@bubblesortRun \sorttemps@t|\endset\sorttemps@t
     \addtocounter{s@tlength}{-1}%
     \ifnum 1<\value{s@tlength}\relax
   \repeat
@@ -355,7 +358,7 @@
   \else
     \let \uniontemps@t=\uniont@mpi
     \ifx \uniont@mpii\empty \else
-      \xpa\sets@append\xpa{\xpa|#2}\to\uniontemps@t
+      \sets@xpa\sets@append\sets@xpa{\sets@xpa|#2}\to\uniontemps@t
     \fi
   \fi
   \sortset{\uniontemps@t}{\uniontemps@t}%
@@ -370,7 +373,7 @@
 %% sorted, too. If #1 contains duplicates, #3 may also contain duplicates.
 \def \intersectsets #1#2\to#3{%
   \def \tempinters@ct{}%
-  \xpa \sets@intersectsets #1|\endset#2\tempinters@ct
+  \sets@xpa \sets@intersectsets #1|\endset#2\tempinters@ct
   \ifx \tempinters@ct\empty
     \def #3{}%
   \else
@@ -401,7 +404,7 @@
 %% will be part if it is in #2.
 \def \minussets #1\minus#2\to#3{%
   \def \@tempminus{}%
-  \xpa \sets@minussets #1|\endset#2\@tempminus
+  \sets@xpa \sets@minussets #1|\endset#2\@tempminus
   \ifx \@tempminus\empty
     \def #3{}%
   \else
diff --git a/Master/texmf-dist/tex/latex/vhistory/vhistory.sty b/Master/texmf-dist/tex/latex/vhistory/vhistory.sty
index 32f728e04a1..7b9812bc6a8 100644
--- a/Master/texmf-dist/tex/latex/vhistory/vhistory.sty
+++ b/Master/texmf-dist/tex/latex/vhistory/vhistory.sty
@@ -3,8 +3,8 @@
 %% FILE: vhistory.sty                                                       %%
 %%                                                                          %%
 %% AUTHOR: Jochen Wertenauer                                                %%
-%% VERSION: 1.3                                                             %%
-%% DATE: 2007-07-21                                                         %%
+%% VERSION: 1.4                                                             %%
+%% DATE: 2009-03-01                                                         %%
 %%                                                                          %%
 %% LICENSE: This program may be distributed and/or modified under the       %%
 %% conditions of the LaTeX Project Public License, either version 1.2       %%
@@ -46,7 +46,7 @@
 %%                     listing the name(s) of the author(s).                %%
 %%                                                                          %%
 %% REQUIRED PACKAGES:                                                       %%
-%% - sets: Works well with version 0.6 or higher                            %%
+%% - sets: Works well with version 1.2 or higher                            %%
 %% - ltxtable: Works well with version 0.2 from 1995-12-11                  %%
 %%     ltxtable requires tabularx and longtable. Versions                   %%
 %%        - 2.07 (1999-01-07) of tabularx and                               %%
@@ -81,8 +81,8 @@
 \RequirePackage{ltxtable, sets}
 
 %% Helper methods ------------------------------------------------------------
-\let \xpa=\expandafter
-\let \nxp=\noexpand
+\let \vh@xpa=\expandafter
+\def \vh@empty{\empty}
 \def \vh@iwrite{\immediate\write}
 
 \long\def \vh@ReturnFi #1\fi{\fi #1}
@@ -91,12 +91,12 @@
 \def \vh@Ifundefined #1{\expandafter\ifx\csname#1\endcsname\relax}
 
 %% Prints the content of macro #1 without expansion.
-\long \def \vh@verbprint #1{\xpa\vh@eraseToBrace\meaning #1}
+\long \def \vh@verbprint #1{\vh@xpa\vh@eraseToBrace\meaning #1}
 
 %% This macro writes #2 verbatim to the (open) file #1.
 \long \def \vh@verbwrite #1#2{%
   \long \def \vh@verbtemp{#2}%
-  \xpa\vh@iwrite\xpa#1\xpa{\xpa\vh@eraseToBrace \meaning\vh@verbtemp}%
+  \vh@xpa\vh@iwrite\vh@xpa#1\vh@xpa{\vh@xpa\vh@eraseToBrace \meaning\vh@verbtemp}%
 } 
 
 %% Deletes everything before the next > e.g. "macro ->". Used by \vh@verbprint
@@ -196,13 +196,13 @@
 
 %% Prints the contents of \vhAllAuthorsSet but regards the elements as
 %% commands.  Instead of XY, the definition of the command \XY will be used.
-%% If \XY is undefined, \relax is used.
-\def \vhListAllAuthorsLong{\xpa\vh@longlistset \vhAllAuthorsSet|\empty\endset}
+\def \vhListAllAuthorsLong{\vh@xpa\vh@longlistset \vhAllAuthorsSet|\empty\endset}
 
 %% Helper method for \vhListAllAuthorsLong.
 \def \vh@longlistset #1|#2\endset{%
   \csname #1\endcsname % Create command and expand
-  \ifx#2\empty{}\else
+  \def\vh@tmp{#2}%
+  \ifx\vh@tmp\vh@empty{}\else
     \setseparator
     \vh@ReturnFi{\vh@longlistset #2\endset}%
   \fi
@@ -303,11 +303,11 @@
   \newwrite \vh@hstfile%
   \immediate \openout \vh@hstfile=\jobname.hst%
   \vh@iwrite \vh@hstfile {%
-    \def \nxp\vhCurrentVersion{\vh@verbprint\vhCurrentVersion}}%
+    \def \noexpand\vhCurrentVersion{\vh@verbprint\vhCurrentVersion}}%
   \vh@iwrite \vh@hstfile {%
-    \def \nxp\vhCurrentDate{\vh@verbprint\vhCurrentDate}}%
+    \def \noexpand\vhCurrentDate{\vh@verbprint\vhCurrentDate}}%
   \vh@iwrite \vh@hstfile {%
-    \nxp\newsetsimple \nxp\vhAllAuthorsSet{\vh@verbprint\vhAllAuthorsSet}}%
+    \noexpand\newsetsimple \noexpand\vhAllAuthorsSet{\vh@verbprint\vhAllAuthorsSet}}%
   \immediate \closeout \vh@hstfile%
 }
 
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 31f5c5a421a..9a263bc2064 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -521,6 +521,7 @@ chdir $startdir || die "chdir($startdir) failed: $!";  # back to raw
 %prehook = (
  'cm-super'		=> '&PREHOOK_cm_super',
  'ibygrk'		=> '&PREHOOK_ibygrk',
+ 'vhistory'		=> '&PREHOOK_vhistory',
  'wsuipa'		=> '&PREHOOK_wsuipa',
 );
 
@@ -3435,6 +3436,12 @@ sub PREHOOK_ibygrk
   &SYSTEM ("$RM tex/generic/ibycus4/ibycus4.map");
 }
 
+sub PREHOOK_vhistory
+{
+  print "PREHOOK_$package - rm dup file\n";
+  &SYSTEM ("$RM doc/sets.sty");
+}
+
 sub PREHOOK_wsuipa
 {
   print "PREHOOK_$package - rearrange directories, except for doc\n";