changes 0.5.3 (23nov10)

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

3 files changed, 318 insertions, 140 deletions

diff --git a/Master/texmf-dist/source/latex/changes/changes.drv b/Master/texmf-dist/source/latex/changes/changes.drv
new file mode 100644
index 00000000000..d4a7df3effc
--- /dev/null
+++ b/Master/texmf-dist/source/latex/changes/changes.drv
@@ -0,0 +1,75 @@
+%%%
+%
+% Treiberdatei für changes-Paket
+%
+%
+
+\documentclass[twoside, titlepage, parskip=half, toc=flat, cleardoublepage=empty, captions=nooneline, origlongtable, english, ngerman]{scrartcl}
+
+% Doc-Paket
+\usepackage{doc}
+
+% im Basis-Layout setzen
+% http://www.dr-kleinod.de/schreiben/latex.html
+\usepackage[font=charter]{basis}
+
+% Änderungsmarkierungen ermöglichen ;)
+\usepackage{changes}
+\definechangesauthor{EK}{orange}
+
+% voller Index
+\EnableCrossrefs
+
+% Angabe nach Zeilennummern
+\CodelineIndex
+
+% Umgebung für Einsatz
+\newenvironment{einspiel}[1][false]{%
+ \small
+ \begin{tabbing}
+	Definitionm\=\kill
+	\textsl{%
+	 \ifthenelse{\equal{#1}{false}}%
+		{Definition}%
+		{\iflanguage{english}{Example}{Beispiel}}%
+	}
+}{%
+ \end{tabbing}
+}
+
+% Formatierungsbefehle
+\newcommand{\paket}[1]{\textsl{#1}}
+\newcommand{\option}[1]{\texttt{#1}}
+\newcommand{\datei}[1]{\texttt{#1}}
+\newcommand{\befehl}[1]{\texttt{\textbackslash{}#1}}
+
+% Makroüberschriften
+\makeatletter
+\def\Describe@Macro#1{%
+ \endgroup%
+ \fbox{\PrintDescribeMacro{#1}}\par%
+ \SpecialUsageIndex{#1}\@esphack\ignorespaces%
+}
+\def\Describe@Env#1{%
+ \endgroup%
+ \fbox{\PrintDescribeEnv{#1}}\par%
+ \SpecialEnvIndex{#1}\@esphack\ignorespaces
+}
+\makeatother
+
+
+\title{\iflanguage{english}{The \paket{changes}-package}{Das \paket{changes}-Paket}}
+\subtitle{\iflanguage{english}{Manual change markup --- version}{Manuelle Änderungsmarkierung -- Version} 0.5.3} %$^\alpha$}
+\author{Ekkart Kleinod}
+\email{ekkart@ekkart.de}
+
+% nur Beschreibungsteil ausgeben?
+%\OnlyDescription
+
+% Eigentliches Dokument
+\begin{document}
+
+	\selectlanguage{ngerman}
+	\DocInput{changes.dtx}
+
+\end{document}
diff --git a/Master/texmf-dist/source/latex/changes/changes.dtx b/Master/texmf-dist/source/latex/changes/changes.dtx
index dd9a67bf3af..1aa2611afb9 100644
--- a/Master/texmf-dist/source/latex/changes/changes.dtx
+++ b/Master/texmf-dist/source/latex/changes/changes.dtx
@@ -1,4 +1,60 @@
-% \CheckSum{432}
+% \CheckSum{511}
+%
+% \iffalse meta-comment
+%
+%  Copyright (C) 2007-2010
+%  Ekkart Kleinod (ekkart@ekkart.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 any later version.
+%  The latest version of this license is in\\
+%   \url{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".
+%  The current maintainer of this work is Ekkart Kleinod.
+%
+%  Some code for providing multilanguage documentation was
+%  used from the pst-pdf package by Rolf Niepraschk and Hubert Gaesslein.
+% \fi
+%
+% \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         \~}
+%
+% \changes{v0.1}{2007/01/16}{Initial version.}
+% \changes{v0.2}{2007/01/17}{new convenience commands, LPPL, bugfixes: missing babel package, ifthen-placement, loc, author markup}
+% \changes{v0.3}{2007/01/22}{english documentation, replaced command changed with command replaced}
+% \changes{v0.4}{2007/01/24}{pdfcolmk for improved markup, introduced author-ids, first CTAN version}
+% \changes{v0.5}{2007/08/26}{reimplementation without array package, UTF-8, grayed text, change pf command arguments}
+% \changes{v0.5.1}{2007/08/27}{deleted text is striked out again using package ulem, greying didn't work}
+% \changes{v0.5.2}{2007/10/10}{package options for pdfcolmk, ulem, and xcolor}
+% \changes{v0.5.3}{2010/11/22}{use class options (final, draft) as well}
+% \GetFileInfo{changes.dtx}
+%
+%^^A --------------------------------------------------------------------------
+%^^A definition for multilanguage documentation
+%
+% \newif\ifGERMAN  \GERMANfalse
+% \newif\ifENGLISH \ENGLISHfalse
+% \iflanguage{ngerman}{\GERMANtrue}{%
+%   \iflanguage{german}{\GERMANtrue}{\GERMANfalse}}
+% \iflanguage{english}{\ENGLISHtrue}{\ENGLISHfalse}
 %
 %^^A --------------------------------------------------------------------------
 %
@@ -62,9 +118,9 @@
 % \befehl{usepackage\{changes\}}
 %
 % \iflanguage{english}{
-%  Options for the package are described in \autoref{sec:Optionen}.
+%  Options for the package are described in \autoref{sec:options}.
 % }{
-%  Die Paketoptionen werden in \autoref{sec:Optionen} erläutert.
+%  Die Paketoptionen werden in \autoref{sec:options} erläutert.
 % }
 %
 %^^A -- Pakete ----------------------------------------------------------------
@@ -106,17 +162,23 @@
 % }{
 %  \subsection{Optionen}
 % }
-% \label{sec:Optionen}
+% \label{sec:options}
 %
 % \minisec{draft}
 % \iflanguage{english}{
 %  The \option{draft}-option enables markup of changes.
 %  The list of changes is available via \befehl{listofchanges}.
 %  This option is the default option, if no other option is selected.
+%
+%  The \paket{changes} package reuses the declaration of \option{draft} in \befehl{documentclass}.
+%  The local declaration of \option{final} overrules the declaration of \option{draft} in \befehl{documentclass}.
 % }{
 %  Die \option{draft}-Option bewirkt, dass alle Änderungen markiert werden.
 %  Die Änderungsliste kann durch \befehl{listofchanges} ausgegeben werden.
 %  Ohne Optionsangabe wird \option{draft} automatisch eingestellt.
+%
+%  Die Angabe von \option{draft} in \befehl{documentclass} wird vom \paket{changes}-Paket mitgenutzt.
+%  Die lokale Angabe von \option{final} überstimmt die Angabe von \option{draft} in \befehl{documentclass}.
 % }
 %
 % \befehl{usepackage[draft]\{changes\}}
@@ -126,9 +188,15 @@
 % \iflanguage{english}{
 %  The \option{final}-option disables markup of changes, only the correct text will be shown.
 %  The list of changes is disabled, too.
+%
+%  The \paket{changes} package reuses the declaration of \option{final} in \befehl{documentclass}.
+%  The local declaration of \option{draft} overrules the declaration of \option{final} in \befehl{documentclass}.
 % }{
 %  Die \option{final}-Option bewirkt, dass alle Änderungsmarkierungen ausgeblendet werden und nur noch der korrekte Text ausgegeben wird.
 %  Die Änderungsliste wird ebenfalls unterdrückt.
+%
+%  Die Angabe von \option{final} in \befehl{documentclass} wird vom \paket{changes}-Paket mitgenutzt.
+%  Die lokale Angabe von \option{draft} überstimmt die Angabe von \option{final} in \befehl{documentclass}.
 % }
 %
 % \befehl{usepackage[final]\{changes\}}
@@ -137,14 +205,14 @@
 %
 % \iflanguage{english}{
 %  All options for the \paket{ulem} package can be specified as parameters of the \option{ulem}-option.
-%  Two or more option have to be embraced in curly brackets.
+%  Two or more options have to be embraced in curly brackets.
 % }{
 %  Optionen für das \paket{ulem}-Paket können als Parameter der \option{ulem}-Option angegeben werden.
 %  Zwei oder mehr Optionen müssen in geschweifte Klammern gesetzt werden.
 % }
 %
 % \befehl{usepackage[ulem=normalem]\{changes\}}\\
-% \befehl{usepackage[ulem={normalem,normalbf}]\{changes\}}
+% \befehl{usepackage[ulem=\{normalem,normalbf\}]\{changes\}}
 %
 % \minisec{xcolor}
 %
@@ -157,7 +225,7 @@
 % }
 %
 % \befehl{usepackage[xcolor=dvipdf]\{changes\}}\\
-% \befehl{usepackage[xcolor={dvipdf,gray}]\{changes\}}
+% \befehl{usepackage[xcolor=\{dvipdf,gray\}]\{changes\}}
 %
 %^^A -- Neue Befehle ----------------------------------------------------------
 %
@@ -371,10 +439,30 @@
 % \StopEventually{
 %
 % \iflanguage{english}{
+%  \section{Authors}
+% }{
+%  \section{Autoren}
+% }
+% \label{sec:authors}
+%
+% \iflanguage{english}{
+%  The \paket{changes} packages was written by several authors.
+%  The authors are (in alphabetical order):
+% }{
+%  Am \paket{changes}-Paket haben mehrere Autoren mitgewirkt.
+%  Dies sind in alphabetischer Reihenfolge:
+% }
+% \begin{itemize}
+%  \item Kleinod, Ekkart
+%  \item Wolter, Steve
+% \end{itemize}
+%
+% \iflanguage{english}{
 %  \section{Versions}
 % }{
 %  \section{Versionen}
 % }
+% \label{sec:versions}
 %
 % \iflanguage{english}{
 %  \subsection{TODO/known bugs}
@@ -398,6 +486,20 @@
 %  \end{itemize}
 % }
 %
+% \subsection{Version 0.5.3}
+%
+% \iflanguage{english}{
+%  Date: 2010/11/22
+%  \begin{itemize}
+%   \item document options of \befehl{documentclass} are used as well (suggestion and code of Steve Wolter)
+%  \end{itemize}
+% }{
+%  Datum: 22.\,11.~2010
+%  \begin{itemize}
+%   \item Dokumentoptionen von \befehl{documentclass} werden ebenfalls genutzt (Vorschlag und Code von Steve Wolter)
+%  \end{itemize}
+% }
+%
 % \subsection{Version 0.5.2}
 %
 % \iflanguage{english}{
@@ -543,7 +645,7 @@
 % \iflanguage{english}{
 %  \section{Distribution, Copyright, License}
 %
-%  Copyright 2007 Ekkart Kleinod (\href{mailto:ekkart@ekkart.de}{ekkart@ekkart.de})
+%  Copyright 2007-2010 Ekkart Kleinod (\href{mailto:ekkart@ekkart.de}{ekkart@ekkart.de})
 %
 %  This work may be distributed and/or modified under the
 %  conditions of the \LaTeX\ Project Public License, either version~1.3
@@ -576,7 +678,7 @@
 % }{
 %  \section{Weitergabe, Copyright, Lizenz}
 %
-%  Copyright 2007 Ekkart Kleinod (\href{mailto:ekkart@ekkart.de}{ekkart@ekkart.de})
+%  Copyright 2007-2010 Ekkart Kleinod (\href{mailto:ekkart@ekkart.de}{ekkart@ekkart.de})
 %
 %  Dieses Paket darf unter der "`\LaTeX\ Project Public License"' Version~1.3 oder jeder späteren Version weitergegeben und/oder geändert werden.
 %  Die neueste Version dieser Lizenz steht auf\\
@@ -635,8 +737,8 @@
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{changes}
-[2007/10/10 v0.5.2 changes-Paket]
-\typeout{*** changes-Paket 2007/10/10 v0.5.2 ***}
+[2010/11/22 v0.5.3 changes-Paket]
+\typeout{*** changes-Paket 2010/11/22 v0.5.3 ***}
 %    \end{macrocode}
 %
 % \iflanguage{english}{
@@ -668,6 +770,7 @@
 \newboolean{Changes@optiondraft}
 \setboolean{Changes@optiondraft}{true}
 \DeclareOptionX{draft}{
+ \setboolean{Changes@optiondraft}{true}
  \typeout{changes-option '\CurrentOption'}
 }
 %    \end{macrocode}
@@ -725,7 +828,7 @@
 %  Ausführung des Optionenbearbeitens.
 % }
 %    \begin{macrocode}
-\ProcessOptionsX\relax
+\ProcessOptionsX*\relax
 %    \end{macrocode}
 %
 % \iflanguage{english}{
@@ -765,41 +868,41 @@
 %    \begin{macrocode}
 \ifthenelse{\isundefined{\addto}}
  {
-  \def\listchangesname{\"Anderungen}
-  \def\changesaddname{Eingef\"ugt}
-  \def\changesdeletename{Gel\"oscht}
-  \def\changesreplacename{Ersetzt}
-  \def\changesauthorname{Autor}
-  \def\changesanonymousname{Anonym}
-  \def\changesnoloc{\"Anderungsliste erst nach dem n\"achsten Durchlauf verf\"ugbar.}
+	\def\listchangesname{\"Anderungen}
+	\def\changesaddname{Eingef\"ugt}
+	\def\changesdeletename{Gel\"oscht}
+	\def\changesreplacename{Ersetzt}
+	\def\changesauthorname{Autor}
+	\def\changesanonymousname{Anonym}
+	\def\changesnoloc{\"Anderungsliste erst nach dem n\"achsten Durchlauf verf\"ugbar.}
  }{
-  \addto\captionsngerman{\def\listchangesname{\"Anderungen}}
-  \addto\captionsgerman{\def\listchangesname{\"Anderungen}}
-  \addto\captionsenglish{\def\listchangesname{Changes}}
+	\addto\captionsngerman{\def\listchangesname{\"Anderungen}}
+	\addto\captionsgerman{\def\listchangesname{\"Anderungen}}
+	\addto\captionsenglish{\def\listchangesname{Changes}}
 
-  \addto\captionsngerman{\def\changesaddname{Eingef\"ugt}}
-  \addto\captionsgerman{\def\changesaddname{Eingef\"ugt}}
-  \addto\captionsenglish{\def\changesaddname{Added}}
+	\addto\captionsngerman{\def\changesaddname{Eingef\"ugt}}
+	\addto\captionsgerman{\def\changesaddname{Eingef\"ugt}}
+	\addto\captionsenglish{\def\changesaddname{Added}}
 
-  \addto\captionsngerman{\def\changesdeletename{Gel\"oscht}}
-  \addto\captionsgerman{\def\changesdeletename{Gel\"oscht}}
-  \addto\captionsenglish{\def\changesdeletename{Deleted}}
+	\addto\captionsngerman{\def\changesdeletename{Gel\"oscht}}
+	\addto\captionsgerman{\def\changesdeletename{Gel\"oscht}}
+	\addto\captionsenglish{\def\changesdeletename{Deleted}}
 
-  \addto\captionsngerman{\def\changesreplacename{Ersetzt}}
-  \addto\captionsgerman{\def\changesreplacename{Ersetzt}}
-  \addto\captionsenglish{\def\changesreplacename{Replaced}}
+	\addto\captionsngerman{\def\changesreplacename{Ersetzt}}
+	\addto\captionsgerman{\def\changesreplacename{Ersetzt}}
+	\addto\captionsenglish{\def\changesreplacename{Replaced}}
 
-  \addto\captionsngerman{\def\changesauthorname{Autor}}
-  \addto\captionsgerman{\def\changesauthorname{Autor}}
-  \addto\captionsenglish{\def\changesauthorname{Author}}
+	\addto\captionsngerman{\def\changesauthorname{Autor}}
+	\addto\captionsgerman{\def\changesauthorname{Autor}}
+	\addto\captionsenglish{\def\changesauthorname{Author}}
 
-  \addto\captionsngerman{\def\changesanonymousname{Anonym}}
-  \addto\captionsgerman{\def\changesanonymousname{Anonym}}
-  \addto\captionsenglish{\def\changesanonymousname{anonymous}}
+	\addto\captionsngerman{\def\changesanonymousname{Anonym}}
+	\addto\captionsgerman{\def\changesanonymousname{Anonym}}
+	\addto\captionsenglish{\def\changesanonymousname{anonymous}}
 
-  \addto\captionsngerman{\def\changesnoloc{\"Anderungsliste erst nach dem n\"achsten \LaTeX-Lauf verf\"ugbar.}}
-  \addto\captionsgerman{\def\changesnoloc{\"Anderungsliste erst nach dem n\"achsten Durchlauf verf\"ugbar.}}
-  \addto\captionsenglish{\def\changesnoloc{List of changes is available after the next \LaTeX\ run.}}
+	\addto\captionsngerman{\def\changesnoloc{\"Anderungsliste erst nach dem n\"achsten \LaTeX-Lauf verf\"ugbar.}}
+	\addto\captionsgerman{\def\changesnoloc{\"Anderungsliste erst nach dem n\"achsten Durchlauf verf\"ugbar.}}
+	\addto\captionsenglish{\def\changesnoloc{List of changes is available after the next \LaTeX\ run.}}
  }
 %    \end{macrocode}
 %
@@ -915,8 +1018,8 @@
 %    \begin{macrocode}
 \newcommand{\setauthormarkup}[2][left]{%
  \ifthenelse{\equal{#1}{left}}
-  {\setboolean{Changes@AuthorPositionLeft}{true}}
-  {\setboolean{Changes@AuthorPositionLeft}{false}}
+	{\setboolean{Changes@AuthorPositionLeft}{true}}
+	{\setboolean{Changes@AuthorPositionLeft}{false}}
  \renewcommand{\Changes@AuthorMark}[1]{#2}
 }
 %    \end{macrocode}
@@ -980,22 +1083,22 @@
 }
 \newcommand{\Changes@added}[2][\@empty]{%
  \ifthenelse{\boolean{Changes@optiondraft}}%
-  {%
-   \textcolor{Changes@Color\Changes@temp}{%
-    \ifthenelse{\boolean{Changes@AuthorPositionLeft}}%
-     {\ifthenelse{\equal{\@empty}{\Changes@temp}}%
-      {}{\Changes@AuthorMark{\Changes@temp}}%
-     }{}%
-    #2%
-    \ifthenelse{\not\boolean{Changes@AuthorPositionLeft}}%
-     {\ifthenelse{\equal{\@empty}{\Changes@temp}}%
-      {}{\Changes@AuthorMark{\Changes@temp}}%
-     }{}%
-    \ifthenelse{\equal{\@empty}{#1}}%
-     {}{\Changes@Remark{\Changes@temp}{#1}}%
-   }%
-   \stepcounter{Changes@AddCount\Changes@temp}%
-  }{#2}%
+	{%
+	 \textcolor{Changes@Color\Changes@temp}{%
+		\ifthenelse{\boolean{Changes@AuthorPositionLeft}}%
+		 {\ifthenelse{\equal{\@empty}{\Changes@temp}}%
+			{}{\Changes@AuthorMark{\Changes@temp}}%
+		 }{}%
+		#2%
+		\ifthenelse{\not\boolean{Changes@AuthorPositionLeft}}%
+		 {\ifthenelse{\equal{\@empty}{\Changes@temp}}%
+			{}{\Changes@AuthorMark{\Changes@temp}}%
+		 }{}%
+		\ifthenelse{\equal{\@empty}{#1}}%
+		 {}{\Changes@Remark{\Changes@temp}{#1}}%
+	 }%
+	 \stepcounter{Changes@AddCount\Changes@temp}%
+	}{#2}%
 }
 %    \end{macrocode}
 % \end{macro}
@@ -1025,22 +1128,22 @@
 }
 \newcommand{\Changes@deleted}[2][\@empty]{%
  \ifthenelse{\boolean{Changes@optiondraft}}%
-  {%
-   \textcolor{Changes@Color\Changes@temp}{%
-    \ifthenelse{\boolean{Changes@AuthorPositionLeft}}%
-     {\ifthenelse{\equal{\@empty}{\Changes@temp}}%
-      {}{\Changes@AuthorMark{\Changes@temp}}%
-     }{}%
-    \sout{#2}%
-    \ifthenelse{\not\boolean{Changes@AuthorPositionLeft}}%
-     {\ifthenelse{\equal{\@empty}{\Changes@temp}}%
-      {}{\Changes@AuthorMark{\Changes@temp}}%
-     }{}%
-    \ifthenelse{\equal{\@empty}{#1}}%
-     {}{\Changes@Remark{\Changes@temp}{#1}}%
-   }%
-   \stepcounter{Changes@DeleteCount\Changes@temp}%
-  }{\@bsphack \expandafter \@esphack}%
+	{%
+	 \textcolor{Changes@Color\Changes@temp}{%
+		\ifthenelse{\boolean{Changes@AuthorPositionLeft}}%
+		 {\ifthenelse{\equal{\@empty}{\Changes@temp}}%
+			{}{\Changes@AuthorMark{\Changes@temp}}%
+		 }{}%
+		\sout{#2}%
+		\ifthenelse{\not\boolean{Changes@AuthorPositionLeft}}%
+		 {\ifthenelse{\equal{\@empty}{\Changes@temp}}%
+			{}{\Changes@AuthorMark{\Changes@temp}}%
+		 }{}%
+		\ifthenelse{\equal{\@empty}{#1}}%
+		 {}{\Changes@Remark{\Changes@temp}{#1}}%
+	 }%
+	 \stepcounter{Changes@DeleteCount\Changes@temp}%
+	}{\@bsphack \expandafter \@esphack}%
 }
 %    \end{macrocode}
 % \end{macro}
@@ -1064,23 +1167,23 @@
 }
 \newcommand{\Changes@replaced}[3][\@empty]{%
  \ifthenelse{\boolean{Changes@optiondraft}}%
-  {%
-   \textcolor{Changes@Color\Changes@temp}{%
-    \ifthenelse{\boolean{Changes@AuthorPositionLeft}}%
-     {\ifthenelse{\equal{\@empty}{\Changes@temp}}%
-      {}{\Changes@AuthorMark{\Changes@temp}}%
-     }{}%
-    #2%
-    \sout{#3}%
-    \ifthenelse{\not\boolean{Changes@AuthorPositionLeft}}%
-     {\ifthenelse{\equal{\@empty}{\Changes@temp}}%
-      {}{\Changes@AuthorMark{\Changes@temp}}%
-     }{}%
-    \ifthenelse{\equal{\@empty}{#1}}%
-     {}{\Changes@Remark{\Changes@temp}{#1}}%
-   }%
-   \stepcounter{Changes@ReplaceCount\Changes@temp}%
-  }{#2}%
+	{%
+	 \textcolor{Changes@Color\Changes@temp}{%
+		\ifthenelse{\boolean{Changes@AuthorPositionLeft}}%
+		 {\ifthenelse{\equal{\@empty}{\Changes@temp}}%
+			{}{\Changes@AuthorMark{\Changes@temp}}%
+		 }{}%
+		#2%
+		\sout{#3}%
+		\ifthenelse{\not\boolean{Changes@AuthorPositionLeft}}%
+		 {\ifthenelse{\equal{\@empty}{\Changes@temp}}%
+			{}{\Changes@AuthorMark{\Changes@temp}}%
+		 }{}%
+		\ifthenelse{\equal{\@empty}{#1}}%
+		 {}{\Changes@Remark{\Changes@temp}{#1}}%
+	 }%
+	 \stepcounter{Changes@ReplaceCount\Changes@temp}%
+	}{#2}%
 }
 %    \end{macrocode}
 % \end{macro}
@@ -1120,40 +1223,40 @@
 %    \begin{macrocode}
 \newcommand{\listofchanges}{%
  \ifthenelse{\boolean{Changes@optiondraft}}
-  {
-   \section*{\listchangesname}
-   \IfFileExists{\jobname.\Changes@extension}
-    {
-     \newboolean{Changes@MoreLines}
-     \setboolean{Changes@MoreLines}{true}
-     \newread\Changes@InFile
-     \openin\Changes@InFile = \jobname.\Changes@extension
-      \whiledo{\boolean{Changes@MoreLines}}{
-      \read\Changes@InFile to \Changes@Line
-       \ifeof\Changes@InFile
-        \setboolean{Changes@MoreLines}{false}
-       \else
-        \expandafter\changes@chopline\Changes@Line\\
-        \begin{tabbing}
-         mm\=mmmmmm\=\kill
-         \ifthenelse{\equal{\Changes@InID}{}}
-          {\textcolor{\Changes@InColor}{\changesauthorname: \changesanonymousname}\\}
-          {\textcolor{\Changes@InColor}{\changesauthorname: \Changes@InID}
-           \ifthenelse{\equal{\Changes@InName}{}}{}
-           { \textcolor{\Changes@InColor}{(\Changes@InName)}}
-           \\
-          }
-         \>\changesaddname:\>\Changes@InAdded\\
-         \>\changesdeletename:\>\Changes@InDeleted\\
-         \>\changesreplacename:\>\Changes@InReplaced\\
-        \end{tabbing}
-       \fi
-      }
-     \closein\Changes@InFile
-    }{
-     \emph{\changesnoloc}
-    }
-  }{}
+	{
+	 \section*{\listchangesname}
+	 \IfFileExists{\jobname.\Changes@extension}
+		{
+		 \newboolean{Changes@MoreLines}
+		 \setboolean{Changes@MoreLines}{true}
+		 \newread\Changes@InFile
+		 \openin\Changes@InFile = \jobname.\Changes@extension
+			\whiledo{\boolean{Changes@MoreLines}}{
+			\read\Changes@InFile to \Changes@Line
+			 \ifeof\Changes@InFile
+				\setboolean{Changes@MoreLines}{false}
+			 \else
+				\expandafter\changes@chopline\Changes@Line\\
+				\begin{tabbing}
+				 mm\=mmmmmm\=\kill
+				 \ifthenelse{\equal{\Changes@InID}{}}
+					{\textcolor{\Changes@InColor}{\changesauthorname: \changesanonymousname}\\}
+					{\textcolor{\Changes@InColor}{\changesauthorname: \Changes@InID}
+					 \ifthenelse{\equal{\Changes@InName}{}}{}
+					 { \textcolor{\Changes@InColor}{(\Changes@InName)}}
+					 \\
+					}
+				 \>\changesaddname:\>\Changes@InAdded\\
+				 \>\changesdeletename:\>\Changes@InDeleted\\
+				 \>\changesreplacename:\>\Changes@InReplaced\\
+				\end{tabbing}
+			 \fi
+			}
+		 \closein\Changes@InFile
+		}{
+		 \emph{\changesnoloc}
+		}
+	}{}
 }
 %    \end{macrocode}
 % \end{macro}
@@ -1175,14 +1278,14 @@
  \immediate\openout\Changes@OutFile = \jobname.\Changes@extension
  \setcounter{Changes@iAuthor}{0}
  \whiledo{\value{Changes@iAuthor} < \value{Changes@AuthorCount}}{
-  \stepcounter{Changes@iAuthor}
-  \def\Changes@ID{\@nameuse{Changes@Author\theChanges@iAuthor}}
-  \immediate\write\Changes@OutFile{\Changes@ID;%
-   \@nameuse{Changes@AuthorColor\Changes@ID};%
-   \@nameuse{Changes@AuthorName\Changes@ID};%
-   \the\value{Changes@AddCount\Changes@ID};%
-   \the\value{Changes@DeleteCount\Changes@ID};%
-   \the\value{Changes@ReplaceCount\Changes@ID}}
+	\stepcounter{Changes@iAuthor}
+	\def\Changes@ID{\@nameuse{Changes@Author\theChanges@iAuthor}}
+	\immediate\write\Changes@OutFile{\Changes@ID;%
+	 \@nameuse{Changes@AuthorColor\Changes@ID};%
+	 \@nameuse{Changes@AuthorName\Changes@ID};%
+	 \the\value{Changes@AddCount\Changes@ID};%
+	 \the\value{Changes@DeleteCount\Changes@ID};%
+	 \the\value{Changes@ReplaceCount\Changes@ID}}
  }
  \closeout\Changes@OutFile
 }
diff --git a/Master/texmf-dist/source/latex/changes/changes.ins b/Master/texmf-dist/source/latex/changes/changes.ins
index efec41e8d42..08b310ae525 100644
--- a/Master/texmf-dist/source/latex/changes/changes.ins
+++ b/Master/texmf-dist/source/latex/changes/changes.ins
@@ -1,6 +1,6 @@
 %% Diese Datei erzeugt die benötigten Dateien aus changes.dtx
 %%
-\def\filedate{2007/01/24}
+\def\filedate{2010/11/21}
 \def\batchfile{changes.ins}
 \input docstrip
 
@@ -10,7 +10,7 @@
 \preamble
 
 changes.dtx
-Copyright 2007 Ekkart Kleinod (ekkart@ekkart.de)
+Copyright 2007-2010 Ekkart Kleinod (ekkart@ekkart.de)
 
 This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either version 1.3
@@ -38,14 +38,14 @@ and the derived files
 \endpreamble
 
 \postamble
-Copyright 2007 Ekkart Kleinod
+Copyright 2007-2010 Ekkart Kleinod
 \endpostamble
 
 \generate{
-  \file{changes.sty}{\from{changes.dtx}{changes}}
-  \file{changes.example1.tex}{\from{changes.dtx}{example:1}}
-  \file{changes.example2.tex}{\from{changes.dtx}{example:2}}
-  \file{changes.example3.tex}{\from{changes.dtx}{example:3}}
+	\file{changes.sty}{\from{changes.dtx}{changes}}
+	\file{changes.example1.tex}{\from{changes.dtx}{example:1}}
+	\file{changes.example2.tex}{\from{changes.dtx}{example:2}}
+	\file{changes.example3.tex}{\from{changes.dtx}{example:3}}
 }
 
 \endinput