summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-04-28 22:08:01 +0000
committerKarl Berry <karl@freefriends.org>2015-04-28 22:08:01 +0000
commit65d9dc5f743f9891c02bb20f904445af62100ce2 (patch)
tree816b877f2dbbe82231570cb96c51384023cdbc8e /Master/texmf-dist/source
parentab2fea2516cb42cf436ea44c685042a07fc183ee (diff)
changes (28apr15)
git-svn-id: svn://tug.org/texlive/trunk@37104 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source')
-rw-r--r--Master/texmf-dist/source/latex/changes/changes.drv4
-rw-r--r--Master/texmf-dist/source/latex/changes/changes.dtx139
2 files changed, 114 insertions, 29 deletions
diff --git a/Master/texmf-dist/source/latex/changes/changes.drv b/Master/texmf-dist/source/latex/changes/changes.drv
index 39deec5c734..4f1265b633f 100644
--- a/Master/texmf-dist/source/latex/changes/changes.drv
+++ b/Master/texmf-dist/source/latex/changes/changes.drv
@@ -91,11 +91,11 @@
% document title
\ifENGLISH
\title{The \chpackage{changes}-package}
- \subtitle{Manual change markup --- version 2.0.3}
+ \subtitle{Manual change markup --- version 2.0.4}
\fi
\ifGERMAN
\title{Das \chpackage{changes}-Paket}
- \subtitle{Manuelle Änderungsmarkierung -- Version 2.0.3}
+ \subtitle{Manuelle Änderungsmarkierung -- Version 2.0.4}
\fi
\author{Ekkart Kleinod}
diff --git a/Master/texmf-dist/source/latex/changes/changes.dtx b/Master/texmf-dist/source/latex/changes/changes.dtx
index fb180869317..5a302b36ff4 100644
--- a/Master/texmf-dist/source/latex/changes/changes.dtx
+++ b/Master/texmf-dist/source/latex/changes/changes.dtx
@@ -1,8 +1,8 @@
-% \CheckSum{966}
+% \CheckSum{1086}
%
% \iffalse meta-comment
%
-% Copyright (C) 2007-2013
+% Copyright (C) 2007-2015
% Ekkart Kleinod (ekleinod@edgesoft.de)
% --------------------------------------------------------------------------
%
@@ -52,6 +52,7 @@
% \changes{v2.0.1}{2013/08/10}{no changes in behavior or code; fixed problems with CTAN upload}
% \changes{v2.0.2}{2013/08/13}{again no changes in behavior or code; fixed CTAN upload - pdf files were corrupt; improved documentation}
% \changes{v2.0.3}{2014/10/15}{bugfix when using with amsart}
+% \changes{v2.0.4}{2015/04/27}{unknown language does not lead to error: fallback English}
% \GetFileInfo{changes.dtx}
% \RecordChanges
%
@@ -91,8 +92,8 @@
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{changes}
-[2014/10/15 v2.0.3 changes package]
-\typeout{*** changes package 2014/10/15 v2.0.3 ***}
+[2015/04/27 v2.0.4 changes package]
+\typeout{*** changes package 2015/04/27 v2.0.4 ***}
% \end{macrocode}
%
% Package \chpackage{xkeyval} provides options with key-value-pairs.
@@ -337,13 +338,19 @@
% \begin{macrocode}
\DeclareOptionX<Changes@added>{id}{\def\Changes@added@id{#1}}
\DeclareOptionX<Changes@added>{remark}{\def\Changes@added@remark{#1}}
+\DeclareOptionX<Changes@added>{decision}{\def\Changes@added@dec{#1}}
+\DeclareOptionX<Changes@added>{decisionid}{\def\Changes@added@decid{#1}}
+\DeclareOptionX<Changes@added>{decisionremark}{\def\Changes@added@decrem{#1}}
% \end{macrocode}
%
% Set the default values of the options.
% \begin{macrocode}
\presetkeys{Changes@added}{
id=\@empty,
- remark=\@empty
+ remark=\@empty,
+ decision=\@empty,
+ decisionid=\@empty,
+ decisionremark=\@empty
}{}
% \end{macrocode}
%
@@ -353,13 +360,19 @@
% \begin{macrocode}
\DeclareOptionX<Changes@deleted>{id}{\def\Changes@deleted@id{#1}}
\DeclareOptionX<Changes@deleted>{remark}{\def\Changes@deleted@remark{#1}}
+\DeclareOptionX<Changes@deleted>{decision}{\def\Changes@deleted@dec{#1}}
+\DeclareOptionX<Changes@deleted>{decisionid}{\def\Changes@deleted@decid{#1}}
+\DeclareOptionX<Changes@deleted>{decisionremark}{\def\Changes@deleted@decrem{#1}}
% \end{macrocode}
%
% Set the default values of the options.
% \begin{macrocode}
\presetkeys{Changes@deleted}{
id=\@empty,
- remark=\@empty
+ remark=\@empty,
+ decision=\@empty,
+ decisionid=\@empty,
+ decisionremark=\@empty
}{}
% \end{macrocode}
%
@@ -369,13 +382,19 @@
% \begin{macrocode}
\DeclareOptionX<Changes@replaced>{id}{\def\Changes@replaced@id{#1}}
\DeclareOptionX<Changes@replaced>{remark}{\def\Changes@replaced@remark{#1}}
+\DeclareOptionX<Changes@replaced>{decision}{\def\Changes@replaced@dec{#1}}
+\DeclareOptionX<Changes@replaced>{decisionid}{\def\Changes@replaced@decid{#1}}
+\DeclareOptionX<Changes@replaced>{decisionremark}{\def\Changes@replaced@decrem{#1}}
% \end{macrocode}
%
% Set the default values of the options.
% \begin{macrocode}
\presetkeys{Changes@replaced}{
id=\@empty,
- remark=\@empty
+ remark=\@empty,
+ decision=\@empty,
+ decisionid=\@empty,
+ decisionremark=\@empty
}{}
% \end{macrocode}
%
@@ -442,22 +461,32 @@
%
% \subsection{Language dependent texts}
%
-% Declaration of language dependent names and identifiers.
-% The check for \chcommand{addto} is a check for the \chpackage{babel} package.
-% If the babel package is not loaded, the default language is English, in order to use another language, the user has to redefine the variables.
+% If the \chpackage{babel} package is not loaded, the default language is English, in order to use another language, the user has to redefine the variables.
+% If the \chpackage{babel} or the \chpackage{polyglossia} package is loaded, the default language is English too for undefined languages.
% \begin{macrocode}
-\ifthenelse{\isundefined{\addto}}
+\newcommand*\listofchangesname{List of changes}
+\newcommand*\summaryofchangesname{Changes}
+\newcommand*\changesaddname{Added}
+\newcommand*\changesdeletename{Deleted}
+\newcommand*\changesreplacename{Replaced}
+\newcommand*\changesauthorname{Author}
+\newcommand*\changesanonymousname{anonymous}
+\newcommand*\changesnoloc{List of changes is available after the next \LaTeX\ run.}
+\newcommand*\changesnosoc{Summary of changes is available after the next \LaTeX\ run.}
+% \end{macrocode}
+%
+% The check for \chpackage{babel} or \chpackage{polyglossia}, define language dependent texts afterwards.
+% \begin{macrocode}
+\newboolean{Changes@langpackage}
+\setboolean{Changes@langpackage}{false}
+\@ifpackageloaded{babel}
+ {\setboolean{Changes@langpackage}{true}}
+ {}
+\@ifpackageloaded{polyglossia}
+ {\setboolean{Changes@langpackage}{true}}
+ {}
+\ifthenelse{\boolean{Changes@langpackage}}
{
- \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\listofchangesname{Liste der \"Anderungen}}
\addto\captionsngerman{\def\summaryofchangesname{\"Anderungen}}
\addto\captionsngerman{\def\changesaddname{Eingef\"ugt}}
@@ -488,6 +517,16 @@
\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\captionsbritish{\def\listofchangesname{List of changes}}
+ \addto\captionsbritish{\def\summaryofchangesname{Changes}}
+ \addto\captionsbritish{\def\changesaddname{Added}}
+ \addto\captionsbritish{\def\changesdeletename{Deleted}}
+ \addto\captionsbritish{\def\changesreplacename{Replaced}}
+ \addto\captionsbritish{\def\changesauthorname{Author}}
+ \addto\captionsbritish{\def\changesanonymousname{anonymous}}
+ \addto\captionsbritish{\def\changesnoloc{List of changes is available after the next \LaTeX\ run.}}
+ \addto\captionsbritish{\def\changesnosoc{Summary of changes is available after the next \LaTeX\ run.}}
+
\addto\captionsitalian{\def\listofchangesname{Lista delle modifiche}}
\addto\captionsitalian{\def\summaryofchangesname{Modifiche}}
\addto\captionsitalian{\def\changesaddname{Aggiunte}}
@@ -498,6 +537,7 @@
\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.}}
}
+ {}
% \end{macrocode}
%
% \subsection{File extension}
@@ -740,11 +780,14 @@
% \item remark
% \item text for list of changes
% \item change type for list of changes
+% \item decision (accept or reject)
+% \item decision author's id
+% \item decision remark
% \end{enumerate}
% Define boolean for author test.
% \begin{macrocode}
\newboolean{Changes@WrongID}
-\newcommand{\Changes@output}[6]{%
+\newcommand{\Changes@output}[9]{%
% \end{macrocode}
% Output changed text if option \choption{draft} is set, otherwise output unchanged text.
% \begin{macrocode}
@@ -768,14 +811,47 @@
{You have to define the author #3 with e.g.: \definechangesauthor{#3}}}%
{}%
% \end{macrocode}
+% Check if the decision's author exists, error message otherwise.
+% \begin{macrocode}
+ \ifthenelse{\not\equal{#8}{\@empty}}%
+ {%
+ \setboolean{Changes@WrongID}{true}%
+ \setcounter{Changes@Author}{0}%
+ \whiledo{\value{Changes@Author} < \value{Changes@AuthorCount}}{%
+ \stepcounter{Changes@Author}%
+ \ifthenelse{\equal{#8}{\@nameuse{Changes@AuthorID\theChanges@Author}}}%
+ {\setboolean{Changes@WrongID}{false}}%
+ {}%
+ }%
+ \ifthenelse{\boolean{Changes@WrongID}}%
+ {\PackageError{changes}%
+ {Undefined changes author: #8}%
+ {You have to define the author #8 with e.g.: \definechangesauthor{#8}}}%
+ {}%
+ }%
+ {}%
+% \end{macrocode}
% Save author text for output.
% \begin{macrocode}
\ifthenelse{\equal{\Changes@optionauthormarkuptext}{id}}%
- {\@namedef{Changes@AuthorText}{#3}}%
+ {%
+ \@namedef{Changes@AuthorText}{#3}%
+ \ifthenelse{\not\equal{#8}{\@empty}}%
+ {\@namedef{Changes@DecAuthorText}{#8}}%
+ {}%
+ }%
{}%
\ifthenelse{\equal{\Changes@optionauthormarkuptext}{name}}%
- {\@namedef{Changes@AuthorText}{\@nameuse{Changes@AuthorName#3}}}%
+ {%
+ \@namedef{Changes@AuthorText}{\@nameuse{Changes@AuthorName#3}}%
+ \ifthenelse{\not\equal{#8}{\@empty}}%
+ {\@namedef{Changes@DecAuthorText}{\@nameuse{Changes@AuthorName#8}}}%
+ {}%
+ }%
{}%
+% \end{macrocode}
+% Begin output
+% \begin{macrocode}
{%
% \end{macrocode}
% Change color, if colored text is used.
@@ -826,7 +902,7 @@
% The command formats text as new text.
%
% Mandatory argument: added text.
-% Optional argument (key-value): author's id, remark
+% Optional argument (key-value): author's id, remark, decision, decision author's id, decision remark
% \begin{macrocode}
\newcommand{\added}[2][\@empty]{%
% \end{macrocode}
@@ -840,6 +916,9 @@
{\Changes@added@remark}%
{#2}%
{\changesaddname}%
+ {\Changes@added@dec}%
+ {\Changes@added@decid}%
+ {\Changes@added@decremark}%
\stepcounter{Changes@AddCount\Changes@added@id}%
}
% \end{macrocode}
@@ -852,7 +931,7 @@
% It solves the problem of additional space caused by an empty command.
%
% Mandatory argument: deleted text.
-% Optional argument (key-value): author's id, remark
+% Optional argument (key-value): author's id, remark, decision, decision author's id, decision remark
% \begin{macrocode}
\newcommand{\deleted}[2][\@empty]{%
% \end{macrocode}
@@ -866,6 +945,9 @@
{\Changes@deleted@remark}%
{#2}%
{\changesdeletename}%
+ {\Changes@deleted@dec}%
+ {\Changes@deleted@decid}%
+ {\Changes@deleted@decremark}%
\stepcounter{Changes@DeleteCount\Changes@deleted@id}%
}
% \end{macrocode}
@@ -875,7 +957,7 @@
% The command formats text as replaced text.
%
% Mandatory arguments: new text and old text.
-% Optional argument (key-value): author's id, remark
+% Optional argument (key-value): author's id, remark, decision, decision author's id, decision remark
% \begin{macrocode}
\newcommand{\replaced}[3][\@empty]{%
% \end{macrocode}
@@ -889,6 +971,9 @@
{\Changes@replaced@remark}%
{#2}%
{\changesreplacename}%
+ {\Changes@replaced@dec}%
+ {\Changes@replaced@decid}%
+ {\Changes@replaced@decremark}%
\stepcounter{Changes@ReplaceCount\Changes@replaced@id}%
}
% \end{macrocode}