summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/changes
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2012-01-12 23:14:21 +0000
committerKarl Berry <karl@freefriends.org>2012-01-12 23:14:21 +0000
commit0bef79968f3cdff2ce0c5b3a0fc06d1b1d6363fd (patch)
treebf650b7f1031eaad155091ea6ede74a09be5a669 /Master/texmf-dist/tex/latex/changes
parenta8dc21bc7f0d5d3240be20c07c97a6746b210b1e (diff)
changes 0.6.0 (12jan12)
git-svn-id: svn://tug.org/texlive/trunk@25085 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/changes')
-rw-r--r--Master/texmf-dist/tex/latex/changes/changes.sty564
1 files changed, 392 insertions, 172 deletions
diff --git a/Master/texmf-dist/tex/latex/changes/changes.sty b/Master/texmf-dist/tex/latex/changes/changes.sty
index ac814c3f7cb..003ba802c81 100644
--- a/Master/texmf-dist/tex/latex/changes/changes.sty
+++ b/Master/texmf-dist/tex/latex/changes/changes.sty
@@ -7,7 +7,7 @@
%% changes.dtx (with options: `changes')
%%
%% changes.dtx
-%% Copyright 2007-2011 Ekkart Kleinod (ekkart@ekkart.de)
+%% Copyright 2007-2012 Ekkart Kleinod (ekleinod@edgesoft.de)
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -21,61 +21,222 @@
%% The current maintainer of this work is Ekkart Kleinod.
%%
%% This work consists of the files
-%% doc/latex/changes/examples/changes.example.1.de.tex
-%% doc/latex/changes/examples/changes.example.2.de.tex
-%% doc/latex/changes/examples/changes.example.3.de.tex
-%% doc/latex/changes/examples/changes.example.1.de.pdf
-%% doc/latex/changes/examples/changes.example.2.de.pdf
-%% doc/latex/changes/examples/changes.example.3.de.pdf
-%%
%% source/latex/changes/changes.drv
%% source/latex/changes/changes.dtx
%% source/latex/changes/changes.ins
+%% source/latex/changes/examples.dtx
%% source/latex/changes/README
+%% source/latex/changes/userdoc/*.tex
%%
%% scripts/changes/delcmdchanges.bash
%% and the derived files
-%% doc/latex/changes/changes.english.full.pdf
-%% doc/latex/changes/changes.english.short.pdf
-%% doc/latex/changes/changes.ngerman.full.pdf
-%% doc/latex/changes/changes.ngerman.short.pdf
+%% doc/latex/changes/changes.english.pdf
+%% doc/latex/changes/changes.english.withcode.pdf
+%% doc/latex/changes/changes.ngerman.pdf
+%% doc/latex/changes/changes.ngerman.withcode.pdf
%%
-%% tex/latex/changes/changes.sty
+%% doc/latex/changes/examples/changes.example.*.tex
+%% doc/latex/changes/examples/changes.example.*.pdf
%%
+%% tex/latex/changes/changes.sty
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{changes}
-[2011/04/25 v0.5.4 changes-Paket]
-\typeout{*** changes-Paket 2011/04/25 v0.5.4 ***}
+[2012/01/11 v0.6.0 changes-Paket]
+\typeout{*** changes-Paket 2012/01/11 v0.6.0 ***}
\RequirePackage{xkeyval}
-\RequirePackage{ifthen}
+\RequirePackage{xifthen}
\newboolean{Changes@optiondraft}
\setboolean{Changes@optiondraft}{true}
\DeclareOptionX{draft}{
- \setboolean{Changes@optiondraft}{true}
- \typeout{changes-option '\CurrentOption'}
+\setboolean{Changes@optiondraft}{true}
+\typeout{changes-option '\CurrentOption'}
}
\DeclareOptionX{final}{
- \setboolean{Changes@optiondraft}{false}
- \typeout{changes-option '\CurrentOption'}
+\setboolean{Changes@optiondraft}{false}
+\typeout{changes-option '\CurrentOption'}
+}
+\newcommand{\Changes@optionaddedmarkup}{none}
+\newcommand{\Changes@optiondeletedmarkup}{sout}
+\newcommand{\Changes@optionmarkup}{default}
+\DeclareOptionX{markup}{
+\ifthenelse{\equal{\@empty}{#1}}
+{}
+{
+\ifthenelse{
+\equal{#1}{default}\or
+\equal{#1}{underlined}\or
+\equal{#1}{bfit}\or
+\equal{#1}{nocolor}
+}
+{\renewcommand{\Changes@optionmarkup}{#1}}
+{\PackageWarning{changes}{markup '#1' unknown, using '\Changes@optionmarkup'}}
+}
+\ifthenelse{\equal{\Changes@optionmarkup}{default}}
+{
+\renewcommand{\Changes@optionaddedmarkup}{none}
+\renewcommand{\Changes@optiondeletedmarkup}{sout}
+}
+{}
+\ifthenelse{\equal{\Changes@optionmarkup}{underlined}}
+{
+\renewcommand{\Changes@optionaddedmarkup}{uline}
+\renewcommand{\Changes@optiondeletedmarkup}{sout}
+}
+{}
+\ifthenelse{\equal{\Changes@optionmarkup}{bfit}}
+{
+\renewcommand{\Changes@optionaddedmarkup}{bf}
+\renewcommand{\Changes@optiondeletedmarkup}{it}
+}
+{}
+\ifthenelse{\equal{\Changes@optionmarkup}{nocolor}}
+{
+\renewcommand{\Changes@optionaddedmarkup}{uline}
+\renewcommand{\Changes@optiondeletedmarkup}{sout}
+}
+{}
+\typeout{changes-option 'markup=\Changes@optionmarkup'}
+}
+\DeclareOptionX{addedmarkup}{
+\ifthenelse{\equal{\@empty}{#1}}
+{}
+{
+\ifthenelse{
+\equal{#1}{none}\or
+\equal{#1}{uline}\or
+\equal{#1}{uuline}\or
+\equal{#1}{uwave}\or
+\equal{#1}{dashuline}\or
+\equal{#1}{dotuline}\or
+\equal{#1}{sout}\or
+\equal{#1}{xout}\or
+\equal{#1}{bf}\or
+\equal{#1}{it}\or
+\equal{#1}{sl}\or
+\equal{#1}{em}
+}
+{\renewcommand{\Changes@optionaddedmarkup}{#1}}
+{\PackageWarning{changes}{addedmarkup '#1' unknown, using '\Changes@optionaddedmarkup'}}
+}
+\typeout{changes-option 'addedmarkup=\Changes@optionaddedmarkup'}
+}
+\DeclareOptionX{deletedmarkup}{
+\ifthenelse{\equal{\@empty}{#1}}
+{}
+{
+\ifthenelse{
+\equal{#1}{none}\or
+\equal{#1}{uline}\or
+\equal{#1}{uuline}\or
+\equal{#1}{uwave}\or
+\equal{#1}{dashuline}\or
+\equal{#1}{dotuline}\or
+\equal{#1}{sout}\or
+\equal{#1}{xout}\or
+\equal{#1}{bf}\or
+\equal{#1}{it}\or
+\equal{#1}{sl}\or
+\equal{#1}{em}
+}
+{\renewcommand{\Changes@optiondeletedmarkup}{#1}}
+{\PackageWarning{changes}{deletedmarkup '#1' unknown, using '\Changes@optiondeletedmarkup'}}
+}
+\typeout{changes-option 'deletedmarkup=\Changes@optiondeletedmarkup'}
+}
+\newcommand{\Changes@optionauthormarkup}{superscript}
+\DeclareOptionX{authormarkup}{
+\ifthenelse{\equal{\@empty}{#1}}
+{}
+{
+\ifthenelse{
+\equal{#1}{superscript}\or
+\equal{#1}{subscript}\or
+\equal{#1}{brackets}\or
+\equal{#1}{footnote}
+}
+{\renewcommand{\Changes@optionauthormarkup}{#1}}
+{\PackageWarning{changes}{authormarkup '#1' unknown, using '\Changes@optionauthormarkup'}}
+}
+\typeout{changes-option 'authormarkup=\Changes@optionauthormarkup'}
+}
+\newcommand{\Changes@optionauthormarkupposition}{right}
+\DeclareOptionX{authormarkupposition}{
+\ifthenelse{\equal{\@empty}{#1}}
+{}
+{
+\ifthenelse{
+\equal{#1}{right}\or
+\equal{#1}{left}
+}
+{\renewcommand{\Changes@optionauthormarkupposition}{#1}}
+{\PackageWarning{changes}{authormarkupposition '#1' unknown, using '\Changes@optionauthormarkupposition'}}
+}
+\typeout{changes-option 'authormarkupposition=\Changes@optionauthormarkupposition'}
+}
+\newcommand{\Changes@optionauthormarkuptext}{id}
+\DeclareOptionX{authormarkuptext}{
+\ifthenelse{\equal{\@empty}{#1}}
+{}
+{
+\ifthenelse{
+\equal{#1}{id}\or
+\equal{#1}{name}
+}
+{\renewcommand{\Changes@optionauthormarkuptext}{#1}}
+{\PackageWarning{changes}{authormarkuptext '#1' unknown, using '\Changes@optionauthormarkuptext'}}
+}
+\typeout{changes-option 'authormarkuptext=\Changes@optionauthormarkuptext'}
}
\DeclareOptionX{ulem}{
- \typeout{ulem-option '#1', passed to package ulem}
- \PassOptionsToPackage{#1}{ulem}
+\typeout{ulem-option '#1', passed to package ulem}
+\PassOptionsToPackage{#1}{ulem}
}
\DeclareOptionX{xcolor}{
- \typeout{xcolor-option '#1', passed to package xcolor}
- \PassOptionsToPackage{#1}{xcolor}
+\typeout{xcolor-option '#1', passed to package xcolor}
+\PassOptionsToPackage{#1}{xcolor}
}
\DeclareOptionX*{
- \PackageWarning{Unknown changes-option '\CurrentOption'}
+\PackageWarning{changes}{Unknown option '\CurrentOption'}
}
+\DeclareOptionX<Changes@definechangesauthor>{name}{\def\Changes@definechangesauthor@name{#1}}
+\DeclareOptionX<Changes@definechangesauthor>{color}{\def\Changes@definechangesauthor@color{#1}}
+\presetkeys{Changes@definechangesauthor}{
+name=\@empty,
+color=black
+}{}
\ProcessOptionsX*\relax
+\newboolean{Changes@colored}
+\setboolean{Changes@colored}{true}
+\ifthenelse{\equal{\Changes@optionmarkup}{nocolor}}
+{\setboolean{Changes@colored}{false}}
+{}
+\ifthenelse{\boolean{Changes@colored}}
+{
\RequirePackage{xcolor}
\RequirePackage{pdfcolmk}
-\RequirePackage{ulem}
+}
+{}
+\ifthenelse{
+\equal{\Changes@optionaddedmarkup}{uline}\or
+\equal{\Changes@optionaddedmarkup}{uuline}\or
+\equal{\Changes@optionaddedmarkup}{uwave}\or
+\equal{\Changes@optionaddedmarkup}{dashuline}\or
+\equal{\Changes@optionaddedmarkup}{dotuline}\or
+\equal{\Changes@optionaddedmarkup}{sout}\or
+\equal{\Changes@optionaddedmarkup}{xout}\or
+\equal{\Changes@optiondeletedmarkup}{uline}\or
+\equal{\Changes@optiondeletedmarkup}{uuline}\or
+\equal{\Changes@optiondeletedmarkup}{uwave}\or
+\equal{\Changes@optiondeletedmarkup}{dashuline}\or
+\equal{\Changes@optiondeletedmarkup}{dotuline}\or
+\equal{\Changes@optiondeletedmarkup}{sout}\or
+\equal{\Changes@optiondeletedmarkup}{xout}
+}
+{\RequirePackage[normalem,normalbf]{ulem}}
+{}
\ifthenelse{\isundefined{\addto}}
- {
+{
\def\listchangesname{Changes}
\def\changesaddname{Added}
\def\changesdeletename{Deleted}
@@ -83,202 +244,261 @@
\def\changesauthorname{Author}
\def\changesanonymousname{anonymous}
\def\changesnoloc{List of changes is available after the next \LaTeX\ run.}
- }{
+}{
\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\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\changesauthorname{Autor}}
-\addto\captionsgerman{\def\changesauthorname{Autor}}
-\addto\captionsenglish{\def\changesauthorname{Author}}
-
\addto\captionsngerman{\def\changesanonymousname{Anonym}}
+\addto\captionsngerman{\def\changesnoloc{\"Anderungsliste nach dem n\"achsten \LaTeX-Lauf verf\"ugbar.}}
+
+\addto\captionsgerman{\def\listchangesname{\"Anderungen}}
+\addto\captionsgerman{\def\changesaddname{Eingef\"ugt}}
+\addto\captionsgerman{\def\changesdeletename{Gel\"oscht}}
+\addto\captionsgerman{\def\changesreplacename{Ersetzt}}
+\addto\captionsgerman{\def\changesauthorname{Autor}}
\addto\captionsgerman{\def\changesanonymousname{Anonym}}
-\addto\captionsenglish{\def\changesanonymousname{anonymous}}
+\addto\captionsgerman{\def\changesnoloc{\"Anderungsliste nach dem n\"achsten \LaTeX-Lauf verf\"ugbar.}}
-\addto\captionsngerman{\def\changesnoloc{\"Anderungsliste nach dem n\"achsten \LaTeX-Lauf verf\"ugbar.}}
-\addto\captionsgerman{\def\changesnoloc{\"Anderungsliste nach dem n\"achsten Durchlauf verf\"ugbar.}}
+\addto\captionsenglish{\def\listchangesname{Changes}}
+\addto\captionsenglish{\def\changesaddname{Added}}
+\addto\captionsenglish{\def\changesdeletename{Deleted}}
+\addto\captionsenglish{\def\changesreplacename{Replaced}}
+\addto\captionsenglish{\def\changesauthorname{Author}}
+\addto\captionsenglish{\def\changesanonymousname{anonymous}}
\addto\captionsenglish{\def\changesnoloc{List of changes is available after the next \LaTeX\ run.}}
- }
+
+\addto\captionsitalian{\def\listchangesname{Modifiche}}
+\addto\captionsitalian{\def\changesaddname{Aggiunte}}
+\addto\captionsitalian{\def\changesdeletename{Cancellazioni}}
+\addto\captionsitalian{\def\changesreplacename{Sostituzioni}}
+\addto\captionsitalian{\def\changesauthorname{Autore}}
+\addto\captionsitalian{\def\changesanonymousname{anonimo}}
+\addto\captionsitalian{\def\changesnoloc{La lista delle modifiche sar\`a disponibile alla prossima esecuzione di \LaTeX.}}
+}
\newcommand{\Changes@extension}{loc}
\newcommand{\setlocextension}[1]{
- \renewcommand{\Changes@extension}{#1}
+\renewcommand{\Changes@extension}{#1}
}
\newcounter{Changes@AuthorCount}
\setcounter{Changes@AuthorCount}{0}
\newcounter{Changes@iAuthor}
-\newcommand{\definechangesauthor}[3][\@empty]{
- \stepcounter{Changes@AuthorCount}
- \@namedef{Changes@Author\theChanges@AuthorCount}{#2}
- \@namedef{Changes@AuthorName#2}{#1}
- \@namedef{Changes@AuthorColor#2}{#3}
- \newcounter{Changes@AddCount#2}
- \newcounter{Changes@DeleteCount#2}
- \newcounter{Changes@ReplaceCount#2}
- \colorlet{Changes@Color#2}{#3}
-}
-\definechangesauthor{\@empty}{blue}
-\newboolean{Changes@AuthorPositionLeft}
-\setboolean{Changes@AuthorPositionLeft}{false}
-\newcommand{\Changes@AuthorMark}[1]{%
- \textsuperscript{#1}%
-}
-\newcommand{\setauthormarkup}[2][left]{%
- \ifthenelse{\equal{#1}{left}}
-{\setboolean{Changes@AuthorPositionLeft}{true}}
-{\setboolean{Changes@AuthorPositionLeft}{false}}
- \renewcommand{\Changes@AuthorMark}[1]{#2}
+\newcommand*\definechangesauthor[2][]{%
+\setkeys{Changes@definechangesauthor}{#1}
+\stepcounter{Changes@AuthorCount}
+\@namedef{Changes@AuthorID\theChanges@AuthorCount}{#2}
+\expandafter
+\let\csname Changes@AuthorName#2\endcsname=\Changes@definechangesauthor@name
+\newcounter{Changes@AddCount#2}
+\newcounter{Changes@DeleteCount#2}
+\newcounter{Changes@ReplaceCount#2}
+\ifthenelse{\boolean{Changes@colored}}
+{
+\expandafter
+\let\csname Changes@AuthorColor#2\endcsname=\Changes@definechangesauthor@color
+\colorlet{Changes@Color#2}{\@nameuse{Changes@AuthorColor#2}}
+}
+{}
+}
+\definechangesauthor[color=blue]{\@empty}
+\newcommand{\Changes@Markup@Author}[1]{%
+\ifthenelse{\equal{\Changes@optionauthormarkup}{superscript}}{\textsuperscript{#1}}{}%
+\ifthenelse{\equal{\Changes@optionauthormarkup}{subscript}}{\textsubscript{#1}}{}%
+\ifthenelse{\equal{\Changes@optionauthormarkup}{brackets}}{(#1)}{}%
+\ifthenelse{\equal{\Changes@optionauthormarkup}{footnote}}{\footnote{#1}}{}%
+}
+\newcommand{\setauthormarkup}[1]{
+\renewcommand{\Changes@Markup@Author}[1]{#1}
+}
+\ifthenelse{\isundefined{\textsubscript}}
+{
+\DeclareRobustCommand*\textsubscript[1]{\@textsubscript{\selectfont#1}}
+\newcommand{\@textsubscript}[1]{{\m@th\ensuremath{_{\mbox{\fontsize\sf@size\z@#1}}}}}
+}{}
+\newcommand{\setauthormarkupposition}[1]{
+\renewcommand{\Changes@optionauthormarkupposition}{#1}
+}
+\newcommand{\setauthormarkuptext}[1]{
+\renewcommand{\Changes@optionauthormarkuptext}{#1}
}
\newcommand{\Changes@Remark}[2]{%
- \footnote{\textcolor{Changes@Color#1}{#2}}%
+\footnote{%
+\ifthenelse{\not\equal{#1}{\@empty}}%
+{#1: }%
+{}%
+#2%
+}%
}
\newcommand{\setremarkmarkup}[1]{%
- \renewcommand{\Changes@Remark}[2]{#1}%
+\renewcommand{\Changes@Remark}[2]{#1}%
+}
+\newcommand{\Changes@Markup@Added}[1]{%
+\ifthenelse{\equal{\Changes@optionaddedmarkup}{none}}{#1}{}%
+\ifthenelse{\equal{\Changes@optionaddedmarkup}{uline}}{\uline{#1}}{}%
+\ifthenelse{\equal{\Changes@optionaddedmarkup}{uuline}}{\uuline{#1}}{}%
+\ifthenelse{\equal{\Changes@optionaddedmarkup}{uwave}}{\uwave{#1}}{}%
+\ifthenelse{\equal{\Changes@optionaddedmarkup}{dashuline}}{\dashuline{#1}}{}%
+\ifthenelse{\equal{\Changes@optionaddedmarkup}{dotuline}}{\dotuline{#1}}{}%
+\ifthenelse{\equal{\Changes@optionaddedmarkup}{sout}}{\sout{#1}}{}%
+\ifthenelse{\equal{\Changes@optionaddedmarkup}{xout}}{\xout{#1}}{}%
+\ifthenelse{\equal{\Changes@optionaddedmarkup}{bf}}{\textbf{#1}}{}%
+\ifthenelse{\equal{\Changes@optionaddedmarkup}{it}}{\textit{#1}}{}%
+\ifthenelse{\equal{\Changes@optionaddedmarkup}{sl}}{\textsl{#1}}{}%
+\ifthenelse{\equal{\Changes@optionaddedmarkup}{em}}{\emph{#1}}{}%
+}
+\newcommand{\setaddedmarkup}[1]{
+\renewcommand{\Changes@Markup@Added}[1]{#1}
+}
+\newcommand{\Changes@Markup@Deleted}[1]{%
+\ifthenelse{\equal{\Changes@optiondeletedmarkup}{none}}{#1}{}%
+\ifthenelse{\equal{\Changes@optiondeletedmarkup}{uline}}{\uline{#1}}{}%
+\ifthenelse{\equal{\Changes@optiondeletedmarkup}{uuline}}{\uuline{#1}}{}%
+\ifthenelse{\equal{\Changes@optiondeletedmarkup}{uwave}}{\uwave{#1}}{}%
+\ifthenelse{\equal{\Changes@optiondeletedmarkup}{dashuline}}{\dashuline{#1}}{}%
+\ifthenelse{\equal{\Changes@optiondeletedmarkup}{dotuline}}{\dotuline{#1}}{}%
+\ifthenelse{\equal{\Changes@optiondeletedmarkup}{sout}}{\sout{#1}}{}%
+\ifthenelse{\equal{\Changes@optiondeletedmarkup}{xout}}{\xout{#1}}{}%
+\ifthenelse{\equal{\Changes@optiondeletedmarkup}{bf}}{\textbf{#1}}{}%
+\ifthenelse{\equal{\Changes@optiondeletedmarkup}{it}}{\textit{#1}}{}%
+\ifthenelse{\equal{\Changes@optiondeletedmarkup}{sl}}{\textsl{#1}}{}%
+\ifthenelse{\equal{\Changes@optiondeletedmarkup}{em}}{\emph{#1}}{}%
+}
+\newcommand{\setdeletedmarkup}[1]{
+\renewcommand{\Changes@Markup@Deleted}[1]{#1}
+}
+\newcommand{\Changes@output}[4]{%
+\ifthenelse{\boolean{Changes@optiondraft}}%
+{%
+\ifthenelse{\equal{\Changes@optionauthormarkuptext}{id}}%
+{\@namedef{Changes@AuthorText}{#3}}%
+{}%
+\ifthenelse{\equal{\Changes@optionauthormarkuptext}{name}}%
+{\@namedef{Changes@AuthorText}{\@nameuse{Changes@AuthorName#3}}}%
+{}%
+{%
+\ifthenelse{\boolean{Changes@colored}}%
+{\color{Changes@Color#3}}%
+{}%
+\ifthenelse{\equal{\Changes@optionauthormarkupposition}{left} \and \not\equal{#3}{\@empty}}%
+{\Changes@Markup@Author{\@nameuse{Changes@AuthorText}}}%
+{}%
+{#1}%
+\ifthenelse{\equal{\Changes@optionauthormarkupposition}{right} \and \not\equal{#3}{\@empty}}%
+{\Changes@Markup@Author{\@nameuse{Changes@AuthorText}}}%
+{}%
+\ifthenelse{\not\equal{#4}{\@empty}}%
+{\Changes@Remark{#3}{#4}}%
+{}%
+}%
+}%
+{#2}%
}
\newcommand{\Changes@temp}{\@empty}
\newcommand{\added}[1][\@empty]{%
- \renewcommand{\Changes@temp}{#1}%
- \Changes@added%
+\renewcommand{\Changes@temp}{#1}%
+\Changes@added%
}
\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}%
+\Changes@output
+{\Changes@Markup@Added{#2}}
+{#2}
+{\Changes@temp}
+{#1}%
+\stepcounter{Changes@AddCount\Changes@temp}%
}
\newcommand{\deleted}[1][\@empty]{%
- \renewcommand{\Changes@temp}{#1}%
- \Changes@deleted%
+\renewcommand{\Changes@temp}{#1}%
+\Changes@deleted%
}
\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}%
+\Changes@output
+{\Changes@Markup@Deleted{#2}}
+{\@bsphack \expandafter \@esphack}
+{\Changes@temp}
+{#1}%
+\stepcounter{Changes@DeleteCount\Changes@temp}%
}
\newcommand{\replaced}[1][\@empty]{%
- \renewcommand{\Changes@temp}{#1}%
- \Changes@replaced%
+\renewcommand{\Changes@temp}{#1}%
+\Changes@replaced%
}
\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}%
+\Changes@output
+{{\Changes@Markup@Added{#2}}{\Changes@Markup@Deleted{#3}}}
+{#2}
+{\Changes@temp}
+{#1}%
+\stepcounter{Changes@ReplaceCount\Changes@temp}%
}
\def\changes@chopline#1;#2;#3;#4;#5;#6 \\{
- \def\Changes@InID{#1}
- \def\Changes@InColor{#2}
- \def\Changes@InName{#3}
- \def\Changes@InAdded{#4}
- \def\Changes@InDeleted{#5}
- \def\Changes@InReplaced{#6}
+\def\Changes@InID{#1}
+\def\Changes@InColor{#2}
+\def\Changes@InName{#3}
+\def\Changes@InAdded{#4}
+\def\Changes@InDeleted{#5}
+\def\Changes@InReplaced{#6}
}
\newcommand{\listofchanges}{%
- \ifthenelse{\boolean{Changes@optiondraft}}
+\ifthenelse{\boolean{Changes@optiondraft}}
{
- \section*{\listchangesname}
- \IfFileExists{\jobname.\Changes@extension}
+\section*{\listchangesname}
+\IfFileExists{\jobname.\Changes@extension}
{
- \newboolean{Changes@MoreLines}
- \setboolean{Changes@MoreLines}{true}
- \newread\Changes@InFile
- \openin\Changes@InFile = \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
+\ifeof\Changes@InFile
\setboolean{Changes@MoreLines}{false}
- \else
+\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\\
+mm\=mmmmmm\=\kill
+{
+\ifthenelse{\boolean{Changes@colored}}
+{\color{\Changes@InColor}}
+{}
+\ifthenelse{\equal{\Changes@InID}{\@empty}}
+{\changesauthorname: \changesanonymousname}
+{
+\changesauthorname: \Changes@InID
+\ifthenelse{\equal{\Changes@InName}{\@empty}}
+{}
+{(\Changes@InName)}
+}
+}\\
+\>\changesaddname:\>\Changes@InAdded\\
+\>\changesdeletename:\>\Changes@InDeleted\\
+\>\changesreplacename:\>\Changes@InReplaced\\
\end{tabbing}
- \fi
+\fi
}
- \closein\Changes@InFile
+\closein\Changes@InFile
}{
- \emph{\changesnoloc}
+\emph{\changesnoloc}
+\PackageWarning{changes}{LaTeX rerun needed for list of changes}
}
}{}
}
\AtEndDocument{
- \newwrite\Changes@OutFile
- \immediate\openout\Changes@OutFile = \jobname.\Changes@extension
- \setcounter{Changes@iAuthor}{0}
- \whiledo{\value{Changes@iAuthor} < \value{Changes@AuthorCount}}{
+\newwrite\Changes@OutFile
+\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}}
+\def\Changes@ID{\@nameuse{Changes@AuthorID\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
-}
-%% Copyright 2007-2011 Ekkart Kleinod
+\@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
+}
+%% Copyright 2007-2012 Ekkart Kleinod
%%
%% End of file `changes.sty'.