changes (10aug13)

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

1 files changed, 86 insertions, 37 deletions

diff --git a/Master/texmf-dist/tex/latex/changes/changes.sty b/Master/texmf-dist/tex/latex/changes/changes.sty
index 179e06f5224..43cf9d8d3fa 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-2012 Ekkart Kleinod (ekleinod@edgesoft.de)
+%% Copyright 2007-2013 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
@@ -41,8 +41,8 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{changes}
-[2012/04/25 v1.0.0 changes-Paket]
-\typeout{*** changes-Paket 2012/04/25 v1.0.0 ***}
+[2013/08/10 v2.0.1 changes-Paket]
+\typeout{*** changes-Paket 2013/08/10 v2.0.1 ***}
 \RequirePackage{xkeyval}
 \RequirePackage{xifthen}
 \newboolean{Changes@optiondraft}
@@ -152,7 +152,8 @@
 \equal{#1}{superscript}\or
 \equal{#1}{subscript}\or
 \equal{#1}{brackets}\or
-\equal{#1}{footnote}
+\equal{#1}{footnote}\or
+\equal{#1}{none}
 }
 {\renewcommand{\Changes@optionauthormarkup}{#1}}
 {\PackageWarning{changes}{authormarkup '#1' unknown, using '\Changes@optionauthormarkup'}}
@@ -222,6 +223,10 @@ remark=\@empty
 id=\@empty,
 remark=\@empty
 }{}
+\DeclareOptionX<Changes@loc>{style}{\def\Changes@loc@style{#1}}
+\presetkeys{Changes@loc}{
+style=list
+}{}
 \ProcessOptionsX*\relax
 \newboolean{Changes@colored}
 \setboolean{Changes@colored}{true}
@@ -254,48 +259,58 @@ remark=\@empty
 {}
 \ifthenelse{\isundefined{\addto}}
 {
-\def\listchangesname{Changes}
+\def\listofchangesname{List of changes}
+\def\summaryofchangesname{Changes}
 \def\changesaddname{Added}
 \def\changesdeletename{Deleted}
 \def\changesreplacename{Replaced}
 \def\changesauthorname{Author}
 \def\changesanonymousname{anonymous}
 \def\changesnoloc{List of changes is available after the next \LaTeX\ run.}
+\def\changesnosoc{Summary of changes is available after the next \LaTeX\ run.}
 }{
-\addto\captionsngerman{\def\listchangesname{\"Anderungen}}
+\addto\captionsngerman{\def\listofchangesname{Liste der \"Anderungen}}
+\addto\captionsngerman{\def\summaryofchangesname{\"Anderungen}}
 \addto\captionsngerman{\def\changesaddname{Eingef\"ugt}}
 \addto\captionsngerman{\def\changesdeletename{Gel\"oscht}}
 \addto\captionsngerman{\def\changesreplacename{Ersetzt}}
 \addto\captionsngerman{\def\changesauthorname{Autor}}
 \addto\captionsngerman{\def\changesanonymousname{Anonym}}
-\addto\captionsngerman{\def\changesnoloc{\"Anderungsliste nach dem n\"achsten \LaTeX-Lauf verf\"ugbar.}}
+\addto\captionsngerman{\def\changesnoloc{Liste der \"Anderungen nach dem n\"achsten \LaTeX-Lauf verf\"ugbar.}}
+\addto\captionsngerman{\def\changesnosoc{\"Anderungen nach dem n\"achsten \LaTeX-Lauf verf\"ugbar.}}
 
-\addto\captionsgerman{\def\listchangesname{\"Anderungen}}
+\addto\captionsgerman{\def\listofchangesname{Liste der \"Anderungen}}
+\addto\captionsgerman{\def\summaryofchangesname{\"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\captionsgerman{\def\changesnoloc{\"Anderungsliste nach dem n\"achsten \LaTeX-Lauf verf\"ugbar.}}
+\addto\captionsgerman{\def\changesnoloc{Liste der \"Anderungen nach dem n\"achsten \LaTeX-Lauf verf\"ugbar.}}
+\addto\captionsgerman{\def\changesnosoc{\"Anderungen nach dem n\"achsten \LaTeX-Lauf verf\"ugbar.}}
 
-\addto\captionsenglish{\def\listchangesname{Changes}}
+\addto\captionsenglish{\def\listofchangesname{List of changes}}
+\addto\captionsenglish{\def\summaryofchangesname{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\captionsenglish{\def\changesnosoc{Summary of changes is available after the next \LaTeX\ run.}}
 
-\addto\captionsitalian{\def\listchangesname{Modifiche}}
+\addto\captionsitalian{\def\listofchangesname{Lista delle modifiche}}
+\addto\captionsitalian{\def\summaryofchangesname{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.}}
+\addto\captionsitalian{\def\changesnosoc{Le modifiche sar\`a disponibile alla prossima esecuzione di \LaTeX.}}
 }
-\newcommand{\Changes@extension}{loc}
-\newcommand{\setlocextension}[1]{
+\newcommand{\Changes@extension}{soc}
+\newcommand{\setsocextension}[1]{
 \renewcommand{\Changes@extension}{#1}
 }
 \newcounter{Changes@AuthorCount}
@@ -324,6 +339,7 @@ remark=\@empty
 \ifthenelse{\equal{\Changes@optionauthormarkup}{subscript}}{\textsubscript{#1}}{}%
 \ifthenelse{\equal{\Changes@optionauthormarkup}{brackets}}{(#1)}{}%
 \ifthenelse{\equal{\Changes@optionauthormarkup}{footnote}}{\footnote{#1}}{}%
+\ifthenelse{\equal{\Changes@optionauthormarkup}{none}}{}{}%
 }
 \newcommand{\setauthormarkup}[1]{
 \renewcommand{\Changes@Markup@Author}[1]{#1}
@@ -385,7 +401,7 @@ remark=\@empty
 \renewcommand{\Changes@Markup@Deleted}[1]{#1}
 }
 \newboolean{Changes@WrongID}
-\newcommand{\Changes@output}[4]{%
+\newcommand{\Changes@output}[6]{%
 \ifthenelse{\boolean{Changes@optiondraft}}%
 {%
 \setboolean{Changes@WrongID}{true}%
@@ -422,25 +438,33 @@ remark=\@empty
 {\Changes@Remark{#3}{#4}}%
 {}%
 }%
+\ifthenelse{\equal{\@empty}{#3}}%
+{\def\Changes@locid{}}%
+{\def\Changes@locid{~(#3)}}%
+\addcontentsline{loc}{subsection}{#6\Changes@locid: \truncate{.3\textwidth}{#5}}%
 }%
 {#2}%
 }
 \newcommand{\added}[2][\@empty]{%
 \setkeys{Changes@added}{#1}%
-\Changes@output
-{\Changes@Markup@Added{#2}}
-{#2}
-{\Changes@added@id}
+\Changes@output%
+{\Changes@Markup@Added{#2}}%
+{#2}%
+{\Changes@added@id}%
 {\Changes@added@remark}%
+{#2}%
+{\changesaddname}%
 \stepcounter{Changes@AddCount\Changes@added@id}%
 }
 \newcommand{\deleted}[2][\@empty]{%
 \setkeys{Changes@deleted}{#1}%
-\Changes@output
-{\Changes@Markup@Deleted{#2}}
-{\@bsphack \expandafter \@esphack}
-{\Changes@deleted@id}
+\Changes@output%
+{\Changes@Markup@Deleted{#2}}%
+{\@bsphack \expandafter \@esphack}%
+{\Changes@deleted@id}%
 {\Changes@deleted@remark}%
+{#2}%
+{\changesdeletename}%
 \stepcounter{Changes@DeleteCount\Changes@deleted@id}%
 }
 \newcommand{\replaced}[3][\@empty]{%
@@ -450,8 +474,11 @@ remark=\@empty
 {#2}
 {\Changes@replaced@id}
 {\Changes@replaced@remark}%
+{#2}%
+{\changesreplacename}%
 \stepcounter{Changes@ReplaceCount\Changes@replaced@id}%
 }
+\RequirePackage[breakall]{truncate}
 \def\changes@chopline#1;#2;#3;#4;#5;#6 \\{
 \def\Changes@InID{#1}
 \def\Changes@InColor{#2}
@@ -460,13 +487,37 @@ remark=\@empty
 \def\Changes@InDeleted{#5}
 \def\Changes@InReplaced{#6}
 }
-\newcommand{\listofchanges}{%
+\newlength{\Changes@Len@summ}
+\setlength{\Changes@Len@summ}{.2\textwidth}
+\newboolean{Changes@MoreLines}
+\newcommand{\listofchanges}[1][style=list]{%
+\setkeys{Changes@loc}{#1}%
+\ifthenelse{\equal{\@empty}{\Changes@loc@style}}
+{\def\Changes@loc@style{list}}
+{
+\ifthenelse{
+\equal{\Changes@loc@style}{list}\or
+\equal{\Changes@loc@style}{summary}
+}
+{}
+{\def\Changes@loc@style{list}}
+}
+\ifthenelse{\equal{\Changes@loc@style}{list}}
+{
+\section*{\listofchangesname}
+\IfFileExists{\jobname.loc}
+{}{
+\emph{\changesnoloc}
+\PackageWarning{changes}{LaTeX rerun needed for list of changes}
+}
+\@starttoc{loc}
+}
+{
 \ifthenelse{\boolean{Changes@optiondraft}}
 {
-\section*{\listchangesname}
+\section*{\summaryofchangesname}
 \IfFileExists{\jobname.\Changes@extension}
 {
-\newboolean{Changes@MoreLines}
 \setboolean{Changes@MoreLines}{true}
 \newread\Changes@InFile
 \openin\Changes@InFile = \jobname.\Changes@extension
@@ -476,34 +527,32 @@ remark=\@empty
 \setboolean{Changes@MoreLines}{false}
 \else
 \expandafter\changes@chopline\Changes@Line\\
-\begin{tabbing}
-mm\=mmmmmm\=\kill
-{
+\textbf{%
 \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}
+\parbox{\Changes@Len@summ}{\changesaddname~\dotfill~\Changes@InAdded}\\
+\parbox{\Changes@Len@summ}{\changesdeletename~\dotfill~\Changes@InDeleted}\\
+\parbox{\Changes@Len@summ}{\changesreplacename~\dotfill~\Changes@InReplaced}\\[1ex]
 \fi
 }
 \closein\Changes@InFile
-}{
-\emph{\changesnoloc}
-\PackageWarning{changes}{LaTeX rerun needed for list of changes}
+}{%
+\emph{\changesnosoc}
+\PackageWarning{changes}{LaTeX rerun needed for summary of changes}
 }
 }{}
 }
+}
 \AtEndDocument{
 \newwrite\Changes@OutFile
 \immediate\openout\Changes@OutFile = \jobname.\Changes@extension
@@ -523,6 +572,6 @@ mm\=mmmmmm\=\kill
 \immediate\closeout\Changes@OutFile
 \let\protect\Changes@protect
 }
-%% Copyright 2007-2012 Ekkart Kleinod
+%% Copyright 2007-2013 Ekkart Kleinod
 %%
 %% End of file `changes.sty'.