diff options
| author | Karl Berry <karl@freefriends.org> | 2021-01-29 22:30:54 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2021-01-29 22:30:54 +0000 |
| commit | cbd0c9d5ad3299c4a474bb472f7dc205fb8c2bcc (patch) | |
| tree | 5520789c0a556178f7075aa306034aa089cddb91 /Master | |
| parent | 988964e7df68cb46b8977ecd2d34e678c165fb65 (diff) | |
changes (29jan21)
git-svn-id: svn://tug.org/texlive/trunk@57549 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
242 files changed, 2474 insertions, 1792 deletions
diff --git a/Master/texmf-dist/doc/latex/changes/README b/Master/texmf-dist/doc/latex/changes/README index b14ada07dfb..675b98a888e 100644 --- a/Master/texmf-dist/doc/latex/changes/README +++ b/Master/texmf-dist/doc/latex/changes/README @@ -11,7 +11,7 @@ Das Paket ermöglicht die freie Definition von Autoren und deren zugeordneten Fa Es erlaubt zusätzlich die Änderung des Änderungs-, Autor-, Hervorhebungs- und Kommentarmarkups. Autor/author: Ekkart Kleinod <ekleinod@edgesoft.de> -Internet: http://changes.sourceforge.net/ +Internet: https://edgesoft.de/projects/changes/ This material is subject to the LaTeX Project Public License (LPPL 1.3 or any later version). For more details please refer to the user documentation changes.english.pdf diff --git a/Master/texmf-dist/doc/latex/changes/changes.english.pdf b/Master/texmf-dist/doc/latex/changes/changes.english.pdf Binary files differindex 028860caa32..6ba651b4989 100644 --- a/Master/texmf-dist/doc/latex/changes/changes.english.pdf +++ b/Master/texmf-dist/doc/latex/changes/changes.english.pdf diff --git a/Master/texmf-dist/doc/latex/changes/changes.english.withcode.pdf b/Master/texmf-dist/doc/latex/changes/changes.english.withcode.pdf Binary files differindex fbc104e48d3..b2a851bc443 100644 --- a/Master/texmf-dist/doc/latex/changes/changes.english.withcode.pdf +++ b/Master/texmf-dist/doc/latex/changes/changes.english.withcode.pdf diff --git a/Master/texmf-dist/doc/latex/changes/changes.ngerman.pdf b/Master/texmf-dist/doc/latex/changes/changes.ngerman.pdf Binary files differindex 92372fc5481..fbd71eef6a6 100644 --- a/Master/texmf-dist/doc/latex/changes/changes.ngerman.pdf +++ b/Master/texmf-dist/doc/latex/changes/changes.ngerman.pdf diff --git a/Master/texmf-dist/doc/latex/changes/examples/changes.example.addedmarkup.bf.pdf b/Master/texmf-dist/doc/latex/changes/examples/changes.example.addedmarkup.bf.pdf Binary files differnew file mode 100644 index 00000000000..595a62e67ac --- /dev/null +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.addedmarkup.bf.pdf diff --git a/Master/texmf-dist/doc/latex/changes/changes.example.addedmarkup.bf.tex b/Master/texmf-dist/doc/latex/changes/examples/changes.example.addedmarkup.bf.tex index 028dadb4efe..fa0505af9a1 100644 --- a/Master/texmf-dist/doc/latex/changes/changes.example.addedmarkup.bf.tex +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.addedmarkup.bf.tex @@ -1,5 +1,5 @@ %% -%% This is file `changes.example.addedmarkup.bf.tex', +%% This is file `examples/changes.example.addedmarkup.bf.tex', %% generated with the docstrip utility. %% %% The original source files were: @@ -7,7 +7,7 @@ %% examples.dtx (with options: `example:addedmarkup:bf') %% %% changes.dtx -%% Copyright 2007-2020 Ekkart Kleinod (ekleinod@edgesoft.de) +%% Copyright 2007-2021 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 @@ -111,6 +111,6 @@ That's also clear. \end{document} -%% Copyright 2007-2020 Ekkart Kleinod +%% Copyright 2007-2021 Ekkart Kleinod %% -%% End of file `changes.example.addedmarkup.bf.tex'. +%% End of file `examples/changes.example.addedmarkup.bf.tex'. diff --git a/Master/texmf-dist/doc/latex/changes/examples/changes.example.addedmarkup.colored.pdf b/Master/texmf-dist/doc/latex/changes/examples/changes.example.addedmarkup.colored.pdf Binary files differnew file mode 100644 index 00000000000..2b0ab941fd0 --- /dev/null +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.addedmarkup.colored.pdf diff --git a/Master/texmf-dist/doc/latex/changes/changes.example.addedmarkup.colored.tex b/Master/texmf-dist/doc/latex/changes/examples/changes.example.addedmarkup.colored.tex index ed1d63993d2..0d47dbb146a 100644 --- a/Master/texmf-dist/doc/latex/changes/changes.example.addedmarkup.colored.tex +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.addedmarkup.colored.tex @@ -1,5 +1,5 @@ %% -%% This is file `changes.example.addedmarkup.colored.tex', +%% This is file `examples/changes.example.addedmarkup.colored.tex', %% generated with the docstrip utility. %% %% The original source files were: @@ -7,7 +7,7 @@ %% examples.dtx (with options: `example:addedmarkup:colored') %% %% changes.dtx -%% Copyright 2007-2020 Ekkart Kleinod (ekleinod@edgesoft.de) +%% Copyright 2007-2021 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 @@ -111,6 +111,6 @@ That's also clear. \end{document} -%% Copyright 2007-2020 Ekkart Kleinod +%% Copyright 2007-2021 Ekkart Kleinod %% -%% End of file `changes.example.addedmarkup.colored.tex'. +%% End of file `examples/changes.example.addedmarkup.colored.tex'. diff --git a/Master/texmf-dist/doc/latex/changes/examples/changes.example.addedmarkup.dashuline.pdf b/Master/texmf-dist/doc/latex/changes/examples/changes.example.addedmarkup.dashuline.pdf Binary files differnew file mode 100644 index 00000000000..304843e359d --- /dev/null +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.addedmarkup.dashuline.pdf diff --git a/Master/texmf-dist/doc/latex/changes/changes.example.addedmarkup.dashuline.tex b/Master/texmf-dist/doc/latex/changes/examples/changes.example.addedmarkup.dashuline.tex index 3c9509ded48..04135fe6565 100644 --- a/Master/texmf-dist/doc/latex/changes/changes.example.addedmarkup.dashuline.tex +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.addedmarkup.dashuline.tex @@ -1,5 +1,5 @@ %% -%% This is file `changes.example.addedmarkup.dashuline.tex', +%% This is file `examples/changes.example.addedmarkup.dashuline.tex', %% generated with the docstrip utility. %% %% The original source files were: @@ -7,7 +7,7 @@ %% examples.dtx (with options: `example:addedmarkup:dashuline') %% %% changes.dtx -%% Copyright 2007-2020 Ekkart Kleinod (ekleinod@edgesoft.de) +%% Copyright 2007-2021 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 @@ -111,6 +111,6 @@ That's also clear. \end{document} -%% Copyright 2007-2020 Ekkart Kleinod +%% Copyright 2007-2021 Ekkart Kleinod %% -%% End of file `changes.example.addedmarkup.dashuline.tex'. +%% End of file `examples/changes.example.addedmarkup.dashuline.tex'. diff --git a/Master/texmf-dist/doc/latex/changes/examples/changes.example.addedmarkup.dotuline.pdf b/Master/texmf-dist/doc/latex/changes/examples/changes.example.addedmarkup.dotuline.pdf Binary files differnew file mode 100644 index 00000000000..8d1aa262309 --- /dev/null +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.addedmarkup.dotuline.pdf diff --git a/Master/texmf-dist/doc/latex/changes/changes.example.addedmarkup.dotuline.tex b/Master/texmf-dist/doc/latex/changes/examples/changes.example.addedmarkup.dotuline.tex index 3c04b3897ab..6c2d21a3c0e 100644 --- a/Master/texmf-dist/doc/latex/changes/changes.example.addedmarkup.dotuline.tex +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.addedmarkup.dotuline.tex @@ -1,5 +1,5 @@ %% -%% This is file `changes.example.addedmarkup.dotuline.tex', +%% This is file `examples/changes.example.addedmarkup.dotuline.tex', %% generated with the docstrip utility. %% %% The original source files were: @@ -7,7 +7,7 @@ %% examples.dtx (with options: `example:addedmarkup:dotuline') %% %% changes.dtx -%% Copyright 2007-2020 Ekkart Kleinod (ekleinod@edgesoft.de) +%% Copyright 2007-2021 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 @@ -111,6 +111,6 @@ That's also clear. \end{document} -%% Copyright 2007-2020 Ekkart Kleinod +%% Copyright 2007-2021 Ekkart Kleinod %% -%% End of file `changes.example.addedmarkup.dotuline.tex'. +%% End of file `examples/changes.example.addedmarkup.dotuline.tex'. diff --git a/Master/texmf-dist/doc/latex/changes/examples/changes.example.addedmarkup.em.pdf b/Master/texmf-dist/doc/latex/changes/examples/changes.example.addedmarkup.em.pdf Binary files differnew file mode 100644 index 00000000000..13c9f1bb757 --- /dev/null +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.addedmarkup.em.pdf diff --git a/Master/texmf-dist/doc/latex/changes/changes.example.addedmarkup.em.tex b/Master/texmf-dist/doc/latex/changes/examples/changes.example.addedmarkup.em.tex index af95ba58c07..58f1987b640 100644 --- a/Master/texmf-dist/doc/latex/changes/changes.example.addedmarkup.em.tex +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.addedmarkup.em.tex @@ -1,5 +1,5 @@ %% -%% This is file `changes.example.addedmarkup.em.tex', +%% This is file `examples/changes.example.addedmarkup.em.tex', %% generated with the docstrip utility. %% %% The original source files were: @@ -7,7 +7,7 @@ %% examples.dtx (with options: `example:addedmarkup:em') %% %% changes.dtx -%% Copyright 2007-2020 Ekkart Kleinod (ekleinod@edgesoft.de) +%% Copyright 2007-2021 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 @@ -111,6 +111,6 @@ That's also clear. \end{document} -%% Copyright 2007-2020 Ekkart Kleinod +%% Copyright 2007-2021 Ekkart Kleinod %% -%% End of file `changes.example.addedmarkup.em.tex'. +%% End of file `examples/changes.example.addedmarkup.em.tex'. diff --git a/Master/texmf-dist/doc/latex/changes/examples/changes.example.addedmarkup.it.pdf b/Master/texmf-dist/doc/latex/changes/examples/changes.example.addedmarkup.it.pdf Binary files differnew file mode 100644 index 00000000000..27f400d0315 --- /dev/null +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.addedmarkup.it.pdf diff --git a/Master/texmf-dist/doc/latex/changes/changes.example.addedmarkup.it.tex b/Master/texmf-dist/doc/latex/changes/examples/changes.example.addedmarkup.it.tex index ca46b5e2348..02bce5dd096 100644 --- a/Master/texmf-dist/doc/latex/changes/changes.example.addedmarkup.it.tex +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.addedmarkup.it.tex @@ -1,5 +1,5 @@ %% -%% This is file `changes.example.addedmarkup.it.tex', +%% This is file `examples/changes.example.addedmarkup.it.tex', %% generated with the docstrip utility. %% %% The original source files were: @@ -7,7 +7,7 @@ %% examples.dtx (with options: `example:addedmarkup:it') %% %% changes.dtx -%% Copyright 2007-2020 Ekkart Kleinod (ekleinod@edgesoft.de) +%% Copyright 2007-2021 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 @@ -111,6 +111,6 @@ That's also clear. \end{document} -%% Copyright 2007-2020 Ekkart Kleinod +%% Copyright 2007-2021 Ekkart Kleinod %% -%% End of file `changes.example.addedmarkup.it.tex'. +%% End of file `examples/changes.example.addedmarkup.it.tex'. diff --git a/Master/texmf-dist/doc/latex/changes/examples/changes.example.addedmarkup.sl.pdf b/Master/texmf-dist/doc/latex/changes/examples/changes.example.addedmarkup.sl.pdf Binary files differnew file mode 100644 index 00000000000..9ffe8f072ee --- /dev/null +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.addedmarkup.sl.pdf diff --git a/Master/texmf-dist/doc/latex/changes/changes.example.addedmarkup.sl.tex b/Master/texmf-dist/doc/latex/changes/examples/changes.example.addedmarkup.sl.tex index b7c38b823ba..29361cfd85d 100644 --- a/Master/texmf-dist/doc/latex/changes/changes.example.addedmarkup.sl.tex +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.addedmarkup.sl.tex @@ -1,5 +1,5 @@ %% -%% This is file `changes.example.addedmarkup.sl.tex', +%% This is file `examples/changes.example.addedmarkup.sl.tex', %% generated with the docstrip utility. %% %% The original source files were: @@ -7,7 +7,7 @@ %% examples.dtx (with options: `example:addedmarkup:sl') %% %% changes.dtx -%% Copyright 2007-2020 Ekkart Kleinod (ekleinod@edgesoft.de) +%% Copyright 2007-2021 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 @@ -111,6 +111,6 @@ That's also clear. \end{document} -%% Copyright 2007-2020 Ekkart Kleinod +%% Copyright 2007-2021 Ekkart Kleinod %% -%% End of file `changes.example.addedmarkup.sl.tex'. +%% End of file `examples/changes.example.addedmarkup.sl.tex'. diff --git a/Master/texmf-dist/doc/latex/changes/examples/changes.example.addedmarkup.uline.pdf b/Master/texmf-dist/doc/latex/changes/examples/changes.example.addedmarkup.uline.pdf Binary files differnew file mode 100644 index 00000000000..b433d66122c --- /dev/null +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.addedmarkup.uline.pdf diff --git a/Master/texmf-dist/doc/latex/changes/changes.example.addedmarkup.uline.tex b/Master/texmf-dist/doc/latex/changes/examples/changes.example.addedmarkup.uline.tex index 33b88f68233..42a11d79ed9 100644 --- a/Master/texmf-dist/doc/latex/changes/changes.example.addedmarkup.uline.tex +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.addedmarkup.uline.tex @@ -1,5 +1,5 @@ %% -%% This is file `changes.example.addedmarkup.uline.tex', +%% This is file `examples/changes.example.addedmarkup.uline.tex', %% generated with the docstrip utility. %% %% The original source files were: @@ -7,7 +7,7 @@ %% examples.dtx (with options: `example:addedmarkup:uline') %% %% changes.dtx -%% Copyright 2007-2020 Ekkart Kleinod (ekleinod@edgesoft.de) +%% Copyright 2007-2021 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 @@ -111,6 +111,6 @@ That's also clear. \end{document} -%% Copyright 2007-2020 Ekkart Kleinod +%% Copyright 2007-2021 Ekkart Kleinod %% -%% End of file `changes.example.addedmarkup.uline.tex'. +%% End of file `examples/changes.example.addedmarkup.uline.tex'. diff --git a/Master/texmf-dist/doc/latex/changes/examples/changes.example.addedmarkup.uuline.pdf b/Master/texmf-dist/doc/latex/changes/examples/changes.example.addedmarkup.uuline.pdf Binary files differnew file mode 100644 index 00000000000..100bc60fe00 --- /dev/null +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.addedmarkup.uuline.pdf diff --git a/Master/texmf-dist/doc/latex/changes/changes.example.addedmarkup.uuline.tex b/Master/texmf-dist/doc/latex/changes/examples/changes.example.addedmarkup.uuline.tex index 801f38486f7..4cf0fd002f5 100644 --- a/Master/texmf-dist/doc/latex/changes/changes.example.addedmarkup.uuline.tex +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.addedmarkup.uuline.tex @@ -1,5 +1,5 @@ %% -%% This is file `changes.example.addedmarkup.uuline.tex', +%% This is file `examples/changes.example.addedmarkup.uuline.tex', %% generated with the docstrip utility. %% %% The original source files were: @@ -7,7 +7,7 @@ %% examples.dtx (with options: `example:addedmarkup:uuline') %% %% changes.dtx -%% Copyright 2007-2020 Ekkart Kleinod (ekleinod@edgesoft.de) +%% Copyright 2007-2021 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 @@ -111,6 +111,6 @@ That's also clear. \end{document} -%% Copyright 2007-2020 Ekkart Kleinod +%% Copyright 2007-2021 Ekkart Kleinod %% -%% End of file `changes.example.addedmarkup.uuline.tex'. +%% End of file `examples/changes.example.addedmarkup.uuline.tex'. diff --git a/Master/texmf-dist/doc/latex/changes/examples/changes.example.addedmarkup.uwave.pdf b/Master/texmf-dist/doc/latex/changes/examples/changes.example.addedmarkup.uwave.pdf Binary files differnew file mode 100644 index 00000000000..9d4bae0bfa3 --- /dev/null +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.addedmarkup.uwave.pdf diff --git a/Master/texmf-dist/doc/latex/changes/changes.example.addedmarkup.uwave.tex b/Master/texmf-dist/doc/latex/changes/examples/changes.example.addedmarkup.uwave.tex index d1c2df40283..4f672e54638 100644 --- a/Master/texmf-dist/doc/latex/changes/changes.example.addedmarkup.uwave.tex +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.addedmarkup.uwave.tex @@ -1,5 +1,5 @@ %% -%% This is file `changes.example.addedmarkup.uwave.tex', +%% This is file `examples/changes.example.addedmarkup.uwave.tex', %% generated with the docstrip utility. %% %% The original source files were: @@ -7,7 +7,7 @@ %% examples.dtx (with options: `example:addedmarkup:uwave') %% %% changes.dtx -%% Copyright 2007-2020 Ekkart Kleinod (ekleinod@edgesoft.de) +%% Copyright 2007-2021 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 @@ -111,6 +111,6 @@ That's also clear. \end{document} -%% Copyright 2007-2020 Ekkart Kleinod +%% Copyright 2007-2021 Ekkart Kleinod %% -%% End of file `changes.example.addedmarkup.uwave.tex'. +%% End of file `examples/changes.example.addedmarkup.uwave.tex'. diff --git a/Master/texmf-dist/doc/latex/changes/examples/changes.example.addedmarkup.wrong.pdf b/Master/texmf-dist/doc/latex/changes/examples/changes.example.addedmarkup.wrong.pdf Binary files differnew file mode 100644 index 00000000000..83d4a26c79e --- /dev/null +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.addedmarkup.wrong.pdf diff --git a/Master/texmf-dist/doc/latex/changes/changes.example.addedmarkup.wrong.tex b/Master/texmf-dist/doc/latex/changes/examples/changes.example.addedmarkup.wrong.tex index 4f93d6dd56b..28e143d5629 100644 --- a/Master/texmf-dist/doc/latex/changes/changes.example.addedmarkup.wrong.tex +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.addedmarkup.wrong.tex @@ -1,5 +1,5 @@ %% -%% This is file `changes.example.addedmarkup.wrong.tex', +%% This is file `examples/changes.example.addedmarkup.wrong.tex', %% generated with the docstrip utility. %% %% The original source files were: @@ -7,7 +7,7 @@ %% examples.dtx (with options: `example:addedmarkup:wrong') %% %% changes.dtx -%% Copyright 2007-2020 Ekkart Kleinod (ekleinod@edgesoft.de) +%% Copyright 2007-2021 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 @@ -111,6 +111,6 @@ That's also clear. \end{document} -%% Copyright 2007-2020 Ekkart Kleinod +%% Copyright 2007-2021 Ekkart Kleinod %% -%% End of file `changes.example.addedmarkup.wrong.tex'. +%% End of file `examples/changes.example.addedmarkup.wrong.tex'. diff --git a/Master/texmf-dist/doc/latex/changes/examples/changes.example.authormarkup.brackets.pdf b/Master/texmf-dist/doc/latex/changes/examples/changes.example.authormarkup.brackets.pdf Binary files differnew file mode 100644 index 00000000000..dded54a8262 --- /dev/null +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.authormarkup.brackets.pdf diff --git a/Master/texmf-dist/doc/latex/changes/changes.example.authormarkup.brackets.tex b/Master/texmf-dist/doc/latex/changes/examples/changes.example.authormarkup.brackets.tex index 27c1a17ea45..a7c43aa9806 100644 --- a/Master/texmf-dist/doc/latex/changes/changes.example.authormarkup.brackets.tex +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.authormarkup.brackets.tex @@ -1,5 +1,5 @@ %% -%% This is file `changes.example.authormarkup.brackets.tex', +%% This is file `examples/changes.example.authormarkup.brackets.tex', %% generated with the docstrip utility. %% %% The original source files were: @@ -7,7 +7,7 @@ %% examples.dtx (with options: `example:authormarkup:brackets') %% %% changes.dtx -%% Copyright 2007-2020 Ekkart Kleinod (ekleinod@edgesoft.de) +%% Copyright 2007-2021 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 @@ -111,6 +111,6 @@ That's also clear. \end{document} -%% Copyright 2007-2020 Ekkart Kleinod +%% Copyright 2007-2021 Ekkart Kleinod %% -%% End of file `changes.example.authormarkup.brackets.tex'. +%% End of file `examples/changes.example.authormarkup.brackets.tex'. diff --git a/Master/texmf-dist/doc/latex/changes/examples/changes.example.authormarkup.footnote.pdf b/Master/texmf-dist/doc/latex/changes/examples/changes.example.authormarkup.footnote.pdf Binary files differnew file mode 100644 index 00000000000..6ea10e807c4 --- /dev/null +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.authormarkup.footnote.pdf diff --git a/Master/texmf-dist/doc/latex/changes/changes.example.authormarkup.footnote.tex b/Master/texmf-dist/doc/latex/changes/examples/changes.example.authormarkup.footnote.tex index 60ba569744c..866f0f476af 100644 --- a/Master/texmf-dist/doc/latex/changes/changes.example.authormarkup.footnote.tex +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.authormarkup.footnote.tex @@ -1,5 +1,5 @@ %% -%% This is file `changes.example.authormarkup.footnote.tex', +%% This is file `examples/changes.example.authormarkup.footnote.tex', %% generated with the docstrip utility. %% %% The original source files were: @@ -7,7 +7,7 @@ %% examples.dtx (with options: `example:authormarkup:footnote') %% %% changes.dtx -%% Copyright 2007-2020 Ekkart Kleinod (ekleinod@edgesoft.de) +%% Copyright 2007-2021 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 @@ -111,6 +111,6 @@ That's also clear. \end{document} -%% Copyright 2007-2020 Ekkart Kleinod +%% Copyright 2007-2021 Ekkart Kleinod %% -%% End of file `changes.example.authormarkup.footnote.tex'. +%% End of file `examples/changes.example.authormarkup.footnote.tex'. diff --git a/Master/texmf-dist/doc/latex/changes/examples/changes.example.authormarkup.none.pdf b/Master/texmf-dist/doc/latex/changes/examples/changes.example.authormarkup.none.pdf Binary files differnew file mode 100644 index 00000000000..0769d2479ba --- /dev/null +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.authormarkup.none.pdf diff --git a/Master/texmf-dist/doc/latex/changes/changes.example.authormarkup.none.tex b/Master/texmf-dist/doc/latex/changes/examples/changes.example.authormarkup.none.tex index 5c1fc6a7c9a..678479901f1 100644 --- a/Master/texmf-dist/doc/latex/changes/changes.example.authormarkup.none.tex +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.authormarkup.none.tex @@ -1,5 +1,5 @@ %% -%% This is file `changes.example.authormarkup.none.tex', +%% This is file `examples/changes.example.authormarkup.none.tex', %% generated with the docstrip utility. %% %% The original source files were: @@ -7,7 +7,7 @@ %% examples.dtx (with options: `example:authormarkup:none') %% %% changes.dtx -%% Copyright 2007-2020 Ekkart Kleinod (ekleinod@edgesoft.de) +%% Copyright 2007-2021 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 @@ -111,6 +111,6 @@ That's also clear. \end{document} -%% Copyright 2007-2020 Ekkart Kleinod +%% Copyright 2007-2021 Ekkart Kleinod %% -%% End of file `changes.example.authormarkup.none.tex'. +%% End of file `examples/changes.example.authormarkup.none.tex'. diff --git a/Master/texmf-dist/doc/latex/changes/examples/changes.example.authormarkup.subscript.pdf b/Master/texmf-dist/doc/latex/changes/examples/changes.example.authormarkup.subscript.pdf Binary files differnew file mode 100644 index 00000000000..a022d30cf31 --- /dev/null +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.authormarkup.subscript.pdf diff --git a/Master/texmf-dist/doc/latex/changes/changes.example.authormarkup.subscript.tex b/Master/texmf-dist/doc/latex/changes/examples/changes.example.authormarkup.subscript.tex index f9f43b68af0..1594261270e 100644 --- a/Master/texmf-dist/doc/latex/changes/changes.example.authormarkup.subscript.tex +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.authormarkup.subscript.tex @@ -1,5 +1,5 @@ %% -%% This is file `changes.example.authormarkup.subscript.tex', +%% This is file `examples/changes.example.authormarkup.subscript.tex', %% generated with the docstrip utility. %% %% The original source files were: @@ -7,7 +7,7 @@ %% examples.dtx (with options: `example:authormarkup:subscript') %% %% changes.dtx -%% Copyright 2007-2020 Ekkart Kleinod (ekleinod@edgesoft.de) +%% Copyright 2007-2021 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 @@ -111,6 +111,6 @@ That's also clear. \end{document} -%% Copyright 2007-2020 Ekkart Kleinod +%% Copyright 2007-2021 Ekkart Kleinod %% -%% End of file `changes.example.authormarkup.subscript.tex'. +%% End of file `examples/changes.example.authormarkup.subscript.tex'. diff --git a/Master/texmf-dist/doc/latex/changes/examples/changes.example.authormarkup.superscript.pdf b/Master/texmf-dist/doc/latex/changes/examples/changes.example.authormarkup.superscript.pdf Binary files differnew file mode 100644 index 00000000000..f1ce218fa8f --- /dev/null +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.authormarkup.superscript.pdf diff --git a/Master/texmf-dist/doc/latex/changes/changes.example.authormarkup.superscript.tex b/Master/texmf-dist/doc/latex/changes/examples/changes.example.authormarkup.superscript.tex index 84edcf6c649..11d05861d6e 100644 --- a/Master/texmf-dist/doc/latex/changes/changes.example.authormarkup.superscript.tex +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.authormarkup.superscript.tex @@ -1,5 +1,5 @@ %% -%% This is file `changes.example.authormarkup.superscript.tex', +%% This is file `examples/changes.example.authormarkup.superscript.tex', %% generated with the docstrip utility. %% %% The original source files were: @@ -7,7 +7,7 @@ %% examples.dtx (with options: `example:authormarkup:superscript') %% %% changes.dtx -%% Copyright 2007-2020 Ekkart Kleinod (ekleinod@edgesoft.de) +%% Copyright 2007-2021 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 @@ -111,6 +111,6 @@ That's also clear. \end{document} -%% Copyright 2007-2020 Ekkart Kleinod +%% Copyright 2007-2021 Ekkart Kleinod %% -%% End of file `changes.example.authormarkup.superscript.tex'. +%% End of file `examples/changes.example.authormarkup.superscript.tex'. diff --git a/Master/texmf-dist/doc/latex/changes/examples/changes.example.authormarkup.wrong.pdf b/Master/texmf-dist/doc/latex/changes/examples/changes.example.authormarkup.wrong.pdf Binary files differnew file mode 100644 index 00000000000..89f36b5930a --- /dev/null +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.authormarkup.wrong.pdf diff --git a/Master/texmf-dist/doc/latex/changes/changes.example.authormarkup.wrong.tex b/Master/texmf-dist/doc/latex/changes/examples/changes.example.authormarkup.wrong.tex index e48759e1280..b65ebb789a7 100644 --- a/Master/texmf-dist/doc/latex/changes/changes.example.authormarkup.wrong.tex +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.authormarkup.wrong.tex @@ -1,5 +1,5 @@ %% -%% This is file `changes.example.authormarkup.wrong.tex', +%% This is file `examples/changes.example.authormarkup.wrong.tex', %% generated with the docstrip utility. %% %% The original source files were: @@ -7,7 +7,7 @@ %% examples.dtx (with options: `example:authormarkup:wrong') %% %% changes.dtx -%% Copyright 2007-2020 Ekkart Kleinod (ekleinod@edgesoft.de) +%% Copyright 2007-2021 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 @@ -111,6 +111,6 @@ That's also clear. \end{document} -%% Copyright 2007-2020 Ekkart Kleinod +%% Copyright 2007-2021 Ekkart Kleinod %% -%% End of file `changes.example.authormarkup.wrong.tex'. +%% End of file `examples/changes.example.authormarkup.wrong.tex'. diff --git a/Master/texmf-dist/doc/latex/changes/examples/changes.example.authormarkupposition.left.pdf b/Master/texmf-dist/doc/latex/changes/examples/changes.example.authormarkupposition.left.pdf Binary files differnew file mode 100644 index 00000000000..28e91a9669d --- /dev/null +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.authormarkupposition.left.pdf diff --git a/Master/texmf-dist/doc/latex/changes/changes.example.authormarkupposition.left.tex b/Master/texmf-dist/doc/latex/changes/examples/changes.example.authormarkupposition.left.tex index 70026bd9cdf..64fa8c7191c 100644 --- a/Master/texmf-dist/doc/latex/changes/changes.example.authormarkupposition.left.tex +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.authormarkupposition.left.tex @@ -1,5 +1,5 @@ %% -%% This is file `changes.example.authormarkupposition.left.tex', +%% This is file `examples/changes.example.authormarkupposition.left.tex', %% generated with the docstrip utility. %% %% The original source files were: @@ -7,7 +7,7 @@ %% examples.dtx (with options: `example:authormarkupposition:left') %% %% changes.dtx -%% Copyright 2007-2020 Ekkart Kleinod (ekleinod@edgesoft.de) +%% Copyright 2007-2021 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 @@ -111,6 +111,6 @@ That's also clear. \end{document} -%% Copyright 2007-2020 Ekkart Kleinod +%% Copyright 2007-2021 Ekkart Kleinod %% -%% End of file `changes.example.authormarkupposition.left.tex'. +%% End of file `examples/changes.example.authormarkupposition.left.tex'. diff --git a/Master/texmf-dist/doc/latex/changes/examples/changes.example.authormarkupposition.right.pdf b/Master/texmf-dist/doc/latex/changes/examples/changes.example.authormarkupposition.right.pdf Binary files differnew file mode 100644 index 00000000000..822bf41ee68 --- /dev/null +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.authormarkupposition.right.pdf diff --git a/Master/texmf-dist/doc/latex/changes/changes.example.authormarkupposition.right.tex b/Master/texmf-dist/doc/latex/changes/examples/changes.example.authormarkupposition.right.tex index 32e27561a40..fb0ca21093b 100644 --- a/Master/texmf-dist/doc/latex/changes/changes.example.authormarkupposition.right.tex +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.authormarkupposition.right.tex @@ -1,5 +1,5 @@ %% -%% This is file `changes.example.authormarkupposition.right.tex', +%% This is file `examples/changes.example.authormarkupposition.right.tex', %% generated with the docstrip utility. %% %% The original source files were: @@ -7,7 +7,7 @@ %% examples.dtx (with options: `example:authormarkupposition:right') %% %% changes.dtx -%% Copyright 2007-2020 Ekkart Kleinod (ekleinod@edgesoft.de) +%% Copyright 2007-2021 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 @@ -111,6 +111,6 @@ That's also clear. \end{document} -%% Copyright 2007-2020 Ekkart Kleinod +%% Copyright 2007-2021 Ekkart Kleinod %% -%% End of file `changes.example.authormarkupposition.right.tex'. +%% End of file `examples/changes.example.authormarkupposition.right.tex'. diff --git a/Master/texmf-dist/doc/latex/changes/examples/changes.example.authormarkupposition.wrong.pdf b/Master/texmf-dist/doc/latex/changes/examples/changes.example.authormarkupposition.wrong.pdf Binary files differnew file mode 100644 index 00000000000..e2d79f9440a --- /dev/null +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.authormarkupposition.wrong.pdf diff --git a/Master/texmf-dist/doc/latex/changes/changes.example.authormarkupposition.wrong.tex b/Master/texmf-dist/doc/latex/changes/examples/changes.example.authormarkupposition.wrong.tex index 2d39baca4c9..f4a759220e2 100644 --- a/Master/texmf-dist/doc/latex/changes/changes.example.authormarkupposition.wrong.tex +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.authormarkupposition.wrong.tex @@ -1,5 +1,5 @@ %% -%% This is file `changes.example.authormarkupposition.wrong.tex', +%% This is file `examples/changes.example.authormarkupposition.wrong.tex', %% generated with the docstrip utility. %% %% The original source files were: @@ -7,7 +7,7 @@ %% examples.dtx (with options: `example:authormarkupposition:wrong') %% %% changes.dtx -%% Copyright 2007-2020 Ekkart Kleinod (ekleinod@edgesoft.de) +%% Copyright 2007-2021 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 @@ -111,6 +111,6 @@ That's also clear. \end{document} -%% Copyright 2007-2020 Ekkart Kleinod +%% Copyright 2007-2021 Ekkart Kleinod %% -%% End of file `changes.example.authormarkupposition.wrong.tex'. +%% End of file `examples/changes.example.authormarkupposition.wrong.tex'. diff --git a/Master/texmf-dist/doc/latex/changes/examples/changes.example.authormarkuptext.id.pdf b/Master/texmf-dist/doc/latex/changes/examples/changes.example.authormarkuptext.id.pdf Binary files differnew file mode 100644 index 00000000000..196ee432cee --- /dev/null +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.authormarkuptext.id.pdf diff --git a/Master/texmf-dist/doc/latex/changes/changes.example.authormarkuptext.id.tex b/Master/texmf-dist/doc/latex/changes/examples/changes.example.authormarkuptext.id.tex index 3c5ec6490b5..748a40a53e9 100644 --- a/Master/texmf-dist/doc/latex/changes/changes.example.authormarkuptext.id.tex +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.authormarkuptext.id.tex @@ -1,5 +1,5 @@ %% -%% This is file `changes.example.authormarkuptext.id.tex', +%% This is file `examples/changes.example.authormarkuptext.id.tex', %% generated with the docstrip utility. %% %% The original source files were: @@ -7,7 +7,7 @@ %% examples.dtx (with options: `example:authormarkuptext:id') %% %% changes.dtx -%% Copyright 2007-2020 Ekkart Kleinod (ekleinod@edgesoft.de) +%% Copyright 2007-2021 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 @@ -111,6 +111,6 @@ That's also clear. \end{document} -%% Copyright 2007-2020 Ekkart Kleinod +%% Copyright 2007-2021 Ekkart Kleinod %% -%% End of file `changes.example.authormarkuptext.id.tex'. +%% End of file `examples/changes.example.authormarkuptext.id.tex'. diff --git a/Master/texmf-dist/doc/latex/changes/examples/changes.example.authormarkuptext.name.pdf b/Master/texmf-dist/doc/latex/changes/examples/changes.example.authormarkuptext.name.pdf Binary files differnew file mode 100644 index 00000000000..7b044cbd314 --- /dev/null +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.authormarkuptext.name.pdf diff --git a/Master/texmf-dist/doc/latex/changes/changes.example.authormarkuptext.name.tex b/Master/texmf-dist/doc/latex/changes/examples/changes.example.authormarkuptext.name.tex index 43f0db7fc2d..ecf40679ab1 100644 --- a/Master/texmf-dist/doc/latex/changes/changes.example.authormarkuptext.name.tex +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.authormarkuptext.name.tex @@ -1,5 +1,5 @@ %% -%% This is file `changes.example.authormarkuptext.name.tex', +%% This is file `examples/changes.example.authormarkuptext.name.tex', %% generated with the docstrip utility. %% %% The original source files were: @@ -7,7 +7,7 @@ %% examples.dtx (with options: `example:authormarkuptext:name') %% %% changes.dtx -%% Copyright 2007-2020 Ekkart Kleinod (ekleinod@edgesoft.de) +%% Copyright 2007-2021 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 @@ -111,6 +111,6 @@ That's also clear. \end{document} -%% Copyright 2007-2020 Ekkart Kleinod +%% Copyright 2007-2021 Ekkart Kleinod %% -%% End of file `changes.example.authormarkuptext.name.tex'. +%% End of file `examples/changes.example.authormarkuptext.name.tex'. diff --git a/Master/texmf-dist/doc/latex/changes/examples/changes.example.authormarkuptext.wrong.pdf b/Master/texmf-dist/doc/latex/changes/examples/changes.example.authormarkuptext.wrong.pdf Binary files differnew file mode 100644 index 00000000000..e3388ee80b5 --- /dev/null +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.authormarkuptext.wrong.pdf diff --git a/Master/texmf-dist/doc/latex/changes/changes.example.authormarkuptext.wrong.tex b/Master/texmf-dist/doc/latex/changes/examples/changes.example.authormarkuptext.wrong.tex index 870a8439a2a..46c339da41e 100644 --- a/Master/texmf-dist/doc/latex/changes/changes.example.authormarkuptext.wrong.tex +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.authormarkuptext.wrong.tex @@ -1,5 +1,5 @@ %% -%% This is file `changes.example.authormarkuptext.wrong.tex', +%% This is file `examples/changes.example.authormarkuptext.wrong.tex', %% generated with the docstrip utility. %% %% The original source files were: @@ -7,7 +7,7 @@ %% examples.dtx (with options: `example:authormarkuptext:wrong') %% %% changes.dtx -%% Copyright 2007-2020 Ekkart Kleinod (ekleinod@edgesoft.de) +%% Copyright 2007-2021 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 @@ -111,6 +111,6 @@ That's also clear. \end{document} -%% Copyright 2007-2020 Ekkart Kleinod +%% Copyright 2007-2021 Ekkart Kleinod %% -%% End of file `changes.example.authormarkuptext.wrong.tex'. +%% End of file `examples/changes.example.authormarkuptext.wrong.tex'. diff --git a/Master/texmf-dist/doc/latex/changes/examples/changes.example.commandnameprefix.always.pdf b/Master/texmf-dist/doc/latex/changes/examples/changes.example.commandnameprefix.always.pdf Binary files differnew file mode 100644 index 00000000000..eb2da0d367d --- /dev/null +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.commandnameprefix.always.pdf diff --git a/Master/texmf-dist/doc/latex/changes/examples/changes.example.commandnameprefix.always.tex b/Master/texmf-dist/doc/latex/changes/examples/changes.example.commandnameprefix.always.tex new file mode 100644 index 00000000000..40345fa5a92 --- /dev/null +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.commandnameprefix.always.tex @@ -0,0 +1,116 @@ +%% +%% This is file `examples/changes.example.commandnameprefix.always.tex', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% examples.dtx (with options: `example:commandnameprefix:always') +%% +%% changes.dtx +%% Copyright 2007-2021 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 +%% of this license or any later version. +%% The latest version of this license is in +%% 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. +%% +%% This work consists of the files +%% 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/pyMergeChanges.py +%% and the derived files +%% doc/latex/changes/changes.english.pdf +%% doc/latex/changes/changes.english.withcode.pdf +%% doc/latex/changes/changes.ngerman.pdf +%% +%% doc/latex/changes/examples/changes.example.*.tex +%% doc/latex/changes/examples/changes.example.*.pdf +%% +%% tex/latex/changes/changes.sty +%% +\documentclass[11pt, a4paper, notitlepage, english]{article} +\usepackage{babel} +\usepackage[commandnameprefix=always]{changes} +\definechangesauthor[color=green]{Green} +\definechangesauthor[name={Mister Orange}, color=orange]{OA} +\definechangesauthor{nochanges} +\begin{document} + + + +\subsection*{Changes by default author} + +You think water moves fast? +\added{You should see ice.} +It moves like it has a mind. +Like it knows it killed the world once and got a taste for murder. +\deleted[comment={No?}]{After the avalanche, it took us a week to climb out.} +Now, I don't know exactly \added{when} we turned on each other, but I know that seven of us survived the slide... and only five made it out. +\replaced{Now we took an oath, that I'm breaking now.}{We said we'd say it was the snow that killed the other two, but it wasn't.} +Nature is lethal but it doesn't hold a candle to man. +However unreal\comment{speaking of unreal\dots} it may seem, we are connected, you and I. +We're on the same curve, just on opposite ends. +You don't get \highlight[comment={Yes, sick.}]{sick}, I do. +That's also \highlight{clear}. + +\subsection*{Changes by green author} + +The lysine contingency - it's intended to prevent the spread of the animals is case they ever got off the island. +Dr. Wu inserted a gene \replaced[id=Green]{taht}{that} makes a \deleted[id=Green]{single} faulty enzyme in protein metabolism. +The animals can't manufacture the amino acid lysine. +Unless \replaced[id=Green]{they're}{continually} supplied with lysine by us, they'll slip into a coma and die. +We're on the same curve, just on opposite ends. +However unreal\comment[id=Green]{speaking of unreal\dots} it may seem, we are connected, you and I. +You don't get \highlight[id=Green, comment={Yes, sick.}]{sick}, I do. +That's also \highlight[id=Green]{clear}. + +\subsection*{Changes by orange author with some comments} + +Now that we know who you are, I know who I am. +\added[id=OA, comment={Yeah, I like animals better than people sometimes\dots}]{I'm not a mistake!} +It all makes sense! +In a comic, you know how you can tell who the arch-villain's going to be? +\deleted[id=OA, comment={Especially dogs. Dogs are the best.}]{He's the exact opposite of the hero.} +\deleted[id=OA]{And most times they're friends, like you and me!} +I should've known way back when... +You know why, David? +They called me Mr Glass. +However unreal\comment[id=OA]{just nice} it may seem, we are connected, you and I. +We're on the same curve, just on opposite ends. +You don't get \highlight[id=OA, comment={Yes, sick.}]{sick}, I do. +That's also \highlight[id=OA]{clear}. + +\subsection*{No changes} + +Your bones don't break, mine do. +\textbf{That's clear.} +Your cells react to bacteria and viruses differently than mine. +\textsl{You don't get sick, I do.} +That's also clear. +\textit{But for some reason, you and I react the exact same way to water.} +We swallow it too fast, we choke. +\emph{We get some in our lungs, we drown.} +However unreal it may seem, we are connected, you and I. +We're on the same curve, just on opposite ends. +You don't get sick, I do. +That's also clear. + + + + + +\end{document} +%% Copyright 2007-2021 Ekkart Kleinod +%% +%% End of file `examples/changes.example.commandnameprefix.always.tex'. diff --git a/Master/texmf-dist/doc/latex/changes/examples/changes.example.commandnameprefix.ifneeded.pdf b/Master/texmf-dist/doc/latex/changes/examples/changes.example.commandnameprefix.ifneeded.pdf Binary files differnew file mode 100644 index 00000000000..b596dd14d05 --- /dev/null +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.commandnameprefix.ifneeded.pdf diff --git a/Master/texmf-dist/doc/latex/changes/examples/changes.example.commandnameprefix.ifneeded.tex b/Master/texmf-dist/doc/latex/changes/examples/changes.example.commandnameprefix.ifneeded.tex new file mode 100644 index 00000000000..36ffec3d0be --- /dev/null +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.commandnameprefix.ifneeded.tex @@ -0,0 +1,117 @@ +%% +%% This is file `examples/changes.example.commandnameprefix.ifneeded.tex', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% examples.dtx (with options: `example:commandnameprefix:ifneeded') +%% +%% changes.dtx +%% Copyright 2007-2021 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 +%% of this license or any later version. +%% The latest version of this license is in +%% 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. +%% +%% This work consists of the files +%% 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/pyMergeChanges.py +%% and the derived files +%% doc/latex/changes/changes.english.pdf +%% doc/latex/changes/changes.english.withcode.pdf +%% doc/latex/changes/changes.ngerman.pdf +%% +%% doc/latex/changes/examples/changes.example.*.tex +%% doc/latex/changes/examples/changes.example.*.pdf +%% +%% tex/latex/changes/changes.sty +%% +\documentclass[11pt, a4paper, notitlepage, english]{article} +\usepackage{babel} +\newcommand{\added}{Definition of added} +\usepackage[commandnameprefix=ifneeded]{changes} +\definechangesauthor[color=green]{Green} +\definechangesauthor[name={Mister Orange}, color=orange]{OA} +\definechangesauthor{nochanges} +\begin{document} + + + +\subsection*{Changes by default author} + +You think water moves fast? +\added{You should see ice.} +It moves like it has a mind. +Like it knows it killed the world once and got a taste for murder. +\deleted[comment={No?}]{After the avalanche, it took us a week to climb out.} +Now, I don't know exactly \added{when} we turned on each other, but I know that seven of us survived the slide... and only five made it out. +\replaced{Now we took an oath, that I'm breaking now.}{We said we'd say it was the snow that killed the other two, but it wasn't.} +Nature is lethal but it doesn't hold a candle to man. +However unreal\comment{speaking of unreal\dots} it may seem, we are connected, you and I. +We're on the same curve, just on opposite ends. +You don't get \highlight[comment={Yes, sick.}]{sick}, I do. +That's also \highlight{clear}. + +\subsection*{Changes by green author} + +The lysine contingency - it's intended to prevent the spread of the animals is case they ever got off the island. +Dr. Wu inserted a gene \replaced[id=Green]{taht}{that} makes a \deleted[id=Green]{single} faulty enzyme in protein metabolism. +The animals can't manufacture the amino acid lysine. +Unless \replaced[id=Green]{they're}{continually} supplied with lysine by us, they'll slip into a coma and die. +We're on the same curve, just on opposite ends. +However unreal\comment[id=Green]{speaking of unreal\dots} it may seem, we are connected, you and I. +You don't get \highlight[id=Green, comment={Yes, sick.}]{sick}, I do. +That's also \highlight[id=Green]{clear}. + +\subsection*{Changes by orange author with some comments} + +Now that we know who you are, I know who I am. +\added[id=OA, comment={Yeah, I like animals better than people sometimes\dots}]{I'm not a mistake!} +It all makes sense! +In a comic, you know how you can tell who the arch-villain's going to be? +\deleted[id=OA, comment={Especially dogs. Dogs are the best.}]{He's the exact opposite of the hero.} +\deleted[id=OA]{And most times they're friends, like you and me!} +I should've known way back when... +You know why, David? +They called me Mr Glass. +However unreal\comment[id=OA]{just nice} it may seem, we are connected, you and I. +We're on the same curve, just on opposite ends. +You don't get \highlight[id=OA, comment={Yes, sick.}]{sick}, I do. +That's also \highlight[id=OA]{clear}. + +\subsection*{No changes} + +Your bones don't break, mine do. +\textbf{That's clear.} +Your cells react to bacteria and viruses differently than mine. +\textsl{You don't get sick, I do.} +That's also clear. +\textit{But for some reason, you and I react the exact same way to water.} +We swallow it too fast, we choke. +\emph{We get some in our lungs, we drown.} +However unreal it may seem, we are connected, you and I. +We're on the same curve, just on opposite ends. +You don't get sick, I do. +That's also clear. + + + + + +\end{document} +%% Copyright 2007-2021 Ekkart Kleinod +%% +%% End of file `examples/changes.example.commandnameprefix.ifneeded.tex'. diff --git a/Master/texmf-dist/doc/latex/changes/examples/changes.example.commandnameprefix.none.pdf b/Master/texmf-dist/doc/latex/changes/examples/changes.example.commandnameprefix.none.pdf Binary files differnew file mode 100644 index 00000000000..ae109004845 --- /dev/null +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.commandnameprefix.none.pdf diff --git a/Master/texmf-dist/doc/latex/changes/examples/changes.example.commandnameprefix.none.tex b/Master/texmf-dist/doc/latex/changes/examples/changes.example.commandnameprefix.none.tex new file mode 100644 index 00000000000..c653f52f6f1 --- /dev/null +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.commandnameprefix.none.tex @@ -0,0 +1,116 @@ +%% +%% This is file `examples/changes.example.commandnameprefix.none.tex', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% examples.dtx (with options: `example:commandnameprefix:none') +%% +%% changes.dtx +%% Copyright 2007-2021 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 +%% of this license or any later version. +%% The latest version of this license is in +%% 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. +%% +%% This work consists of the files +%% 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/pyMergeChanges.py +%% and the derived files +%% doc/latex/changes/changes.english.pdf +%% doc/latex/changes/changes.english.withcode.pdf +%% doc/latex/changes/changes.ngerman.pdf +%% +%% doc/latex/changes/examples/changes.example.*.tex +%% doc/latex/changes/examples/changes.example.*.pdf +%% +%% tex/latex/changes/changes.sty +%% +\documentclass[11pt, a4paper, notitlepage, english]{article} +\usepackage{babel} +\usepackage[commandnameprefix=none]{changes} +\definechangesauthor[color=green]{Green} +\definechangesauthor[name={Mister Orange}, color=orange]{OA} +\definechangesauthor{nochanges} +\begin{document} + + + +\subsection*{Changes by default author} + +You think water moves fast? +\added{You should see ice.} +It moves like it has a mind. +Like it knows it killed the world once and got a taste for murder. +\deleted[comment={No?}]{After the avalanche, it took us a week to climb out.} +Now, I don't know exactly \added{when} we turned on each other, but I know that seven of us survived the slide... and only five made it out. +\replaced{Now we took an oath, that I'm breaking now.}{We said we'd say it was the snow that killed the other two, but it wasn't.} +Nature is lethal but it doesn't hold a candle to man. +However unreal\comment{speaking of unreal\dots} it may seem, we are connected, you and I. +We're on the same curve, just on opposite ends. +You don't get \highlight[comment={Yes, sick.}]{sick}, I do. +That's also \highlight{clear}. + +\subsection*{Changes by green author} + +The lysine contingency - it's intended to prevent the spread of the animals is case they ever got off the island. +Dr. Wu inserted a gene \replaced[id=Green]{taht}{that} makes a \deleted[id=Green]{single} faulty enzyme in protein metabolism. +The animals can't manufacture the amino acid lysine. +Unless \replaced[id=Green]{they're}{continually} supplied with lysine by us, they'll slip into a coma and die. +We're on the same curve, just on opposite ends. +However unreal\comment[id=Green]{speaking of unreal\dots} it may seem, we are connected, you and I. +You don't get \highlight[id=Green, comment={Yes, sick.}]{sick}, I do. +That's also \highlight[id=Green]{clear}. + +\subsection*{Changes by orange author with some comments} + +Now that we know who you are, I know who I am. +\added[id=OA, comment={Yeah, I like animals better than people sometimes\dots}]{I'm not a mistake!} +It all makes sense! +In a comic, you know how you can tell who the arch-villain's going to be? +\deleted[id=OA, comment={Especially dogs. Dogs are the best.}]{He's the exact opposite of the hero.} +\deleted[id=OA]{And most times they're friends, like you and me!} +I should've known way back when... +You know why, David? +They called me Mr Glass. +However unreal\comment[id=OA]{just nice} it may seem, we are connected, you and I. +We're on the same curve, just on opposite ends. +You don't get \highlight[id=OA, comment={Yes, sick.}]{sick}, I do. +That's also \highlight[id=OA]{clear}. + +\subsection*{No changes} + +Your bones don't break, mine do. +\textbf{That's clear.} +Your cells react to bacteria and viruses differently than mine. +\textsl{You don't get sick, I do.} +That's also clear. +\textit{But for some reason, you and I react the exact same way to water.} +We swallow it too fast, we choke. +\emph{We get some in our lungs, we drown.} +However unreal it may seem, we are connected, you and I. +We're on the same curve, just on opposite ends. +You don't get sick, I do. +That's also clear. + + + + + +\end{document} +%% Copyright 2007-2021 Ekkart Kleinod +%% +%% End of file `examples/changes.example.commandnameprefix.none.tex'. diff --git a/Master/texmf-dist/doc/latex/changes/examples/changes.example.commandnameprefix.wrong.pdf b/Master/texmf-dist/doc/latex/changes/examples/changes.example.commandnameprefix.wrong.pdf Binary files differnew file mode 100644 index 00000000000..f3939dff96c --- /dev/null +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.commandnameprefix.wrong.pdf diff --git a/Master/texmf-dist/doc/latex/changes/examples/changes.example.commandnameprefix.wrong.tex b/Master/texmf-dist/doc/latex/changes/examples/changes.example.commandnameprefix.wrong.tex new file mode 100644 index 00000000000..ec2ded1be1f --- /dev/null +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.commandnameprefix.wrong.tex @@ -0,0 +1,116 @@ +%% +%% This is file `examples/changes.example.commandnameprefix.wrong.tex', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% examples.dtx (with options: `example:commandnameprefix:wrong') +%% +%% changes.dtx +%% Copyright 2007-2021 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 +%% of this license or any later version. +%% The latest version of this license is in +%% 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. +%% +%% This work consists of the files +%% 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/pyMergeChanges.py +%% and the derived files +%% doc/latex/changes/changes.english.pdf +%% doc/latex/changes/changes.english.withcode.pdf +%% doc/latex/changes/changes.ngerman.pdf +%% +%% doc/latex/changes/examples/changes.example.*.tex +%% doc/latex/changes/examples/changes.example.*.pdf +%% +%% tex/latex/changes/changes.sty +%% +\documentclass[11pt, a4paper, notitlepage, english]{article} +\usepackage{babel} +\usepackage[commandnameprefix=wrong]{changes} +\definechangesauthor[color=green]{Green} +\definechangesauthor[name={Mister Orange}, color=orange]{OA} +\definechangesauthor{nochanges} +\begin{document} + + + +\subsection*{Changes by default author} + +You think water moves fast? +\added{You should see ice.} +It moves like it has a mind. +Like it knows it killed the world once and got a taste for murder. +\deleted[comment={No?}]{After the avalanche, it took us a week to climb out.} +Now, I don't know exactly \added{when} we turned on each other, but I know that seven of us survived the slide... and only five made it out. +\replaced{Now we took an oath, that I'm breaking now.}{We said we'd say it was the snow that killed the other two, but it wasn't.} +Nature is lethal but it doesn't hold a candle to man. +However unreal\comment{speaking of unreal\dots} it may seem, we are connected, you and I. +We're on the same curve, just on opposite ends. +You don't get \highlight[comment={Yes, sick.}]{sick}, I do. +That's also \highlight{clear}. + +\subsection*{Changes by green author} + +The lysine contingency - it's intended to prevent the spread of the animals is case they ever got off the island. +Dr. Wu inserted a gene \replaced[id=Green]{taht}{that} makes a \deleted[id=Green]{single} faulty enzyme in protein metabolism. +The animals can't manufacture the amino acid lysine. +Unless \replaced[id=Green]{they're}{continually} supplied with lysine by us, they'll slip into a coma and die. +We're on the same curve, just on opposite ends. +However unreal\comment[id=Green]{speaking of unreal\dots} it may seem, we are connected, you and I. +You don't get \highlight[id=Green, comment={Yes, sick.}]{sick}, I do. +That's also \highlight[id=Green]{clear}. + +\subsection*{Changes by orange author with some comments} + +Now that we know who you are, I know who I am. +\added[id=OA, comment={Yeah, I like animals better than people sometimes\dots}]{I'm not a mistake!} +It all makes sense! +In a comic, you know how you can tell who the arch-villain's going to be? +\deleted[id=OA, comment={Especially dogs. Dogs are the best.}]{He's the exact opposite of the hero.} +\deleted[id=OA]{And most times they're friends, like you and me!} +I should've known way back when... +You know why, David? +They called me Mr Glass. +However unreal\comment[id=OA]{just nice} it may seem, we are connected, you and I. +We're on the same curve, just on opposite ends. +You don't get \highlight[id=OA, comment={Yes, sick.}]{sick}, I do. +That's also \highlight[id=OA]{clear}. + +\subsection*{No changes} + +Your bones don't break, mine do. +\textbf{That's clear.} +Your cells react to bacteria and viruses differently than mine. +\textsl{You don't get sick, I do.} +That's also clear. +\textit{But for some reason, you and I react the exact same way to water.} +We swallow it too fast, we choke. +\emph{We get some in our lungs, we drown.} +However unreal it may seem, we are connected, you and I. +We're on the same curve, just on opposite ends. +You don't get sick, I do. +That's also clear. + + + + + +\end{document} +%% Copyright 2007-2021 Ekkart Kleinod +%% +%% End of file `examples/changes.example.commandnameprefix.wrong.tex'. diff --git a/Master/texmf-dist/doc/latex/changes/examples/changes.example.commentmarkup.footnote.pdf b/Master/texmf-dist/doc/latex/changes/examples/changes.example.commentmarkup.footnote.pdf Binary files differnew file mode 100644 index 00000000000..79672ad52e7 --- /dev/null +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.commentmarkup.footnote.pdf diff --git a/Master/texmf-dist/doc/latex/changes/changes.example.commentmarkup.footnote.tex b/Master/texmf-dist/doc/latex/changes/examples/changes.example.commentmarkup.footnote.tex index b2b865a43e3..4e749c8cdda 100644 --- a/Master/texmf-dist/doc/latex/changes/changes.example.commentmarkup.footnote.tex +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.commentmarkup.footnote.tex @@ -1,5 +1,5 @@ %% -%% This is file `changes.example.commentmarkup.footnote.tex', +%% This is file `examples/changes.example.commentmarkup.footnote.tex', %% generated with the docstrip utility. %% %% The original source files were: @@ -7,7 +7,7 @@ %% examples.dtx (with options: `example:commentmarkup:footnote') %% %% changes.dtx -%% Copyright 2007-2020 Ekkart Kleinod (ekleinod@edgesoft.de) +%% Copyright 2007-2021 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 @@ -111,6 +111,6 @@ That's also clear. \end{document} -%% Copyright 2007-2020 Ekkart Kleinod +%% Copyright 2007-2021 Ekkart Kleinod %% -%% End of file `changes.example.commentmarkup.footnote.tex'. +%% End of file `examples/changes.example.commentmarkup.footnote.tex'. diff --git a/Master/texmf-dist/doc/latex/changes/examples/changes.example.commentmarkup.margin.pdf b/Master/texmf-dist/doc/latex/changes/examples/changes.example.commentmarkup.margin.pdf Binary files differnew file mode 100644 index 00000000000..afbf0d1d66b --- /dev/null +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.commentmarkup.margin.pdf diff --git a/Master/texmf-dist/doc/latex/changes/changes.example.commentmarkup.margin.tex b/Master/texmf-dist/doc/latex/changes/examples/changes.example.commentmarkup.margin.tex index 1441255cb27..4f7c6771f9d 100644 --- a/Master/texmf-dist/doc/latex/changes/changes.example.commentmarkup.margin.tex +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.commentmarkup.margin.tex @@ -1,5 +1,5 @@ %% -%% This is file `changes.example.commentmarkup.margin.tex', +%% This is file `examples/changes.example.commentmarkup.margin.tex', %% generated with the docstrip utility. %% %% The original source files were: @@ -7,7 +7,7 @@ %% examples.dtx (with options: `example:commentmarkup:margin') %% %% changes.dtx -%% Copyright 2007-2020 Ekkart Kleinod (ekleinod@edgesoft.de) +%% Copyright 2007-2021 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 @@ -111,6 +111,6 @@ That's also clear. \end{document} -%% Copyright 2007-2020 Ekkart Kleinod +%% Copyright 2007-2021 Ekkart Kleinod %% -%% End of file `changes.example.commentmarkup.margin.tex'. +%% End of file `examples/changes.example.commentmarkup.margin.tex'. diff --git a/Master/texmf-dist/doc/latex/changes/examples/changes.example.commentmarkup.todo.pdf b/Master/texmf-dist/doc/latex/changes/examples/changes.example.commentmarkup.todo.pdf Binary files differnew file mode 100644 index 00000000000..f803fff8b20 --- /dev/null +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.commentmarkup.todo.pdf diff --git a/Master/texmf-dist/doc/latex/changes/changes.example.commentmarkup.todo.tex b/Master/texmf-dist/doc/latex/changes/examples/changes.example.commentmarkup.todo.tex index d8be69cac15..ef5b0e22f62 100644 --- a/Master/texmf-dist/doc/latex/changes/changes.example.commentmarkup.todo.tex +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.commentmarkup.todo.tex @@ -1,5 +1,5 @@ %% -%% This is file `changes.example.commentmarkup.todo.tex', +%% This is file `examples/changes.example.commentmarkup.todo.tex', %% generated with the docstrip utility. %% %% The original source files were: @@ -7,7 +7,7 @@ %% examples.dtx (with options: `example:commentmarkup:todo') %% %% changes.dtx -%% Copyright 2007-2020 Ekkart Kleinod (ekleinod@edgesoft.de) +%% Copyright 2007-2021 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 @@ -111,6 +111,6 @@ That's also clear. \end{document} -%% Copyright 2007-2020 Ekkart Kleinod +%% Copyright 2007-2021 Ekkart Kleinod %% -%% End of file `changes.example.commentmarkup.todo.tex'. +%% End of file `examples/changes.example.commentmarkup.todo.tex'. diff --git a/Master/texmf-dist/doc/latex/changes/examples/changes.example.commentmarkup.uwave.pdf b/Master/texmf-dist/doc/latex/changes/examples/changes.example.commentmarkup.uwave.pdf Binary files differnew file mode 100644 index 00000000000..b34480650d8 --- /dev/null +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.commentmarkup.uwave.pdf diff --git a/Master/texmf-dist/doc/latex/changes/changes.example.commentmarkup.uwave.tex b/Master/texmf-dist/doc/latex/changes/examples/changes.example.commentmarkup.uwave.tex index 421d76d180d..1b2aa40ad35 100644 --- a/Master/texmf-dist/doc/latex/changes/changes.example.commentmarkup.uwave.tex +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.commentmarkup.uwave.tex @@ -1,5 +1,5 @@ %% -%% This is file `changes.example.commentmarkup.uwave.tex', +%% This is file `examples/changes.example.commentmarkup.uwave.tex', %% generated with the docstrip utility. %% %% The original source files were: @@ -7,7 +7,7 @@ %% examples.dtx (with options: `example:commentmarkup:uwave') %% %% changes.dtx -%% Copyright 2007-2020 Ekkart Kleinod (ekleinod@edgesoft.de) +%% Copyright 2007-2021 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 @@ -111,6 +111,6 @@ That's also clear. \end{document} -%% Copyright 2007-2020 Ekkart Kleinod +%% Copyright 2007-2021 Ekkart Kleinod %% -%% End of file `changes.example.commentmarkup.uwave.tex'. +%% End of file `examples/changes.example.commentmarkup.uwave.tex'. diff --git a/Master/texmf-dist/doc/latex/changes/examples/changes.example.defaultcolor.pdf b/Master/texmf-dist/doc/latex/changes/examples/changes.example.defaultcolor.pdf Binary files differnew file mode 100644 index 00000000000..f6317a71c80 --- /dev/null +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.defaultcolor.pdf diff --git a/Master/texmf-dist/doc/latex/changes/examples/changes.example.defaultcolor.tex b/Master/texmf-dist/doc/latex/changes/examples/changes.example.defaultcolor.tex new file mode 100644 index 00000000000..d0a83b8a9e6 --- /dev/null +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.defaultcolor.tex @@ -0,0 +1,116 @@ +%% +%% This is file `examples/changes.example.defaultcolor.tex', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% examples.dtx (with options: `example:defaultcolor') +%% +%% changes.dtx +%% Copyright 2007-2021 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 +%% of this license or any later version. +%% The latest version of this license is in +%% 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. +%% +%% This work consists of the files +%% 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/pyMergeChanges.py +%% and the derived files +%% doc/latex/changes/changes.english.pdf +%% doc/latex/changes/changes.english.withcode.pdf +%% doc/latex/changes/changes.ngerman.pdf +%% +%% doc/latex/changes/examples/changes.example.*.tex +%% doc/latex/changes/examples/changes.example.*.pdf +%% +%% tex/latex/changes/changes.sty +%% +\documentclass[11pt, a4paper, notitlepage, english]{article} +\usepackage{babel} +\usepackage[defaultcolor=magenta]{changes} +\definechangesauthor[color=green]{Green} +\definechangesauthor[name={Mister Orange}, color=orange]{OA} +\definechangesauthor{nochanges} +\begin{document} + + + +\subsection*{Changes by default author} + +You think water moves fast? +\added{You should see ice.} +It moves like it has a mind. +Like it knows it killed the world once and got a taste for murder. +\deleted[comment={No?}]{After the avalanche, it took us a week to climb out.} +Now, I don't know exactly \added{when} we turned on each other, but I know that seven of us survived the slide... and only five made it out. +\replaced{Now we took an oath, that I'm breaking now.}{We said we'd say it was the snow that killed the other two, but it wasn't.} +Nature is lethal but it doesn't hold a candle to man. +However unreal\comment{speaking of unreal\dots} it may seem, we are connected, you and I. +We're on the same curve, just on opposite ends. +You don't get \highlight[comment={Yes, sick.}]{sick}, I do. +That's also \highlight{clear}. + +\subsection*{Changes by green author} + +The lysine contingency - it's intended to prevent the spread of the animals is case they ever got off the island. +Dr. Wu inserted a gene \replaced[id=Green]{taht}{that} makes a \deleted[id=Green]{single} faulty enzyme in protein metabolism. +The animals can't manufacture the amino acid lysine. +Unless \replaced[id=Green]{they're}{continually} supplied with lysine by us, they'll slip into a coma and die. +We're on the same curve, just on opposite ends. +However unreal\comment[id=Green]{speaking of unreal\dots} it may seem, we are connected, you and I. +You don't get \highlight[id=Green, comment={Yes, sick.}]{sick}, I do. +That's also \highlight[id=Green]{clear}. + +\subsection*{Changes by orange author with some comments} + +Now that we know who you are, I know who I am. +\added[id=OA, comment={Yeah, I like animals better than people sometimes\dots}]{I'm not a mistake!} +It all makes sense! +In a comic, you know how you can tell who the arch-villain's going to be? +\deleted[id=OA, comment={Especially dogs. Dogs are the best.}]{He's the exact opposite of the hero.} +\deleted[id=OA]{And most times they're friends, like you and me!} +I should've known way back when... +You know why, David? +They called me Mr Glass. +However unreal\comment[id=OA]{just nice} it may seem, we are connected, you and I. +We're on the same curve, just on opposite ends. +You don't get \highlight[id=OA, comment={Yes, sick.}]{sick}, I do. +That's also \highlight[id=OA]{clear}. + +\subsection*{No changes} + +Your bones don't break, mine do. +\textbf{That's clear.} +Your cells react to bacteria and viruses differently than mine. +\textsl{You don't get sick, I do.} +That's also clear. +\textit{But for some reason, you and I react the exact same way to water.} +We swallow it too fast, we choke. +\emph{We get some in our lungs, we drown.} +However unreal it may seem, we are connected, you and I. +We're on the same curve, just on opposite ends. +You don't get sick, I do. +That's also clear. + + + + + +\end{document} +%% Copyright 2007-2021 Ekkart Kleinod +%% +%% End of file `examples/changes.example.defaultcolor.tex'. diff --git a/Master/texmf-dist/doc/latex/changes/examples/changes.example.deletedmarkup.bf.pdf b/Master/texmf-dist/doc/latex/changes/examples/changes.example.deletedmarkup.bf.pdf Binary files differnew file mode 100644 index 00000000000..b7226cea65e --- /dev/null +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.deletedmarkup.bf.pdf diff --git a/Master/texmf-dist/doc/latex/changes/changes.example.deletedmarkup.bf.tex b/Master/texmf-dist/doc/latex/changes/examples/changes.example.deletedmarkup.bf.tex index da28a02903d..380bfaa994f 100644 --- a/Master/texmf-dist/doc/latex/changes/changes.example.deletedmarkup.bf.tex +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.deletedmarkup.bf.tex @@ -1,5 +1,5 @@ %% -%% This is file `changes.example.deletedmarkup.bf.tex', +%% This is file `examples/changes.example.deletedmarkup.bf.tex', %% generated with the docstrip utility. %% %% The original source files were: @@ -7,7 +7,7 @@ %% examples.dtx (with options: `example:deletedmarkup:bf') %% %% changes.dtx -%% Copyright 2007-2020 Ekkart Kleinod (ekleinod@edgesoft.de) +%% Copyright 2007-2021 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 @@ -111,6 +111,6 @@ That's also clear. \end{document} -%% Copyright 2007-2020 Ekkart Kleinod +%% Copyright 2007-2021 Ekkart Kleinod %% -%% End of file `changes.example.deletedmarkup.bf.tex'. +%% End of file `examples/changes.example.deletedmarkup.bf.tex'. diff --git a/Master/texmf-dist/doc/latex/changes/examples/changes.example.deletedmarkup.colored.pdf b/Master/texmf-dist/doc/latex/changes/examples/changes.example.deletedmarkup.colored.pdf Binary files differnew file mode 100644 index 00000000000..18af1cd23ea --- /dev/null +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.deletedmarkup.colored.pdf diff --git a/Master/texmf-dist/doc/latex/changes/changes.example.deletedmarkup.colored.tex b/Master/texmf-dist/doc/latex/changes/examples/changes.example.deletedmarkup.colored.tex index d8c595d7536..eb47f9f679d 100644 --- a/Master/texmf-dist/doc/latex/changes/changes.example.deletedmarkup.colored.tex +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.deletedmarkup.colored.tex @@ -1,5 +1,5 @@ %% -%% This is file `changes.example.deletedmarkup.colored.tex', +%% This is file `examples/changes.example.deletedmarkup.colored.tex', %% generated with the docstrip utility. %% %% The original source files were: @@ -7,7 +7,7 @@ %% examples.dtx (with options: `example:deletedmarkup:colored') %% %% changes.dtx -%% Copyright 2007-2020 Ekkart Kleinod (ekleinod@edgesoft.de) +%% Copyright 2007-2021 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 @@ -111,6 +111,6 @@ That's also clear. \end{document} -%% Copyright 2007-2020 Ekkart Kleinod +%% Copyright 2007-2021 Ekkart Kleinod %% -%% End of file `changes.example.deletedmarkup.colored.tex'. +%% End of file `examples/changes.example.deletedmarkup.colored.tex'. diff --git a/Master/texmf-dist/doc/latex/changes/examples/changes.example.deletedmarkup.dashuline.pdf b/Master/texmf-dist/doc/latex/changes/examples/changes.example.deletedmarkup.dashuline.pdf Binary files differnew file mode 100644 index 00000000000..aee4964d3d6 --- /dev/null +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.deletedmarkup.dashuline.pdf diff --git a/Master/texmf-dist/doc/latex/changes/changes.example.deletedmarkup.dashuline.tex b/Master/texmf-dist/doc/latex/changes/examples/changes.example.deletedmarkup.dashuline.tex index 390fd89618b..8aefb263ca5 100644 --- a/Master/texmf-dist/doc/latex/changes/changes.example.deletedmarkup.dashuline.tex +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.deletedmarkup.dashuline.tex @@ -1,5 +1,5 @@ %% -%% This is file `changes.example.deletedmarkup.dashuline.tex', +%% This is file `examples/changes.example.deletedmarkup.dashuline.tex', %% generated with the docstrip utility. %% %% The original source files were: @@ -7,7 +7,7 @@ %% examples.dtx (with options: `example:deletedmarkup:dashuline') %% %% changes.dtx -%% Copyright 2007-2020 Ekkart Kleinod (ekleinod@edgesoft.de) +%% Copyright 2007-2021 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 @@ -111,6 +111,6 @@ That's also clear. \end{document} -%% Copyright 2007-2020 Ekkart Kleinod +%% Copyright 2007-2021 Ekkart Kleinod %% -%% End of file `changes.example.deletedmarkup.dashuline.tex'. +%% End of file `examples/changes.example.deletedmarkup.dashuline.tex'. diff --git a/Master/texmf-dist/doc/latex/changes/examples/changes.example.deletedmarkup.dotuline.pdf b/Master/texmf-dist/doc/latex/changes/examples/changes.example.deletedmarkup.dotuline.pdf Binary files differnew file mode 100644 index 00000000000..3fd863a4471 --- /dev/null +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.deletedmarkup.dotuline.pdf diff --git a/Master/texmf-dist/doc/latex/changes/changes.example.deletedmarkup.dotuline.tex b/Master/texmf-dist/doc/latex/changes/examples/changes.example.deletedmarkup.dotuline.tex index 11e6bf34edd..c646a00ba9d 100644 --- a/Master/texmf-dist/doc/latex/changes/changes.example.deletedmarkup.dotuline.tex +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.deletedmarkup.dotuline.tex @@ -1,5 +1,5 @@ %% -%% This is file `changes.example.deletedmarkup.dotuline.tex', +%% This is file `examples/changes.example.deletedmarkup.dotuline.tex', %% generated with the docstrip utility. %% %% The original source files were: @@ -7,7 +7,7 @@ %% examples.dtx (with options: `example:deletedmarkup:dotuline') %% %% changes.dtx -%% Copyright 2007-2020 Ekkart Kleinod (ekleinod@edgesoft.de) +%% Copyright 2007-2021 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 @@ -111,6 +111,6 @@ That's also clear. \end{document} -%% Copyright 2007-2020 Ekkart Kleinod +%% Copyright 2007-2021 Ekkart Kleinod %% -%% End of file `changes.example.deletedmarkup.dotuline.tex'. +%% End of file `examples/changes.example.deletedmarkup.dotuline.tex'. diff --git a/Master/texmf-dist/doc/latex/changes/examples/changes.example.deletedmarkup.em.pdf b/Master/texmf-dist/doc/latex/changes/examples/changes.example.deletedmarkup.em.pdf Binary files differnew file mode 100644 index 00000000000..1dcbc949040 --- /dev/null +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.deletedmarkup.em.pdf diff --git a/Master/texmf-dist/doc/latex/changes/changes.example.deletedmarkup.em.tex b/Master/texmf-dist/doc/latex/changes/examples/changes.example.deletedmarkup.em.tex index a43f6c5fa94..2cf6ddf46f0 100644 --- a/Master/texmf-dist/doc/latex/changes/changes.example.deletedmarkup.em.tex +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.deletedmarkup.em.tex @@ -1,5 +1,5 @@ %% -%% This is file `changes.example.deletedmarkup.em.tex', +%% This is file `examples/changes.example.deletedmarkup.em.tex', %% generated with the docstrip utility. %% %% The original source files were: @@ -7,7 +7,7 @@ %% examples.dtx (with options: `example:deletedmarkup:em') %% %% changes.dtx -%% Copyright 2007-2020 Ekkart Kleinod (ekleinod@edgesoft.de) +%% Copyright 2007-2021 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 @@ -111,6 +111,6 @@ That's also clear. \end{document} -%% Copyright 2007-2020 Ekkart Kleinod +%% Copyright 2007-2021 Ekkart Kleinod %% -%% End of file `changes.example.deletedmarkup.em.tex'. +%% End of file `examples/changes.example.deletedmarkup.em.tex'. diff --git a/Master/texmf-dist/doc/latex/changes/examples/changes.example.deletedmarkup.it.pdf b/Master/texmf-dist/doc/latex/changes/examples/changes.example.deletedmarkup.it.pdf Binary files differnew file mode 100644 index 00000000000..04891fc679f --- /dev/null +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.deletedmarkup.it.pdf diff --git a/Master/texmf-dist/doc/latex/changes/changes.example.deletedmarkup.it.tex b/Master/texmf-dist/doc/latex/changes/examples/changes.example.deletedmarkup.it.tex index 7a145be6bd0..8e9aeba8d8b 100644 --- a/Master/texmf-dist/doc/latex/changes/changes.example.deletedmarkup.it.tex +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.deletedmarkup.it.tex @@ -1,5 +1,5 @@ %% -%% This is file `changes.example.deletedmarkup.it.tex', +%% This is file `examples/changes.example.deletedmarkup.it.tex', %% generated with the docstrip utility. %% %% The original source files were: @@ -7,7 +7,7 @@ %% examples.dtx (with options: `example:deletedmarkup:it') %% %% changes.dtx -%% Copyright 2007-2020 Ekkart Kleinod (ekleinod@edgesoft.de) +%% Copyright 2007-2021 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 @@ -111,6 +111,6 @@ That's also clear. \end{document} -%% Copyright 2007-2020 Ekkart Kleinod +%% Copyright 2007-2021 Ekkart Kleinod %% -%% End of file `changes.example.deletedmarkup.it.tex'. +%% End of file `examples/changes.example.deletedmarkup.it.tex'. diff --git a/Master/texmf-dist/doc/latex/changes/examples/changes.example.deletedmarkup.sl.pdf b/Master/texmf-dist/doc/latex/changes/examples/changes.example.deletedmarkup.sl.pdf Binary files differnew file mode 100644 index 00000000000..d63d40df26d --- /dev/null +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.deletedmarkup.sl.pdf diff --git a/Master/texmf-dist/doc/latex/changes/changes.example.deletedmarkup.sl.tex b/Master/texmf-dist/doc/latex/changes/examples/changes.example.deletedmarkup.sl.tex index 86c7b09b0b8..2998cf82912 100644 --- a/Master/texmf-dist/doc/latex/changes/changes.example.deletedmarkup.sl.tex +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.deletedmarkup.sl.tex @@ -1,5 +1,5 @@ %% -%% This is file `changes.example.deletedmarkup.sl.tex', +%% This is file `examples/changes.example.deletedmarkup.sl.tex', %% generated with the docstrip utility. %% %% The original source files were: @@ -7,7 +7,7 @@ %% examples.dtx (with options: `example:deletedmarkup:sl') %% %% changes.dtx -%% Copyright 2007-2020 Ekkart Kleinod (ekleinod@edgesoft.de) +%% Copyright 2007-2021 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 @@ -111,6 +111,6 @@ That's also clear. \end{document} -%% Copyright 2007-2020 Ekkart Kleinod +%% Copyright 2007-2021 Ekkart Kleinod %% -%% End of file `changes.example.deletedmarkup.sl.tex'. +%% End of file `examples/changes.example.deletedmarkup.sl.tex'. diff --git a/Master/texmf-dist/doc/latex/changes/examples/changes.example.deletedmarkup.sout.pdf b/Master/texmf-dist/doc/latex/changes/examples/changes.example.deletedmarkup.sout.pdf Binary files differnew file mode 100644 index 00000000000..3cd09efeba2 --- /dev/null +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.deletedmarkup.sout.pdf diff --git a/Master/texmf-dist/doc/latex/changes/changes.example.deletedmarkup.sout.tex b/Master/texmf-dist/doc/latex/changes/examples/changes.example.deletedmarkup.sout.tex index 10e68fad07c..ea3bcda772f 100644 --- a/Master/texmf-dist/doc/latex/changes/changes.example.deletedmarkup.sout.tex +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.deletedmarkup.sout.tex @@ -1,5 +1,5 @@ %% -%% This is file `changes.example.deletedmarkup.sout.tex', +%% This is file `examples/changes.example.deletedmarkup.sout.tex', %% generated with the docstrip utility. %% %% The original source files were: @@ -7,7 +7,7 @@ %% examples.dtx (with options: `example:deletedmarkup:sout') %% %% changes.dtx -%% Copyright 2007-2020 Ekkart Kleinod (ekleinod@edgesoft.de) +%% Copyright 2007-2021 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 @@ -111,6 +111,6 @@ That's also clear. \end{document} -%% Copyright 2007-2020 Ekkart Kleinod +%% Copyright 2007-2021 Ekkart Kleinod %% -%% End of file `changes.example.deletedmarkup.sout.tex'. +%% End of file `examples/changes.example.deletedmarkup.sout.tex'. diff --git a/Master/texmf-dist/doc/latex/changes/examples/changes.example.deletedmarkup.uline.pdf b/Master/texmf-dist/doc/latex/changes/examples/changes.example.deletedmarkup.uline.pdf Binary files differnew file mode 100644 index 00000000000..16ddbee7a15 --- /dev/null +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.deletedmarkup.uline.pdf diff --git a/Master/texmf-dist/doc/latex/changes/changes.example.deletedmarkup.uline.tex b/Master/texmf-dist/doc/latex/changes/examples/changes.example.deletedmarkup.uline.tex index 2878aee06e7..0e2d2b56452 100644 --- a/Master/texmf-dist/doc/latex/changes/changes.example.deletedmarkup.uline.tex +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.deletedmarkup.uline.tex @@ -1,5 +1,5 @@ %% -%% This is file `changes.example.deletedmarkup.uline.tex', +%% This is file `examples/changes.example.deletedmarkup.uline.tex', %% generated with the docstrip utility. %% %% The original source files were: @@ -7,7 +7,7 @@ %% examples.dtx (with options: `example:deletedmarkup:uline') %% %% changes.dtx -%% Copyright 2007-2020 Ekkart Kleinod (ekleinod@edgesoft.de) +%% Copyright 2007-2021 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 @@ -111,6 +111,6 @@ That's also clear. \end{document} -%% Copyright 2007-2020 Ekkart Kleinod +%% Copyright 2007-2021 Ekkart Kleinod %% -%% End of file `changes.example.deletedmarkup.uline.tex'. +%% End of file `examples/changes.example.deletedmarkup.uline.tex'. diff --git a/Master/texmf-dist/doc/latex/changes/examples/changes.example.deletedmarkup.uuline.pdf b/Master/texmf-dist/doc/latex/changes/examples/changes.example.deletedmarkup.uuline.pdf Binary files differnew file mode 100644 index 00000000000..c9594641f58 --- /dev/null +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.deletedmarkup.uuline.pdf diff --git a/Master/texmf-dist/doc/latex/changes/changes.example.deletedmarkup.uuline.tex b/Master/texmf-dist/doc/latex/changes/examples/changes.example.deletedmarkup.uuline.tex index bad513e5ac4..d3fa33c85dd 100644 --- a/Master/texmf-dist/doc/latex/changes/changes.example.deletedmarkup.uuline.tex +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.deletedmarkup.uuline.tex @@ -1,5 +1,5 @@ %% -%% This is file `changes.example.deletedmarkup.uuline.tex', +%% This is file `examples/changes.example.deletedmarkup.uuline.tex', %% generated with the docstrip utility. %% %% The original source files were: @@ -7,7 +7,7 @@ %% examples.dtx (with options: `example:deletedmarkup:uuline') %% %% changes.dtx -%% Copyright 2007-2020 Ekkart Kleinod (ekleinod@edgesoft.de) +%% Copyright 2007-2021 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 @@ -111,6 +111,6 @@ That's also clear. \end{document} -%% Copyright 2007-2020 Ekkart Kleinod +%% Copyright 2007-2021 Ekkart Kleinod %% -%% End of file `changes.example.deletedmarkup.uuline.tex'. +%% End of file `examples/changes.example.deletedmarkup.uuline.tex'. diff --git a/Master/texmf-dist/doc/latex/changes/examples/changes.example.deletedmarkup.uwave.pdf b/Master/texmf-dist/doc/latex/changes/examples/changes.example.deletedmarkup.uwave.pdf Binary files differnew file mode 100644 index 00000000000..d805268cb82 --- /dev/null +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.deletedmarkup.uwave.pdf diff --git a/Master/texmf-dist/doc/latex/changes/changes.example.deletedmarkup.uwave.tex b/Master/texmf-dist/doc/latex/changes/examples/changes.example.deletedmarkup.uwave.tex index 2df34a3dbd4..46bbf8ca75e 100644 --- a/Master/texmf-dist/doc/latex/changes/changes.example.deletedmarkup.uwave.tex +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.deletedmarkup.uwave.tex @@ -1,5 +1,5 @@ %% -%% This is file `changes.example.deletedmarkup.uwave.tex', +%% This is file `examples/changes.example.deletedmarkup.uwave.tex', %% generated with the docstrip utility. %% %% The original source files were: @@ -7,7 +7,7 @@ %% examples.dtx (with options: `example:deletedmarkup:uwave') %% %% changes.dtx -%% Copyright 2007-2020 Ekkart Kleinod (ekleinod@edgesoft.de) +%% Copyright 2007-2021 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 @@ -111,6 +111,6 @@ That's also clear. \end{document} -%% Copyright 2007-2020 Ekkart Kleinod +%% Copyright 2007-2021 Ekkart Kleinod %% -%% End of file `changes.example.deletedmarkup.uwave.tex'. +%% End of file `examples/changes.example.deletedmarkup.uwave.tex'. diff --git a/Master/texmf-dist/doc/latex/changes/examples/changes.example.deletedmarkup.wrong.pdf b/Master/texmf-dist/doc/latex/changes/examples/changes.example.deletedmarkup.wrong.pdf Binary files differnew file mode 100644 index 00000000000..bfecc54b0d7 --- /dev/null +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.deletedmarkup.wrong.pdf diff --git a/Master/texmf-dist/doc/latex/changes/changes.example.deletedmarkup.wrong.tex b/Master/texmf-dist/doc/latex/changes/examples/changes.example.deletedmarkup.wrong.tex index ec714e2ad26..b03b08229a1 100644 --- a/Master/texmf-dist/doc/latex/changes/changes.example.deletedmarkup.wrong.tex +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.deletedmarkup.wrong.tex @@ -1,5 +1,5 @@ %% -%% This is file `changes.example.deletedmarkup.wrong.tex', +%% This is file `examples/changes.example.deletedmarkup.wrong.tex', %% generated with the docstrip utility. %% %% The original source files were: @@ -7,7 +7,7 @@ %% examples.dtx (with options: `example:deletedmarkup:wrong') %% %% changes.dtx -%% Copyright 2007-2020 Ekkart Kleinod (ekleinod@edgesoft.de) +%% Copyright 2007-2021 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 @@ -111,6 +111,6 @@ That's also clear. \end{document} -%% Copyright 2007-2020 Ekkart Kleinod +%% Copyright 2007-2021 Ekkart Kleinod %% -%% End of file `changes.example.deletedmarkup.wrong.tex'. +%% End of file `examples/changes.example.deletedmarkup.wrong.tex'. diff --git a/Master/texmf-dist/doc/latex/changes/examples/changes.example.deletedmarkup.xout.pdf b/Master/texmf-dist/doc/latex/changes/examples/changes.example.deletedmarkup.xout.pdf Binary files differnew file mode 100644 index 00000000000..708bffc41ff --- /dev/null +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.deletedmarkup.xout.pdf diff --git a/Master/texmf-dist/doc/latex/changes/changes.example.deletedmarkup.xout.tex b/Master/texmf-dist/doc/latex/changes/examples/changes.example.deletedmarkup.xout.tex index 8309ee4cb53..f6800ee5d77 100644 --- a/Master/texmf-dist/doc/latex/changes/changes.example.deletedmarkup.xout.tex +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.deletedmarkup.xout.tex @@ -1,5 +1,5 @@ %% -%% This is file `changes.example.deletedmarkup.xout.tex', +%% This is file `examples/changes.example.deletedmarkup.xout.tex', %% generated with the docstrip utility. %% %% The original source files were: @@ -7,7 +7,7 @@ %% examples.dtx (with options: `example:deletedmarkup:xout') %% %% changes.dtx -%% Copyright 2007-2020 Ekkart Kleinod (ekleinod@edgesoft.de) +%% Copyright 2007-2021 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 @@ -111,6 +111,6 @@ That's also clear. \end{document} -%% Copyright 2007-2020 Ekkart Kleinod +%% Copyright 2007-2021 Ekkart Kleinod %% -%% End of file `changes.example.deletedmarkup.xout.tex'. +%% End of file `examples/changes.example.deletedmarkup.xout.tex'. diff --git a/Master/texmf-dist/doc/latex/changes/examples/changes.example.draft.pdf b/Master/texmf-dist/doc/latex/changes/examples/changes.example.draft.pdf Binary files differnew file mode 100644 index 00000000000..478cc37a200 --- /dev/null +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.draft.pdf diff --git a/Master/texmf-dist/doc/latex/changes/changes.example.draft.tex b/Master/texmf-dist/doc/latex/changes/examples/changes.example.draft.tex index c078781d2ed..bd68a485f36 100644 --- a/Master/texmf-dist/doc/latex/changes/changes.example.draft.tex +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.draft.tex @@ -1,5 +1,5 @@ %% -%% This is file `changes.example.draft.tex', +%% This is file `examples/changes.example.draft.tex', %% generated with the docstrip utility. %% %% The original source files were: @@ -7,7 +7,7 @@ %% examples.dtx (with options: `example:draft') %% %% changes.dtx -%% Copyright 2007-2020 Ekkart Kleinod (ekleinod@edgesoft.de) +%% Copyright 2007-2021 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 @@ -111,6 +111,6 @@ That's also clear. \end{document} -%% Copyright 2007-2020 Ekkart Kleinod +%% Copyright 2007-2021 Ekkart Kleinod %% -%% End of file `changes.example.draft.tex'. +%% End of file `examples/changes.example.draft.tex'. diff --git a/Master/texmf-dist/doc/latex/changes/examples/changes.example.final.pdf b/Master/texmf-dist/doc/latex/changes/examples/changes.example.final.pdf Binary files differnew file mode 100644 index 00000000000..ef941b1528d --- /dev/null +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.final.pdf diff --git a/Master/texmf-dist/doc/latex/changes/changes.example.final.tex b/Master/texmf-dist/doc/latex/changes/examples/changes.example.final.tex index 1a298fc5d6b..170b01cbce1 100644 --- a/Master/texmf-dist/doc/latex/changes/changes.example.final.tex +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.final.tex @@ -1,5 +1,5 @@ %% -%% This is file `changes.example.final.tex', +%% This is file `examples/changes.example.final.tex', %% generated with the docstrip utility. %% %% The original source files were: @@ -7,7 +7,7 @@ %% examples.dtx (with options: `example:final') %% %% changes.dtx -%% Copyright 2007-2020 Ekkart Kleinod (ekleinod@edgesoft.de) +%% Copyright 2007-2021 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 @@ -111,6 +111,6 @@ That's also clear. \end{document} -%% Copyright 2007-2020 Ekkart Kleinod +%% Copyright 2007-2021 Ekkart Kleinod %% -%% End of file `changes.example.final.tex'. +%% End of file `examples/changes.example.final.tex'. diff --git a/Master/texmf-dist/doc/latex/changes/examples/changes.example.highlightmarkup.background.pdf b/Master/texmf-dist/doc/latex/changes/examples/changes.example.highlightmarkup.background.pdf Binary files differnew file mode 100644 index 00000000000..4eecbb38d47 --- /dev/null +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.highlightmarkup.background.pdf diff --git a/Master/texmf-dist/doc/latex/changes/changes.example.highlightmarkup.background.tex b/Master/texmf-dist/doc/latex/changes/examples/changes.example.highlightmarkup.background.tex index ecc2264c097..a8a6d47c06c 100644 --- a/Master/texmf-dist/doc/latex/changes/changes.example.highlightmarkup.background.tex +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.highlightmarkup.background.tex @@ -1,5 +1,5 @@ %% -%% This is file `changes.example.highlightmarkup.background.tex', +%% This is file `examples/changes.example.highlightmarkup.background.tex', %% generated with the docstrip utility. %% %% The original source files were: @@ -7,7 +7,7 @@ %% examples.dtx (with options: `example:highlightmarkup:background') %% %% changes.dtx -%% Copyright 2007-2020 Ekkart Kleinod (ekleinod@edgesoft.de) +%% Copyright 2007-2021 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 @@ -111,6 +111,6 @@ That's also clear. \end{document} -%% Copyright 2007-2020 Ekkart Kleinod +%% Copyright 2007-2021 Ekkart Kleinod %% -%% End of file `changes.example.highlightmarkup.background.tex'. +%% End of file `examples/changes.example.highlightmarkup.background.tex'. diff --git a/Master/texmf-dist/doc/latex/changes/examples/changes.example.highlightmarkup.uuline.pdf b/Master/texmf-dist/doc/latex/changes/examples/changes.example.highlightmarkup.uuline.pdf Binary files differnew file mode 100644 index 00000000000..6e5d874f6ea --- /dev/null +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.highlightmarkup.uuline.pdf diff --git a/Master/texmf-dist/doc/latex/changes/changes.example.highlightmarkup.uuline.tex b/Master/texmf-dist/doc/latex/changes/examples/changes.example.highlightmarkup.uuline.tex index 599f43ad164..d5321d20ee9 100644 --- a/Master/texmf-dist/doc/latex/changes/changes.example.highlightmarkup.uuline.tex +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.highlightmarkup.uuline.tex @@ -1,5 +1,5 @@ %% -%% This is file `changes.example.highlightmarkup.uuline.tex', +%% This is file `examples/changes.example.highlightmarkup.uuline.tex', %% generated with the docstrip utility. %% %% The original source files were: @@ -7,7 +7,7 @@ %% examples.dtx (with options: `example:highlightmarkup:uuline') %% %% changes.dtx -%% Copyright 2007-2020 Ekkart Kleinod (ekleinod@edgesoft.de) +%% Copyright 2007-2021 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 @@ -111,6 +111,6 @@ That's also clear. \end{document} -%% Copyright 2007-2020 Ekkart Kleinod +%% Copyright 2007-2021 Ekkart Kleinod %% -%% End of file `changes.example.highlightmarkup.uuline.tex'. +%% End of file `examples/changes.example.highlightmarkup.uuline.tex'. diff --git a/Master/texmf-dist/doc/latex/changes/examples/changes.example.highlightmarkup.uwave.pdf b/Master/texmf-dist/doc/latex/changes/examples/changes.example.highlightmarkup.uwave.pdf Binary files differnew file mode 100644 index 00000000000..01cea2c3b36 --- /dev/null +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.highlightmarkup.uwave.pdf diff --git a/Master/texmf-dist/doc/latex/changes/changes.example.highlightmarkup.uwave.tex b/Master/texmf-dist/doc/latex/changes/examples/changes.example.highlightmarkup.uwave.tex index 2a30fde9ce6..9db8f18b61c 100644 --- a/Master/texmf-dist/doc/latex/changes/changes.example.highlightmarkup.uwave.tex +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.highlightmarkup.uwave.tex @@ -1,5 +1,5 @@ %% -%% This is file `changes.example.highlightmarkup.uwave.tex', +%% This is file `examples/changes.example.highlightmarkup.uwave.tex', %% generated with the docstrip utility. %% %% The original source files were: @@ -7,7 +7,7 @@ %% examples.dtx (with options: `example:highlightmarkup:uwave') %% %% changes.dtx -%% Copyright 2007-2020 Ekkart Kleinod (ekleinod@edgesoft.de) +%% Copyright 2007-2021 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 @@ -111,6 +111,6 @@ That's also clear. \end{document} -%% Copyright 2007-2020 Ekkart Kleinod +%% Copyright 2007-2021 Ekkart Kleinod %% -%% End of file `changes.example.highlightmarkup.uwave.tex'. +%% End of file `examples/changes.example.highlightmarkup.uwave.tex'. diff --git a/Master/texmf-dist/doc/latex/changes/examples/changes.example.listofchanges.all.pdf b/Master/texmf-dist/doc/latex/changes/examples/changes.example.listofchanges.all.pdf Binary files differnew file mode 100644 index 00000000000..dd19244d393 --- /dev/null +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.listofchanges.all.pdf diff --git a/Master/texmf-dist/doc/latex/changes/changes.example.listofchanges.all.tex b/Master/texmf-dist/doc/latex/changes/examples/changes.example.listofchanges.all.tex index 66c60c2cfad..c94963b5ea2 100644 --- a/Master/texmf-dist/doc/latex/changes/changes.example.listofchanges.all.tex +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.listofchanges.all.tex @@ -1,5 +1,5 @@ %% -%% This is file `changes.example.listofchanges.all.tex', +%% This is file `examples/changes.example.listofchanges.all.tex', %% generated with the docstrip utility. %% %% The original source files were: @@ -7,7 +7,7 @@ %% examples.dtx (with options: `example:listofchanges:all') %% %% changes.dtx -%% Copyright 2007-2020 Ekkart Kleinod (ekleinod@edgesoft.de) +%% Copyright 2007-2021 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 @@ -114,6 +114,6 @@ That's also clear. \end{document} -%% Copyright 2007-2020 Ekkart Kleinod +%% Copyright 2007-2021 Ekkart Kleinod %% -%% End of file `changes.example.listofchanges.all.tex'. +%% End of file `examples/changes.example.listofchanges.all.tex'. diff --git a/Master/texmf-dist/doc/latex/changes/examples/changes.example.listofchanges.compactsummary.pdf b/Master/texmf-dist/doc/latex/changes/examples/changes.example.listofchanges.compactsummary.pdf Binary files differnew file mode 100644 index 00000000000..850d015a958 --- /dev/null +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.listofchanges.compactsummary.pdf diff --git a/Master/texmf-dist/doc/latex/changes/changes.example.listofchanges.compactsummary.tex b/Master/texmf-dist/doc/latex/changes/examples/changes.example.listofchanges.compactsummary.tex index 10035a0fdb7..17ceb9e9068 100644 --- a/Master/texmf-dist/doc/latex/changes/changes.example.listofchanges.compactsummary.tex +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.listofchanges.compactsummary.tex @@ -1,5 +1,5 @@ %% -%% This is file `changes.example.listofchanges.compactsummary.tex', +%% This is file `examples/changes.example.listofchanges.compactsummary.tex', %% generated with the docstrip utility. %% %% The original source files were: @@ -7,7 +7,7 @@ %% examples.dtx (with options: `example:listofchanges:compactsummary') %% %% changes.dtx -%% Copyright 2007-2020 Ekkart Kleinod (ekleinod@edgesoft.de) +%% Copyright 2007-2021 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 @@ -112,6 +112,6 @@ That's also clear. \end{document} -%% Copyright 2007-2020 Ekkart Kleinod +%% Copyright 2007-2021 Ekkart Kleinod %% -%% End of file `changes.example.listofchanges.compactsummary.tex'. +%% End of file `examples/changes.example.listofchanges.compactsummary.tex'. diff --git a/Master/texmf-dist/doc/latex/changes/examples/changes.example.listofchanges.list.pdf b/Master/texmf-dist/doc/latex/changes/examples/changes.example.listofchanges.list.pdf Binary files differnew file mode 100644 index 00000000000..fc04410f1db --- /dev/null +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.listofchanges.list.pdf diff --git a/Master/texmf-dist/doc/latex/changes/changes.example.listofchanges.list.tex b/Master/texmf-dist/doc/latex/changes/examples/changes.example.listofchanges.list.tex index 30b9a018b1d..eafcbf1ceb7 100644 --- a/Master/texmf-dist/doc/latex/changes/changes.example.listofchanges.list.tex +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.listofchanges.list.tex @@ -1,5 +1,5 @@ %% -%% This is file `changes.example.listofchanges.list.tex', +%% This is file `examples/changes.example.listofchanges.list.tex', %% generated with the docstrip utility. %% %% The original source files were: @@ -7,7 +7,7 @@ %% examples.dtx (with options: `example:listofchanges:list') %% %% changes.dtx -%% Copyright 2007-2020 Ekkart Kleinod (ekleinod@edgesoft.de) +%% Copyright 2007-2021 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 @@ -112,6 +112,6 @@ That's also clear. \end{document} -%% Copyright 2007-2020 Ekkart Kleinod +%% Copyright 2007-2021 Ekkart Kleinod %% -%% End of file `changes.example.listofchanges.list.tex'. +%% End of file `examples/changes.example.listofchanges.list.tex'. diff --git a/Master/texmf-dist/doc/latex/changes/examples/changes.example.listofchanges.show.pdf b/Master/texmf-dist/doc/latex/changes/examples/changes.example.listofchanges.show.pdf Binary files differnew file mode 100644 index 00000000000..4da6c4dccd8 --- /dev/null +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.listofchanges.show.pdf diff --git a/Master/texmf-dist/doc/latex/changes/changes.example.listofchanges.show.tex b/Master/texmf-dist/doc/latex/changes/examples/changes.example.listofchanges.show.tex index 1e325d7594b..14af48f1f94 100644 --- a/Master/texmf-dist/doc/latex/changes/changes.example.listofchanges.show.tex +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.listofchanges.show.tex @@ -1,5 +1,5 @@ %% -%% This is file `changes.example.listofchanges.show.tex', +%% This is file `examples/changes.example.listofchanges.show.tex', %% generated with the docstrip utility. %% %% The original source files were: @@ -7,7 +7,7 @@ %% examples.dtx (with options: `example:listofchanges:show') %% %% changes.dtx -%% Copyright 2007-2020 Ekkart Kleinod (ekleinod@edgesoft.de) +%% Copyright 2007-2021 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 @@ -116,6 +116,6 @@ That's also clear. \end{document} -%% Copyright 2007-2020 Ekkart Kleinod +%% Copyright 2007-2021 Ekkart Kleinod %% -%% End of file `changes.example.listofchanges.show.tex'. +%% End of file `examples/changes.example.listofchanges.show.tex'. diff --git a/Master/texmf-dist/doc/latex/changes/examples/changes.example.listofchanges.summary.pdf b/Master/texmf-dist/doc/latex/changes/examples/changes.example.listofchanges.summary.pdf Binary files differnew file mode 100644 index 00000000000..84ed8d2e49a --- /dev/null +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.listofchanges.summary.pdf diff --git a/Master/texmf-dist/doc/latex/changes/changes.example.listofchanges.summary.tex b/Master/texmf-dist/doc/latex/changes/examples/changes.example.listofchanges.summary.tex index a86adcabe89..5d71928c23b 100644 --- a/Master/texmf-dist/doc/latex/changes/changes.example.listofchanges.summary.tex +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.listofchanges.summary.tex @@ -1,5 +1,5 @@ %% -%% This is file `changes.example.listofchanges.summary.tex', +%% This is file `examples/changes.example.listofchanges.summary.tex', %% generated with the docstrip utility. %% %% The original source files were: @@ -7,7 +7,7 @@ %% examples.dtx (with options: `example:listofchanges:summary') %% %% changes.dtx -%% Copyright 2007-2020 Ekkart Kleinod (ekleinod@edgesoft.de) +%% Copyright 2007-2021 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 @@ -113,6 +113,6 @@ That's also clear. \end{document} -%% Copyright 2007-2020 Ekkart Kleinod +%% Copyright 2007-2021 Ekkart Kleinod %% -%% End of file `changes.example.listofchanges.summary.tex'. +%% End of file `examples/changes.example.listofchanges.summary.tex'. diff --git a/Master/texmf-dist/doc/latex/changes/examples/changes.example.listofchanges.title.pdf b/Master/texmf-dist/doc/latex/changes/examples/changes.example.listofchanges.title.pdf Binary files differnew file mode 100644 index 00000000000..a574cde7fe4 --- /dev/null +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.listofchanges.title.pdf diff --git a/Master/texmf-dist/doc/latex/changes/changes.example.listofchanges.title.tex b/Master/texmf-dist/doc/latex/changes/examples/changes.example.listofchanges.title.tex index b7a4e973535..734869ef98c 100644 --- a/Master/texmf-dist/doc/latex/changes/changes.example.listofchanges.title.tex +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.listofchanges.title.tex @@ -1,5 +1,5 @@ %% -%% This is file `changes.example.listofchanges.title.tex', +%% This is file `examples/changes.example.listofchanges.title.tex', %% generated with the docstrip utility. %% %% The original source files were: @@ -7,7 +7,7 @@ %% examples.dtx (with options: `example:listofchanges:title') %% %% changes.dtx -%% Copyright 2007-2020 Ekkart Kleinod (ekleinod@edgesoft.de) +%% Copyright 2007-2021 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 @@ -114,6 +114,6 @@ That's also clear. \end{document} -%% Copyright 2007-2020 Ekkart Kleinod +%% Copyright 2007-2021 Ekkart Kleinod %% -%% End of file `changes.example.listofchanges.title.tex'. +%% End of file `examples/changes.example.listofchanges.title.tex'. diff --git a/Master/texmf-dist/doc/latex/changes/examples/changes.example.listofchanges.wrong.pdf b/Master/texmf-dist/doc/latex/changes/examples/changes.example.listofchanges.wrong.pdf Binary files differnew file mode 100644 index 00000000000..2a4a7223715 --- /dev/null +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.listofchanges.wrong.pdf diff --git a/Master/texmf-dist/doc/latex/changes/changes.example.listofchanges.wrong.tex b/Master/texmf-dist/doc/latex/changes/examples/changes.example.listofchanges.wrong.tex index f5ccadeac72..dd627e2744c 100644 --- a/Master/texmf-dist/doc/latex/changes/changes.example.listofchanges.wrong.tex +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.listofchanges.wrong.tex @@ -1,5 +1,5 @@ %% -%% This is file `changes.example.listofchanges.wrong.tex', +%% This is file `examples/changes.example.listofchanges.wrong.tex', %% generated with the docstrip utility. %% %% The original source files were: @@ -7,7 +7,7 @@ %% examples.dtx (with options: `example:listofchanges:wrong') %% %% changes.dtx -%% Copyright 2007-2020 Ekkart Kleinod (ekleinod@edgesoft.de) +%% Copyright 2007-2021 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 @@ -112,6 +112,6 @@ That's also clear. \end{document} -%% Copyright 2007-2020 Ekkart Kleinod +%% Copyright 2007-2021 Ekkart Kleinod %% -%% End of file `changes.example.listofchanges.wrong.tex'. +%% End of file `examples/changes.example.listofchanges.wrong.tex'. diff --git a/Master/texmf-dist/doc/latex/changes/examples/changes.example.markup.bfit.pdf b/Master/texmf-dist/doc/latex/changes/examples/changes.example.markup.bfit.pdf Binary files differnew file mode 100644 index 00000000000..8fb5ab5081d --- /dev/null +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.markup.bfit.pdf diff --git a/Master/texmf-dist/doc/latex/changes/changes.example.markup.bfit.tex b/Master/texmf-dist/doc/latex/changes/examples/changes.example.markup.bfit.tex index d4fb2daf087..457fee6f1cd 100644 --- a/Master/texmf-dist/doc/latex/changes/changes.example.markup.bfit.tex +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.markup.bfit.tex @@ -1,5 +1,5 @@ %% -%% This is file `changes.example.markup.bfit.tex', +%% This is file `examples/changes.example.markup.bfit.tex', %% generated with the docstrip utility. %% %% The original source files were: @@ -7,7 +7,7 @@ %% examples.dtx (with options: `example:markup:bfit') %% %% changes.dtx -%% Copyright 2007-2020 Ekkart Kleinod (ekleinod@edgesoft.de) +%% Copyright 2007-2021 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 @@ -111,6 +111,6 @@ That's also clear. \end{document} -%% Copyright 2007-2020 Ekkart Kleinod +%% Copyright 2007-2021 Ekkart Kleinod %% -%% End of file `changes.example.markup.bfit.tex'. +%% End of file `examples/changes.example.markup.bfit.tex'. diff --git a/Master/texmf-dist/doc/latex/changes/examples/changes.example.markup.default.pdf b/Master/texmf-dist/doc/latex/changes/examples/changes.example.markup.default.pdf Binary files differnew file mode 100644 index 00000000000..1aa04761498 --- /dev/null +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.markup.default.pdf diff --git a/Master/texmf-dist/doc/latex/changes/changes.example.markup.default.tex b/Master/texmf-dist/doc/latex/changes/examples/changes.example.markup.default.tex index 4938c3ae3dc..c76f59bcaeb 100644 --- a/Master/texmf-dist/doc/latex/changes/changes.example.markup.default.tex +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.markup.default.tex @@ -1,5 +1,5 @@ %% -%% This is file `changes.example.markup.default.tex', +%% This is file `examples/changes.example.markup.default.tex', %% generated with the docstrip utility. %% %% The original source files were: @@ -7,7 +7,7 @@ %% examples.dtx (with options: `example:markup:default') %% %% changes.dtx -%% Copyright 2007-2020 Ekkart Kleinod (ekleinod@edgesoft.de) +%% Copyright 2007-2021 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 @@ -111,6 +111,6 @@ That's also clear. \end{document} -%% Copyright 2007-2020 Ekkart Kleinod +%% Copyright 2007-2021 Ekkart Kleinod %% -%% End of file `changes.example.markup.default.tex'. +%% End of file `examples/changes.example.markup.default.tex'. diff --git a/Master/texmf-dist/doc/latex/changes/examples/changes.example.markup.nocolor.pdf b/Master/texmf-dist/doc/latex/changes/examples/changes.example.markup.nocolor.pdf Binary files differnew file mode 100644 index 00000000000..cc64461177c --- /dev/null +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.markup.nocolor.pdf diff --git a/Master/texmf-dist/doc/latex/changes/changes.example.markup.nocolor.tex b/Master/texmf-dist/doc/latex/changes/examples/changes.example.markup.nocolor.tex index 03e9d69b054..67227059697 100644 --- a/Master/texmf-dist/doc/latex/changes/changes.example.markup.nocolor.tex +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.markup.nocolor.tex @@ -1,5 +1,5 @@ %% -%% This is file `changes.example.markup.nocolor.tex', +%% This is file `examples/changes.example.markup.nocolor.tex', %% generated with the docstrip utility. %% %% The original source files were: @@ -7,7 +7,7 @@ %% examples.dtx (with options: `example:markup:nocolor') %% %% changes.dtx -%% Copyright 2007-2020 Ekkart Kleinod (ekleinod@edgesoft.de) +%% Copyright 2007-2021 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 @@ -111,6 +111,6 @@ That's also clear. \end{document} -%% Copyright 2007-2020 Ekkart Kleinod +%% Copyright 2007-2021 Ekkart Kleinod %% -%% End of file `changes.example.markup.nocolor.tex'. +%% End of file `examples/changes.example.markup.nocolor.tex'. diff --git a/Master/texmf-dist/doc/latex/changes/examples/changes.example.markup.underlined.pdf b/Master/texmf-dist/doc/latex/changes/examples/changes.example.markup.underlined.pdf Binary files differnew file mode 100644 index 00000000000..dd544e0628e --- /dev/null +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.markup.underlined.pdf diff --git a/Master/texmf-dist/doc/latex/changes/changes.example.markup.underlined.tex b/Master/texmf-dist/doc/latex/changes/examples/changes.example.markup.underlined.tex index 391560219ad..416832b5626 100644 --- a/Master/texmf-dist/doc/latex/changes/changes.example.markup.underlined.tex +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.markup.underlined.tex @@ -1,5 +1,5 @@ %% -%% This is file `changes.example.markup.underlined.tex', +%% This is file `examples/changes.example.markup.underlined.tex', %% generated with the docstrip utility. %% %% The original source files were: @@ -7,7 +7,7 @@ %% examples.dtx (with options: `example:markup:underlined') %% %% changes.dtx -%% Copyright 2007-2020 Ekkart Kleinod (ekleinod@edgesoft.de) +%% Copyright 2007-2021 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 @@ -111,6 +111,6 @@ That's also clear. \end{document} -%% Copyright 2007-2020 Ekkart Kleinod +%% Copyright 2007-2021 Ekkart Kleinod %% -%% End of file `changes.example.markup.underlined.tex'. +%% End of file `examples/changes.example.markup.underlined.tex'. diff --git a/Master/texmf-dist/doc/latex/changes/examples/changes.example.markup.wrong.pdf b/Master/texmf-dist/doc/latex/changes/examples/changes.example.markup.wrong.pdf Binary files differnew file mode 100644 index 00000000000..7de214acac6 --- /dev/null +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.markup.wrong.pdf diff --git a/Master/texmf-dist/doc/latex/changes/changes.example.markup.wrong.tex b/Master/texmf-dist/doc/latex/changes/examples/changes.example.markup.wrong.tex index 3fdeeed2101..d840bd99012 100644 --- a/Master/texmf-dist/doc/latex/changes/changes.example.markup.wrong.tex +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.markup.wrong.tex @@ -1,5 +1,5 @@ %% -%% This is file `changes.example.markup.wrong.tex', +%% This is file `examples/changes.example.markup.wrong.tex', %% generated with the docstrip utility. %% %% The original source files were: @@ -7,7 +7,7 @@ %% examples.dtx (with options: `example:markup:wrong') %% %% changes.dtx -%% Copyright 2007-2020 Ekkart Kleinod (ekleinod@edgesoft.de) +%% Copyright 2007-2021 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 @@ -111,6 +111,6 @@ That's also clear. \end{document} -%% Copyright 2007-2020 Ekkart Kleinod +%% Copyright 2007-2021 Ekkart Kleinod %% -%% End of file `changes.example.markup.wrong.tex'. +%% End of file `examples/changes.example.markup.wrong.tex'. diff --git a/Master/texmf-dist/doc/latex/changes/examples/changes.example.packageoptions.todonotes.pdf b/Master/texmf-dist/doc/latex/changes/examples/changes.example.packageoptions.todonotes.pdf Binary files differnew file mode 100644 index 00000000000..099d5d2634d --- /dev/null +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.packageoptions.todonotes.pdf diff --git a/Master/texmf-dist/doc/latex/changes/changes.example.packageoptions.todonotes.tex b/Master/texmf-dist/doc/latex/changes/examples/changes.example.packageoptions.todonotes.tex index 23adc96a0b9..35ef0f62abf 100644 --- a/Master/texmf-dist/doc/latex/changes/changes.example.packageoptions.todonotes.tex +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.packageoptions.todonotes.tex @@ -1,5 +1,5 @@ %% -%% This is file `changes.example.packageoptions.todonotes.tex', +%% This is file `examples/changes.example.packageoptions.todonotes.tex', %% generated with the docstrip utility. %% %% The original source files were: @@ -7,7 +7,7 @@ %% examples.dtx (with options: `example:packageoptions.todonotes') %% %% changes.dtx -%% Copyright 2007-2020 Ekkart Kleinod (ekleinod@edgesoft.de) +%% Copyright 2007-2021 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 @@ -114,6 +114,6 @@ All\todo{very small text} notes have very small text. \end{document} -%% Copyright 2007-2020 Ekkart Kleinod +%% Copyright 2007-2021 Ekkart Kleinod %% -%% End of file `changes.example.packageoptions.todonotes.tex'. +%% End of file `examples/changes.example.packageoptions.todonotes.tex'. diff --git a/Master/texmf-dist/doc/latex/changes/examples/changes.example.packageoptions.truncate.pdf b/Master/texmf-dist/doc/latex/changes/examples/changes.example.packageoptions.truncate.pdf Binary files differnew file mode 100644 index 00000000000..469c95daa49 --- /dev/null +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.packageoptions.truncate.pdf diff --git a/Master/texmf-dist/doc/latex/changes/changes.example.packageoptions.truncate.tex b/Master/texmf-dist/doc/latex/changes/examples/changes.example.packageoptions.truncate.tex index 4d011af0c19..d3cb0648010 100644 --- a/Master/texmf-dist/doc/latex/changes/changes.example.packageoptions.truncate.tex +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.packageoptions.truncate.tex @@ -1,5 +1,5 @@ %% -%% This is file `changes.example.packageoptions.truncate.tex', +%% This is file `examples/changes.example.packageoptions.truncate.tex', %% generated with the docstrip utility. %% %% The original source files were: @@ -7,7 +7,7 @@ %% examples.dtx (with options: `example:packageoptions.truncate') %% %% changes.dtx -%% Copyright 2007-2020 Ekkart Kleinod (ekleinod@edgesoft.de) +%% Copyright 2007-2021 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 @@ -114,6 +114,6 @@ That's also clear. \truncate{12em}{Truncate word at hyphenation.} \end{document} -%% Copyright 2007-2020 Ekkart Kleinod +%% Copyright 2007-2021 Ekkart Kleinod %% -%% End of file `changes.example.packageoptions.truncate.tex'. +%% End of file `examples/changes.example.packageoptions.truncate.tex'. diff --git a/Master/texmf-dist/doc/latex/changes/examples/changes.example.packageoptions.ulem.pdf b/Master/texmf-dist/doc/latex/changes/examples/changes.example.packageoptions.ulem.pdf Binary files differnew file mode 100644 index 00000000000..ccb5d72af27 --- /dev/null +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.packageoptions.ulem.pdf diff --git a/Master/texmf-dist/doc/latex/changes/changes.example.packageoptions.ulem.tex b/Master/texmf-dist/doc/latex/changes/examples/changes.example.packageoptions.ulem.tex index efe3140252a..da456395586 100644 --- a/Master/texmf-dist/doc/latex/changes/changes.example.packageoptions.ulem.tex +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.packageoptions.ulem.tex @@ -1,5 +1,5 @@ %% -%% This is file `changes.example.packageoptions.ulem.tex', +%% This is file `examples/changes.example.packageoptions.ulem.tex', %% generated with the docstrip utility. %% %% The original source files were: @@ -7,7 +7,7 @@ %% examples.dtx (with options: `example:packageoptions.ulem') %% %% changes.dtx -%% Copyright 2007-2020 Ekkart Kleinod (ekleinod@edgesoft.de) +%% Copyright 2007-2021 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 @@ -114,6 +114,6 @@ This is \textbf{bold} text, underwaved by \emph{ulem} because of the \emph{UWfor \end{document} -%% Copyright 2007-2020 Ekkart Kleinod +%% Copyright 2007-2021 Ekkart Kleinod %% -%% End of file `changes.example.packageoptions.ulem.tex'. +%% End of file `examples/changes.example.packageoptions.ulem.tex'. diff --git a/Master/texmf-dist/doc/latex/changes/examples/changes.example.packageoptions.xcolor.pdf b/Master/texmf-dist/doc/latex/changes/examples/changes.example.packageoptions.xcolor.pdf Binary files differnew file mode 100644 index 00000000000..75771ebe061 --- /dev/null +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.packageoptions.xcolor.pdf diff --git a/Master/texmf-dist/doc/latex/changes/changes.example.packageoptions.xcolor.tex b/Master/texmf-dist/doc/latex/changes/examples/changes.example.packageoptions.xcolor.tex index b69f85c1988..e6b7ead5988 100644 --- a/Master/texmf-dist/doc/latex/changes/changes.example.packageoptions.xcolor.tex +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.packageoptions.xcolor.tex @@ -1,5 +1,5 @@ %% -%% This is file `changes.example.packageoptions.xcolor.tex', +%% This is file `examples/changes.example.packageoptions.xcolor.tex', %% generated with the docstrip utility. %% %% The original source files were: @@ -7,7 +7,7 @@ %% examples.dtx (with options: `example:packageoptions.xcolor') %% %% changes.dtx -%% Copyright 2007-2020 Ekkart Kleinod (ekleinod@edgesoft.de) +%% Copyright 2007-2021 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 @@ -115,6 +115,6 @@ Because of the option \emph{hideerrors} only a warning is raised, not an error.} \end{document} -%% Copyright 2007-2020 Ekkart Kleinod +%% Copyright 2007-2021 Ekkart Kleinod %% -%% End of file `changes.example.packageoptions.xcolor.tex'. +%% End of file `examples/changes.example.packageoptions.xcolor.tex'. diff --git a/Master/texmf-dist/doc/latex/changes/examples/changes.example.screenshot.pdf b/Master/texmf-dist/doc/latex/changes/examples/changes.example.screenshot.pdf Binary files differnew file mode 100644 index 00000000000..4cd38b8c0e5 --- /dev/null +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.screenshot.pdf diff --git a/Master/texmf-dist/doc/latex/changes/changes.example.screenshot.tex b/Master/texmf-dist/doc/latex/changes/examples/changes.example.screenshot.tex index 161ade1b9f7..6a534bdd456 100644 --- a/Master/texmf-dist/doc/latex/changes/changes.example.screenshot.tex +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.screenshot.tex @@ -1,5 +1,5 @@ %% -%% This is file `changes.example.screenshot.tex', +%% This is file `examples/changes.example.screenshot.tex', %% generated with the docstrip utility. %% %% The original source files were: @@ -7,7 +7,7 @@ %% example-screenshot.dtx (with options: `example:screenshot') %% %% changes.dtx -%% Copyright 2007-2020 Ekkart Kleinod (ekleinod@edgesoft.de) +%% Copyright 2007-2021 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 @@ -152,6 +152,6 @@ Hebe \highlight{dieses} Wort hervor.\\ Wir sind\comment[id=EK]{vorerst} am Ende. \end{document} -%% Copyright 2007-2020 Ekkart Kleinod +%% Copyright 2007-2021 Ekkart Kleinod %% -%% End of file `changes.example.screenshot.tex'. +%% End of file `examples/changes.example.screenshot.tex'. diff --git a/Master/texmf-dist/doc/latex/changes/examples/changes.example.setaddedmarkup.pdf b/Master/texmf-dist/doc/latex/changes/examples/changes.example.setaddedmarkup.pdf Binary files differnew file mode 100644 index 00000000000..9665b21f446 --- /dev/null +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.setaddedmarkup.pdf diff --git a/Master/texmf-dist/doc/latex/changes/changes.example.setaddedmarkup.tex b/Master/texmf-dist/doc/latex/changes/examples/changes.example.setaddedmarkup.tex index ddc567cf23a..fac89e9b96a 100644 --- a/Master/texmf-dist/doc/latex/changes/changes.example.setaddedmarkup.tex +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.setaddedmarkup.tex @@ -1,5 +1,5 @@ %% -%% This is file `changes.example.setaddedmarkup.tex', +%% This is file `examples/changes.example.setaddedmarkup.tex', %% generated with the docstrip utility. %% %% The original source files were: @@ -7,7 +7,7 @@ %% examples.dtx (with options: `example:setaddedmarkup') %% %% changes.dtx -%% Copyright 2007-2020 Ekkart Kleinod (ekleinod@edgesoft.de) +%% Copyright 2007-2021 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 @@ -113,6 +113,6 @@ That's also clear. \end{document} -%% Copyright 2007-2020 Ekkart Kleinod +%% Copyright 2007-2021 Ekkart Kleinod %% -%% End of file `changes.example.setaddedmarkup.tex'. +%% End of file `examples/changes.example.setaddedmarkup.tex'. diff --git a/Master/texmf-dist/doc/latex/changes/examples/changes.example.setauthormarkup.pdf b/Master/texmf-dist/doc/latex/changes/examples/changes.example.setauthormarkup.pdf Binary files differnew file mode 100644 index 00000000000..0ba8b62c39a --- /dev/null +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.setauthormarkup.pdf diff --git a/Master/texmf-dist/doc/latex/changes/changes.example.setauthormarkup.tex b/Master/texmf-dist/doc/latex/changes/examples/changes.example.setauthormarkup.tex index bf3d063aca3..6ceecf44138 100644 --- a/Master/texmf-dist/doc/latex/changes/changes.example.setauthormarkup.tex +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.setauthormarkup.tex @@ -1,5 +1,5 @@ %% -%% This is file `changes.example.setauthormarkup.tex', +%% This is file `examples/changes.example.setauthormarkup.tex', %% generated with the docstrip utility. %% %% The original source files were: @@ -7,7 +7,7 @@ %% examples.dtx (with options: `example:setauthormarkup') %% %% changes.dtx -%% Copyright 2007-2020 Ekkart Kleinod (ekleinod@edgesoft.de) +%% Copyright 2007-2021 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 @@ -113,6 +113,6 @@ That's also clear. \end{document} -%% Copyright 2007-2020 Ekkart Kleinod +%% Copyright 2007-2021 Ekkart Kleinod %% -%% End of file `changes.example.setauthormarkup.tex'. +%% End of file `examples/changes.example.setauthormarkup.tex'. diff --git a/Master/texmf-dist/doc/latex/changes/examples/changes.example.setauthormarkupposition.pdf b/Master/texmf-dist/doc/latex/changes/examples/changes.example.setauthormarkupposition.pdf Binary files differnew file mode 100644 index 00000000000..2a1eb5540d7 --- /dev/null +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.setauthormarkupposition.pdf diff --git a/Master/texmf-dist/doc/latex/changes/changes.example.setauthormarkupposition.tex b/Master/texmf-dist/doc/latex/changes/examples/changes.example.setauthormarkupposition.tex index 7829561655b..73fefb0c3f7 100644 --- a/Master/texmf-dist/doc/latex/changes/changes.example.setauthormarkupposition.tex +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.setauthormarkupposition.tex @@ -1,5 +1,5 @@ %% -%% This is file `changes.example.setauthormarkupposition.tex', +%% This is file `examples/changes.example.setauthormarkupposition.tex', %% generated with the docstrip utility. %% %% The original source files were: @@ -7,7 +7,7 @@ %% examples.dtx (with options: `example:setauthormarkupposition') %% %% changes.dtx -%% Copyright 2007-2020 Ekkart Kleinod (ekleinod@edgesoft.de) +%% Copyright 2007-2021 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 @@ -113,6 +113,6 @@ That's also clear. \end{document} -%% Copyright 2007-2020 Ekkart Kleinod +%% Copyright 2007-2021 Ekkart Kleinod %% -%% End of file `changes.example.setauthormarkupposition.tex'. +%% End of file `examples/changes.example.setauthormarkupposition.tex'. diff --git a/Master/texmf-dist/doc/latex/changes/examples/changes.example.setauthormarkuptext.pdf b/Master/texmf-dist/doc/latex/changes/examples/changes.example.setauthormarkuptext.pdf Binary files differnew file mode 100644 index 00000000000..961b32855a2 --- /dev/null +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.setauthormarkuptext.pdf diff --git a/Master/texmf-dist/doc/latex/changes/changes.example.setauthormarkuptext.tex b/Master/texmf-dist/doc/latex/changes/examples/changes.example.setauthormarkuptext.tex index 090fb57d8a0..3f79174cf06 100644 --- a/Master/texmf-dist/doc/latex/changes/changes.example.setauthormarkuptext.tex +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.setauthormarkuptext.tex @@ -1,5 +1,5 @@ %% -%% This is file `changes.example.setauthormarkuptext.tex', +%% This is file `examples/changes.example.setauthormarkuptext.tex', %% generated with the docstrip utility. %% %% The original source files were: @@ -7,7 +7,7 @@ %% examples.dtx (with options: `example:setauthormarkuptext') %% %% changes.dtx -%% Copyright 2007-2020 Ekkart Kleinod (ekleinod@edgesoft.de) +%% Copyright 2007-2021 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 @@ -113,6 +113,6 @@ That's also clear. \end{document} -%% Copyright 2007-2020 Ekkart Kleinod +%% Copyright 2007-2021 Ekkart Kleinod %% -%% End of file `changes.example.setauthormarkuptext.tex'. +%% End of file `examples/changes.example.setauthormarkuptext.tex'. diff --git a/Master/texmf-dist/doc/latex/changes/examples/changes.example.setcommentmarkup.pdf b/Master/texmf-dist/doc/latex/changes/examples/changes.example.setcommentmarkup.pdf Binary files differnew file mode 100644 index 00000000000..26ad28bde30 --- /dev/null +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.setcommentmarkup.pdf diff --git a/Master/texmf-dist/doc/latex/changes/changes.example.setcommentmarkup.tex b/Master/texmf-dist/doc/latex/changes/examples/changes.example.setcommentmarkup.tex index 6eea708cefb..6bde23b8a62 100644 --- a/Master/texmf-dist/doc/latex/changes/changes.example.setcommentmarkup.tex +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.setcommentmarkup.tex @@ -1,5 +1,5 @@ %% -%% This is file `changes.example.setcommentmarkup.tex', +%% This is file `examples/changes.example.setcommentmarkup.tex', %% generated with the docstrip utility. %% %% The original source files were: @@ -7,7 +7,7 @@ %% examples.dtx (with options: `example:setcommentmarkup') %% %% changes.dtx -%% Copyright 2007-2020 Ekkart Kleinod (ekleinod@edgesoft.de) +%% Copyright 2007-2021 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 @@ -42,13 +42,13 @@ \documentclass[11pt, a4paper, notitlepage, english]{article} \usepackage{babel} \usepackage{changes} -\setcommentmarkup{\ifthenelse{\isColored}{\color{authorcolor}}{}---~\ifthenelse{\isAnonymous{#2}}{}{\textbf{#3} }#1~---} +\setcommentmarkup{\IfIsColored{\color{authorcolor}}{}---~\IfIsAnonymous{#2}{}{\textbf{#3} }#1~---} \definechangesauthor[color=green]{Green} \definechangesauthor[name={Mister Orange}, color=orange]{OA} \definechangesauthor{nochanges} \begin{document} -\verb|\setcommentmarkup{\ifthenelse{\isColored}{\color{authorcolor}}{}---~\ifthenelse{\isAnonymous{#2}}{}{\textbf{#3} }#1~---}| +\verb|\setcommentmarkup{\IfIsColored{\color{authorcolor}}{}---~\IfIsAnonymous{#2}{}{\textbf{#3} }#1~---}| \subsection*{Changes by default author} @@ -113,6 +113,6 @@ That's also clear. \end{document} -%% Copyright 2007-2020 Ekkart Kleinod +%% Copyright 2007-2021 Ekkart Kleinod %% -%% End of file `changes.example.setcommentmarkup.tex'. +%% End of file `examples/changes.example.setcommentmarkup.tex'. diff --git a/Master/texmf-dist/doc/latex/changes/examples/changes.example.setdeletedmarkup.pdf b/Master/texmf-dist/doc/latex/changes/examples/changes.example.setdeletedmarkup.pdf Binary files differnew file mode 100644 index 00000000000..217394dc7db --- /dev/null +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.setdeletedmarkup.pdf diff --git a/Master/texmf-dist/doc/latex/changes/changes.example.setdeletedmarkup.tex b/Master/texmf-dist/doc/latex/changes/examples/changes.example.setdeletedmarkup.tex index faea0a55369..72e0d1254d0 100644 --- a/Master/texmf-dist/doc/latex/changes/changes.example.setdeletedmarkup.tex +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.setdeletedmarkup.tex @@ -1,5 +1,5 @@ %% -%% This is file `changes.example.setdeletedmarkup.tex', +%% This is file `examples/changes.example.setdeletedmarkup.tex', %% generated with the docstrip utility. %% %% The original source files were: @@ -7,7 +7,7 @@ %% examples.dtx (with options: `example:setdeletedmarkup') %% %% changes.dtx -%% Copyright 2007-2020 Ekkart Kleinod (ekleinod@edgesoft.de) +%% Copyright 2007-2021 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 @@ -113,6 +113,6 @@ That's also clear. \end{document} -%% Copyright 2007-2020 Ekkart Kleinod +%% Copyright 2007-2021 Ekkart Kleinod %% -%% End of file `changes.example.setdeletedmarkup.tex'. +%% End of file `examples/changes.example.setdeletedmarkup.tex'. diff --git a/Master/texmf-dist/doc/latex/changes/examples/changes.example.sethighlightmarkup.pdf b/Master/texmf-dist/doc/latex/changes/examples/changes.example.sethighlightmarkup.pdf Binary files differnew file mode 100644 index 00000000000..a9cc2600c76 --- /dev/null +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.sethighlightmarkup.pdf diff --git a/Master/texmf-dist/doc/latex/changes/changes.example.sethighlightmarkup.tex b/Master/texmf-dist/doc/latex/changes/examples/changes.example.sethighlightmarkup.tex index 549dd1cc3ba..b181a2dfb7f 100644 --- a/Master/texmf-dist/doc/latex/changes/changes.example.sethighlightmarkup.tex +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.sethighlightmarkup.tex @@ -1,5 +1,5 @@ %% -%% This is file `changes.example.sethighlightmarkup.tex', +%% This is file `examples/changes.example.sethighlightmarkup.tex', %% generated with the docstrip utility. %% %% The original source files were: @@ -7,7 +7,7 @@ %% examples.dtx (with options: `example:sethighlightmarkup') %% %% changes.dtx -%% Copyright 2007-2020 Ekkart Kleinod (ekleinod@edgesoft.de) +%% Copyright 2007-2021 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 @@ -113,6 +113,6 @@ That's also clear. \end{document} -%% Copyright 2007-2020 Ekkart Kleinod +%% Copyright 2007-2021 Ekkart Kleinod %% -%% End of file `changes.example.sethighlightmarkup.tex'. +%% End of file `examples/changes.example.sethighlightmarkup.tex'. diff --git a/Master/texmf-dist/doc/latex/changes/examples/changes.example.setsocextension.pdf b/Master/texmf-dist/doc/latex/changes/examples/changes.example.setsocextension.pdf Binary files differnew file mode 100644 index 00000000000..2a3641f07b2 --- /dev/null +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.setsocextension.pdf diff --git a/Master/texmf-dist/doc/latex/changes/changes.example.setsocextension.tex b/Master/texmf-dist/doc/latex/changes/examples/changes.example.setsocextension.tex index 9c6a4c884d8..12aa728dc17 100644 --- a/Master/texmf-dist/doc/latex/changes/changes.example.setsocextension.tex +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.setsocextension.tex @@ -1,5 +1,5 @@ %% -%% This is file `changes.example.setsocextension.tex', +%% This is file `examples/changes.example.setsocextension.tex', %% generated with the docstrip utility. %% %% The original source files were: @@ -7,7 +7,7 @@ %% examples.dtx (with options: `example:setsocextension') %% %% changes.dtx -%% Copyright 2007-2020 Ekkart Kleinod (ekleinod@edgesoft.de) +%% Copyright 2007-2021 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 @@ -112,6 +112,6 @@ That's also clear. \end{document} -%% Copyright 2007-2020 Ekkart Kleinod +%% Copyright 2007-2021 Ekkart Kleinod %% -%% End of file `changes.example.setsocextension.tex'. +%% End of file `examples/changes.example.setsocextension.tex'. diff --git a/Master/texmf-dist/doc/latex/changes/examples/changes.example.setsummarytowidth.pdf b/Master/texmf-dist/doc/latex/changes/examples/changes.example.setsummarytowidth.pdf Binary files differnew file mode 100644 index 00000000000..1303e89bf6b --- /dev/null +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.setsummarytowidth.pdf diff --git a/Master/texmf-dist/doc/latex/changes/changes.example.setsummarytowidth.tex b/Master/texmf-dist/doc/latex/changes/examples/changes.example.setsummarytowidth.tex index 18526e9a943..a189600a646 100644 --- a/Master/texmf-dist/doc/latex/changes/changes.example.setsummarytowidth.tex +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.setsummarytowidth.tex @@ -1,5 +1,5 @@ %% -%% This is file `changes.example.setsummarytowidth.tex', +%% This is file `examples/changes.example.setsummarytowidth.tex', %% generated with the docstrip utility. %% %% The original source files were: @@ -7,7 +7,7 @@ %% examples.dtx (with options: `example:setsummarytowidth') %% %% changes.dtx -%% Copyright 2007-2020 Ekkart Kleinod (ekleinod@edgesoft.de) +%% Copyright 2007-2021 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 @@ -114,6 +114,6 @@ That's also clear. \end{document} -%% Copyright 2007-2020 Ekkart Kleinod +%% Copyright 2007-2021 Ekkart Kleinod %% -%% End of file `changes.example.setsummarytowidth.tex'. +%% End of file `examples/changes.example.setsummarytowidth.tex'. diff --git a/Master/texmf-dist/doc/latex/changes/examples/changes.example.setsummarywidth.pdf b/Master/texmf-dist/doc/latex/changes/examples/changes.example.setsummarywidth.pdf Binary files differnew file mode 100644 index 00000000000..e1f54aed930 --- /dev/null +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.setsummarywidth.pdf diff --git a/Master/texmf-dist/doc/latex/changes/changes.example.setsummarywidth.tex b/Master/texmf-dist/doc/latex/changes/examples/changes.example.setsummarywidth.tex index 6af9bcea5b8..dcde77fea8b 100644 --- a/Master/texmf-dist/doc/latex/changes/changes.example.setsummarywidth.tex +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.setsummarywidth.tex @@ -1,5 +1,5 @@ %% -%% This is file `changes.example.setsummarywidth.tex', +%% This is file `examples/changes.example.setsummarywidth.tex', %% generated with the docstrip utility. %% %% The original source files were: @@ -7,7 +7,7 @@ %% examples.dtx (with options: `example:setsummarywidth') %% %% changes.dtx -%% Copyright 2007-2020 Ekkart Kleinod (ekleinod@edgesoft.de) +%% Copyright 2007-2021 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 @@ -114,6 +114,6 @@ That's also clear. \end{document} -%% Copyright 2007-2020 Ekkart Kleinod +%% Copyright 2007-2021 Ekkart Kleinod %% -%% End of file `changes.example.setsummarywidth.tex'. +%% End of file `examples/changes.example.setsummarywidth.tex'. diff --git a/Master/texmf-dist/doc/latex/changes/examples/changes.example.settruncatewidth.pdf b/Master/texmf-dist/doc/latex/changes/examples/changes.example.settruncatewidth.pdf Binary files differnew file mode 100644 index 00000000000..03ad57c9fd4 --- /dev/null +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.settruncatewidth.pdf diff --git a/Master/texmf-dist/doc/latex/changes/changes.example.settruncatewidth.tex b/Master/texmf-dist/doc/latex/changes/examples/changes.example.settruncatewidth.tex index 576bc8ff393..fa23de58ec0 100644 --- a/Master/texmf-dist/doc/latex/changes/changes.example.settruncatewidth.tex +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.settruncatewidth.tex @@ -1,5 +1,5 @@ %% -%% This is file `changes.example.settruncatewidth.tex', +%% This is file `examples/changes.example.settruncatewidth.tex', %% generated with the docstrip utility. %% %% The original source files were: @@ -7,7 +7,7 @@ %% examples.dtx (with options: `example:settruncatewidth') %% %% changes.dtx -%% Copyright 2007-2020 Ekkart Kleinod (ekleinod@edgesoft.de) +%% Copyright 2007-2021 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 @@ -114,6 +114,6 @@ That's also clear. \end{document} -%% Copyright 2007-2020 Ekkart Kleinod +%% Copyright 2007-2021 Ekkart Kleinod %% -%% End of file `changes.example.settruncatewidth.tex'. +%% End of file `examples/changes.example.settruncatewidth.tex'. diff --git a/Master/texmf-dist/doc/latex/changes/examples/changes.example.simple.pdf b/Master/texmf-dist/doc/latex/changes/examples/changes.example.simple.pdf Binary files differnew file mode 100644 index 00000000000..5090a2d80d2 --- /dev/null +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.simple.pdf diff --git a/Master/texmf-dist/doc/latex/changes/changes.example.simple.tex b/Master/texmf-dist/doc/latex/changes/examples/changes.example.simple.tex index 79e253c698e..cc8ef949a97 100644 --- a/Master/texmf-dist/doc/latex/changes/changes.example.simple.tex +++ b/Master/texmf-dist/doc/latex/changes/examples/changes.example.simple.tex @@ -1,5 +1,5 @@ %% -%% This is file `changes.example.simple.tex', +%% This is file `examples/changes.example.simple.tex', %% generated with the docstrip utility. %% %% The original source files were: @@ -7,7 +7,7 @@ %% examples.dtx (with options: `example:simple') %% %% changes.dtx -%% Copyright 2007-2020 Ekkart Kleinod (ekleinod@edgesoft.de) +%% Copyright 2007-2021 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 @@ -112,6 +112,6 @@ That's also clear. \end{document} -%% Copyright 2007-2020 Ekkart Kleinod +%% Copyright 2007-2021 Ekkart Kleinod %% -%% End of file `changes.example.simple.tex'. +%% End of file `examples/changes.example.simple.tex'. diff --git a/Master/texmf-dist/doc/latex/changes/userdoc/ex_added.tex b/Master/texmf-dist/doc/latex/changes/userdoc/added_ex.tex index 917cd787461..917cd787461 100644 --- a/Master/texmf-dist/doc/latex/changes/userdoc/ex_added.tex +++ b/Master/texmf-dist/doc/latex/changes/userdoc/added_ex.tex diff --git a/Master/texmf-dist/doc/latex/changes/userdoc/in_added.tex b/Master/texmf-dist/doc/latex/changes/userdoc/added_in.tex index 0bd19a7a55e..0bd19a7a55e 100644 --- a/Master/texmf-dist/doc/latex/changes/userdoc/in_added.tex +++ b/Master/texmf-dist/doc/latex/changes/userdoc/added_in.tex diff --git a/Master/texmf-dist/doc/latex/changes/userdoc/changes.de.tex b/Master/texmf-dist/doc/latex/changes/userdoc/changes.de.tex index 912223f32d1..80f3005654c 100644 --- a/Master/texmf-dist/doc/latex/changes/userdoc/changes.de.tex +++ b/Master/texmf-dist/doc/latex/changes/userdoc/changes.de.tex @@ -6,7 +6,7 @@ Dieses Paket dient dazu, manuelle Änderungsmarkierung zu ermöglichen. Verbesserungsvorschläge, Gedanken oder Kritik sind willkommen. Das Paket wird auf \emph{gitlab} gehalten, bitte gehen Sie zu -\url{http://edgesoft.de/projects/latex/changes/} +\url{https://edgesoft.de/projects/changes/} für Links zum Quellcodezugang, Fehler- und Featuretracker etc. Wenn Sie mich direkt kontaktieren wollen, mailen Sie bitte an \href{mailto:ekleinod@edgesoft.de}{ekleinod@edgesoft.de}. @@ -35,10 +35,10 @@ Bitte sehen Sie die Beispiele als Inspiration oder erste Fehlerlösungsquelle an %^^A ---- usage \cleardoublepage -\section{Benutzung des \chpackage{changes}-Pakets} +\section{Benutzung des \docpackage{changes}-Pakets} \label{sec:usage} -In diesem Kapitel wird die Nutzung des \chpackage{changes}-Pakets beschrieben. +In diesem Kapitel wird die Nutzung des \docpackage{changes}-Pakets beschrieben. Dabei wird ein typischer Anwendungsfall geschildert. Die ausführliche Beschreibung der Paketoptionen und neuen Befehle finden Sie nicht hier, sondern in \autoref{sec:ui}. @@ -46,13 +46,13 @@ Ausgangslage ist ein Text, an dem Änderungen vorgenommen werden sollen. Diese Änderungen sollen markiert werden, und zwar für jeden Autor einzeln. Eine solche Änderungsmarkierung ist \zB von WYSIWYG-Textprogrammen wie \emph{LibreOffice}, \emph{OpenOffice} oder \emph{Word} bekannt. -Zu diesem Zweck wurde das \chpackage{changes}-Paket entwickelt. +Zu diesem Zweck wurde das \docpackage{changes}-Paket entwickelt. Das Paket stellt Befehle zur Verfügung, um verschiedene Autoren zu definieren und Text als zugefügt, gelöscht oder geändert zu markieren. Zusätzlich kann Text hervorgehoben oder kommentiert werden. Um das Paket zu nutzen, sollten Sie folgende Schritte ausführen: \begin{enumerate} - \item \chpackage{changes}-Paket einbinden + \item \docpackage{changes}-Paket einbinden \item Autoren definieren \item Textänderungen markieren \item Text hervorheben und kommentieren @@ -61,9 +61,9 @@ Um das Paket zu nutzen, sollten Sie folgende Schritte ausführen: \item Markierungen entfernen \end{enumerate} -\minisec{\chpackage{changes}-Paket einbinden} +\minisec{\docpackage{changes}-Paket einbinden} -Um die Änderungsverfolgung zu aktivieren, ist das \chpackage{changes}-Paket wie folgt einzubinden: +Um die Änderungsverfolgung zu aktivieren, ist das \docpackage{changes}-Paket wie folgt einzubinden: \chinline{usepackage_changes} @@ -72,13 +72,13 @@ bzw. \chinline{usepackage_options_changes} Mit den verfügbaren Optionen bestimmen Sie hauptsächlich das Aussehen der Änderungsmarkierungen. -Sie können das Aussehen der Änderungsmarkierungen auch nach Einbinden des \chpackage{changes}-Pakets verändern. +Sie können das Aussehen der Änderungsmarkierungen auch nach Einbinden des \docpackage{changes}-Pakets verändern. Für Details lesen Sie bitte \autoref{sec:ui:options} und \autoref{sec:ui:customizingoutput}. \minisec{Autoren definieren} -Das \chpackage{changes}-Paket stellt einen vordefinierten anonymen Autor zur Verfügung. +Das \docpackage{changes}-Paket stellt einen vordefinierten anonymen Autor zur Verfügung. Wenn Sie jedoch die Änderungen per Autor\_in verfolgen wollen, müssen Sie die entsprechenden Autor\_innen definieren. Dies geht wie folgt: @@ -142,9 +142,9 @@ Dies erfolgt mit dem Kommando: Die Ausgabe ist gedacht als Analogon zur Liste von Tabellen oder Abbildungen. -Die Angabe des Stils ist optional, standardmäßig wird \choption{style=list} gewählt. -Um einen schnellen Überblick über Art und Anzahl der Änderungen abhängig von dem/der Autor\_in zu bekommen, verwenden Sie den Befehl mit der Option \choption{style=summary} oder \choption{style=compactsummary}. -Zeigen Sie nur bestimme Änderungstypen mit der \choption{show}-Option. +Die Angabe des Stils ist optional, standardmäßig wird \docoption{style=list} gewählt. +Um einen schnellen Überblick über Art und Anzahl der Änderungen abhängig von dem/der Autor\_in zu bekommen, verwenden Sie den Befehl mit der Option \docoption{style=summary} oder \docoption{style=compactsummary}. +Zeigen Sie nur bestimme Änderungstypen mit der \docoption{show}-Option. Bei jedem \hologo{LaTeX}-Lauf werden die Daten für diese Liste in eine Hilfsdatei geschrieben. Beim nächsten \hologo{LaTeX}-Lauf werden dann diese Daten genutzt, um die Änderungsliste anzuzeigen. @@ -155,7 +155,7 @@ Für Details lesen Sie bitte \autoref{sec:ui:overview}. \minisec{Markierungen entfernen} Oft ist es der Fall, dass die Änderungen eines Dokuments angenommen oder abgelehnt werden und nach diesem Prozess die Änderungsmarkierungen entfernt werden sollen. -Sie können die Ausgabe der Änderungsmarkierungen per Option beim Einbinden des \chpackage{changes}-Pakets unterdrücken: +Sie können die Ausgabe der Änderungsmarkierungen per Option beim Einbinden des \docpackage{changes}-Pakets unterdrücken: \chinline{usepackage_final_changes} @@ -176,16 +176,18 @@ Für Details lesen Sie bitte \autoref{sec:remove-markup}. \section{Einschränkungen und Erweiterungsmöglichkeiten} \label{sec:limitations} -Das \chpackage{changes}-Paket ist sorgfältig programmiert und getestet worden. +Das \docpackage{changes}-Paket ist sorgfältig programmiert und getestet worden. Dennoch kann es vorkommen, dass Fehler im Paket sind, dass die Benutzung problematisch ist oder dass eine Funktion fehlt, die Sie gerne hätten. -In diesem Fall gehen Sie bitte zu -\url{http://changes.sourceforge.net/} +Eine Übersicht über die wichtigsten mir bekannten Probleme und eventuell vorhandenen Lösungen finden Sie in \autoref{sec:known-problems}. +Bitte sehen Sie dort zunächst nach, ob Ihr Problem schon bekannt ist und es eine Lösung gibt. +Weitere Fehler, Probleme und Lösungen finden Sie auf: -Dort finden Sie Links, wie Fehler oder Verbesserungen gemeldet werden können, wie Tips für andere Nutzerinnen angegeben werden können oder wie Sie bei der Entwicklung des Pakets mithelfen können. +\url{https://edgesoft.de/projects/changes/} -Eine Übersicht über alle mir bekannten Probleme und eventuell vorhandenen Lösungen finden Sie in \autoref{sec:known-problems}. -Bitte sehen Sie dort zunächst nach, ob Ihr Problem schon bekannt ist und es eine Lösung gibt. +or + +\url{https://gitlab.com/ekleinod/changes/-/issues} Sie können mir auch eine Mail schreiben an \href{mailto:ekleinod@edgesoft.de}{ekleinod@edgesoft.de}, in diesem Fall starten Sie bitte Ihr Mail-Subject mit \texttt{[changes]}. @@ -204,14 +206,15 @@ Sie können versuchen, solchen Text in eine eigene Datei auszulagern, und diese Manchmal hilft das, oft ist es einen Versuch wert. Danke an Charly Arenz für diesen Tip. +Wenn Sie Fehler wegen bereits vorhandener Makros bekommen, schauen Sie sich bitte die Option \docoption{commandnameprefix} in \autoref{sec:ui:options:commandnameprefix} an. %^^A ---- user interface \cleardoublepage -\section{Die Benutzerschnittstelle des \chpackage{changes}-Pakets} +\section{Die Benutzerschnittstelle des \docpackage{changes}-Pakets} \label{sec:ui} -In diesem Kapitel wird die Nutzerschnittstelle des \chpackage{changes}-Pakets vorgestellt, \dh alle Optionen und Kommandos. +In diesem Kapitel wird die Nutzerschnittstelle des \docpackage{changes}-Pakets vorgestellt, \dh alle Optionen und Kommandos. Jede Option bzw. jedes neue Kommando werden beschrieben. Wenn Sie die Optionen und Kommandos im Beispiel sehen wollen, sehen Sie bitte in das Beispielverzeichnis unter @@ -237,37 +240,75 @@ Die folgenden Optionen sind definiert: \chinline{usepackage_draft_changes} -Die \choption{draft}-Option bewirkt, dass alle Änderungen markiert werden. -Die Änderungsliste kann durch \chcommand{listofchanges} ausgegeben werden. +Die \docoption{draft}-Option bewirkt, dass alle Änderungen markiert werden. +Die Änderungsliste kann durch \doccommand{listofchanges} ausgegeben werden. Diese Option ist automatisch voreingestellt. -Die Angabe von \choption{draft} in \chcommand{documentclass} wird vom \chpackage{changes}-Paket mitgenutzt. -Die lokale Angabe von \choption{final} überstimmt die Angabe von \choption{draft} in \chcommand{documentclass}. +Die Angabe von \docoption{draft} in \doccommand{documentclass} wird vom \docpackage{changes}-Paket mitgenutzt. +Die lokale Angabe von \docoption{final} überstimmt die Angabe von \docoption{draft} in \doccommand{documentclass}. + \subsubsection{final} \chinline{usepackage_final_changes} -Die \choption{final}-Option bewirkt, dass alle Änderungsmarkierungen ausgeblendet werden und nur noch der korrekte Text ausgegeben wird. +Die \docoption{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 \choption{final} in \chcommand{documentclass} wird vom \chpackage{changes}-Paket mitgenutzt. -Die lokale Angabe von \choption{draft} überstimmt die Angabe von \choption{final} in \chcommand{documentclass}. +Die Angabe von \docoption{final} in \doccommand{documentclass} wird vom \docpackage{changes}-Paket mitgenutzt. +Die lokale Angabe von \docoption{draft} überstimmt die Angabe von \docoption{final} in \doccommand{documentclass}. + + +\subsubsection{commandnameprefix} +\label{sec:ui:options:commandnameprefix} + +\chinline{usepackage_commandnameprefix_changes} + +Die \docoption{commandnameprefix}-Option legt die Präfix-Strategie für die Hervorhebungskommandos fest. +Das ist hilfreich, wenn ein anderes Paket bereits ein Kommando definiert hat, \zB \doccommand{comment} oder \doccommand{highlight}. + +Standardmäßig wird in diesem Fall ein Fehler ausgegeben und kein Präfix vergeben (Option ist nicht oder auf \docoption{none} gesetzt). + +Wenn eine Präfix-Strategie angegeben ist, wird dem betreffenden Kommando ein "`ch"' vorangestellt. +Die Strategie legt fest, welche Kommandos einen Präfix bekommen. + +Diese Option wirkt sich nur auf die Änderungs- und Hervorhebungkommandos aus: + +\begin{itemize} + \item \doccommand{added} \ensuremath{\to} \doccommand{chadded} + \item \doccommand{deleted} \ensuremath{\to} \doccommand{chdeleted} + \item \doccommand{replaced} \ensuremath{\to} \doccommand{chreplaced} + \item \doccommand{highlight} \ensuremath{\to} \doccommand{chhighlight} + \item \doccommand{comment} \ensuremath{\to} \doccommand{chcomment} +\end{itemize} + +Folgende Strategien stehen zur Verfügung: + +\begin{description} + \item [\docoption{none}] kein Präfix, wenn ein Kommando bereits definiert ist, wird eine Fehlermeldung ausgegeben (Standardstrategie) + \item [\docoption{ifneeded}] falls ein Kommando bereits definiert ist, bekommt es ein Präfix und eine Warnung wird ausgegeben. + Je nachdem, welche Kommandos bereits definiert sind, wird das Dokument eine Mischung von Kommandos mit und ohne Präfix enthalten. + Diese Strategie ist vor allem nützlich, wenn nur die Kommandos \doccommand{comment} oder \doccommand{highlight} bereits definiert sind und für die Änderungsmarkierung die normalen Kommandos \doccommand{added}, \doccommand{deleted} und \doccommand{replaced} genutzt werden sollen. + \item [\docoption{always}] alle Kommandos bekommen ein Präfix, eine entsprechende Nachricht wird ins Log geschrieben +\end{description} + +\chexample{usepackage_commandnameprefix_changes} + \subsubsection{markup} \chinline{usepackage_markup_changes} -Die \choption{markup}-Option wählt ein vordefiniertes visuelles Markup für geänderten Text. +Die \docoption{markup}-Option wählt ein vordefiniertes visuelles Markup für geänderten Text. Das default-Markup wird gewählt, wenn die Option nicht gesetzt wird. -Das mit \choption{markup} gewählte Markup kann mit den spezielleren Optionen \choption{addedmarkup}, \choption{deletedmarkup}, \choption{commentmarkup} oder \choption{highlightmarkup} geändert werden. +Das mit \docoption{markup} gewählte Markup kann mit den spezielleren Optionen \docoption{addedmarkup}, \docoption{deletedmarkup}, \docoption{commentmarkup} oder \docoption{highlightmarkup} geändert werden. Die folgenden Werte für \emph{markup} sind definiert: \begin{description} - \item [\choption{default}] default für zugefügten, gelöschten und hervorgehobenen Text sowie Kommentare (default) - \item [\choption{underlined}] zugefügter Text wird unterstrichen, gewellt unterstrichen für Hervorhebungen, default für gelöschten Text sowie Kommentare - \item [\choption{bfit}] fetter zugefügter Text, schräger gelöschter Text, default für hervorgehobenen Text sowie Kommentare - \item [\choption{nocolor}] es werden keine Farben verwendet, zugefügter Text wird unterstrichen, gewellt unterstrichen für Hervorhebungen, default für gelöschten Text sowie Kommentare + \item [\docoption{default}] default für zugefügten, gelöschten und hervorgehobenen Text sowie Kommentare (default) + \item [\docoption{underlined}] zugefügter Text wird unterstrichen, gewellt unterstrichen für Hervorhebungen, default für gelöschten Text sowie Kommentare + \item [\docoption{bfit}] fetter zugefügter Text, schräger gelöschter Text, default für hervorgehobenen Text sowie Kommentare + \item [\docoption{nocolor}] es werden keine Farben verwendet, zugefügter Text wird unterstrichen, gewellt unterstrichen für Hervorhebungen, default für gelöschten Text sowie Kommentare \end{description} \chexample{usepackage_markup_changes} @@ -280,22 +321,22 @@ Wenn von farbigem zu nichtfarbigem Markup oder umgekehrt gewechselt wird und ein \chinline{usepackage_addedmarkup_changes} -Die \choption{addedmarkup}-Option wählt ein vordefiniertes visuelles Markup für zugefügten Text. +Die \docoption{addedmarkup}-Option wählt ein vordefiniertes visuelles Markup für zugefügten Text. Das default-Markup wird gewählt, wenn die Option nicht gesetzt wird. -Die Option \choption{addedmarkup} überschreibt das mit \choption{markup} gewählte Markup. +Die Option \docoption{addedmarkup} überschreibt das mit \docoption{markup} gewählte Markup. Die folgenden Werte für \emph{addedmarkup} sind definiert: \begin{description} - \item [\choption{colored}] kein Textmarkup, nur farbige Kennzeichnung -- {\color{orange} Beispiel} (default) - \item [\choption{uline}] unterstrichener Text -- \uline{Beispiel} - \item [\choption{uuline}] doppelt unterstrichener Text -- \uuline{Beispiel} - \item [\choption{uwave}] gewellt unterstrichener Text -- \uwave{Beispiel} - \item [\choption{dashuline}] gestrichelt unterstrichener Text -- \dashuline{Beispiel} - \item [\choption{dotuline}] gepunktet unterstrichener Text -- \dotuline{Beispiel} - \item [\choption{bf}] fetter Text -- \textbf{Beispiel} - \item [\choption{it}] italic Text -- \textit{Beispiel} - \item [\choption{sl}] schräger Text -- \textsl{Beispiel} - \item [\choption{em}] hervorgehobener Text -- \emph{Beispiel} + \item [\docoption{colored}] kein Textmarkup, nur farbige Kennzeichnung -- {\color{orange} Beispiel} (default) + \item [\docoption{uline}] unterstrichener Text -- \uline{Beispiel} + \item [\docoption{uuline}] doppelt unterstrichener Text -- \uuline{Beispiel} + \item [\docoption{uwave}] gewellt unterstrichener Text -- \uwave{Beispiel} + \item [\docoption{dashuline}] gestrichelt unterstrichener Text -- \dashuline{Beispiel} + \item [\docoption{dotuline}] gepunktet unterstrichener Text -- \dotuline{Beispiel} + \item [\docoption{bf}] fetter Text -- \textbf{Beispiel} + \item [\docoption{it}] italic Text -- \textit{Beispiel} + \item [\docoption{sl}] schräger Text -- \textsl{Beispiel} + \item [\docoption{em}] hervorgehobener Text -- \emph{Beispiel} \end{description} Die Ausgabe ersetzten Texts ist ein Kombination von zugefügtem und gelöschten Text, daher beeinflusst deren Layoutänderung auch das Layout ersetzen Texts. @@ -308,26 +349,26 @@ Die Ausgabe ersetzten Texts ist ein Kombination von zugefügtem und gelöschten \chinline{usepackage_deletedmarkup_changes} -Die \choption{addedmarkup}-Option wählt ein vordefiniertes visuelles Markup für zugefügten Text. -Die \choption{deletedmarkup}-Option wählt analog ein vordefiniertes visuelles Markup für gelöschten Text. +Die \docoption{addedmarkup}-Option wählt ein vordefiniertes visuelles Markup für zugefügten Text. +Die \docoption{deletedmarkup}-Option wählt analog ein vordefiniertes visuelles Markup für gelöschten Text. Das default-Markup wird gewählt, wenn die Option nicht gesetzt wird. -Die Optionen \choption{addedmarkup} und \choption{deletedmarkup} überschreiben das mit \choption{markup} gewählte Markup. +Die Optionen \docoption{addedmarkup} und \docoption{deletedmarkup} überschreiben das mit \docoption{markup} gewählte Markup. Die folgenden Werte für \emph{addedmarkup} sind definiert: \begin{description} - \item [\choption{sout}] durchgestrichener Text -- \sout{Beispiel} (default) - \item [\choption{xout}] schräg durchgestrichener Text -- \xout{Beispiel} - \item [\choption{colored}] kein Textmarkup, nur farbige Kennzeichnung -- {\color{orange} Beispiel} - \item [\choption{uline}] unterstrichener Text -- \uline{Beispiel} - \item [\choption{uuline}] doppelt unterstrichener Text -- \uuline{Beispiel} - \item [\choption{uwave}] gewellt unterstrichener Text -- \uwave{Beispiel} - \item [\choption{dashuline}] gestrichelt unterstrichener Text -- \dashuline{Beispiel} - \item [\choption{dotuline}] gepunktet unterstrichener Text -- \dotuline{Beispiel} - \item [\choption{bf}] fetter Text -- \textbf{Beispiel} - \item [\choption{it}] italic Text -- \textit{Beispiel} - \item [\choption{sl}] schräger Text -- \textsl{Beispiel} - \item [\choption{em}] hervorgehobener Text -- \emph{Beispiel} + \item [\docoption{sout}] durchgestrichener Text -- \sout{Beispiel} (default) + \item [\docoption{xout}] schräg durchgestrichener Text -- \xout{Beispiel} + \item [\docoption{colored}] kein Textmarkup, nur farbige Kennzeichnung -- {\color{orange} Beispiel} + \item [\docoption{uline}] unterstrichener Text -- \uline{Beispiel} + \item [\docoption{uuline}] doppelt unterstrichener Text -- \uuline{Beispiel} + \item [\docoption{uwave}] gewellt unterstrichener Text -- \uwave{Beispiel} + \item [\docoption{dashuline}] gestrichelt unterstrichener Text -- \dashuline{Beispiel} + \item [\docoption{dotuline}] gepunktet unterstrichener Text -- \dotuline{Beispiel} + \item [\docoption{bf}] fetter Text -- \textbf{Beispiel} + \item [\docoption{it}] italic Text -- \textit{Beispiel} + \item [\docoption{sl}] schräger Text -- \textsl{Beispiel} + \item [\docoption{em}] hervorgehobener Text -- \emph{Beispiel} \end{description} Die Ausgabe ersetzten Texts ist ein Kombination von zugefügtem und gelöschten Text, daher beeinflusst deren Layoutänderung auch das Layout ersetzen Texts. @@ -339,16 +380,16 @@ Die Ausgabe ersetzten Texts ist ein Kombination von zugefügtem und gelöschten \chinline{usepackage_highlightmarkup_changes} -Die \choption{highlightmarkup}-Option wählt ein vordefiniertes visuelles Markup für hervorgehobenen Text. +Die \docoption{highlightmarkup}-Option wählt ein vordefiniertes visuelles Markup für hervorgehobenen Text. Das default-Markup wird gewählt, wenn die Option nicht gesetzt wird. -Die Option \choption{highlightmarkup} überschreibt das mit \choption{markup} gewählte Markup. +Die Option \docoption{highlightmarkup} überschreibt das mit \docoption{markup} gewählte Markup. Die folgenden Werte für \emph{highlightmarkup} sind definiert: \begin{description} - \item [\choption{background}] Hervorhebung durch Hintergrundfarbe -- \colorbox{orange!30}{Beispiel} (default) - \item [\choption{uuline}] doppelt unterstrichener Text -- \uuline{Beispiel} - \item [\choption{uwave}] gewellt unterstrichener Text -- \uwave{Beispiel} + \item [\docoption{background}] Hervorhebung durch Hintergrundfarbe -- \colorbox{orange!30}{Beispiel} (default) + \item [\docoption{uuline}] doppelt unterstrichener Text -- \uuline{Beispiel} + \item [\docoption{uwave}] gewellt unterstrichener Text -- \uwave{Beispiel} \end{description} \chexample{usepackage_highlightmarkup_changes} @@ -358,17 +399,17 @@ Die folgenden Werte für \emph{highlightmarkup} sind definiert: \chinline{usepackage_commentmarkup_changes} -Die \choption{commentmarkup}-Option wählt ein vordefiniertes visuelles Markup für Kommentare. +Die \docoption{commentmarkup}-Option wählt ein vordefiniertes visuelles Markup für Kommentare. Das default-Markup wird gewählt, wenn die Option nicht gesetzt wird. -Die Option \choption{commentmarkup} überschreibt das mit \choption{markup} gewählte Markup. +Die Option \docoption{commentmarkup} überschreibt das mit \docoption{markup} gewählte Markup. Die folgenden Werte für \emph{commentmarkup} sind definiert: \begin{description} - \item [\choption{todo}] Kommentar als ToDo-Notiz, die nicht in der Liste der ToDos erscheint\todo{Beispielkommentar} (default) - \item [\choption{margin}] Kommentar im Seitenrand\marginpar{Beispielkommentar} - \item [\choption{footnote}] Kommentar als Fußnote\footnote{Beispielkommentar} - \item [\choption{uwave}] gewellt unterstrichener Text -- \uwave{Beispielkommentar} + \item [\docoption{todo}] Kommentar als ToDo-Notiz, die nicht in der Liste der ToDos erscheint\todo{Beispielkommentar} (default) + \item [\docoption{margin}] Kommentar im Seitenrand\marginpar{Beispielkommentar} + \item [\docoption{footnote}] Kommentar als Fußnote\footnote{Beispielkommentar} + \item [\docoption{uwave}] gewellt unterstrichener Text -- \uwave{Beispielkommentar} \end{description} \chexample{usepackage_commentmarkup_changes} @@ -378,17 +419,17 @@ Die folgenden Werte für \emph{commentmarkup} sind definiert: \chinline{usepackage_authormarkup_changes} -Die \choption{authormarkup}-Option wählt ein vordefiniertes visuelles Markup für die Autor-Identifizierung. +Die \docoption{authormarkup}-Option wählt ein vordefiniertes visuelles Markup für die Autor-Identifizierung. Das default-Markup wird gewählt, wenn die Option nicht gesetzt wird. Die folgenden Werte für \emph{authormarkup} sind definiert: \begin{description} - \item [\choption{superscript}] hochgestellter Text -- Text\textsuperscript{Autor} (default) - \item [\choption{subscript}] tiefgestellter Text -- Text\textsubscript{Autor} - \item [\choption{brackets}] Text in Klammern -- Text(Autor) - \item [\choption{footnote}] Text in einer Fußnote -- Text\footnote{Autor} - \item [\choption{none}] keine Autor-Identifizierung + \item [\docoption{superscript}] hochgestellter Text -- Text\textsuperscript{Autor} (default) + \item [\docoption{subscript}] tiefgestellter Text -- Text\textsubscript{Autor} + \item [\docoption{brackets}] Text in Klammern -- Text(Autor) + \item [\docoption{footnote}] Text in einer Fußnote -- Text\footnote{Autor} + \item [\docoption{none}] keine Autor-Identifizierung \end{description} \chexample{usepackage_authormarkup_changes} @@ -398,14 +439,14 @@ Die folgenden Werte für \emph{authormarkup} sind definiert: \chinline{usepackage_authormarkupposition_changes} -Die \choption{authormarkupposition}-Option gibt an, wo die Autor-Identifizierung gesetzt wird. +Die \docoption{authormarkupposition}-Option gibt an, wo die Autor-Identifizierung gesetzt wird. Der default-Wert wird gewählt, wenn die Option nicht gesetzt wird. Die folgenden Werte für \emph{authormarkupposition} sind definiert: \begin{description} - \item [\choption{right}] rechts vom Text -- Text\textsuperscript{Autor} (default) - \item [\choption{left}] links vom Text -- \textsuperscript{Autor}Text + \item [\docoption{right}] rechts vom Text -- Text\textsuperscript{Autor} (default) + \item [\docoption{left}] links vom Text -- \textsuperscript{Autor}Text \end{description} \chexample{usepackage_authormarkupposition_changes} @@ -415,24 +456,36 @@ Die folgenden Werte für \emph{authormarkupposition} sind definiert: \chinline{usepackage_authormarkuptext_changes} -Die \choption{authormarkuptext}-Option gibt an, was für die Autor-Identifizierung genutzt wird. +Die \docoption{authormarkuptext}-Option gibt an, was für die Autor-Identifizierung genutzt wird. Der default-Wert wird gewählt, wenn die Option nicht gesetzt wird. Die folgenden Werte für \emph{authormarkuptext} sind definiert: \begin{description} - \item [\choption{id}] Autoren-ID -- Text\textsuperscript{ID} (default) - \item [\choption{name}] Autorenname -- Text\textsuperscript{Autorenname} + \item [\docoption{id}] Autoren-ID -- Text\textsuperscript{ID} (default) + \item [\docoption{name}] Autorenname -- Text\textsuperscript{Autorenname} \end{description} \chexample{usepackage_authormarkuptext_changes} +\subsubsection{defaultcolor} + +\chinline{usepackage_defaultcolor_changes} + +Die \docoption{defaultcolor}-Option legt die Standardfarbe für Autoren, insbesondere den anonymen Autor fest. +Sie können die Farben des \docpackage{xcolor}-Pakets benutzen. + +Die Standardfarbe ist blau (\emph{blue}). + +\chexample{usepackage_defaultcolor_changes} + + \subsubsection{todonotes} \chinline{usepackage_todonotes_changes} -Optionen für das \chpackage{todonotes}-Paket können als Parameter der \choption{todonotes}-Option angegeben werden. +Optionen für das \docpackage{todonotes}-Paket können als Parameter der \docoption{todonotes}-Option angegeben werden. Mehrere Optionen oder Angaben mit Sonderzeichen müssen in geschweifte Klammern gesetzt werden. \chexample{usepackage_todonotes_changes} @@ -443,7 +496,7 @@ Mehrere Optionen oder Angaben mit Sonderzeichen müssen in geschweifte Klammern \chinline{usepackage_truncate_changes} -Optionen für das \chpackage{truncate}-Paket können als Parameter der \choption{truncate}-Option angegeben werden. +Optionen für das \docpackage{truncate}-Paket können als Parameter der \docoption{truncate}-Option angegeben werden. Mehrere Optionen oder Angaben mit Sonderzeichen müssen in geschweifte Klammern gesetzt werden. \chexample{usepackage_truncate_changes} @@ -454,7 +507,7 @@ Mehrere Optionen oder Angaben mit Sonderzeichen müssen in geschweifte Klammern \chinline{usepackage_ulem_changes} -Optionen für das \chpackage{ulem}-Paket können als Parameter der \choption{ulem}-Option angegeben werden. +Optionen für das \docpackage{ulem}-Paket können als Parameter der \docoption{ulem}-Option angegeben werden. Mehrere Optionen oder Angaben mit Sonderzeichen müssen in geschweifte Klammern gesetzt werden. \chexample{usepackage_ulem_changes} @@ -465,7 +518,7 @@ Mehrere Optionen oder Angaben mit Sonderzeichen müssen in geschweifte Klammern \chinline{usepackage_xcolor_changes} -Optionen für das \chpackage{xcolor}-Paket können als Parameter der \choption{xcolor}-Option angegeben werden. +Optionen für das \docpackage{xcolor}-Paket können als Parameter der \docoption{xcolor}-Option angegeben werden. Mehrere Optionen oder Angaben mit Sonderzeichen müssen in geschweifte Klammern gesetzt werden. \chexample{usepackage_xcolor_changes} @@ -482,11 +535,11 @@ Mehrere Optionen oder Angaben mit Sonderzeichen müssen in geschweifte Klammern \chinline{added} -Der Befehl \chcommand{added} markiert zugefügten Text. +Der Befehl \doccommand{added} markiert zugefügten Text. Der neue Text wird in geschweiften Klammern übergeben. Das optionale Argument enthält Key-Value-Paare für die Angabe von Autor-ID sowie eines Kommentars. -Die Autor-ID muss mit einer mit dem \chcommand{definechangesauthor}-Befehl definierten ID übereinstimmen. +Die Autor-ID muss mit einer mit dem \doccommand{definechangesauthor}-Befehl definierten ID übereinstimmen. Enthält der Kommentar Sonderzeichen oder Leerzeichen, ist er in geschweifte Klammern einzuschließen. Wenn ein Kommentar angegeben wurde, wird das direkte Autormarkup am geänderten Text unterdrückt, da es im Kommentar erscheint. @@ -499,10 +552,10 @@ Wenn ein Kommentar angegeben wurde, wird das direkte Autormarkup am geänderten \chinline{deleted} -Der Befehl \chcommand{deleted} markiert gelöschten Text. +Der Befehl \doccommand{deleted} markiert gelöschten Text. Der gelöschte Text wird in geschweiften Klammern übergeben. -Optionale Argumente: siehe \chcommand{added} (\autoref{sec:ui:cmd:added}). +Optionale Argumente: siehe \doccommand{added} (\autoref{sec:ui:cmd:added}). \chexample{deleted} \chresult{deleted} @@ -512,10 +565,10 @@ Optionale Argumente: siehe \chcommand{added} (\autoref{sec:ui:cmd:added}). \chinline{replaced} -Der Befehl \chcommand{replaced} markiert geänderten Text. +Der Befehl \doccommand{replaced} markiert geänderten Text. Der neue sowie der alte Text werden in dieser Reihenfolge jeweils in geschweiften Klammern übergeben. -Optionale Argumente: siehe \chcommand{added} (\autoref{sec:ui:cmd:added}). +Optionale Argumente: siehe \doccommand{added} (\autoref{sec:ui:cmd:added}). Die Ausgabe ersetzten Texts ist ein Kombination von zugefügtem und gelöschten Text, daher beeinflusst deren Layoutänderung auch das Layout ersetzen Texts. @@ -534,10 +587,10 @@ Die Ausgabe ersetzten Texts ist ein Kombination von zugefügtem und gelöschten \chinline{highlight} -Der Befehl \chcommand{highlight} markiert hervorgehobenen Text. +Der Befehl \doccommand{highlight} markiert hervorgehobenen Text. Der hervorzuhebende Text wird in geschweiften Klammern übergeben. -Optionale Argumente: siehe \chcommand{added} (\autoref{sec:ui:cmd:added}). +Optionale Argumente: siehe \doccommand{added} (\autoref{sec:ui:cmd:added}). \chexample{highlight} \chresult{highlight} @@ -547,11 +600,11 @@ Optionale Argumente: siehe \chcommand{added} (\autoref{sec:ui:cmd:added}). \chinline{comment} -Der Befehl \chcommand{comment} fügt dem Dokument einen Kommentar hinzu. +Der Befehl \doccommand{comment} fügt dem Dokument einen Kommentar hinzu. Der Kommentar wird als in geschweiften Klammern übergeben. Der Befehl besitzt nur ein optionales Argument: ein Key-Value-Paar für die Angabe der Autor-ID. -Die Autor-ID muss mit einer mit dem \chcommand{definechangesauthor}-Befehl definierten ID übereinstimmen. +Die Autor-ID muss mit einer mit dem \doccommand{definechangesauthor}-Befehl definierten ID übereinstimmen. Die Kommentare werden durchnumeriert, die Nummer erscheint im Kommentar. @@ -572,46 +625,46 @@ Die Kommentare werden durchnumeriert, die Nummer erscheint im Kommentar. \chinline{listofchanges} -Der Befehl \chcommand{listofchanges} gibt eine Liste oder Zusammenfassung der Änderungen aus. +Der Befehl \doccommand{listofchanges} gibt eine Liste oder Zusammenfassung der Änderungen aus. Im ersten \hologo{LaTeX}-Lauf wird eine Hilfsdatei angelegt, deren Daten im zweiten Durchlauf eingebunden werden. Für eine aktuelle Liste der Änderungen sind daher zwei \hologo{LaTeX}-Läufe notwendig. Es können drei optionale Argumente angegeben werden: \begin{description} - \item[\choption{style}] Listenstil - \item[\choption{title}] individueller Titel - \item[\choption{show}] Änderungstypen + \item[\docoption{style}] Listenstil + \item[\docoption{title}] individueller Titel + \item[\docoption{show}] Änderungstypen \end{description} \paragraph{style} -Über das Argument \choption{style} können verschiedene Listenstile für die Anzeige ausgewählt werden. +Über das Argument \docoption{style} können verschiedene Listenstile für die Anzeige ausgewählt werden. Es sind folgende drei Stile definiert: \begin{description} - \item[\choption{list}] gibt die Änderungsliste wie ein Inhaltsverzeichnis aus (default) - \item[\choption{summary}] gibt die Anzahl der Änderungen gruppiert nach Autor aus - \item[\choption{compactsummary}] wie \choption{summary}, jedoch werden Änderungen mit Anzahl 0 nicht ausgegeben + \item[\docoption{list}] gibt die Änderungsliste wie ein Inhaltsverzeichnis aus (default) + \item[\docoption{summary}] gibt die Anzahl der Änderungen gruppiert nach Autor aus + \item[\docoption{compactsummary}] wie \docoption{summary}, jedoch werden Änderungen mit Anzahl 0 nicht ausgegeben \end{description} \paragraph{title} -Mit dem Argument \choption{title} kann ein eigener Titel für die Änderungsliste angegeben werden. +Mit dem Argument \docoption{title} kann ein eigener Titel für die Änderungsliste angegeben werden. Wenn Sie Sonderzeichen oder Leerzeichen im Titel benutzen wollen, klammern Sie den Titel geschweift ein. \paragraph{show} -Das Argument \choption{show} gibt an, welche Änderungstypen in der Änderungsliste ausgegeben werden. +Das Argument \docoption{show} gibt an, welche Änderungstypen in der Änderungsliste ausgegeben werden. Sie können die Typen mit Hilfe des Zeichens \texttt{|} kombinieren. Wenn Sie \zB alle neuen Texte und alle Löschungen anzeigen wollen, geben Sie \texttt{show=added|deleted} an. Die folgenden Werte sind definiert: \begin{description} - \item[\choption{all}] alle Typen (default) - \item[\choption{added}] nur neue Texte - \item[\choption{deleted}] nur Löschungen - \item[\choption{replaced}] nur Ersetzungen - \item[\choption{highlight}] nur Hervorhebungen - \item[\choption{comment}] nur Kommentare + \item[\docoption{all}] alle Typen (default) + \item[\docoption{added}] nur neue Texte + \item[\docoption{deleted}] nur Löschungen + \item[\docoption{replaced}] nur Ersetzungen + \item[\docoption{highlight}] nur Hervorhebungen + \item[\docoption{comment}] nur Kommentare \end{description} \chexample{listofchanges} @@ -627,7 +680,7 @@ Die folgenden Werte sind definiert: \chinline{definechangesauthor} -Der Befehl \chcommand{definechangesauthor} definiert einen neuen Autor/eine neue Autorin für Änderungen. +Der Befehl \doccommand{definechangesauthor} definiert einen neuen Autor/eine neue Autorin für Änderungen. Es muss eine eindeutige Autor-ID angegeben werden, die keine Sonder- oder Leerzeichen enthalten darf. Optional kann eine Farbe und ein Name angegeben werden. @@ -650,8 +703,8 @@ Das Paket definiert einen anonymen Autor vor, der ohne ID genutzt werden kann. \chinline{setaddedmarkup} -Der Befehl \chcommand{setaddedmarkup} legt fest, wie neuer Text ausgezeichnet wird. -Ohne andere Definition gilt, dass der Text farbig oder je nach Option \choption{markup} bzw.\ \choption{addedmarkup} erscheint. +Der Befehl \doccommand{setaddedmarkup} legt fest, wie neuer Text ausgezeichnet wird. +Ohne andere Definition gilt, dass der Text farbig oder je nach Option \docoption{markup} bzw.\ \docoption{addedmarkup} erscheint. Werte für die Definition: @@ -667,8 +720,8 @@ Werte für die Definition: \chinline{setdeletedmarkup} -Der Befehl \chcommand{setdeletedmarkup} legt fest, wie gelöschter Text ausgezeichnet wird. -Ohne andere Definition gilt, dass der Text durchgestrichen wird oder je nach Option \choption{markup} bzw.\ \choption{deletedmarkup} erscheint. +Der Befehl \doccommand{setdeletedmarkup} legt fest, wie gelöschter Text ausgezeichnet wird. +Ohne andere Definition gilt, dass der Text durchgestrichen wird oder je nach Option \docoption{markup} bzw.\ \docoption{deletedmarkup} erscheint. Werte für die Definition: @@ -686,15 +739,15 @@ Die Ausgabe ersetzten Texts ist ein Kombination von zugefügtem und gelöschten \chinline{sethighlightmarkup} -Der Befehl \chcommand{sethighlightmarkup} legt fest, wie hervorgehobene Texte gesetzt werden. -Ohne andere Definition gilt, dass die Hervorhebung über die Hintergrundfarbe erfolgt oder je nach Option \choption{markup} bzw.\ \choption{commentmarkup} erscheint. +Der Befehl \doccommand{sethighlightmarkup} legt fest, wie hervorgehobene Texte gesetzt werden. +Ohne andere Definition gilt, dass die Hervorhebung über die Hintergrundfarbe erfolgt oder je nach Option \docoption{markup} bzw.\ \docoption{commentmarkup} erscheint. Werte für die Definition: \begin{itemize} \item beliebige \hologo{LaTeX}-Befehle \item hervorgehobener Text wird mit "`\#1"' genutzt - \item \chpackage{ifthenelse} boolscher Test auf farbigen Text mit ``\chcommand{isColored}'' + \item \docpackage{ifthenelse} boolscher Test auf farbigen Text mit ``\doccommand{isColored}'' \item Autorenfarbe wird mit ``authorcolor'' genutzt \end{itemize} @@ -705,8 +758,8 @@ Werte für die Definition: \chinline{setcommentmarkup} -Der Befehl \chcommand{setcommentmarkup} legt fest, wie Kommentare gesetzt werden. -Ohne andere Definition gilt, dass Kommentare im Rand oder je nach Option \choption{markup} bzw.\ \choption{commentmarkup} erscheint. +Der Befehl \doccommand{setcommentmarkup} legt fest, wie Kommentare gesetzt werden. +Ohne andere Definition gilt, dass Kommentare im Rand oder je nach Option \docoption{markup} bzw.\ \docoption{commentmarkup} erscheint. Werte für die Definition: @@ -715,8 +768,8 @@ Werte für die Definition: \item Kommentar wird mit "`\#1"' genutzt \item Autor-ID wird mit ``\#2'' genutzt \item Autor-Ausgabe (ID oder Name) wird mit ``\#3'' genutzt - \item \chpackage{ifthenelse} boolscher Test auf anonymen Autor Text mit ``\chcommand{isAnonymous}'' - \item \chpackage{ifthenelse} boolscher Test auf farbigen Text mit ``\chcommand{isColored}'' + \item \docpackage{ifthenelse} boolscher Test auf anonymen Autor Text mit ``\doccommand{isAnonymous}'' + \item \docpackage{ifthenelse} boolscher Test auf farbigen Text mit ``\doccommand{isColored}'' \item Autorenfarbe wird mit ``authorcolor'' genutzt \item Kommentaranzahl wird mit ``authorcommentcount'' genutzt \end{itemize} @@ -728,7 +781,7 @@ Werte für die Definition: \chinline{setauthormarkup} -Der Befehl \chcommand{setauthormarkup} legt fest, wie der Autortext im Text angezeigt wird. +Der Befehl \doccommand{setauthormarkup} legt fest, wie der Autortext im Text angezeigt wird. Ohne andere Definition gilt, dass der Autor hochgestellt erscheint. Werte für die Definition: @@ -745,14 +798,14 @@ Werte für die Definition: \chinline{setauthormarkupposition} -Der Befehl \chcommand{setauthormarkupposition} legt fest, auf welcher Seite der Autor im Text angezeigt wird. +Der Befehl \doccommand{setauthormarkupposition} legt fest, auf welcher Seite der Autor im Text angezeigt wird. Ohne andere Definition gilt, dass der Autor rechts von den Änderungen erscheint. Die folgenden Werte für \emph{authormarkupposition} sind definiert: \begin{description} - \item [\choption{right}] rechts vom Text -- Text\textsuperscript{Autor} (default) - \item [\choption{left}] links vom Text -- \textsuperscript{Autor}Text + \item [\docoption{right}] rechts vom Text -- Text\textsuperscript{Autor} (default) + \item [\docoption{left}] links vom Text -- \textsuperscript{Autor}Text \end{description} \chexample{setauthormarkupposition} @@ -762,14 +815,14 @@ Die folgenden Werte für \emph{authormarkupposition} sind definiert: \chinline{setauthormarkuptext} -Der Befehl \chcommand{setauthormarkuptext} legt fest, welche Information des Autors im Text angezeigt wird. +Der Befehl \doccommand{setauthormarkuptext} legt fest, welche Information des Autors im Text angezeigt wird. Ohne andere Definition gilt, dass die Autor-ID genutzt wird. Die folgenden Werte für \emph{authormarkuptext} sind definiert: \begin{description} - \item [\choption{id}] Autoren-ID -- Text\textsuperscript{ID} (default) - \item [\choption{name}] Autorenname -- Text\textsuperscript{Autorenname} + \item [\docoption{id}] Autoren-ID -- Text\textsuperscript{ID} (default) + \item [\docoption{name}] Autorenname -- Text\textsuperscript{Autorenname} \end{description} \chexample{setauthormarkuptext} @@ -780,8 +833,8 @@ Die folgenden Werte für \emph{authormarkuptext} sind definiert: \chinline{settruncatewidth} -Der Befehl \chcommand{settruncatewidth} legt die Breite der Textkürzung in der Änderungsliste fest. -Die Standardbreite ist \texttt{0.6}\chcommand{textwidth}. +Der Befehl \doccommand{settruncatewidth} legt die Breite der Textkürzung in der Änderungsliste fest. +Die Standardbreite ist \texttt{0.6}\doccommand{textwidth}. \chexample{settruncatewidth} @@ -791,8 +844,8 @@ Die Standardbreite ist \texttt{0.6}\chcommand{textwidth}. \chinline{setsummarywidth} -Der Befehl \chcommand{setsummarywidth} legt die Breite der Änderungsliste mit Stil \choption{summary} bzw.\ \choption{compactsummary} fest. -Die Standardbreite ist \texttt{0.3}\chcommand{textwidth}. +Der Befehl \doccommand{setsummarywidth} legt die Breite der Änderungsliste mit Stil \docoption{summary} bzw.\ \docoption{compactsummary} fest. +Die Standardbreite ist \texttt{0.3}\doccommand{textwidth}. \chexample{setsummarywidth} @@ -802,17 +855,34 @@ Die Standardbreite ist \texttt{0.3}\chcommand{textwidth}. \chinline{setsummarytowidth} -Der Befehl \chcommand{setsummarytowidth} legt die Breite der Änderungsliste mit Stil \choption{summary} bzw.\ \choption{compactsummary} anhand der Breite des übergebenen Texts fest. +Der Befehl \doccommand{setsummarytowidth} legt die Breite der Änderungsliste mit Stil \docoption{summary} bzw.\ \docoption{compactsummary} anhand der Breite des übergebenen Texts fest. \chexample{setsummarytowidth} +\chnewcmd{setlocextension} + +\chinline{setlocextension} + +Der Befehl \doccommand{setlocextension} legt die Dateierweiterung der Hilfsdatei für die Liste der Änderungen (loc-Datei\footnote{% + "`loc"' steht dabei für "`list of changes"'. +}) fest. +Ohne andere Definition gilt das Suffix "`\texttt{loc}"'. + +Im angegebenen Beispiel würde für "`\texttt{foo.tex}"' eine Hilfsdatei erzeugt werden, die "`\texttt{foo.listofchanges}"' bzw.\ "`\texttt{foo.lochg}"' statt des Standardnamens "`\texttt{foo.loc}"' hieße. + +\chexample{setlocextension} + +\chimportant{Nutzen Sie keine Standard-\hologo{LaTeX}-Dateierweiterungen wie "`toc"' oder "`lof"', da das den normalen \hologo{LaTeX}-Lauf stören würde.} + + + \chnewcmd{setsocextension} \chinline{setsocextension} -Der Befehl \chcommand{setsocextension} legt die Dateierweiterung der Hilfsdatei für die Änderungszusammenfassung (soc-Datei\footnote{% +Der Befehl \doccommand{setsocextension} legt die Dateierweiterung der Hilfsdatei für die Änderungszusammenfassung (soc-Datei\footnote{% "`soc"' steht dabei für "`summary of changes"'. }) fest. Ohne andere Definition gilt das Suffix "`\texttt{soc}"'. @@ -821,28 +891,28 @@ Im angegebenen Beispiel würde für "`\texttt{foo.tex}"' eine Hilfsdatei erzeugt \chexample{setsocextension} -\chimportant{Nutzen Sie keine Standard-\hologo{LaTeX}-Dateierweiterungen wie "`toc"' oder "`loc"', da das den normalen \hologo{LaTeX}-Lauf stören würde.} +\chimportant{Nutzen Sie keine Standard-\hologo{LaTeX}-Dateierweiterungen wie "`toc"' oder "`lof"', da das den normalen \hologo{LaTeX}-Lauf stören würde.} %^^A ---- packages \subsection{Benötigte Pakete} \label{sec:ui:packages} -Das \chpackage{changes}-Paket bindet bereits Pakete ein, die für die Funktion des Pakets notwendig sind. +Das \docpackage{changes}-Paket bindet bereits Pakete ein, die für die Funktion des Pakets notwendig sind. Eine genauere Beschreibung der einzelnen Pakete ist in der Dokumentation der Pakete selbst zu finden. -Die folgenden Pakete sind zwingend notwendig und müssen für die Nutzung des \chpackage{changes}-Pakets installiert sein: +Die folgenden Pakete sind zwingend notwendig und müssen für die Nutzung des \docpackage{changes}-Pakets installiert sein: \begin{description} - \item [xifthen] stellt eine verbesserte \texttt{if}-Abfrage sowie eine \texttt{while}-Schleife zur Verfügung + \item [etoolbox] stellt verbesserte \doccommand{if}-Abfragen, \emph{bools} oder Listenoperationen zur Verfügung + \item [truncate] Kürzung von Texten (für die Änderungsliste) \item [xkeyval] Eingabe von Optionen mit Werteübergabe \item [xstring] verbesserte Stringoperationen \end{description} Die folgenden Pakete sind manchmal notwendig und müssen installiert sein, wenn sie über die entsprechende Option genutzt werden: \begin{description} - \item [pdfcolmk] wird geladen, wenn farbiger Text genutzt wird (default Markup); löst das Problem farbigen Texts über Seitenumbrüche hinweg (bei pdflatex) \item [todonotes] wird geladen, wenn Kommentare als ToDo-Notizen gesetzt werden (default Markup) - \item [ulem] wird geladen, wenn Text durchgestrichen oder ausge-x-t wird (default Markup) + \item [ulem] wird geladen, wenn Text durchgestrichen, gewellt markiert oder ausge-x-t wird (default Markup) \item [xcolor] wird geladen, wenn farbiger Text genutzt wird (default Markup) \end{description} @@ -912,18 +982,18 @@ Danke an Charly Arenz für diesen Tip. Fußnoten oder Randnotizen werden in bestimmten Umgebungen, \zB Tabellen oder der \emph{tabbing}-Umgebung, nicht korrekt gesetzt. Vermeiden Sie das Markup, wenn Sie diese Umgebungen benutzen. -\subsection{Das \chpackage{ulem}-Paket} +\subsection{Das \docpackage{ulem}-Paket} -Ich verwende standardmäßig das \chpackage{ulem}-Paket für das Durchstreichen von Text. +Ich verwende standardmäßig das \docpackage{ulem}-Paket für das Durchstreichen von Text. Das führt bei manchen Befehlen und Umgebungen zu Problemen, \zB \begin{itemize} \item im Mathemodus - \item bei Verwendung des \chpackage{siunitx}-Pakets - \item bei Nutzung der \chcommand{citet}- oder \chcommand{citep}-Befehle + \item bei Verwendung des \docpackage{siunitx}-Pakets + \item bei Nutzung der \doccommand{citet}- oder \doccommand{citep}-Befehle \end{itemize} -In dem Fall gibt es wenig gute Möglichkeiten, am besten ist es, das Markup für Löschungen selbst zu definieren und das \chpackage{ulem}-Paket zu vermeiden. +In dem Fall gibt es wenig gute Möglichkeiten, am besten ist es, das Markup für Löschungen selbst zu definieren und das \docpackage{ulem}-Paket zu vermeiden. Siehe \begin{itemize} @@ -931,12 +1001,24 @@ Siehe \item \autoref{sec:ui:cmd:setdeletedmarkup} \end{itemize} + +\subsection{Kommando bereits definiert -- command already defined} + +Einige Pakete benutzen für ihre Kommandos dieselben Namen wie das \docpackage{changes}-Paket, insbesondere \doccommand{comment} und \doccommand{highlight} sind keine originell benannten Kommandos. + +In diesem Fall kann \docpackage{changes} seinen Kommandos ein Präfix voranstellen, um Namenskollisionen zu vermeiden. +Das wird über die Option \docoption{commandnameprefix} gesteuert, die in \autoref{sec:ui:options:commandnameprefix} beschrieben ist. + +Damit das funktioniert, muss das \docpackage{changes}-Paket nach dem Paket geladen werden, das das Kommando auch benutzt. + + + %^^A ---- Authors \cleardoublepage \section{Autorinnen und Autoren} \label{sec:authors} -Am \chpackage{changes}-Paket haben mehrere Autorinnen und Autoren mitgewirkt. +Am \docpackage{changes}-Paket haben mehrere Autorinnen und Autoren mitgewirkt. Viele Probleme wurden in de.comp.text.tex gelöst oder deren Lösung durch Lösungsansätzen inspiriert. Danke. @@ -976,7 +1058,7 @@ Wenn Sie an geplanten, zukünftigen Änderungen interessiert sind, finden Sie di \cleardoublepage \section{Weitergabe, Copyright, Lizenz} -Copyright 2007-2020 Ekkart Kleinod (\href{mailto:ekleinod@edgesoft.de}{ekleinod@edgesoft.de}) +Copyright 2007-2021 Ekkart Kleinod (\href{mailto:ekleinod@edgesoft.de}{ekleinod@edgesoft.de}) Dieses Paket darf unter der "`\hologo{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 \url{http://www.latex-project.org/lppl.txt} Version~1.3 und spätere Versionen sind Teil aller \hologo{LaTeX}-Distributionen ab Version~2005/12/01. diff --git a/Master/texmf-dist/doc/latex/changes/userdoc/changes.en.tex b/Master/texmf-dist/doc/latex/changes/userdoc/changes.en.tex index a146dcf8f97..751f4aa391f 100644 --- a/Master/texmf-dist/doc/latex/changes/userdoc/changes.en.tex +++ b/Master/texmf-dist/doc/latex/changes/userdoc/changes.en.tex @@ -6,7 +6,7 @@ This package provides means for manual change markup. Any comments, thoughts or improvements are welcome. The package is maintained at \emph{gitlab}, please see -\url{http://edgesoft.de/projects/latex/changes/} +\url{https://edgesoft.de/projects/changes/} for links to source code access, bug and feature tracker, etc. If you want to contact me directly, please send an email to \href{mailto:ekleinod@edgesoft.de}{ekleinod@edgesoft.de}. @@ -35,23 +35,23 @@ Please refer to these examples for inspiration and first problem solving. %^^A ---- usage \cleardoublepage -\section{Using the \chpackage{changes}-package} +\section{Using the \docpackage{changes}-package} \label{sec:usage} -In this section a typical use case of the \chpackage{changes}-package is described. +In this section a typical use case of the \docpackage{changes}-package is described. You can find the detailed description of the package options and new commands in \autoref{sec:ui}. We start with the text you want to change. You want to markup the changes for each author individually. Such a change markup is well-known in WYSIWYG text processors such as \emph{LibreOffice}, \emph{OpenOffice}, or \emph{Word}. -The \chpackage{changes}-package was developed in order to support such change markup. +The \docpackage{changes}-package was developed in order to support such change markup. The package provides commands for defining authors, and for marking text as added, deleted, or replaced. Additionally, text can be highlighted or commented. In order to use the package, you should follow these steps: \begin{enumerate} - \item use \chpackage{changes}-package + \item use \docpackage{changes}-package \item define authors \item markup text changes \item highlight and comment text @@ -61,9 +61,9 @@ In order to use the package, you should follow these steps: \end{enumerate} -\minisec{Use \chpackage{changes}-package} +\minisec{Use \docpackage{changes}-package} -In order to activate change management, use the \chpackage{changes}-package as follows: +In order to activate change management, use the \docpackage{changes}-package as follows: \chinline{usepackage_changes} @@ -72,14 +72,14 @@ respectively \chinline{usepackage_options_changes} You can use the options for defining the layout of the change markup. -You can change the layout after using the \chpackage{changes}-package as well. +You can change the layout after using the \docpackage{changes}-package as well. For detailed information please refer to \autoref{sec:ui:options} and \autoref{sec:ui:customizingoutput}. \minisec{Define authors} -The \chpackage{changes}-package provides a default anonymous author. +The \docpackage{changes}-package provides a default anonymous author. If you want to track your changes depending on the author, you have to define the needed authors as follows: \chinline{definechangesauthor} @@ -142,9 +142,9 @@ You can print a list of changes using: The list is meant to be the analogon to the list of tables, or the list of figures. -Stating the style is optional, default is \choption{style=list}. -In order to print a quick overview of the number and kind of changes of every author, use the option \choption{style=summary} or \choption{style=compactsummary}. -Show only specific changes by using the \choption{show} option. +Stating the style is optional, default is \docoption{style=list}. +In order to print a quick overview of the number and kind of changes of every author, use the option \docoption{style=summary} or \docoption{style=compactsummary}. +Show only specific changes by using the \docoption{show} option. By running \hologo{LaTeX} the data of the list is written into an auxiliary file. This data is used in the next \hologo{LaTeX} run for typesetting the list of changes. @@ -178,16 +178,18 @@ For detailed information please refer to \autoref{sec:remove-markup}. \section{Limitations and possible enhancements} \label{sec:limitations} -The \chpackage{changes}-package was carefully programmed and tested. +The \docpackage{changes}-package was carefully programmed and tested. Yet the possibility of errors in the package exists, you might encounter problem during use, or you might miss functionality. -In that case, please go to -\url{http://changes.sourceforge.net/} +You can find a list of th emost important known problems and possible solutions in \autoref{sec:known-problems}. +Please refer to the section first if your problem is known and is a solution exists. +More errors, problems, and solutions are provided at: -There you find information on how to report errors or improvements, give advice to other users, or participate in the development of the package. +\url{https://edgesoft.de/projects/changes/} -You can find a list of known problems and possible solutions in \autoref{sec:known-problems}. -Please refer to the section first if your problem is known and is a solution exists. +or + +\url{https://gitlab.com/ekleinod/changes/-/issues} You can write me an email too, please send it to \href{mailto:ekleinod@edgesoft.de}{ekleinod@edgesoft.de}. In that case, please start your email subject with \texttt{[changes]}. @@ -207,13 +209,14 @@ You can try putting such text in an extra file and include in with \texttt{input This works sometimes, give it a try. Kudos to Charly Arenz for this tip. +If you experience errors about already defined macros, please see option \docoption{commandnameprefix}, \autoref{sec:ui:options:commandnameprefix}. %^^A ---- user interface \cleardoublepage -\section{User interface of the \chpackage{changes}-package} +\section{User interface of the \docpackage{changes}-package} \label{sec:ui} -This section describes the user interface of the \chpackage{changes}-package, i.e.\ all options and commands of the package. +This section describes the user interface of the \docpackage{changes}-package, i.e.\ all options and commands of the package. Every option and new command is described. If you want to see the options and commands in action, please refer to the examples in @@ -239,39 +242,75 @@ The following options are defined: \chinline{usepackage_draft_changes} -The \choption{draft}-option enables markup of changes. -The list of changes is available via \chcommand{listofchanges}. +The \docoption{draft}-option enables markup of changes. +The list of changes is available via \doccommand{listofchanges}. This option is the default option, if no other option is selected. -The \chpackage{changes} package reuses the declaration of \choption{draft} in \chcommand{documentclass}. -The local declaration of \choption{final} overrules the declaration of \choption{draft} in \chcommand{documentclass}. +The \docpackage{changes} package reuses the declaration of \docoption{draft} in \doccommand{documentclass}. +The local declaration of \docoption{final} overrules the declaration of \docoption{draft} in \doccommand{documentclass}. \subsubsection{final} \chinline{usepackage_final_changes} -The \choption{final}-option disables markup of changes, only the correct text will be shown. +The \docoption{final}-option disables markup of changes, only the correct text will be shown. The list of changes is disabled, too. -The \chpackage{changes} package reuses the declaration of \choption{final} in \chcommand{documentclass}. -The local declaration of \choption{draft} overrules the declaration of \choption{final} in \chcommand{documentclass}. +The \docpackage{changes} package reuses the declaration of \docoption{final} in \doccommand{documentclass}. +The local declaration of \docoption{draft} overrules the declaration of \docoption{final} in \doccommand{documentclass}. + + +\subsubsection{commandnameprefix} +\label{sec:ui:options:commandnameprefix} + +\chinline{usepackage_commandnameprefix_changes} + +The \docoption{commandnameprefix} option sets the prefixing strategy for the markup commands. +This is useful if another package already defined commands, e.g. \doccommand{comment} or \doccommand{highlight}. + +Per default an error is raised if a command is already defined and no prefixing takes place (option not given or set to \docoption{none}). + +If a prefix strategy is set, the command in question is prefixed with "ch". +The strategy determines which commands are prefixed. + +This option only provides prefixed names for the markup commands: + +\begin{itemize} + \item \doccommand{added} \ensuremath{\to} \doccommand{chadded} + \item \doccommand{deleted} \ensuremath{\to} \doccommand{chdeleted} + \item \doccommand{replaced} \ensuremath{\to} \doccommand{chreplaced} + \item \doccommand{highlight} \ensuremath{\to} \doccommand{chhighlight} + \item \doccommand{comment} \ensuremath{\to} \doccommand{chcomment} +\end{itemize} + +The following strategies for \emph{commandnameprefix} are provided: + +\begin{description} + \item [\docoption{none}] no prefix, a command already defined raises an error (default strategy) + \item [\docoption{ifneeded}] if a command is already defined, \docpackage{changes} prefixes this command and raises a warning. + Depending on the commands already defined, the document will contain a mix of prefixed and not prefixed markup commands. + This is mostly used if only \doccommand{comment} or \doccommand{highlight} are already defined and you mainly want to use the change commands \doccommand{added}, \doccommand{deleted}, and \doccommand{replaced}. + \item [\docoption{always}] all commands are prefixed, an according message is written to the log +\end{description} + +\chexample{usepackage_commandnameprefix_changes} \subsubsection{markup} \chinline{usepackage_markup_changes} -The \choption{markup} option chooses a predefined visual markup of changed text. +The \docoption{markup} option chooses a predefined visual markup of changed text. The default markup is chosen if no explicit markup is given. -The markup chosen with \choption{markup} can be overwritten with the more special markup options \choption{addedmarkup}, \choption{deletedmarkup}, \choption{commentmarkup}, or \choption{highlightmarkup}. +The markup chosen with \docoption{markup} can be overwritten with the more special markup options \docoption{addedmarkup}, \docoption{deletedmarkup}, \docoption{commentmarkup}, or \docoption{highlightmarkup}. The following values for \emph{markup} are defined: \begin{description} - \item [\choption{default}] default markup for added and deleted text, comments and highlighted text (default markup) - \item [\choption{underlined}] underlined for added text, wavy underlined for highlighted text, default for deleted text, and comments - \item [\choption{bfit}] bold added text, italic deleted text, default for comments and highlighted text - \item [\choption{nocolor}] no colored markup, underlined for added text, wavy underlined for highlighted text, default for deleted text and comments + \item [\docoption{default}] default markup for added and deleted text, comments and highlighted text (default markup) + \item [\docoption{underlined}] underlined for added text, wavy underlined for highlighted text, default for deleted text, and comments + \item [\docoption{bfit}] bold added text, italic deleted text, default for comments and highlighted text + \item [\docoption{nocolor}] no colored markup, underlined for added text, wavy underlined for highlighted text, default for deleted text and comments \end{description} \chexample{usepackage_markup_changes} @@ -283,23 +322,23 @@ Please ignore the errors, they vanish in the second run. \chinline{usepackage_addedmarkup_changes} -The \choption{addedmarkup} option chooses a predefined visual markup of added text. +The \docoption{addedmarkup} option chooses a predefined visual markup of added text. The default markup is chosen if no explicit markup is given. -The option \choption{addedmarkup} overwrites the markup chosen with \choption{markup}. +The option \docoption{addedmarkup} overwrites the markup chosen with \docoption{markup}. The following values for \emph{addedmarkup} are defined: \begin{description} - \item [\choption{colored}] no text markup, just coloring -- {\color{orange} example} (default) - \item [\choption{uline}] underlined text -- \uline{example} - \item [\choption{uuline}] double underlined text -- \uuline{example} - \item [\choption{uwave}] wavy underlined text -- \uwave{example} - \item [\choption{dashuline}] dashed underlined text -- \dashuline{example} - \item [\choption{dotuline}] dotted underlined text -- \dotuline{example} - \item [\choption{bf}] bold text -- \textbf{example} - \item [\choption{it}] italic text -- \textit{example} - \item [\choption{sl}] slanted text -- \textsl{example} - \item [\choption{em}] emphasized text -- \emph{example} + \item [\docoption{colored}] no text markup, just coloring -- {\color{orange} example} (default) + \item [\docoption{uline}] underlined text -- \uline{example} + \item [\docoption{uuline}] double underlined text -- \uuline{example} + \item [\docoption{uwave}] wavy underlined text -- \uwave{example} + \item [\docoption{dashuline}] dashed underlined text -- \dashuline{example} + \item [\docoption{dotuline}] dotted underlined text -- \dotuline{example} + \item [\docoption{bf}] bold text -- \textbf{example} + \item [\docoption{it}] italic text -- \textit{example} + \item [\docoption{sl}] slanted text -- \textsl{example} + \item [\docoption{em}] emphasized text -- \emph{example} \end{description} The output of replaced text is a combination of added and deleted text, thus any change in their layout influences the layout of replaced text. @@ -312,25 +351,25 @@ The output of replaced text is a combination of added and deleted text, thus any \chinline{usepackage_deletedmarkup_changes} -The \choption{deletedmarkup} option chooses a predefined visual markup of deleted texty. +The \docoption{deletedmarkup} option chooses a predefined visual markup of deleted texty. The default markup is chosen if no explicit markup is given. -The option \choption{deletedmarkup} overwrites the markup chosen with \choption{markup}. +The option \docoption{deletedmarkup} overwrites the markup chosen with \docoption{markup}. The following values for \emph{deletedmarkup} are defined: \begin{description} - \item [\choption{sout}] striked out text -- \sout{example} (default) - \item [\choption{xout}] crossed out text -- \xout{example} - \item [\choption{colored}] no text markup, just coloring -- {\color{orange} example} - \item [\choption{uline}] underlined text -- \uline{example} - \item [\choption{uuline}] double underlined text -- \uuline{example} - \item [\choption{uwave}] wavy underlined text -- \uwave{example} - \item [\choption{dashuline}] dashed underlined text -- \dashuline{example} - \item [\choption{dotuline}] dotted underlined text -- \dotuline{example} - \item [\choption{bf}] bold text -- \textbf{example} - \item [\choption{it}] italic text -- \textit{example} - \item [\choption{sl}] slanted text -- \textsl{example} - \item [\choption{em}] emphasized text -- \emph{example} + \item [\docoption{sout}] striked out text -- \sout{example} (default) + \item [\docoption{xout}] crossed out text -- \xout{example} + \item [\docoption{colored}] no text markup, just coloring -- {\color{orange} example} + \item [\docoption{uline}] underlined text -- \uline{example} + \item [\docoption{uuline}] double underlined text -- \uuline{example} + \item [\docoption{uwave}] wavy underlined text -- \uwave{example} + \item [\docoption{dashuline}] dashed underlined text -- \dashuline{example} + \item [\docoption{dotuline}] dotted underlined text -- \dotuline{example} + \item [\docoption{bf}] bold text -- \textbf{example} + \item [\docoption{it}] italic text -- \textit{example} + \item [\docoption{sl}] slanted text -- \textsl{example} + \item [\docoption{em}] emphasized text -- \emph{example} \end{description} The output of replaced text is a combination of added and deleted text, thus any change in their layout influences the layout of replaced text. @@ -342,16 +381,16 @@ The output of replaced text is a combination of added and deleted text, thus any \chinline{usepackage_highlightmarkup_changes} -The \choption{highlightmarkup} option chooses a predefined visual markup for highlighted text. +The \docoption{highlightmarkup} option chooses a predefined visual markup for highlighted text. The default markup is chosen if no explicit markup is given. -The option \choption{highlightmarkup} overwrites the markup chosen with \choption{markup}. +The option \docoption{highlightmarkup} overwrites the markup chosen with \docoption{markup}. The following values for \emph{highlightmarkup} are defined: \begin{description} - \item [\choption{background}] markup by background color -- \colorbox{orange!30}{example} (default) - \item [\choption{uuline}] double underlined text -- \uuline{example} - \item [\choption{uwave}] wavy underlined text -- \uwave{example} + \item [\docoption{background}] markup by background color -- \colorbox{orange!30}{example} (default) + \item [\docoption{uuline}] double underlined text -- \uuline{example} + \item [\docoption{uwave}] wavy underlined text -- \uwave{example} \end{description} \chexample{usepackage_highlightmarkup_changes} @@ -362,17 +401,17 @@ The following values for \emph{highlightmarkup} are defined: \chinline{usepackage_commentmarkup_changes} -The \choption{commentmarkup} option chooses a predefined visual markup for comments. +The \docoption{commentmarkup} option chooses a predefined visual markup for comments. The default markup is chosen if no explicit markup is given. -The option \choption{commentmarkup} overwrites the markup chosen with \choption{markup}. +The option \docoption{commentmarkup} overwrites the markup chosen with \docoption{markup}. The following values for \emph{commentmarkup} are defined: \begin{description} - \item [\choption{todo}] comment as todo note, which is not added to list of todos \todo{example comment}(default) - \item [\choption{margin}] comment in margin\marginpar{example comment} - \item [\choption{footnote}] comment as footnote\footnote{example comment} - \item [\choption{uwave}] wavy underlined text -- \uwave{example comment} + \item [\docoption{todo}] comment as todo note, which is not added to list of todos \todo{example comment}(default) + \item [\docoption{margin}] comment in margin\marginpar{example comment} + \item [\docoption{footnote}] comment as footnote\footnote{example comment} + \item [\docoption{uwave}] wavy underlined text -- \uwave{example comment} \end{description} \chexample{usepackage_commentmarkup_changes} @@ -382,17 +421,17 @@ The following values for \emph{commentmarkup} are defined: \chinline{usepackage_authormarkup_changes} -The \choption{authormarkup} option chooses a predefined visual markup of the author's identification. +The \docoption{authormarkup} option chooses a predefined visual markup of the author's identification. The default markup is chosen if no explicit markup is given. The following values for \emph{authormarkup} are defined: \begin{description} - \item [\choption{superscript}] superscripted text -- text\textsuperscript{author} (default) - \item [\choption{subscript}] subscripted text -- text\textsubscript{author} - \item [\choption{brackets}] text in brackets -- text(author) - \item [\choption{footnote}] text in footnote -- text\footnote{author} - \item [\choption{none}] no author identification + \item [\docoption{superscript}] superscripted text -- text\textsuperscript{author} (default) + \item [\docoption{subscript}] subscripted text -- text\textsubscript{author} + \item [\docoption{brackets}] text in brackets -- text(author) + \item [\docoption{footnote}] text in footnote -- text\footnote{author} + \item [\docoption{none}] no author identification \end{description} \chexample{usepackage_authormarkup_changes} @@ -402,14 +441,14 @@ The following values for \emph{authormarkup} are defined: \chinline{usepackage_authormarkupposition_changes} -The \choption{authormarkupposition} option chooses the position of the author's identification. +The \docoption{authormarkupposition} option chooses the position of the author's identification. The default value is chosen if no explicit markup is given. The following values for \emph{authormarkupposition} are defined: \begin{description} - \item [\choption{right}] right of the text -- text\textsuperscript{author} (default) - \item [\choption{left}] left of the text -- \textsuperscript{author}text + \item [\docoption{right}] right of the text -- text\textsuperscript{author} (default) + \item [\docoption{left}] left of the text -- \textsuperscript{author}text \end{description} \chexample{usepackage_authormarkupposition_changes} @@ -420,24 +459,37 @@ The following values for \emph{authormarkupposition} are defined: \chinline{usepackage_authormarkuptext_changes} -The \choption{authormarkuptext} option chooses the text that is used for the author's identification. +The \docoption{authormarkuptext} option chooses the text that is used for the author's identification. The default value is chosen if no explicit markup is given. The following values for \emph{authormarkuptext} are defined: \begin{description} - \item [\choption{id}] author's id -- text\textsuperscript{id} (default) - \item [\choption{name}] author's name -- text\textsuperscript{authorname} + \item [\docoption{id}] author's id -- text\textsuperscript{id} (default) + \item [\docoption{name}] author's name -- text\textsuperscript{authorname} \end{description} \chexample{usepackage_authormarkuptext_changes} + +\subsubsection{defaultcolor} + +\chinline{usepackage_defaultcolor_changes} + +The \docoption{defaultcolor} option defines the default color for authors, including the color for the default (anonymous) author. +You can use colors of the \docpackage{xcolor} package. + +The default color is \emph{blue}. + +\chexample{usepackage_defaultcolor_changes} + + \subsubsection{todonotes} \chinline{usepackage_todonotes_changes} -Options for the \chpackage{todonotes} package can be specified as parameters of the \choption{todonotes}-option. +Options for the \docpackage{todonotes} package can be specified as parameters of the \docoption{todonotes}-option. Several options or options with special characters have to be put in curly brackets. \chexample{usepackage_todonotes_changes} @@ -448,7 +500,7 @@ Several options or options with special characters have to be put in curly brack \chinline{usepackage_truncate_changes} -Options for the \chpackage{truncate} package can be specified as parameters of the \choption{truncate}-option. +Options for the \docpackage{truncate} package can be specified as parameters of the \docoption{truncate}-option. Several options or options with special characters have to be put in curly brackets. \chexample{usepackage_truncate_changes} @@ -458,7 +510,7 @@ Several options or options with special characters have to be put in curly brack \chinline{usepackage_ulem_changes} -Options for the \chpackage{ulem} package can be specified as parameters of the \choption{ulem}-option. +Options for the \docpackage{ulem} package can be specified as parameters of the \docoption{ulem}-option. Several options or options with special characters have to be put in curly brackets. \chexample{usepackage_ulem_changes} @@ -468,7 +520,7 @@ Several options or options with special characters have to be put in curly brack \chinline{usepackage_xcolor_changes} -Options for the \chpackage{xcolor} package can be specified as parameters of the \choption{xcolor}-option. +Options for the \docpackage{xcolor} package can be specified as parameters of the \docoption{xcolor}-option. Several options or options with special characters have to be put in curly brackets. \chexample{usepackage_xcolor_changes} @@ -485,11 +537,11 @@ Several options or options with special characters have to be put in curly brack \chinline{added} -The command \chcommand{added} marks newly added text. +The command \doccommand{added} marks newly added text. The new text is given in curly braces. The optional argument contains key-value-pairs for author-id and comment. -The author-id has to be defined using \chcommand{definechangesauthor}. +The author-id has to be defined using \doccommand{definechangesauthor}. If the comment contains special characters or spaces, use curly brackets to enclose the comment. If a comment is given, the direct author markup at the changes text is omitted, because the author is printed in the comment. @@ -502,10 +554,10 @@ If a comment is given, the direct author markup at the changes text is omitted, \chinline{deleted} -The command \chcommand{deleted} marks deleted text. +The command \doccommand{deleted} marks deleted text. The deleted text is given in curly braces. -For the optional arguments see \chcommand{added} (\autoref{sec:ui:cmd:added}). +For the optional arguments see \doccommand{added} (\autoref{sec:ui:cmd:added}). \chexample{deleted} \chresult{deleted} @@ -516,10 +568,10 @@ For the optional arguments see \chcommand{added} (\autoref{sec:ui:cmd:added}). \chinline{replaced} -The command \chcommand{replaced} marks replaced text. +The command \doccommand{replaced} marks replaced text. The new and the replaced text are given in this order in curly braces. -For the optional arguments see \chcommand{added} (\autoref{sec:ui:cmd:added}). +For the optional arguments see \doccommand{added} (\autoref{sec:ui:cmd:added}). The output of replaced text is a combination of added and deleted text, thus any change in their layout influences the layout of replaced text. @@ -538,10 +590,10 @@ The output of replaced text is a combination of added and deleted text, thus any \chinline{highlight} -The command \chcommand{highlight} highlights text. +The command \doccommand{highlight} highlights text. The highlighted text is given in curly braces. -For the optional arguments see \chcommand{added} (\autoref{sec:ui:cmd:added}). +For the optional arguments see \doccommand{added} (\autoref{sec:ui:cmd:added}). \chexample{highlight} \chresult{highlight} @@ -551,11 +603,11 @@ For the optional arguments see \chcommand{added} (\autoref{sec:ui:cmd:added}). \chinline{comment} -The command \chcommand{comments} adds a comment to the document. +The command \doccommand{comments} adds a comment to the document. The comment is given in curly braces. The command has only one optional argument: a key-value-pair for the author-id. -The author-id has to be defined using \chcommand{definechangesauthor}. +The author-id has to be defined using \doccommand{definechangesauthor}. The comments are numbered automatically, the number is printed in the comment. @@ -574,46 +626,46 @@ The comments are numbered automatically, the number is printed in the comment. \chinline{listofchanges} -The command \chcommand{listofchanges} outputs a list or summary of changes. +The command \doccommand{listofchanges} outputs a list or summary of changes. The first \hologo{LaTeX}-run creates an auxiliary file, the second run uses the data of this file. Therefore you need two \hologo{LaTeX}-runs for an up-to-date list of changes. There are three optional arguments: \begin{description} - \item[\choption{style}] list style - \item[\choption{title}] individual title - \item[\choption{show}] markup types + \item[\docoption{style}] list style + \item[\docoption{title}] individual title + \item[\docoption{show}] markup types \end{description} \paragraph{style} -The \choption{style} argument defines the layout of the list of changes. +The \docoption{style} argument defines the layout of the list of changes. Three styles are defined: \begin{description} - \item[\choption{list}] prints the list of changes like a list of figures (default) - \item[\choption{summary}] prints the number of changes grouped by author - \item[\choption{compactsummary}] same as \choption{summary} but entries with count 0 are omitted + \item[\docoption{list}] prints the list of changes like a list of figures (default) + \item[\docoption{summary}] prints the number of changes grouped by author + \item[\docoption{compactsummary}] same as \docoption{summary} but entries with count 0 are omitted \end{description} \paragraph{title} -The \choption{title} argument is used to change the title for the list. +The \docoption{title} argument is used to change the title for the list. If you want to use special characters or spaces in the title, enclose it in curly braces. \paragraph{show} -The \choption{show} argument defines which types of change markup are shown in the list of changes. +The \docoption{show} argument defines which types of change markup are shown in the list of changes. You can combine the values using the \texttt{|} character. For example if you want to show all additions and deletions, use \texttt{show=added|deleted}. The following values are defined: \begin{description} - \item[\choption{all}] show all types (default) - \item[\choption{added}] show only additions - \item[\choption{deleted}] show only deletions - \item[\choption{replaced}] show only replacements - \item[\choption{highlight}] show only highlights - \item[\choption{comment}] show only comments + \item[\docoption{all}] show all types (default) + \item[\docoption{added}] show only additions + \item[\docoption{deleted}] show only deletions + \item[\docoption{replaced}] show only replacements + \item[\docoption{highlight}] show only highlights + \item[\docoption{comment}] show only comments \end{description} \chexample{listofchanges} @@ -628,7 +680,7 @@ The following values are defined: \chinline{definechangesauthor} -The command \chcommand{definechangesauthor} defines a new author for changes. +The command \doccommand{definechangesauthor} defines a new author for changes. You have to define a unique author's id, special characters or spaces are not allowed within the author's id. You may define a corresponding color and the author's name. @@ -651,8 +703,8 @@ The package predefines one anonymous author without id. \chinline{setaddedmarkup} -The command \chcommand{setaddedmarkup} defines the layout of added text. -The default markup is colored text, or the markup set with the option \choption{markup} respectively \choption{addedmarkup}. +The command \doccommand{setaddedmarkup} defines the layout of added text. +The default markup is colored text, or the markup set with the option \docoption{markup} respectively \docoption{addedmarkup}. Values for definition: @@ -670,8 +722,8 @@ The output of replaced text is a combination of added and deleted text, thus any \chinline{setdeletedmarkup} -The command \chcommand{setdeletedmarkup} defines the layout of deleted text. -The default markup is striked-out, or the markup set with the option \choption{markup} respectively \choption{deletedmarkup}. +The command \doccommand{setdeletedmarkup} defines the layout of deleted text. +The default markup is striked-out, or the markup set with the option \docoption{markup} respectively \docoption{deletedmarkup}. Values for definition: @@ -689,15 +741,15 @@ The output of replaced text is a combination of added and deleted text, thus any \chinline{sethighlightmarkup} -The command \chcommand{sethighlightmarkup} defines the layout of highlighted text. -The default markup is via a background color, or the markup set with the option \choption{markup} respectively \choption{highlightmarkup}. +The command \doccommand{sethighlightmarkup} defines the layout of highlighted text. +The default markup is via a background color, or the markup set with the option \docoption{markup} respectively \docoption{highlightmarkup}. Values for definition: \begin{itemize} \item any \hologo{LaTeX}-commands \item highlighted text can be used with ``\#1'' - \item \chpackage{ifthenelse} boolean test for colored text ``\chcommand{isColored}'' + \item \docpackage{ifthenelse} boolean test for colored text ``\doccommand{isColored}'' \item author's color can be used with color ``authorcolor'' \end{itemize} @@ -708,8 +760,8 @@ Values for definition: \chinline{setcommentmarkup} -The command \chcommand{setcommentmarkup} defines the layout of comments. -The default markup is a margin note, or the markup set with the option \choption{markup} respectively \choption{commentmarkup}. +The command \doccommand{setcommentmarkup} defines the layout of comments. +The default markup is a margin note, or the markup set with the option \docoption{markup} respectively \docoption{commentmarkup}. Values for definition: @@ -718,8 +770,8 @@ Values for definition: \item comment can be used with ``\#1'' \item author's id can be used with ``\#2'' \item author output (id or name) can be used with ``\#3'' - \item \chpackage{ifthenelse} boolean test for anonymous author ``\chcommand{isAnonymous}'' - \item \chpackage{ifthenelse} boolean test for colored text ``\chcommand{isColored}'' + \item \docpackage{ifthenelse} boolean test for anonymous author ``\doccommand{isAnonymous}'' + \item \docpackage{ifthenelse} boolean test for colored text ``\doccommand{isColored}'' \item author's color can be used with color ``authorcolor'' \item comment count of the autor can be used with counter ``authorcommentcount'' \end{itemize} @@ -731,7 +783,7 @@ Values for definition: \chinline{setauthormarkup} -The command \chcommand{setauthormarkup} defines the layout of the author's markup in the text. +The command \doccommand{setauthormarkup} defines the layout of the author's markup in the text. The default markup is a superscripted author's text. Values for definition: @@ -748,14 +800,14 @@ Values for definition: \chinline{setauthormarkupposition} -The command \chcommand{setauthormarkupposition} defines the position of the author's markup relative to the changed text. +The command \doccommand{setauthormarkupposition} defines the position of the author's markup relative to the changed text. The default position is right of the changed text. The following values for \emph{authormarkupposition} are defined: \begin{description} - \item [\choption{right}] right of the text -- text\textsuperscript{author} (default) - \item [\choption{left}] left of the text -- \textsuperscript{author}text + \item [\docoption{right}] right of the text -- text\textsuperscript{author} (default) + \item [\docoption{left}] left of the text -- \textsuperscript{author}text \end{description} \chexample{setauthormarkupposition} @@ -765,14 +817,14 @@ The following values for \emph{authormarkupposition} are defined: \chinline{setauthormarkuptext} -The command \chcommand{setauthormarkuptext} defines the text for the author's markup. +The command \doccommand{setauthormarkuptext} defines the text for the author's markup. The default markup is the author's id. The following values for \emph{authormarkuptext} are defined: \begin{description} - \item [\choption{id}] author's id -- text\textsuperscript{id} (default) - \item [\choption{name}] author's name -- text\textsuperscript{authorname} + \item [\docoption{id}] author's id -- text\textsuperscript{id} (default) + \item [\docoption{name}] author's name -- text\textsuperscript{authorname} \end{description} \chexample{setauthormarkuptext} @@ -783,8 +835,8 @@ The following values for \emph{authormarkuptext} are defined: \chinline{settruncatewidth} -The command \chcommand{settruncatewidth} sets the width of the truncation in the list of changes to the given width. -The default width is \texttt{0.6}\chcommand{textwidth}. +The command \doccommand{settruncatewidth} sets the width of the truncation in the list of changes to the given width. +The default width is \texttt{0.6}\doccommand{textwidth}. \chexample{settruncatewidth} @@ -794,8 +846,8 @@ The default width is \texttt{0.6}\chcommand{textwidth}. \chinline{setsummarywidth} -The command \chcommand{setsummarywidth} sets the width of the list of changes in summary style to the given width. -The default width is \texttt{0.3}\chcommand{textwidth}. +The command \doccommand{setsummarywidth} sets the width of the list of changes in summary style to the given width. +The default width is \texttt{0.3}\doccommand{textwidth}. \chexample{setsummarywidth} @@ -805,17 +857,34 @@ The default width is \texttt{0.3}\chcommand{textwidth}. \chinline{setsummarytowidth} -The command \chcommand{setsummarytowidth} sets the width of the list of changes in summary style to the width of the given text. +The command \doccommand{setsummarytowidth} sets the width of the list of changes in summary style to the width of the given text. \chexample{setsummarytowidth} +\chnewcmd{setlocextension} + +\chinline{setlocextension} + +The command \doccommand{setlocextension} sets the extension of the auxiliary file for the list of changes (loc-file\footnote{% + ``loc'' stands for ``list of changes''. +}). +The default extension is ``\texttt{loc}''. + +In the example, the loc-file for ``\texttt{foo.tex}'' would be named ``\texttt{foo.listofchanges}'' resp.\ ``\texttt{foo.lochg}'' instead of the default name ``\texttt{foo.loc}''. + +\chexample{setlocextension} + +\chimportant{Do not use a \hologo{LaTeX} standard file extension, such as ``toc'' or ``lof'', as this would collide with the normal \hologo{LaTeX} run.} + + + \chnewcmd{setsocextension} \chinline{setsocextension} -The command \chcommand{setsocextension} sets the extension of the auxiliary file for the summary of changes (soc-file\footnote{% +The command \doccommand{setsocextension} sets the extension of the auxiliary file for the summary of changes (soc-file\footnote{% ``soc'' stands for ``summary of changes''. }). The default extension is ``\texttt{soc}''. @@ -824,7 +893,7 @@ In the example, the soc-file for ``\texttt{foo.tex}'' would be named ``\texttt{f \chexample{setsocextension} -\chimportant{Do not use a \hologo{LaTeX} standard file extension, such as ``toc'' or ``loc'', as this would collide with the normal \hologo{LaTeX} run.} +\chimportant{Do not use a \hologo{LaTeX} standard file extension, such as ``toc'' or ``lof'', as this would collide with the normal \hologo{LaTeX} run.} @@ -832,21 +901,21 @@ In the example, the soc-file for ``\texttt{foo.tex}'' would be named ``\texttt{f \subsection{Used packages} \label{sec:ui:packages} -The \chpackage{changes}-package uses already existing packages for it's functions. +The \docpackage{changes}-package uses already existing packages for it's functions. You will find detailed description of the packages in their distributions. -The following packages are always required and have to be installed for the \chpackage{changes}-package: +The following packages are always required and have to be installed for the \docpackage{changes}-package: \begin{description} - \item [xifthen] provides an enhanced \chcommand{if}-command as well as a \texttt{while}-loop - \item [xkeyval] provides options with key-value-pairs + \item [etoolbox] provides an enhanced \doccommand{if}-commands, \emph{bools}, or list operations + \item [truncate] truncation of texts (used for list of changes) + \item [xkeyval] provides key-value-lists for parameters \item [xstring] improves string operations \end{description} The following packages are sometimes required and have to be installed if used by the corresponding option: \begin{description} - \item [pdfcolmk] loaded if colored text is used for markup (default markup); solves the problem of colored text and page breaks (with pdflatex) \item [todonotes] loaded if comments are layouted as todo notes (default markup) - \item [ulem] loaded if text has to be striked or exed out (default markup) + \item [ulem] loaded if text has to be striked, wavylined or exed out (default markup) \item [xcolor] loaded if colored text is used for markup (default markup) \end{description} @@ -917,18 +986,18 @@ There is a problem of typesetting footnotes or margin notes in special environme Avoid such markup when using these environments. -\subsection{The \chpackage{ulem} package} +\subsection{The \docpackage{ulem} package} -I am using the \chpackage{ulem} package for striking out text as default. +I am using the \docpackage{ulem} package for striking out text as default. This leads to problems with some commands or environments, e.g. \begin{itemize} \item in math mode - \item when using the \chpackage{siunitx} package - \item when using the \chcommand{citet} or \chcommand{citep} command + \item when using the \docpackage{siunitx} package + \item when using the \doccommand{citet} or \doccommand{citep} command \end{itemize} -In that case there are only a few good solutions, the best way is to avoid using the \chpackage{ulem} package by defining your own deletion markup. +In that case there are only a few good solutions, the best way is to avoid using the \docpackage{ulem} package by defining your own deletion markup. See \begin{itemize} @@ -937,12 +1006,23 @@ See \end{itemize} +\subsection{Command already defined} + +Some package define the markup commands as well, especially \doccommand{comment} and \doccommand{highlight} are not exclusively used by \docpackage{changes}. + +If needed, \docpackage{changes} can prefix it's markup commands in order to avoid name clashes. +This is set with the option \docoption{commandnameprefix}, see \autoref{sec:ui:options:commandnameprefix} for the documentation. + +In order for this to work, the \docpackage{changes} package has to be used after the other package defining the command. + + + %^^A -- Authors ------------------------------------------------------------- \cleardoublepage \section{Authors} \label{sec:authors} -Several authors contributed to the \chpackage{changes}-package. +Several authors contributed to the \docpackage{changes}-package. Many bugs and problems were solved or their solution inspired via de.comp.text.tex. Thanks. @@ -982,7 +1062,7 @@ If you are interested in planned new features, please see \cleardoublepage \section{Distribution, Copyright, License} -Copyright 2007-2020 Ekkart Kleinod (\href{mailto:ekleinod@edgesoft.de}{ekleinod@edgesoft.de}) +Copyright 2007-2021 Ekkart Kleinod (\href{mailto:ekleinod@edgesoft.de}{ekleinod@edgesoft.de}) This work may be distributed and/or modified under the conditions of the \hologo{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 \hologo{LaTeX} version 2005/12/01 or later. diff --git a/Master/texmf-dist/doc/latex/changes/userdoc/ex_comment.tex b/Master/texmf-dist/doc/latex/changes/userdoc/comment_ex.tex index 2b0655a2c4b..2b0655a2c4b 100644 --- a/Master/texmf-dist/doc/latex/changes/userdoc/ex_comment.tex +++ b/Master/texmf-dist/doc/latex/changes/userdoc/comment_ex.tex diff --git a/Master/texmf-dist/doc/latex/changes/userdoc/in_comment.tex b/Master/texmf-dist/doc/latex/changes/userdoc/comment_in.tex index 851b22f22f8..851b22f22f8 100644 --- a/Master/texmf-dist/doc/latex/changes/userdoc/in_comment.tex +++ b/Master/texmf-dist/doc/latex/changes/userdoc/comment_in.tex diff --git a/Master/texmf-dist/doc/latex/changes/userdoc/ex_definechangesauthor.tex b/Master/texmf-dist/doc/latex/changes/userdoc/definechangesauthor_ex.tex index 278fcc6e045..278fcc6e045 100644 --- a/Master/texmf-dist/doc/latex/changes/userdoc/ex_definechangesauthor.tex +++ b/Master/texmf-dist/doc/latex/changes/userdoc/definechangesauthor_ex.tex diff --git a/Master/texmf-dist/doc/latex/changes/userdoc/in_definechangesauthor.tex b/Master/texmf-dist/doc/latex/changes/userdoc/definechangesauthor_in.tex index 196c911decf..196c911decf 100644 --- a/Master/texmf-dist/doc/latex/changes/userdoc/in_definechangesauthor.tex +++ b/Master/texmf-dist/doc/latex/changes/userdoc/definechangesauthor_in.tex diff --git a/Master/texmf-dist/doc/latex/changes/userdoc/ex_deleted.tex b/Master/texmf-dist/doc/latex/changes/userdoc/deleted_ex.tex index 3ae710b378f..3ae710b378f 100644 --- a/Master/texmf-dist/doc/latex/changes/userdoc/ex_deleted.tex +++ b/Master/texmf-dist/doc/latex/changes/userdoc/deleted_ex.tex diff --git a/Master/texmf-dist/doc/latex/changes/userdoc/in_deleted.tex b/Master/texmf-dist/doc/latex/changes/userdoc/deleted_in.tex index 0a6b6fa444f..0a6b6fa444f 100644 --- a/Master/texmf-dist/doc/latex/changes/userdoc/in_deleted.tex +++ b/Master/texmf-dist/doc/latex/changes/userdoc/deleted_in.tex diff --git a/Master/texmf-dist/doc/latex/changes/userdoc/ex_highlight.tex b/Master/texmf-dist/doc/latex/changes/userdoc/highlight_ex.tex index f7ae9fcfb55..f7ae9fcfb55 100644 --- a/Master/texmf-dist/doc/latex/changes/userdoc/ex_highlight.tex +++ b/Master/texmf-dist/doc/latex/changes/userdoc/highlight_ex.tex diff --git a/Master/texmf-dist/doc/latex/changes/userdoc/in_highlight.tex b/Master/texmf-dist/doc/latex/changes/userdoc/highlight_in.tex index ef6a26c546b..ef6a26c546b 100644 --- a/Master/texmf-dist/doc/latex/changes/userdoc/in_highlight.tex +++ b/Master/texmf-dist/doc/latex/changes/userdoc/highlight_in.tex diff --git a/Master/texmf-dist/doc/latex/changes/userdoc/ex_listofchanges.tex b/Master/texmf-dist/doc/latex/changes/userdoc/listofchanges_ex.tex index 2c1bf1e4b5f..2c1bf1e4b5f 100644 --- a/Master/texmf-dist/doc/latex/changes/userdoc/ex_listofchanges.tex +++ b/Master/texmf-dist/doc/latex/changes/userdoc/listofchanges_ex.tex diff --git a/Master/texmf-dist/doc/latex/changes/userdoc/in_listofchanges.tex b/Master/texmf-dist/doc/latex/changes/userdoc/listofchanges_in.tex index 62eed33347e..62eed33347e 100644 --- a/Master/texmf-dist/doc/latex/changes/userdoc/in_listofchanges.tex +++ b/Master/texmf-dist/doc/latex/changes/userdoc/listofchanges_in.tex diff --git a/Master/texmf-dist/doc/latex/changes/userdoc/in_path_doc_examples.tex b/Master/texmf-dist/doc/latex/changes/userdoc/path_doc_examples_in.tex index ebd4eab8622..ebd4eab8622 100644 --- a/Master/texmf-dist/doc/latex/changes/userdoc/in_path_doc_examples.tex +++ b/Master/texmf-dist/doc/latex/changes/userdoc/path_doc_examples_in.tex diff --git a/Master/texmf-dist/doc/latex/changes/userdoc/in_path_script.tex b/Master/texmf-dist/doc/latex/changes/userdoc/path_script_in.tex index fe17199aed2..fe17199aed2 100644 --- a/Master/texmf-dist/doc/latex/changes/userdoc/in_path_script.tex +++ b/Master/texmf-dist/doc/latex/changes/userdoc/path_script_in.tex diff --git a/Master/texmf-dist/doc/latex/changes/userdoc/ex_replaced.tex b/Master/texmf-dist/doc/latex/changes/userdoc/replaced_ex.tex index e1040929f7c..e1040929f7c 100644 --- a/Master/texmf-dist/doc/latex/changes/userdoc/ex_replaced.tex +++ b/Master/texmf-dist/doc/latex/changes/userdoc/replaced_ex.tex diff --git a/Master/texmf-dist/doc/latex/changes/userdoc/in_replaced.tex b/Master/texmf-dist/doc/latex/changes/userdoc/replaced_in.tex index 3c51087abf4..3c51087abf4 100644 --- a/Master/texmf-dist/doc/latex/changes/userdoc/in_replaced.tex +++ b/Master/texmf-dist/doc/latex/changes/userdoc/replaced_in.tex diff --git a/Master/texmf-dist/doc/latex/changes/userdoc/ex_setaddedmarkup.tex b/Master/texmf-dist/doc/latex/changes/userdoc/setaddedmarkup_ex.tex index 49e9386fc37..49e9386fc37 100644 --- a/Master/texmf-dist/doc/latex/changes/userdoc/ex_setaddedmarkup.tex +++ b/Master/texmf-dist/doc/latex/changes/userdoc/setaddedmarkup_ex.tex diff --git a/Master/texmf-dist/doc/latex/changes/userdoc/in_setaddedmarkup.tex b/Master/texmf-dist/doc/latex/changes/userdoc/setaddedmarkup_in.tex index b0038e36409..b0038e36409 100644 --- a/Master/texmf-dist/doc/latex/changes/userdoc/in_setaddedmarkup.tex +++ b/Master/texmf-dist/doc/latex/changes/userdoc/setaddedmarkup_in.tex diff --git a/Master/texmf-dist/doc/latex/changes/userdoc/ex_setauthormarkup.tex b/Master/texmf-dist/doc/latex/changes/userdoc/setauthormarkup_ex.tex index 51592c856b2..51592c856b2 100644 --- a/Master/texmf-dist/doc/latex/changes/userdoc/ex_setauthormarkup.tex +++ b/Master/texmf-dist/doc/latex/changes/userdoc/setauthormarkup_ex.tex diff --git a/Master/texmf-dist/doc/latex/changes/userdoc/in_setauthormarkup.tex b/Master/texmf-dist/doc/latex/changes/userdoc/setauthormarkup_in.tex index b5f1edba8b2..b5f1edba8b2 100644 --- a/Master/texmf-dist/doc/latex/changes/userdoc/in_setauthormarkup.tex +++ b/Master/texmf-dist/doc/latex/changes/userdoc/setauthormarkup_in.tex diff --git a/Master/texmf-dist/doc/latex/changes/userdoc/ex_setauthormarkupposition.tex b/Master/texmf-dist/doc/latex/changes/userdoc/setauthormarkupposition_ex.tex index a94425ea8a6..a94425ea8a6 100644 --- a/Master/texmf-dist/doc/latex/changes/userdoc/ex_setauthormarkupposition.tex +++ b/Master/texmf-dist/doc/latex/changes/userdoc/setauthormarkupposition_ex.tex diff --git a/Master/texmf-dist/doc/latex/changes/userdoc/in_setauthormarkupposition.tex b/Master/texmf-dist/doc/latex/changes/userdoc/setauthormarkupposition_in.tex index d66708d7430..d66708d7430 100644 --- a/Master/texmf-dist/doc/latex/changes/userdoc/in_setauthormarkupposition.tex +++ b/Master/texmf-dist/doc/latex/changes/userdoc/setauthormarkupposition_in.tex diff --git a/Master/texmf-dist/doc/latex/changes/userdoc/ex_setauthormarkuptext.tex b/Master/texmf-dist/doc/latex/changes/userdoc/setauthormarkuptext_ex.tex index f9b15959f5a..f9b15959f5a 100644 --- a/Master/texmf-dist/doc/latex/changes/userdoc/ex_setauthormarkuptext.tex +++ b/Master/texmf-dist/doc/latex/changes/userdoc/setauthormarkuptext_ex.tex diff --git a/Master/texmf-dist/doc/latex/changes/userdoc/in_setauthormarkuptext.tex b/Master/texmf-dist/doc/latex/changes/userdoc/setauthormarkuptext_in.tex index bcb95276bda..bcb95276bda 100644 --- a/Master/texmf-dist/doc/latex/changes/userdoc/in_setauthormarkuptext.tex +++ b/Master/texmf-dist/doc/latex/changes/userdoc/setauthormarkuptext_in.tex diff --git a/Master/texmf-dist/doc/latex/changes/userdoc/ex_setcommentmarkup.tex b/Master/texmf-dist/doc/latex/changes/userdoc/setcommentmarkup_ex.tex index 121e2d9dc82..121e2d9dc82 100644 --- a/Master/texmf-dist/doc/latex/changes/userdoc/ex_setcommentmarkup.tex +++ b/Master/texmf-dist/doc/latex/changes/userdoc/setcommentmarkup_ex.tex diff --git a/Master/texmf-dist/doc/latex/changes/userdoc/in_setcommentmarkup.tex b/Master/texmf-dist/doc/latex/changes/userdoc/setcommentmarkup_in.tex index ad8bd1bba19..ad8bd1bba19 100644 --- a/Master/texmf-dist/doc/latex/changes/userdoc/in_setcommentmarkup.tex +++ b/Master/texmf-dist/doc/latex/changes/userdoc/setcommentmarkup_in.tex diff --git a/Master/texmf-dist/doc/latex/changes/userdoc/ex_setdeletedmarkup.tex b/Master/texmf-dist/doc/latex/changes/userdoc/setdeletedmarkup_ex.tex index f7ed2e21149..f7ed2e21149 100644 --- a/Master/texmf-dist/doc/latex/changes/userdoc/ex_setdeletedmarkup.tex +++ b/Master/texmf-dist/doc/latex/changes/userdoc/setdeletedmarkup_ex.tex diff --git a/Master/texmf-dist/doc/latex/changes/userdoc/in_setdeletedmarkup.tex b/Master/texmf-dist/doc/latex/changes/userdoc/setdeletedmarkup_in.tex index 41f404cd9c4..41f404cd9c4 100644 --- a/Master/texmf-dist/doc/latex/changes/userdoc/in_setdeletedmarkup.tex +++ b/Master/texmf-dist/doc/latex/changes/userdoc/setdeletedmarkup_in.tex diff --git a/Master/texmf-dist/doc/latex/changes/userdoc/ex_sethighlightmarkup.tex b/Master/texmf-dist/doc/latex/changes/userdoc/sethighlightmarkup_ex.tex index e731735ce2a..e731735ce2a 100644 --- a/Master/texmf-dist/doc/latex/changes/userdoc/ex_sethighlightmarkup.tex +++ b/Master/texmf-dist/doc/latex/changes/userdoc/sethighlightmarkup_ex.tex diff --git a/Master/texmf-dist/doc/latex/changes/userdoc/in_sethighlightmarkup.tex b/Master/texmf-dist/doc/latex/changes/userdoc/sethighlightmarkup_in.tex index b67cec700af..b67cec700af 100644 --- a/Master/texmf-dist/doc/latex/changes/userdoc/in_sethighlightmarkup.tex +++ b/Master/texmf-dist/doc/latex/changes/userdoc/sethighlightmarkup_in.tex diff --git a/Master/texmf-dist/doc/latex/changes/userdoc/setlocextension_ex.tex b/Master/texmf-dist/doc/latex/changes/userdoc/setlocextension_ex.tex new file mode 100644 index 00000000000..83d346745b4 --- /dev/null +++ b/Master/texmf-dist/doc/latex/changes/userdoc/setlocextension_ex.tex @@ -0,0 +1,2 @@ +\setlocextension{listofchanges} +\setlocextension{lochg} diff --git a/Master/texmf-dist/doc/latex/changes/userdoc/setlocextension_in.tex b/Master/texmf-dist/doc/latex/changes/userdoc/setlocextension_in.tex new file mode 100644 index 00000000000..eda80c50275 --- /dev/null +++ b/Master/texmf-dist/doc/latex/changes/userdoc/setlocextension_in.tex @@ -0,0 +1 @@ +\setlocextension{<extension>} diff --git a/Master/texmf-dist/doc/latex/changes/userdoc/ex_setsocextension.tex b/Master/texmf-dist/doc/latex/changes/userdoc/setsocextension_ex.tex index 381c411114e..381c411114e 100644 --- a/Master/texmf-dist/doc/latex/changes/userdoc/ex_setsocextension.tex +++ b/Master/texmf-dist/doc/latex/changes/userdoc/setsocextension_ex.tex diff --git a/Master/texmf-dist/doc/latex/changes/userdoc/in_setsocextension.tex b/Master/texmf-dist/doc/latex/changes/userdoc/setsocextension_in.tex index d0d3339e822..d0d3339e822 100644 --- a/Master/texmf-dist/doc/latex/changes/userdoc/in_setsocextension.tex +++ b/Master/texmf-dist/doc/latex/changes/userdoc/setsocextension_in.tex diff --git a/Master/texmf-dist/doc/latex/changes/userdoc/ex_setsummarytowidth.tex b/Master/texmf-dist/doc/latex/changes/userdoc/setsummarytowidth_ex.tex index ad5a04fe3e4..ad5a04fe3e4 100644 --- a/Master/texmf-dist/doc/latex/changes/userdoc/ex_setsummarytowidth.tex +++ b/Master/texmf-dist/doc/latex/changes/userdoc/setsummarytowidth_ex.tex diff --git a/Master/texmf-dist/doc/latex/changes/userdoc/in_setsummarytowidth.tex b/Master/texmf-dist/doc/latex/changes/userdoc/setsummarytowidth_in.tex index 25238fc21a9..25238fc21a9 100644 --- a/Master/texmf-dist/doc/latex/changes/userdoc/in_setsummarytowidth.tex +++ b/Master/texmf-dist/doc/latex/changes/userdoc/setsummarytowidth_in.tex diff --git a/Master/texmf-dist/doc/latex/changes/userdoc/ex_setsummarywidth.tex b/Master/texmf-dist/doc/latex/changes/userdoc/setsummarywidth_ex.tex index 75cfda0de53..75cfda0de53 100644 --- a/Master/texmf-dist/doc/latex/changes/userdoc/ex_setsummarywidth.tex +++ b/Master/texmf-dist/doc/latex/changes/userdoc/setsummarywidth_ex.tex diff --git a/Master/texmf-dist/doc/latex/changes/userdoc/in_setsummarywidth.tex b/Master/texmf-dist/doc/latex/changes/userdoc/setsummarywidth_in.tex index 4d84a18bf12..4d84a18bf12 100644 --- a/Master/texmf-dist/doc/latex/changes/userdoc/in_setsummarywidth.tex +++ b/Master/texmf-dist/doc/latex/changes/userdoc/setsummarywidth_in.tex diff --git a/Master/texmf-dist/doc/latex/changes/userdoc/ex_settruncatewidth.tex b/Master/texmf-dist/doc/latex/changes/userdoc/settruncatewidth_ex.tex index e9b76536f6d..e9b76536f6d 100644 --- a/Master/texmf-dist/doc/latex/changes/userdoc/ex_settruncatewidth.tex +++ b/Master/texmf-dist/doc/latex/changes/userdoc/settruncatewidth_ex.tex diff --git a/Master/texmf-dist/doc/latex/changes/userdoc/in_settruncatewidth.tex b/Master/texmf-dist/doc/latex/changes/userdoc/settruncatewidth_in.tex index c6de5edfb60..c6de5edfb60 100644 --- a/Master/texmf-dist/doc/latex/changes/userdoc/in_settruncatewidth.tex +++ b/Master/texmf-dist/doc/latex/changes/userdoc/settruncatewidth_in.tex diff --git a/Master/texmf-dist/doc/latex/changes/userdoc/ex_usepackage_addedmarkup_changes.tex b/Master/texmf-dist/doc/latex/changes/userdoc/usepackage_addedmarkup_changes_ex.tex index e89bdf4372f..e89bdf4372f 100644 --- a/Master/texmf-dist/doc/latex/changes/userdoc/ex_usepackage_addedmarkup_changes.tex +++ b/Master/texmf-dist/doc/latex/changes/userdoc/usepackage_addedmarkup_changes_ex.tex diff --git a/Master/texmf-dist/doc/latex/changes/userdoc/in_usepackage_addedmarkup_changes.tex b/Master/texmf-dist/doc/latex/changes/userdoc/usepackage_addedmarkup_changes_in.tex index ffeb96ce16c..ffeb96ce16c 100644 --- a/Master/texmf-dist/doc/latex/changes/userdoc/in_usepackage_addedmarkup_changes.tex +++ b/Master/texmf-dist/doc/latex/changes/userdoc/usepackage_addedmarkup_changes_in.tex diff --git a/Master/texmf-dist/doc/latex/changes/userdoc/ex_usepackage_authormarkup_changes.tex b/Master/texmf-dist/doc/latex/changes/userdoc/usepackage_authormarkup_changes_ex.tex index ca023e61ef0..ca023e61ef0 100644 --- a/Master/texmf-dist/doc/latex/changes/userdoc/ex_usepackage_authormarkup_changes.tex +++ b/Master/texmf-dist/doc/latex/changes/userdoc/usepackage_authormarkup_changes_ex.tex diff --git a/Master/texmf-dist/doc/latex/changes/userdoc/in_usepackage_authormarkup_changes.tex b/Master/texmf-dist/doc/latex/changes/userdoc/usepackage_authormarkup_changes_in.tex index b02ea84a5f8..b02ea84a5f8 100644 --- a/Master/texmf-dist/doc/latex/changes/userdoc/in_usepackage_authormarkup_changes.tex +++ b/Master/texmf-dist/doc/latex/changes/userdoc/usepackage_authormarkup_changes_in.tex diff --git a/Master/texmf-dist/doc/latex/changes/userdoc/ex_usepackage_authormarkupposition_changes.tex b/Master/texmf-dist/doc/latex/changes/userdoc/usepackage_authormarkupposition_changes_ex.tex index f6cad295da4..f6cad295da4 100644 --- a/Master/texmf-dist/doc/latex/changes/userdoc/ex_usepackage_authormarkupposition_changes.tex +++ b/Master/texmf-dist/doc/latex/changes/userdoc/usepackage_authormarkupposition_changes_ex.tex diff --git a/Master/texmf-dist/doc/latex/changes/userdoc/in_usepackage_authormarkupposition_changes.tex b/Master/texmf-dist/doc/latex/changes/userdoc/usepackage_authormarkupposition_changes_in.tex index a031eda5e96..a031eda5e96 100644 --- a/Master/texmf-dist/doc/latex/changes/userdoc/in_usepackage_authormarkupposition_changes.tex +++ b/Master/texmf-dist/doc/latex/changes/userdoc/usepackage_authormarkupposition_changes_in.tex diff --git a/Master/texmf-dist/doc/latex/changes/userdoc/ex_usepackage_authormarkuptext_changes.tex b/Master/texmf-dist/doc/latex/changes/userdoc/usepackage_authormarkuptext_changes_ex.tex index 8698dda5a36..8698dda5a36 100644 --- a/Master/texmf-dist/doc/latex/changes/userdoc/ex_usepackage_authormarkuptext_changes.tex +++ b/Master/texmf-dist/doc/latex/changes/userdoc/usepackage_authormarkuptext_changes_ex.tex diff --git a/Master/texmf-dist/doc/latex/changes/userdoc/in_usepackage_authormarkuptext_changes.tex b/Master/texmf-dist/doc/latex/changes/userdoc/usepackage_authormarkuptext_changes_in.tex index e824e626f0b..e824e626f0b 100644 --- a/Master/texmf-dist/doc/latex/changes/userdoc/in_usepackage_authormarkuptext_changes.tex +++ b/Master/texmf-dist/doc/latex/changes/userdoc/usepackage_authormarkuptext_changes_in.tex diff --git a/Master/texmf-dist/doc/latex/changes/userdoc/in_usepackage_changes.tex b/Master/texmf-dist/doc/latex/changes/userdoc/usepackage_changes_in.tex index 0f542f61dc0..0f542f61dc0 100644 --- a/Master/texmf-dist/doc/latex/changes/userdoc/in_usepackage_changes.tex +++ b/Master/texmf-dist/doc/latex/changes/userdoc/usepackage_changes_in.tex diff --git a/Master/texmf-dist/doc/latex/changes/userdoc/usepackage_commandnameprefix_changes_ex.tex b/Master/texmf-dist/doc/latex/changes/userdoc/usepackage_commandnameprefix_changes_ex.tex new file mode 100644 index 00000000000..312f5e46835 --- /dev/null +++ b/Master/texmf-dist/doc/latex/changes/userdoc/usepackage_commandnameprefix_changes_ex.tex @@ -0,0 +1,3 @@ +\usepackage[commandnameprefix=none]{changes} ~ \usepackage{changes} +\usepackage[commandnameprefix=ifneeded]{changes} +\usepackage[commandnameprefix=always]{changes} diff --git a/Master/texmf-dist/doc/latex/changes/userdoc/usepackage_commandnameprefix_changes_in.tex b/Master/texmf-dist/doc/latex/changes/userdoc/usepackage_commandnameprefix_changes_in.tex new file mode 100644 index 00000000000..fb28e9272d8 --- /dev/null +++ b/Master/texmf-dist/doc/latex/changes/userdoc/usepackage_commandnameprefix_changes_in.tex @@ -0,0 +1 @@ +\usepackage[commandnameprefix=<strategy>]{changes} diff --git a/Master/texmf-dist/doc/latex/changes/userdoc/ex_usepackage_commentmarkup_changes.tex b/Master/texmf-dist/doc/latex/changes/userdoc/usepackage_commentmarkup_changes_ex.tex index 571595b1eed..571595b1eed 100644 --- a/Master/texmf-dist/doc/latex/changes/userdoc/ex_usepackage_commentmarkup_changes.tex +++ b/Master/texmf-dist/doc/latex/changes/userdoc/usepackage_commentmarkup_changes_ex.tex diff --git a/Master/texmf-dist/doc/latex/changes/userdoc/in_usepackage_commentmarkup_changes.tex b/Master/texmf-dist/doc/latex/changes/userdoc/usepackage_commentmarkup_changes_in.tex index 6f92a4bccd9..6f92a4bccd9 100644 --- a/Master/texmf-dist/doc/latex/changes/userdoc/in_usepackage_commentmarkup_changes.tex +++ b/Master/texmf-dist/doc/latex/changes/userdoc/usepackage_commentmarkup_changes_in.tex diff --git a/Master/texmf-dist/doc/latex/changes/userdoc/usepackage_defaultcolor_changes_ex.tex b/Master/texmf-dist/doc/latex/changes/userdoc/usepackage_defaultcolor_changes_ex.tex new file mode 100644 index 00000000000..0ae4093b385 --- /dev/null +++ b/Master/texmf-dist/doc/latex/changes/userdoc/usepackage_defaultcolor_changes_ex.tex @@ -0,0 +1,2 @@ +\usepackage[defaultcolor=blue]{changes} ~ \usepackage{changes} +\usepackage[defaultcolor=magenta]{changes} diff --git a/Master/texmf-dist/doc/latex/changes/userdoc/usepackage_defaultcolor_changes_in.tex b/Master/texmf-dist/doc/latex/changes/userdoc/usepackage_defaultcolor_changes_in.tex new file mode 100644 index 00000000000..d9c2e984720 --- /dev/null +++ b/Master/texmf-dist/doc/latex/changes/userdoc/usepackage_defaultcolor_changes_in.tex @@ -0,0 +1 @@ +\usepackage[defaultcolor=<color>]{changes} diff --git a/Master/texmf-dist/doc/latex/changes/userdoc/ex_usepackage_deletedmarkup_changes.tex b/Master/texmf-dist/doc/latex/changes/userdoc/usepackage_deletedmarkup_changes_ex.tex index 096b60ba89f..096b60ba89f 100644 --- a/Master/texmf-dist/doc/latex/changes/userdoc/ex_usepackage_deletedmarkup_changes.tex +++ b/Master/texmf-dist/doc/latex/changes/userdoc/usepackage_deletedmarkup_changes_ex.tex diff --git a/Master/texmf-dist/doc/latex/changes/userdoc/in_usepackage_deletedmarkup_changes.tex b/Master/texmf-dist/doc/latex/changes/userdoc/usepackage_deletedmarkup_changes_in.tex index 4678399b55b..4678399b55b 100644 --- a/Master/texmf-dist/doc/latex/changes/userdoc/in_usepackage_deletedmarkup_changes.tex +++ b/Master/texmf-dist/doc/latex/changes/userdoc/usepackage_deletedmarkup_changes_in.tex diff --git a/Master/texmf-dist/doc/latex/changes/userdoc/in_usepackage_draft_changes.tex b/Master/texmf-dist/doc/latex/changes/userdoc/usepackage_draft_changes_in.tex index 20d23104b2b..20d23104b2b 100644 --- a/Master/texmf-dist/doc/latex/changes/userdoc/in_usepackage_draft_changes.tex +++ b/Master/texmf-dist/doc/latex/changes/userdoc/usepackage_draft_changes_in.tex diff --git a/Master/texmf-dist/doc/latex/changes/userdoc/in_usepackage_final_changes.tex b/Master/texmf-dist/doc/latex/changes/userdoc/usepackage_final_changes_in.tex index 50e96e334c6..50e96e334c6 100644 --- a/Master/texmf-dist/doc/latex/changes/userdoc/in_usepackage_final_changes.tex +++ b/Master/texmf-dist/doc/latex/changes/userdoc/usepackage_final_changes_in.tex diff --git a/Master/texmf-dist/doc/latex/changes/userdoc/ex_usepackage_highlightmarkup_changes.tex b/Master/texmf-dist/doc/latex/changes/userdoc/usepackage_highlightmarkup_changes_ex.tex index f4b7c1ea0ec..f4b7c1ea0ec 100644 --- a/Master/texmf-dist/doc/latex/changes/userdoc/ex_usepackage_highlightmarkup_changes.tex +++ b/Master/texmf-dist/doc/latex/changes/userdoc/usepackage_highlightmarkup_changes_ex.tex diff --git a/Master/texmf-dist/doc/latex/changes/userdoc/in_usepackage_highlightmarkup_changes.tex b/Master/texmf-dist/doc/latex/changes/userdoc/usepackage_highlightmarkup_changes_in.tex index b834ac3feef..b834ac3feef 100644 --- a/Master/texmf-dist/doc/latex/changes/userdoc/in_usepackage_highlightmarkup_changes.tex +++ b/Master/texmf-dist/doc/latex/changes/userdoc/usepackage_highlightmarkup_changes_in.tex diff --git a/Master/texmf-dist/doc/latex/changes/userdoc/ex_usepackage_markup_changes.tex b/Master/texmf-dist/doc/latex/changes/userdoc/usepackage_markup_changes_ex.tex index 59d99829e16..59d99829e16 100644 --- a/Master/texmf-dist/doc/latex/changes/userdoc/ex_usepackage_markup_changes.tex +++ b/Master/texmf-dist/doc/latex/changes/userdoc/usepackage_markup_changes_ex.tex diff --git a/Master/texmf-dist/doc/latex/changes/userdoc/in_usepackage_markup_changes.tex b/Master/texmf-dist/doc/latex/changes/userdoc/usepackage_markup_changes_in.tex index 0b1b3e4e45c..0b1b3e4e45c 100644 --- a/Master/texmf-dist/doc/latex/changes/userdoc/in_usepackage_markup_changes.tex +++ b/Master/texmf-dist/doc/latex/changes/userdoc/usepackage_markup_changes_in.tex diff --git a/Master/texmf-dist/doc/latex/changes/userdoc/in_usepackage_options_changes.tex b/Master/texmf-dist/doc/latex/changes/userdoc/usepackage_options_changes_in.tex index 6adf76a9dca..6adf76a9dca 100644 --- a/Master/texmf-dist/doc/latex/changes/userdoc/in_usepackage_options_changes.tex +++ b/Master/texmf-dist/doc/latex/changes/userdoc/usepackage_options_changes_in.tex diff --git a/Master/texmf-dist/doc/latex/changes/userdoc/ex_usepackage_todonotes_changes.tex b/Master/texmf-dist/doc/latex/changes/userdoc/usepackage_todonotes_changes_ex.tex index be450838ede..be450838ede 100644 --- a/Master/texmf-dist/doc/latex/changes/userdoc/ex_usepackage_todonotes_changes.tex +++ b/Master/texmf-dist/doc/latex/changes/userdoc/usepackage_todonotes_changes_ex.tex diff --git a/Master/texmf-dist/doc/latex/changes/userdoc/in_usepackage_todonotes_changes.tex b/Master/texmf-dist/doc/latex/changes/userdoc/usepackage_todonotes_changes_in.tex index 4761059b902..4761059b902 100644 --- a/Master/texmf-dist/doc/latex/changes/userdoc/in_usepackage_todonotes_changes.tex +++ b/Master/texmf-dist/doc/latex/changes/userdoc/usepackage_todonotes_changes_in.tex diff --git a/Master/texmf-dist/doc/latex/changes/userdoc/ex_usepackage_truncate_changes.tex b/Master/texmf-dist/doc/latex/changes/userdoc/usepackage_truncate_changes_ex.tex index 075ec61a805..075ec61a805 100644 --- a/Master/texmf-dist/doc/latex/changes/userdoc/ex_usepackage_truncate_changes.tex +++ b/Master/texmf-dist/doc/latex/changes/userdoc/usepackage_truncate_changes_ex.tex diff --git a/Master/texmf-dist/doc/latex/changes/userdoc/in_usepackage_truncate_changes.tex b/Master/texmf-dist/doc/latex/changes/userdoc/usepackage_truncate_changes_in.tex index 4afeb2fa499..4afeb2fa499 100644 --- a/Master/texmf-dist/doc/latex/changes/userdoc/in_usepackage_truncate_changes.tex +++ b/Master/texmf-dist/doc/latex/changes/userdoc/usepackage_truncate_changes_in.tex diff --git a/Master/texmf-dist/doc/latex/changes/userdoc/ex_usepackage_ulem_changes.tex b/Master/texmf-dist/doc/latex/changes/userdoc/usepackage_ulem_changes_ex.tex index 54aba865029..54aba865029 100644 --- a/Master/texmf-dist/doc/latex/changes/userdoc/ex_usepackage_ulem_changes.tex +++ b/Master/texmf-dist/doc/latex/changes/userdoc/usepackage_ulem_changes_ex.tex diff --git a/Master/texmf-dist/doc/latex/changes/userdoc/in_usepackage_ulem_changes.tex b/Master/texmf-dist/doc/latex/changes/userdoc/usepackage_ulem_changes_in.tex index ea60df8a494..ea60df8a494 100644 --- a/Master/texmf-dist/doc/latex/changes/userdoc/in_usepackage_ulem_changes.tex +++ b/Master/texmf-dist/doc/latex/changes/userdoc/usepackage_ulem_changes_in.tex diff --git a/Master/texmf-dist/doc/latex/changes/userdoc/ex_usepackage_xcolor_changes.tex b/Master/texmf-dist/doc/latex/changes/userdoc/usepackage_xcolor_changes_ex.tex index 36409ef3e46..36409ef3e46 100644 --- a/Master/texmf-dist/doc/latex/changes/userdoc/ex_usepackage_xcolor_changes.tex +++ b/Master/texmf-dist/doc/latex/changes/userdoc/usepackage_xcolor_changes_ex.tex diff --git a/Master/texmf-dist/doc/latex/changes/userdoc/in_usepackage_xcolor_changes.tex b/Master/texmf-dist/doc/latex/changes/userdoc/usepackage_xcolor_changes_in.tex index 6a99177d828..6a99177d828 100644 --- a/Master/texmf-dist/doc/latex/changes/userdoc/in_usepackage_xcolor_changes.tex +++ b/Master/texmf-dist/doc/latex/changes/userdoc/usepackage_xcolor_changes_in.tex diff --git a/Master/texmf-dist/source/latex/changes/changes.drv b/Master/texmf-dist/source/latex/changes/changes.drv index 9b744e7298f..dc9bc65432a 100644 --- a/Master/texmf-dist/source/latex/changes/changes.drv +++ b/Master/texmf-dist/source/latex/changes/changes.drv @@ -137,16 +137,16 @@ \usepackage{changes} \definechangesauthor[name={Ekkart Kleinod}, color=Sienna]{EK} \setcommentmarkup{% - \ifthenelse{\isColored}% + \IfIsColored% {% - \ifthenelse{\isAnonymous{#2}}% + \IfIsAnonymous{#2}% {% \todo[color=authorcolor!10, bordercolor=authorcolor, linecolor=authorcolor!70, nolist]{\footnotesize\textbf{[\arabic{authorcommentcount}]} #1}% }{% \todo[color=authorcolor!10, bordercolor=authorcolor, linecolor=authorcolor!70, nolist]{\footnotesize\textbf{[#3~\arabic{authorcommentcount}]} #1}% }% }{% - \ifthenelse{\isAnonymous{#2}}% + \IfIsAnonymous{#2}% {% \todo[color=black!0, bordercolor=black, linecolor=black!70, nolist]{\footnotesize\textbf{[\arabic{authorcommentcount}]} #1}% }{% @@ -162,10 +162,9 @@ \CodelineIndex % formatting -\newcommand{\chpackage}[1]{\textsl{#1}} -\newcommand{\choption}[1]{\texttt{#1}} -\newcommand{\chfile}[1]{\texttt{#1}} -\newcommand{\chcommand}[1]{\texttt{\textbackslash{}#1}} +\newcommand{\docpackage}[1]{\textsl{#1}} +\newcommand{\docoption}[1]{\texttt{#1}} +\newcommand{\doccommand}[1]{\texttt{\textbackslash{}#1}} % additional description list formatting \newlength{\mylabelwidth} @@ -194,7 +193,7 @@ ]{#2}% } \newcommand{\chinline}[2][]{% - \chinputlisting{#1}{userdoc/in_#2}% + \chinputlisting{#1}{userdoc/#2_in}% } \newcommand{\chexample}[1]{ \ifENGLISH @@ -203,7 +202,7 @@ \ifGERMAN \minisec{Beispiele} \fi - \lstinputlisting{userdoc/ex_#1} + \lstinputlisting{userdoc/#1_ex} } \newcommand{\chresult}[1]{ \ifENGLISH @@ -213,7 +212,7 @@ \minisec{Resultat} \fi \begin{quote} - \input{userdoc/ex_#1} + \input{userdoc/#1_ex} \end{quote} } @@ -253,18 +252,18 @@ % new commands \newcommand{\chnewcmd}[1]{ - \subsubsection{\chcommand{#1}} + \subsubsection{\doccommand{#1}} \label{sec:ui:cmd:#1} } % document title \ifENGLISH - \title{The \chpackage{changes}-package} - \subtitle{Manual change markup --- version 3.2.2} + \title{The \docpackage{changes}-package} + \subtitle{Manual change markup --- version 4.0.0} \fi \ifGERMAN - \title{Das \chpackage{changes}-Paket} - \subtitle{Manuelle Änderungsmarkierung -- Version 3.2.2} + \title{Das \docpackage{changes}-Paket} + \subtitle{Manuelle Änderungsmarkierung -- Version 4.0.0} \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 7a7fba693e2..8206f28c5ef 100644 --- a/Master/texmf-dist/source/latex/changes/changes.dtx +++ b/Master/texmf-dist/source/latex/changes/changes.dtx @@ -1,8 +1,8 @@ -% \CheckSum{1509} +% \CheckSum{1258} % % \iffalse meta-comment % -% Copyright (C) 2007-2019 +% Copyright (C) 2007-2021 % Ekkart Kleinod (ekleinod@edgesoft.de) % -------------------------------------------------------------------------- % @@ -62,6 +62,7 @@ % \changes{v3.2.0}{2019/10/28}{Merge changes script (pyMergeChanges): Support nested brackets} % \changes{v3.2.1}{2019/11/17}{removed obsolete package pdfcolmk} % \changes{v3.2.2}{2020/06/16}{Merge changes script (pyMergeChanges): Correctly handle multiple different macros in the same line} +% \changes{v4.0.0}{2021/01/28}{new: convenience macros, setlocextension, option commandnameprefix, defaultcolor; removed: xifthen, remark} % \GetFileInfo{changes.dtx} % \RecordChanges % @@ -102,45 +103,113 @@ % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{changes} -[2020/06/16 v3.2.2 changes package] -\typeout{*** changes package 2020/06/16 v3.2.2 ***} +[2021/01/28 v4.0.0 changes package] +\typeout{*** changes package 2021/01/28 v4.0.0 ***} % \end{macrocode} % -% Package \chpackage{xkeyval} provides options with key-value-pairs. +% Package \docpackage{xkeyval} provides options with key-value-pairs. % \begin{macrocode} \RequirePackage{xkeyval} % \end{macrocode} % -% Package \chpackage{xifthen} provides improved \texttt{if} as well as a \texttt{while}-loop. +% Package \docpackage{etoolbox} provides improved \emph{if}, \emph{bools} as well as a \emph{list} operations. +% todo % \begin{macrocode} -\RequirePackage{xifthen} +\RequirePackage{etoolbox} % \end{macrocode} % -% Package \chpackage{xstring} provides improved string test and handling methods. +% Package \docpackage{xstring} provides improved string test and handling methods. % \begin{macrocode} \RequirePackage{xstring} % \end{macrocode} % +% \begin{macro}{\IfIsInList} +% +% Helper macro: tests if one of the pipe separated values is in the second list of pipe separated values (boolean or). +% +% Corresponds to the if macros of \docpackage{etoolbox}, so it can be used in it's boolean tests. +% Mainly the last two parameters are the results of \emph{true} and \emph{false} computation. +% +% Declare list parsers. +% \begin{macrocode} +\DeclareListParser{\dopsvlist}{|} +\DeclareListParser*{\forpsvlist}{|} +% \end{macrocode} +% +% A temporary list and flag. +% \begin{macrocode} +\newcommand{\Changes@tmplist}{} +\newbool{Changes@inlist} +% \end{macrocode} +% +% Fill list with values, then check if one of the values of the first list is in the second one. +% \begin{macrocode} +\newrobustcmd{\IfIsInList}[4]{% + \renewcommand{\Changes@tmplist}{}% +% \end{macrocode} +% +% I could not get +% \doccommand{forpsvlist}\{\doccommand{listadd}\doccommand{Changes@tmplist}\}\{\#2\} +% to work if \#2 is a macro, so I used the code below. +% +% Thanks to Ulrike Fischer for the fix of the macro call of \doccommand{dopsvlist} with \doccommand{expandafter}. +% \begin{macrocode} + \renewcommand*{\do}[1]{% + \listadd{\Changes@tmplist}{##1}% + }% + \expandafter\dopsvlist\expandafter{#2}% +% \end{macrocode} +% End fo the workaround for \doccommand{forpsvlist}. +% \begin{macrocode} + \setbool{Changes@inlist}{false}% + \renewcommand*{\do}[1]{% + \ifinlist{##1}{\Changes@tmplist}% + {\setbool{Changes@inlist}{true}}% + {}% + }% + \expandafter\dopsvlist\expandafter{#1}% + \ifbool{Changes@inlist}% + {#3}% + {#4}% +} +% \end{macrocode} +% \end{macro} +% % \subsubsection{Package options} % -% Option \choption{draft}, \emph{default} is \texttt{true}. +% Option \docoption{draft}, \emph{default} is \emph{true}. % \begin{macrocode} -\newboolean{Changes@optiondraft} -\setboolean{Changes@optiondraft}{true} +\newbool{Changes@optiondraft} +\setbool{Changes@optiondraft}{true} \DeclareOptionX{draft}{ - \setboolean{Changes@optiondraft}{true} + \setbool{Changes@optiondraft}{true} \typeout{changes-option '\CurrentOption'} } % \end{macrocode} % -% Option \choption{final}, sets \choption{draft} to \texttt{false}. +% Option \docoption{final}, sets \docoption{draft} to \emph{false}. % \begin{macrocode} \DeclareOptionX{final}{ - \setboolean{Changes@optiondraft}{false} + \setbool{Changes@optiondraft}{false} \typeout{changes-option '\CurrentOption'} } % \end{macrocode} % +% Declare storage for authormarkup option and store option value or set to default value \emph{superscript}. +% \begin{macrocode} +\newcommand{\Changes@optioncommandnameprefix}{none} +\DeclareOptionX{commandnameprefix}{ + \ifblank{#1} + {} + { + \IfIsInList{#1}{none|always|ifneeded} + {\renewcommand{\Changes@optioncommandnameprefix}{#1}} + {\PackageWarning{changes}{commandnameprefix '#1' unknown, using '\Changes@optioncommandnameprefix'}} + } + \typeout{changes-option 'commandnameprefix=\Changes@optioncommandnameprefix'} +} +% \end{macrocode} +% % Declare storage for markup options, they are set by the markup option but can be changed with the more special options, therefore they have to be declared at this place. % Replacement markup is a combination of added and deleted markup, thus there is no special markup storage. % \begin{macrocode} @@ -150,40 +219,35 @@ \newcommand{\Changes@optioncommentmarkup}{todo} % \end{macrocode} % -% Option \choption{markup}, sets markup options accordingly. +% Option \docoption{markup}, sets markup options accordingly. % \begin{macrocode} \newcommand{\Changes@optionmarkup}{default} \DeclareOptionX{markup}{ - \ifthenelse{\equal{\@empty}{#1}} + \ifblank{#1} {} { - \ifthenelse{ - \equal{#1}{default}\or - \equal{#1}{underlined}\or - \equal{#1}{bfit}\or - \equal{#1}{nocolor} - } + \IfIsInList{#1}{bfit|default|nocolor|underlined} {\renewcommand{\Changes@optionmarkup}{#1}} {\PackageWarning{changes}{markup '#1' unknown, using '\Changes@optionmarkup'}} } - \ifthenelse{\equal{\Changes@optionmarkup}{default}} + \IfStrEq{\Changes@optionmarkup}{default} { - % nothing to do + % nothing to do, included for symmetry and potential later use } {} - \ifthenelse{\equal{\Changes@optionmarkup}{underlined}} + \IfStrEq{\Changes@optionmarkup}{underlined} { \renewcommand{\Changes@optionaddedmarkup}{uline} \renewcommand{\Changes@optionhighlightmarkup}{uwave} } {} - \ifthenelse{\equal{\Changes@optionmarkup}{bfit}} + \IfStrEq{\Changes@optionmarkup}{bfit} { \renewcommand{\Changes@optionaddedmarkup}{bf} \renewcommand{\Changes@optiondeletedmarkup}{it} } {} - \ifthenelse{\equal{\Changes@optionmarkup}{nocolor}} + \IfStrEq{\Changes@optionmarkup}{nocolor} { \renewcommand{\Changes@optionaddedmarkup}{uline} \renewcommand{\Changes@optionhighlightmarkup}{uwave} @@ -193,24 +257,13 @@ } % \end{macrocode} % -% Option \choption{addedmarkup}, stored or set to default value ``\texttt{colored}''. +% Option \docoption{addedmarkup}, stored or set to default value \emph{colored}. % \begin{macrocode} \DeclareOptionX{addedmarkup}{ - \ifthenelse{\equal{\@empty}{#1}} + \ifblank{#1} {} { - \ifthenelse{ - \equal{#1}{colored}\or - \equal{#1}{uline}\or - \equal{#1}{uuline}\or - \equal{#1}{uwave}\or - \equal{#1}{dashuline}\or - \equal{#1}{dotuline}\or - \equal{#1}{bf}\or - \equal{#1}{it}\or - \equal{#1}{sl}\or - \equal{#1}{em} - } + \IfIsInList{#1}{bf|colored|dashuline|dotuline|em|it|sl|uline|uuline|uwave} {\renewcommand{\Changes@optionaddedmarkup}{#1}} {\PackageWarning{changes}{addedmarkup '#1' unknown, using '\Changes@optionaddedmarkup'}} } @@ -218,26 +271,13 @@ } % \end{macrocode} % -% Option \choption{deletedmarkup}, stored or set to default value ``\texttt{sout}''. +% Option \docoption{deletedmarkup}, stored or set to default value \emph{sout}. % \begin{macrocode} \DeclareOptionX{deletedmarkup}{ - \ifthenelse{\equal{\@empty}{#1}} + \ifblank{#1} {} { - \ifthenelse{ - \equal{#1}{sout}\or - \equal{#1}{colored}\or - \equal{#1}{uline}\or - \equal{#1}{uuline}\or - \equal{#1}{uwave}\or - \equal{#1}{dashuline}\or - \equal{#1}{dotuline}\or - \equal{#1}{xout}\or - \equal{#1}{bf}\or - \equal{#1}{it}\or - \equal{#1}{sl}\or - \equal{#1}{em} - } + \IfIsInList{#1}{bf|colored|dashuline|dotuline|em|it|sl|sout|uline|uuline|uwave|xout} {\renewcommand{\Changes@optiondeletedmarkup}{#1}} {\PackageWarning{changes}{deletedmarkup '#1' unknown, using '\Changes@optiondeletedmarkup'}} } @@ -245,17 +285,13 @@ } % \end{macrocode} % -% Option \choption{highlightmarkup}, stored or set to default value ``\texttt{background}''. +% Option \docoption{highlightmarkup}, stored or set to default value \emph{background}. % \begin{macrocode} \DeclareOptionX{highlightmarkup}{ - \ifthenelse{\equal{\@empty}{#1}} + \ifblank{#1} {} { - \ifthenelse{ - \equal{#1}{background}\or - \equal{#1}{uuline}\or - \equal{#1}{uwave} - } + \IfIsInList{#1}{background|uuline|uwave} {\renewcommand{\Changes@optionhighlightmarkup}{#1}} {\PackageWarning{changes}{highlightmarkup '#1' unknown, using '\Changes@optionhighlightmarkup'}} } @@ -263,18 +299,13 @@ } % \end{macrocode} % -% Option \choption{commentmarkup}, stored or set to default value ``\texttt{todo}''. +% Option \docoption{commentmarkup}, stored or set to default value \emph{todo}. % \begin{macrocode} \DeclareOptionX{commentmarkup}{ - \ifthenelse{\equal{\@empty}{#1}} + \ifblank{#1} {} { - \ifthenelse{ - \equal{#1}{todo}\or - \equal{#1}{margin}\or - \equal{#1}{footnote}\or - \equal{#1}{uwave} - } + \IfIsInList{#1}{footnote|margin|todo|uwave} {\renewcommand{\Changes@optioncommentmarkup}{#1}} {\PackageWarning{changes}{commentmarkup '#1' unknown, using '\Changes@optioncommentmarkup'}} } @@ -282,20 +313,14 @@ } % \end{macrocode} % -% Declare storage for authormarkup option and store option value or set to default value ``\texttt{superscript}''. +% Declare storage for authormarkup option and store option value or set to default value \emph{superscript}. % \begin{macrocode} \newcommand{\Changes@optionauthormarkup}{superscript} \DeclareOptionX{authormarkup}{ - \ifthenelse{\equal{\@empty}{#1}} + \ifblank{#1} {} { - \ifthenelse{ - \equal{#1}{superscript}\or - \equal{#1}{subscript}\or - \equal{#1}{brackets}\or - \equal{#1}{footnote}\or - \equal{#1}{none} - } + \IfIsInList{#1}{brackets|footnote|none|subscript|superscript} {\renewcommand{\Changes@optionauthormarkup}{#1}} {\PackageWarning{changes}{authormarkup '#1' unknown, using '\Changes@optionauthormarkup'}} } @@ -303,17 +328,14 @@ } % \end{macrocode} % -% Declare storage for authormarkupposition option and store option value or set to default value ``\texttt{right}''. +% Declare storage for authormarkupposition option and store option value or set to default value \emph{right}. % \begin{macrocode} \newcommand{\Changes@optionauthormarkupposition}{right} \DeclareOptionX{authormarkupposition}{ - \ifthenelse{\equal{\@empty}{#1}} + \ifblank{#1} {} { - \ifthenelse{ - \equal{#1}{right}\or - \equal{#1}{left} - } + \IfIsInList{#1}{left|right} {\renewcommand{\Changes@optionauthormarkupposition}{#1}} {\PackageWarning{changes}{authormarkupposition '#1' unknown, using '\Changes@optionauthormarkupposition'}} } @@ -321,17 +343,14 @@ } % \end{macrocode} % -% Declare storage for authormarkuptext option and store option value or set to default value ``\texttt{id}''. +% Declare storage for authormarkuptext option and store option value or set to default value \emph{id}. % \begin{macrocode} \newcommand{\Changes@optionauthormarkuptext}{id} \DeclareOptionX{authormarkuptext}{ - \ifthenelse{\equal{\@empty}{#1}} + \ifblank{#1} {} { - \ifthenelse{ - \equal{#1}{id}\or - \equal{#1}{name} - } + \IfIsInList{#1}{id|name} {\renewcommand{\Changes@optionauthormarkuptext}{#1}} {\PackageWarning{changes}{authormarkuptext '#1' unknown, using '\Changes@optionauthormarkuptext'}} } @@ -339,9 +358,21 @@ } % \end{macrocode} % +% Store default author color.. +% \begin{macrocode} +\newcommand{\Changes@optiondefaultcolor}{blue} +\DeclareOptionX{defaultcolor}{ + \ifblank{#1} + {} + { + \renewcommand{\Changes@optiondefaultcolor}{#1} + } + \typeout{changes-option 'defaultcolor=\Changes@optiondefaultcolor'} +} +% \end{macrocode} % % -% Options for package \chpackage{todonotes} are directly passed to the package. +% Options for package \docpackage{todonotes} are directly passed to the package. % \begin{macrocode} \DeclareOptionX{todonotes}{ \typeout{todonotes-option '#1', passed to package todonotes} @@ -349,7 +380,7 @@ } % \end{macrocode} % -% Options for package \chpackage{truncate} are directly passed to the package. +% Options for package \docpackage{truncate} are directly passed to the package. % \begin{macrocode} \DeclareOptionX{truncate}{ \typeout{truncate-option '#1', passed to package truncate} @@ -357,7 +388,7 @@ } % \end{macrocode} % -% Options for package \chpackage{ulem} are directly passed to the package. +% Options for package \docpackage{ulem} are directly passed to the package. % \begin{macrocode} \DeclareOptionX{ulem}{ \typeout{ulem-option '#1', passed to package ulem} @@ -365,7 +396,7 @@ } % \end{macrocode} % -% Options for package \chpackage{xcolor} are directly passed to the package. +% Options for package \docpackage{xcolor} are directly passed to the package. % \begin{macrocode} \DeclareOptionX{xcolor}{ \typeout{xcolor-option '#1', passed to package xcolor} @@ -382,9 +413,9 @@ % % \subsubsection{Command options} % -% All options for commands (e.g. \chcommand{definechangesauthor}) have to be declared before option processing. +% All options for commands (e.g. \doccommand{definechangesauthor}) have to be declared before option processing. % -% \minisec{\chcommand{definechangesauthor}} +% \minisec{\doccommand{definechangesauthor}} % % Declare available options of the command, define value storage. % \begin{macrocode} @@ -396,16 +427,15 @@ % \begin{macrocode} \presetkeys{Changes@definechangesauthor}{ name=\@empty, - color=blue + color=\Changes@optiondefaultcolor }{} % \end{macrocode} % -% \minisec{\chcommand{added}} +% \minisec{\doccommand{added}} % % Declare available options of the command, define value storage. % \begin{macrocode} \DeclareOptionX<Changes@added>{id}{\def\Changes@added@id{#1}} -\DeclareOptionX<Changes@added>{remark}{\def\Changes@added@remark{#1}} \DeclareOptionX<Changes@added>{comment}{\def\Changes@added@comment{#1}} % \end{macrocode} % @@ -413,17 +443,15 @@ % \begin{macrocode} \presetkeys{Changes@added}{ id=\@empty, - remark=\@empty, comment=\@empty, }{} % \end{macrocode} % -% \minisec{\chcommand{deleted}} +% \minisec{\doccommand{deleted}} % % Declare available options of the command, define value storage. % \begin{macrocode} \DeclareOptionX<Changes@deleted>{id}{\def\Changes@deleted@id{#1}} -\DeclareOptionX<Changes@deleted>{remark}{\def\Changes@deleted@remark{#1}} \DeclareOptionX<Changes@deleted>{comment}{\def\Changes@deleted@comment{#1}} % \end{macrocode} % @@ -431,17 +459,15 @@ % \begin{macrocode} \presetkeys{Changes@deleted}{ id=\@empty, - remark=\@empty, comment=\@empty, }{} % \end{macrocode} % -% \minisec{\chcommand{replaced}} +% \minisec{\doccommand{replaced}} % % Declare available options of the command, define value storage. % \begin{macrocode} \DeclareOptionX<Changes@replaced>{id}{\def\Changes@replaced@id{#1}} -\DeclareOptionX<Changes@replaced>{remark}{\def\Changes@replaced@remark{#1}} \DeclareOptionX<Changes@replaced>{comment}{\def\Changes@replaced@comment{#1}} % \end{macrocode} % @@ -449,17 +475,15 @@ % \begin{macrocode} \presetkeys{Changes@replaced}{ id=\@empty, - remark=\@empty, comment=\@empty, }{} % \end{macrocode} % -% \minisec{\chcommand{highlight}} +% \minisec{\doccommand{highlight}} % % Declare available options of the command, define value storage. % \begin{macrocode} \DeclareOptionX<Changes@highlight>{id}{\def\Changes@highlight@id{#1}} -\DeclareOptionX<Changes@highlight>{remark}{\def\Changes@highlight@remark{#1}} \DeclareOptionX<Changes@highlight>{comment}{\def\Changes@highlight@comment{#1}} % \end{macrocode} % @@ -467,12 +491,11 @@ % \begin{macrocode} \presetkeys{Changes@highlight}{ id=\@empty, - remark=\@empty, comment=\@empty, }{} % \end{macrocode} % -% \minisec{\chcommand{comment}} +% \minisec{\doccommand{comment}} % % Declare available options of the command, define value storage. % \begin{macrocode} @@ -486,7 +509,7 @@ }{} % \end{macrocode} % -% \minisec{\chcommand{listofchanges}} +% \minisec{\doccommand{listofchanges}} % % Declare available options of the command, define value storage. % \begin{macrocode} @@ -522,101 +545,140 @@ \ProcessOptionsX*\relax % \end{macrocode} % -% \subsection{Packages} +% \subsection{Utility tests} % -% \begin{macro}{\isColored} +% \begin{macro}{\IfIsColored} % % Check if text should be colored. +% +% Corresponds to the if macros of \docpackage{etoolbox}, so it can be used in it's boolean tests. +% Mainly the last two parameters are the results of \emph{true} and \emph{false} computation. % \begin{macrocode} -\newtest{\isColored}{% - \not\equal{\Changes@optionmarkup}{nocolor}% +\newrobustcmd{\IfIsColored}[2]{% + \IfStrEq{\Changes@optionmarkup}{nocolor}% + {#2}% + {#1}% } % \end{macrocode} % \end{macro} % -% Package \chpackage{xcolor} provides colored text. +% \begin{macro}{\IfIsEmpty} +% +% Checks if text in \docoption{\#1} is empty, executes \docoption{\#2} if empty, \docoption{\#3} otherwise. +% +% Corresponds to the if macros of \docpackage{etoolbox}, so it can be used in it's boolean tests. +% Mainly the last two parameters are the results of \emph{true} and \emph{false} computation. % \begin{macrocode} -\ifthenelse{\isColored} - { - \RequirePackage{xcolor} - } +\newrobustcmd{\IfIsEmpty}[3]{% + \ifboolexpr{% + test {\ifblank{#1}} or% + test {\IfStrEq{#1}{}} or% + test {\IfStrEq{#1}{\@empty}}% + }% + {#2}% + {#3}% +} +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\IfIsAnonymous} +% +% Check if author id is empty, therefore the author is anonymous. +% +% Corresponds to the if macros of \docpackage{etoolbox}, so it can be used in it's boolean tests. +% Mainly the last two parameters are the results of \emph{true} and \emph{false} computation. +% \begin{macrocode} +\newrobustcmd{\IfIsAnonymous}[3]{% + \IfIsEmpty{#1}{#2}{#3}% +} +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\IfIsAuthorEmptyAtPosition} +% +% Check if author is anonymous or position does not equal needed position, therefore the author text is empty. +% This is a new test that can be tested using \doccommand{ifthenelse}. +% +% This test could be removed if the test for empty \doccommand{Changes@output@author} would work. % todo +% +% Corresponds to the if macros of \docpackage{etoolbox}, so it can be used in it's boolean tests. +% Mainly the last two parameters are the results of \emph{true} and \emph{false} computation. +% \begin{macrocode} +\newrobustcmd{\IfIsAuthorEmptyAtPosition}[4]{% + \ifboolexpr{% + test {\IfIsAnonymous{#1}} or% + not test {\IfStrEq{\Changes@optionauthormarkupposition}{#2}}% + }% + {#3}% + {#4}% +} +% \end{macrocode} +% \end{macro} +% +% \subsection{Packages} +% +% Package \docpackage{xcolor} provides colored text. +% \begin{macrocode} +\IfIsColored + {\RequirePackage{xcolor}} {} % \end{macrocode} % -% Package \chpackage{ulem} provides commands for striking out text. -% Providing the needed package options via \chcommand{ExecuteOptionsX}. -% \begin{macrocode} -\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@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}\or - \equal{\Changes@optioncommentmarkup}{uwave}\or - \equal{\Changes@optionhighlightmarkup}{uuline}\or - \equal{\Changes@optionhighlightmarkup}{uwave} +% Package \docpackage{ulem} provides commands for striking out text. +% Providing the needed package options via \doccommand{ExecuteOptionsX}. +% \begin{macrocode} +\ifboolexpr{ + test {\IfIsInList{\Changes@optionaddedmarkup}{dashuline|dotuline|sout|uline|uuline|uwave|xout}} or + test {\IfIsInList{\Changes@optiondeletedmarkup}{dashuline|dotuline|sout|uline|uuline|uwave|xout}} or + test {\IfIsInList{\Changes@optionhighlightmarkup}{dashuline|dotuline|sout|uline|uuline|uwave|xout}} } {\RequirePackage{ulem}} {} % \end{macrocode} % -% Package \chpackage{todonotes} provides commands for todo notes in the margin. +% Package \docpackage{todonotes} provides commands for todo notes in the margin. % \begin{macrocode} -\ifthenelse{ - \equal{\Changes@optioncommentmarkup}{todo} -} +\IfStrEq{\Changes@optioncommentmarkup}{todo} {\RequirePackage{todonotes}} {} % \end{macrocode} % % \subsection{Language dependent texts} % -% 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} -\newcommand*\listofchangesname{List of changes} -\newcommand*\summaryofchangesname{Changes} -\newcommand*\compactsummaryofchangesname{Changes (compact)} -\newcommand*\changesaddname{Added} -\newcommand*\changesdeletename{Deleted} -\newcommand*\changesreplacename{Replaced} -\newcommand*\changeshighlightname{Highlighted} -\newcommand*\changescommentname{Commented} -\newcommand*\changesauthorname{Author} -\newcommand*\changesanonymousname{anonymous} -\newcommand*\changesnochanges{No changes.} -\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}} +% If the \docpackage{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 \docpackage{babel} or the \docpackage{polyglossia} package is loaded, the default language is English too for undefined languages. +% \begin{macrocode} +\def\listofchangesname{List of changes} +\def\summaryofchangesname{Changes} +\def\compactsummaryofchangesname{Changes (compact)} +\def\changesaddedname{Added} +\def\changesdeletedname{Deleted} +\def\changesreplacedname{Replaced} +\def\changeshighlightname{Highlighted} +\def\changescommentname{Commented} +\def\changesauthorname{Author} +\def\changesanonymousname{anonymous} +\def\changesnochanges{No changes.} +\def\changesnoloc{List of changes is available after the next \LaTeX\ run.} +\def\changesnosoc{Summary of changes is available after the next \LaTeX\ run.} +% \end{macrocode} +% +% The check for \docpackage{babel} or \docpackage{polyglossia}, define language dependent texts afterwards. +% \begin{macrocode} +\ifboolexpr{ + test {\@ifpackageloaded{babel}} or + test {\@ifpackageloaded{polyglossia}} +} { \addto\captionsngerman{\def\listofchangesname{Liste der \"Anderungen}} \addto\captionsngerman{\def\summaryofchangesname{\"Anderungen}} \addto\captionsngerman{\def\compactsummaryofchangesname{\"Anderungen (kompakt)}} - \addto\captionsngerman{\def\changesaddname{Eingef\"ugt}} - \addto\captionsngerman{\def\changesdeletename{Gel\"oscht}} - \addto\captionsngerman{\def\changesreplacename{Ersetzt}} + \addto\captionsngerman{\def\changesaddedname{Eingef\"ugt}} + \addto\captionsngerman{\def\changesdeletedname{Gel\"oscht}} + \addto\captionsngerman{\def\changesreplacedname{Ersetzt}} \addto\captionsngerman{\def\changeshighlightname{Hervorgehoben}} \addto\captionsngerman{\def\changescommentname{Kommentiert}} - \addto\captionsngerman{\def\changesauthorname{Autor}} + \addto\captionsngerman{\def\changesauthorname{Autor:in}} \addto\captionsngerman{\def\changesanonymousname{Anonym}} \addto\captionsngerman{\def\changesnochanges{Keine \"Anderungen.}} \addto\captionsngerman{\def\changesnoloc{Liste der \"Anderungen nach dem n\"achsten \LaTeX-Lauf verf\"ugbar.}} @@ -625,12 +687,12 @@ \addto\captionsgerman{\def\listofchangesname{Liste der \"Anderungen}} \addto\captionsgerman{\def\summaryofchangesname{\"Anderungen}} \addto\captionsgerman{\def\compactsummaryofchangesname{\"Anderungen (kompakt)}} - \addto\captionsgerman{\def\changesaddname{Eingef\"ugt}} - \addto\captionsgerman{\def\changesdeletename{Gel\"oscht}} - \addto\captionsgerman{\def\changesreplacename{Ersetzt}} + \addto\captionsgerman{\def\changesaddedname{Eingef\"ugt}} + \addto\captionsgerman{\def\changesdeletedname{Gel\"oscht}} + \addto\captionsgerman{\def\changesreplacedname{Ersetzt}} \addto\captionsgerman{\def\changeshighlightname{Hervorgehoben}} \addto\captionsgerman{\def\changescommentname{Kommentiert}} - \addto\captionsgerman{\def\changesauthorname{Autor}} + \addto\captionsgerman{\def\changesauthorname{Autor:in}} \addto\captionsgerman{\def\changesanonymousname{Anonym}} \addto\captionsgerman{\def\changesnochanges{Keine \"Anderungen.}} \addto\captionsgerman{\def\changesnoloc{Liste der \"Anderungen nach dem n\"achsten \LaTeX-Lauf verf\"ugbar.}} @@ -639,9 +701,9 @@ \addto\captionsenglish{\def\listofchangesname{List of changes}} \addto\captionsenglish{\def\summaryofchangesname{Changes}} \addto\captionsenglish{\def\compactsummaryofchangesname{Changes (compact)}} - \addto\captionsenglish{\def\changesaddname{Added}} - \addto\captionsenglish{\def\changesdeletename{Deleted}} - \addto\captionsenglish{\def\changesreplacename{Replaced}} + \addto\captionsenglish{\def\changesaddedname{Added}} + \addto\captionsenglish{\def\changesdeletedname{Deleted}} + \addto\captionsenglish{\def\changesreplacedname{Replaced}} \addto\captionsenglish{\def\changeshighlightname{Highlighted}} \addto\captionsenglish{\def\changescommentname{Commented}} \addto\captionsenglish{\def\changesauthorname{Author}} @@ -653,9 +715,9 @@ \addto\captionsbritish{\def\listofchangesname{List of changes}} \addto\captionsbritish{\def\summaryofchangesname{Changes}} \addto\captionsbritish{\def\compactsummaryofchangesname{Changes (compact)}} - \addto\captionsbritish{\def\changesaddname{Added}} - \addto\captionsbritish{\def\changesdeletename{Deleted}} - \addto\captionsbritish{\def\changesreplacename{Replaced}} + \addto\captionsbritish{\def\changesaddedname{Added}} + \addto\captionsbritish{\def\changesdeletedname{Deleted}} + \addto\captionsbritish{\def\changesreplacedname{Replaced}} \addto\captionsbritish{\def\changeshighlightname{Highlighted}} \addto\captionsbritish{\def\changescommentname{Commented}} \addto\captionsbritish{\def\changesauthorname{Author}} @@ -667,9 +729,9 @@ \addto\captionsitalian{\def\listofchangesname{Lista delle modifiche}} \addto\captionsitalian{\def\summaryofchangesname{Modifiche}} \addto\captionsitalian{\def\compactsummaryofchangesname{Modifiche (coerente)}} % translation by me (EK), please provide correct translation - \addto\captionsitalian{\def\changesaddname{Aggiunte}} - \addto\captionsitalian{\def\changesdeletename{Cancellazioni}} - \addto\captionsitalian{\def\changesreplacename{Sostituzioni}} + \addto\captionsitalian{\def\changesaddedname{Aggiunte}} + \addto\captionsitalian{\def\changesdeletedname{Cancellazioni}} + \addto\captionsitalian{\def\changesreplacedname{Sostituzioni}} \addto\captionsitalian{\def\changeshighlightname{Accentare}} % translation by me (EK), please provide correct translation \addto\captionsitalian{\def\changescommentname{Commenti}} % translation by me (EK), please provide correct translation \addto\captionsitalian{\def\changesauthorname{Autore}} @@ -681,21 +743,36 @@ {} % \end{macrocode} % -% \subsection{File extension} +% \subsection{File extensions} +% +% \begin{macro}{\Changes@locextension} +% Store file extension for list of changes, set default to \emph{loc}. +% \begin{macrocode} +\newcommand{\Changes@locextension}{loc} +% \end{macrocode} +% \end{macro} % -% \begin{macro}{\Changes@extension} -% Store file extension in variable, set default to \texttt{soc} (summary of changes). +% \begin{macro}{\setlocextension} +% Sets a new file extension for list of changes. % \begin{macrocode} -\newcommand{\Changes@extension}{soc} +\newcommand{\setlocextension}[1]{ + \renewcommand{\Changes@locextension}{#1} +} +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\Changes@socextension} +% Store file extension for summary of changes, set default to \emph{soc}. +% \begin{macrocode} +\newcommand{\Changes@socextension}{soc} % \end{macrocode} % \end{macro} % % \begin{macro}{\setsocextension} -% Set a new file extension. -% Argument: new extension. +% Sets a new file extension for summary of changes. % \begin{macrocode} \newcommand{\setsocextension}[1]{ - \renewcommand{\Changes@extension}{#1} + \renewcommand{\Changes@socextension}{#1} } % \end{macrocode} % \end{macro} @@ -715,7 +792,7 @@ % \begin{macro}{\definechangesauthor} % Define a new author. % Mandatory argument: author's id. -% Optional arguments (key-value): author's name (default: empty) and author's color (default: blue). +% Optional arguments (key-value): author's name (default: empty) and author's color (default: \doccommand{Changes@optiondefaultcolor} (blue)). % % Store id, name and color using named variables. % Define counter and color per author. @@ -764,11 +841,21 @@ % Store markup for authors. % \begin{macrocode} \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}}{}% - \ifthenelse{\equal{\Changes@optionauthormarkup}{none}}{}{}% + \IfStrEq{\Changes@optionauthormarkup}{superscript}% + {\textsuperscript{#1}}% + {}% + \IfStrEq{\Changes@optionauthormarkup}{subscript}% + {\textsubscript{#1}}% + {}% + \IfStrEq{\Changes@optionauthormarkup}{brackets}% + {(#1)}% + {}% + \IfStrEq{\Changes@optionauthormarkup}{footnote}% + {\footnote{#1}}% + {}% + \IfStrEq{\Changes@optionauthormarkup}{none}% + {}% + {}% } % \end{macrocode} % \end{macro} @@ -807,20 +894,62 @@ % Replaced text is always typeset as follows: \meta{added text}\meta{deleted text}. % Therefore no extra command for markup of replaced text is given. % +% \begin{macro}{\Changes@Markup} +% Predefined markups for text. +% \begin{macrocode} +\newcommand{\Changes@Markup}[2]{% + \IfStrEq{#1}{background}% + {% + \IfIsColored% + {\colorbox{authorcolor!30}{#2}}% + {#2}% + }% + {}% + \IfStrEq{#1}{bf}% + {\textbf{#2}}% + {}% + \IfStrEq{#1}{colored}% + {#2}% + {}% + \IfStrEq{#1}{dashuline}% + {\dashuline{#2}}% + {}% + \IfStrEq{#1}{dotuline}% + {\dotuline{#2}}% + {}% + \IfStrEq{#1}{em}% + {\emph{#2}}% + {}% + \IfStrEq{#1}{it}% + {\textit{#2}}% + {}% + \IfStrEq{#1}{sl}% + {\textsl{#2}}% + {}% + \IfStrEq{#1}{sout}% + {\sout{#2}}% + {}% + \IfStrEq{#1}{uline}% + {\uline{#2}}% + {}% + \IfStrEq{#1}{uuline}% + {\uuline{#2}}% + {}% + \IfStrEq{#1}{uwave}% + {\uwave{#2}}% + {}% + \IfStrEq{#1}{xout}% + {\xout{#2}}% + {}% +} +% \end{macrocode} +% \end{macro} +% % \begin{macro}{\Changes@Markup@added} % Store markup for added text. % \begin{macrocode} \newcommand{\Changes@Markup@added}[1]{% - \ifthenelse{\equal{\Changes@optionaddedmarkup}{colored}}{#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}{bf}}{\textbf{#1}}{}% - \ifthenelse{\equal{\Changes@optionaddedmarkup}{it}}{\textit{#1}}{}% - \ifthenelse{\equal{\Changes@optionaddedmarkup}{sl}}{\textsl{#1}}{}% - \ifthenelse{\equal{\Changes@optionaddedmarkup}{em}}{\emph{#1}}{}% + \Changes@Markup{\Changes@optionaddedmarkup}{#1}{}% } % \end{macrocode} % \end{macro} @@ -838,18 +967,7 @@ % Store markup for deleted text. % \begin{macrocode} \newcommand{\Changes@Markup@deleted}[1]{% - \ifthenelse{\equal{\Changes@optiondeletedmarkup}{sout}}{\sout{#1}}{}% - \ifthenelse{\equal{\Changes@optiondeletedmarkup}{colored}}{#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}{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}}{}% + \Changes@Markup{\Changes@optiondeletedmarkup}{#1}{}% } % \end{macrocode} % \end{macro} @@ -868,14 +986,7 @@ % Store markup for highlighted text. % \begin{macrocode} \newcommand{\Changes@Markup@highlight}[1]{% - \ifthenelse{\equal{\Changes@optionhighlightmarkup}{background}}% - {% - \ifthenelse{\isColored}% - {\colorbox{authorcolor!30}{#1}}% - {#1}% - }{}% - \ifthenelse{\equal{\Changes@optionhighlightmarkup}{uuline}}{\uuline{#1}}{}% - \ifthenelse{\equal{\Changes@optionhighlightmarkup}{uwave}}{\uwave{#1}}{}% + \Changes@Markup{\Changes@optionhighlightmarkup}{#1}{}% } % \end{macrocode} % \end{macro} @@ -900,68 +1011,37 @@ % \end{enumerate} % \begin{macrocode} \newcommand{\Changes@Markup@comment}[3]{% -% \end{macrocode} -% -% This one is tricky, because the parameters depend on tests. -% If I use the tests inside the \chcommand{todo} command, they break because of the use of \chpackage{ifthenelse}. -% Thus I am implementing a slightly dirty working version, having in mind, that the code should be revisited in future releases. -% \begin{macrocode} - \ifthenelse{\equal{\Changes@optioncommentmarkup}{todo}}% + \IfStrEq{\Changes@optioncommentmarkup}{todo}% {% - \ifthenelse{\isColored}% - {% - \ifthenelse{\isAnonymous{#2}}% - {% - \todo[color=authorcolor!10, bordercolor=authorcolor, linecolor=authorcolor!70, nolist]{\textbf{[\arabic{authorcommentcount}]} #1}% - }{% - \todo[color=authorcolor!10, bordercolor=authorcolor, linecolor=authorcolor!70, nolist]{\textbf{[#3~\arabic{authorcommentcount}]} #1}% - }% - }{% - \ifthenelse{\isAnonymous{#2}}% - {% - \todo[color=black!0, bordercolor=black, linecolor=black!70, nolist]{\textbf{[\arabic{authorcommentcount}]} #1}% - }{% - \todo[color=black!0, bordercolor=black, linecolor=black!70, nolist]{\textbf{[#3~\arabic{authorcommentcount}]:} #1}% - }% - }% + \IfIsColored% + {\colorlet{Changes@todocolor}{authorcolor}}% + {\colorlet{Changes@todocolor}{black}}% + \todo[color=Changes@todocolor!10, bordercolor=Changes@todocolor, linecolor=Changes@todocolor!70, nolist]{\textbf{[\IfIsAnonymous{#2}{}{#3~}\arabic{authorcommentcount}]} #1}% }{}% -% \end{macrocode} -% -% Something a little more easy. -% \begin{macrocode} - \ifthenelse{\equal{\Changes@optioncommentmarkup}{margin}}% + \IfStrEq{\Changes@optioncommentmarkup}{margin}% {% \marginpar{% - \ifthenelse{\isColored}% + \IfIsColored% {\leavevmode\color{authorcolor}}% {}% - \ifthenelse{\isAnonymous{#2}}% - {\textbf{[\arabic{Changes@commentCount#2}]:} }% - {\textbf{[#3~\arabic{Changes@commentCount#2}]:} }% - #1% + \textbf{[\IfIsAnonymous{#2}{}{#3~}\arabic{Changes@commentCount#2}]:} #1% }% }{}% - \ifthenelse{\equal{\Changes@optioncommentmarkup}{footnote}}% + \IfStrEq{\Changes@optioncommentmarkup}{footnote}% {% \footnote{% - \ifthenelse{\isAnonymous{#2}}% - {\textbf{[\arabic{Changes@commentCount#2}]:} }% - {\textbf{[#3~\arabic{Changes@commentCount#2}]:} }% - #1% + \textbf{[\IfIsAnonymous{#2}{}{#3~}\arabic{Changes@commentCount#2}]:} #1% }% }{}% - \ifthenelse{\equal{\Changes@optioncommentmarkup}{uwave}}% + \IfStrEq{\Changes@optioncommentmarkup}{uwave}% {% {% - \ifthenelse{\isColored}% + \IfIsColored% {\color{authorcolor}}% {}% \allowbreak% \uwave{% - \ifthenelse{\isAnonymous{#2}}% - {\textbf{[\arabic{Changes@commentCount#2}]:} }% - {\textbf{[#3~\arabic{Changes@commentCount#2}]:} }% - #1% + \textbf{[\IfIsAnonymous{#2}{}{#3~}\arabic{Changes@commentCount#2}]:} #1% }% }% }{}% @@ -981,64 +1061,14 @@ % % \subsubsection{Change management command definition} % -% \begin{macro}{\ifIsEmpty} -% -% Checks if text in \choption{\#1} is empty, executes \choption{\#2} if empty, \choption{\#3} otherwise. -% This is a shortcut for the \chcommand{ifthenelse} test, it basically eases the use of the test. -% -% \begin{macrocode} -\DeclareRobustCommand{\ifIsEmpty}[3]{% - \ifthenelse{\equal{#1}{} \or \equal{#1}{\@empty}}% - {#2}% - {#3}% -} -% \end{macrocode} -% \end{macro} -% -% \begin{macro}{\isAnonymous} -% -% Check if author id is empty, therefore the author is anonymous. -% This is a new test that can be tested using \chcommand{ifthenelse}. -% -% This test has the following arguments: -% \begin{enumerate} -% \item author's id -% \end{enumerate} -% -% \begin{macrocode} -\newtest{\isAnonymous}[1]{% - \equal{#1}{\@empty}% -} -% \end{macrocode} -% \end{macro} -% -% \begin{macro}{\isAuthorEmpty} -% -% Check if author is anonymous or position does not equal needed position, therefore the author text is empty. -% This is a new test that can be tested using \chcommand{ifthenelse}. -% -% This test could be removed if the test for empty \chcommand{Changes@output@author} would work. -% -% This test has the following arguments: -% \begin{enumerate} -% \item author's id -% \item position -% \end{enumerate} -% -% \begin{macrocode} -\newtest{\isAuthorEmpty}[2]{% - \isAnonymous{#1} \or \not\equal{\Changes@optionauthormarkupposition}{#2}% -} -% \end{macrocode} -% \end{macro} -% % \begin{macro}{\Changes@check@author} % % Check if author id is valid. % An empty id is valid by default. % % If the id is not valid, a package error is raised. -% I have the feeling that the code is optimizable. +% +% Loop code is taken from \url{https://texfaq.org/FAQ-repeat-num} % % This command has the following arguments: % \begin{enumerate} @@ -1046,23 +1076,26 @@ % \end{enumerate} % % \begin{macrocode} -\newboolean{Changes@WrongID} +\newbool{Changes@WrongID} \newcommand{\Changes@check@author}[1]{% - \ifIsEmpty{#1}% + \IfIsEmpty{#1}% {}% {% - \setboolean{Changes@WrongID}{true}% + \setbool{Changes@WrongID}{true}% \setcounter{Changes@Author}{0}% - \whiledo{\value{Changes@Author} < \value{Changes@AuthorCount}}{% + \loop% \stepcounter{Changes@Author}% - \ifthenelse{\equal{#1}{\@nameuse{Changes@AuthorID\theChanges@Author}}}% - {\setboolean{Changes@WrongID}{false}}% + \IfStrEq{#1}{\csuse{Changes@AuthorID\theChanges@Author}}% + {\setbool{Changes@WrongID}{false}}% {}% - }% - \ifthenelse{\boolean{Changes@WrongID}}% - {\PackageError{changes}% - {Undefined changes author: #1}% - {You have to define the author #1 with e.g.: \definechangesauthor{#1}}}% + \ifnum\theChanges@Author<\theChanges@AuthorCount% + \repeat% + \ifbool{Changes@WrongID}% + {% + \PackageError{changes}% + {Undefined changes author: #1}% + {You have to define the author #1 with e.g.: \definechangesauthor{#1}}% + }% {}% }% } @@ -1079,29 +1112,24 @@ % \item position to output the author to (left or right) % \end{enumerate} % -% \chcommand{DeclareRobustCommand} is used for not breaking the todo note definition. +% \doccommand{DeclareRobustCommand} is used for not breaking the todo note definition. % \begin{macrocode} -\DeclareRobustCommand{\Changes@output@author}[2]{% +\newrobustcmd{\Changes@output@author}[2]{% % \end{macrocode} % % Output author text only if author's id is given and the position matches, otherwise output empty text. % \begin{macrocode} - \ifthenelse{\isAuthorEmpty{#1}{#2}}% + \IfIsAuthorEmptyAtPosition{#1}{#2}% {}% {% - \ifthenelse{\equal{\Changes@optionauthormarkuptext}{id}}% - {% - #1% - }% + \IfStrEq{\Changes@optionauthormarkuptext}{id}% + {#1}% {}% - \ifthenelse{\equal{\Changes@optionauthormarkuptext}{name}}% + \IfStrEq{\Changes@optionauthormarkuptext}{name}% {% - \ifIsEmpty{\@nameuse{Changes@AuthorName#1}}% - {% - #1% - }{% - \@nameuse{Changes@AuthorName#1}% - }% + \IfIsEmpty{\csuse{Changes@AuthorName#1}}% + {#1}% + {\csuse{Changes@AuthorName#1}}% }% {}% }% @@ -1119,9 +1147,9 @@ % \end{enumerate} % % \begin{macrocode} -\newcommand{\Changes@set@color}[1]{% - \ifthenelse{\isColored}% - {\colorlet{authorcolor}{\@nameuse{Changes@AuthorColor#1}}}% +\newrobustcmd{\Changes@set@color}[1]{% + \IfIsColored% + {\colorlet{authorcolor}{\csuse{Changes@AuthorColor#1}}}% {}% } % \end{macrocode} @@ -1138,12 +1166,44 @@ % % \begin{macrocode} \newcounter{authorcommentcount} -\newcommand{\Changes@set@commentcount}[1]{% +\newrobustcmd{\Changes@set@commentcount}[1]{% \setcounter{authorcommentcount}{\value{Changes@commentCount#1}}% } % \end{macrocode} % \end{macro} % +% \begin{macro}{\Changes@set@commandname} +% +% Sets the command name according to setting of \docoption{commandname}. +% \begin{macrocode} +\def\Changes@commandprefix{ch} +\newrobustcmd{\Changes@set@commandname}[1]{ + \def\Changes@commandname{#1} + \IfStrEq{\Changes@optioncommandnameprefix}{always} + { + \def\Changes@commandname{\Changes@commandprefix#1} + \typeout{changes-package option commandnameprefix=always: using prefix on #1, new command name is \Changes@commandname.} + }{ + \ifcsdef{#1} + { + \IfStrEq{\Changes@optioncommandnameprefix}{none} + { + \PackageError{changes} + {Command #1 is already defined.} + {Try package option commandnameprefix with "always" or "ifneeded", e.g. usepackage[commandnameprefix=always]{changes}} + }{} + \IfStrEq{\Changes@optioncommandnameprefix}{ifneeded} + { + \def\Changes@commandname{\Changes@commandprefix#1} + \PackageWarning{changes}{Command #1 is already defined, using \Changes@commandname} + }{} + } + {} + } +} +% \end{macrocode} +% \end{macro} +% % \begin{macro}{\Changes@output} % % Output command for the changed text. @@ -1159,12 +1219,12 @@ % \item text for list of changes % \end{enumerate} % \begin{macrocode} -\newcommand{\Changes@output}[7]{% +\newrobustcmd{\Changes@output}[7]{% % \end{macrocode} % -% Output changed text if option \choption{draft} is set, otherwise output unchanged text. +% Output changed text if option \docoption{draft} is set, otherwise output unchanged text. % \begin{macrocode} - \ifthenelse{\boolean{Changes@optiondraft}}% + \ifbool{Changes@optiondraft}% {% % \end{macrocode} % @@ -1183,23 +1243,18 @@ % % I think this code is not elegant but it gets the work done for now. % \begin{macrocode} - \ifthenelse{% - \equal{#1}{added}\or% - \equal{#1}{deleted}\or% - \equal{#1}{replaced}\or% - \equal{#1}{highlight}% - }% + \IfIsInList{#1}{added|deleted|replaced|highlight}% {% % \end{macrocode} % % Author text for left positioning (only without comment). % \begin{macrocode} - \ifIsEmpty{#5}% + \IfIsEmpty{#5}% {% - \ifthenelse{\isAuthorEmpty{#2}{left}}% + \IfIsAuthorEmptyAtPosition{#2}{left}% {}% {{% - \ifthenelse{\isColored}% + \IfIsColored% {\color{authorcolor}}% {}% \Changes@Markup@author{\Changes@output@author{#2}{left}}% @@ -1210,27 +1265,27 @@ % Changed/highlighted text. % \begin{macrocode} {% - \ifthenelse{\not\equal{#1}{highlight}}% - {% - \ifthenelse{\isColored}% + \IfStrEq{#1}{highlight}% + {}{% + \IfIsColored% {\color{authorcolor}}% {}% - }{}% - \ifthenelse{\equal{#1}{added}}{\Changes@Markup@added{#3}}{}% - \ifthenelse{\equal{#1}{deleted}}{\Changes@Markup@deleted{#4}}{}% - \ifthenelse{\equal{#1}{replaced}}{{\Changes@Markup@added{#3}}\allowbreak\Changes@Markup@deleted{#4}}{}% - \ifthenelse{\equal{#1}{highlight}}{\Changes@Markup@highlight{#3}}{}% + }% + \IfStrEq{#1}{added}{\Changes@Markup@added{#3}}{}% + \IfStrEq{#1}{deleted}{\Changes@Markup@deleted{#4}}{}% + \IfStrEq{#1}{replaced}{{\Changes@Markup@added{#3}}\allowbreak\Changes@Markup@deleted{#4}}{}% + \IfStrEq{#1}{highlight}{\Changes@Markup@highlight{#3}}{}% }% % \end{macrocode} % % Author text for right positioning (only without comment). % \begin{macrocode} - \ifIsEmpty{#5}% + \IfIsEmpty{#5}% {% - \ifthenelse{\isAuthorEmpty{#2}{right}}% + \IfIsAuthorEmptyAtPosition{#2}{right}% {}% {{% - \ifthenelse{\isColored}% + \IfIsColored% {\color{authorcolor}}% {}% \Changes@Markup@author{\Changes@output@author{#2}{right}}% @@ -1246,7 +1301,7 @@ % % Comments. % \begin{macrocode} - \ifIsEmpty{#5}% + \IfIsEmpty{#5}% {}% {% \stepcounter{Changes@commentCount#2}% @@ -1260,17 +1315,17 @@ % \end{macrocode} % Store line for list of changes. % \begin{macrocode} - \ifIsEmpty{#2}% + \IfIsEmpty{#2}% {\def\Changes@locid{}}% {\def\Changes@locid{~(#2)}}% - \addtocontents{loc}{\protect\ChangesListline{#1}{#6\Changes@locid}{#7}{\thepage}}% + \addtocontents{\Changes@locextension}{\protect\ChangesListline{#1}{#6\Changes@locid}{#7}{\thepage}}% }% % \end{macrocode} % -% Output unchanged text (option \choption{final} was set). +% Output unchanged text (option \docoption{final} was set). % \begin{macrocode} {% - \ifIsEmpty{#3}% + \IfIsEmpty{#3}% {\@bsphack\@esphack}% {#3}% }% @@ -1282,38 +1337,21 @@ % The command formats text as new text. % % Mandatory argument: added text. -% Optional argument (key-value): author's id, comment, remark (deprecated) +% Optional argument (key-value): author's id, comment % \begin{macrocode} -\newcommand{\added}[2][\@empty]{% +\Changes@set@commandname{added} +\expandafter\newcommand\expandafter{\csname\Changes@commandname\endcsname}[2][\@empty]{% % \end{macrocode} % Call \emph{setkeys} in order to evaluate the key-value-options and fill the value storage. % \begin{macrocode} \setkeys{Changes@added}{#1}% -% \end{macrocode} -% Check for use of deprecated \choption{remark} option. -% \begin{macrocode} - \ifIsEmpty{\Changes@added@remark}% - {}% - {% - \ifIsEmpty{\Changes@added@comment}% - {% - \PackageWarning{changes}{You used the deprecated option 'remark' in your markup, please use 'comment' instead.}% - \let\Changes@added@comment\Changes@added@remark% - }% - {% - \PackageWarning{changes}{You used both options 'comment' and the deprecated 'remark' in your markup, please use 'comment' only, the content of 'remark' will be ignored.}% - }% - }% -% \end{macrocode} -% End of check for use of deprecated \choption{remark} option. -% \begin{macrocode} \Changes@output% {added}% {\Changes@added@id}% {#2}% {}% {\Changes@added@comment}% - {\changesaddname}% + {\changesaddedname}% {#2}% } % \end{macrocode} @@ -1323,42 +1361,25 @@ % The command formats text as deleted text. % % The definition of the empty text for unchanged text is provided by Frank Mittelbach, slightly modified by me. -% It solves the problem of additional space caused by an empty command (e.g. when using the \choption{final} option). +% It solves the problem of additional space caused by an empty command (e.g. when using the \docoption{final} option). % Before that, there was a slightly erroneous version from \texttt{de.comp.text.tex} (issue \#2). % % Mandatory argument: deleted text. -% Optional argument (key-value): author's id, comment, remark (deprecated) +% Optional argument (key-value): author's id, comment % \begin{macrocode} -\newcommand{\deleted}[2][\@empty]{% +\Changes@set@commandname{deleted} +\expandafter\newcommand\expandafter{\csname\Changes@commandname\endcsname}[2][\@empty]{% % \end{macrocode} % Call \emph{setkeys} in order to evaluate the key-value-options and fill the value storage. % \begin{macrocode} \setkeys{Changes@deleted}{#1}% -% \end{macrocode} -% Check for use of deprecated \choption{remark} option. -% \begin{macrocode} - \ifIsEmpty{\Changes@deleted@remark}% - {}% - {% - \ifIsEmpty{\Changes@deleted@comment}% - {% - \PackageWarning{changes}{You used the deprecated option 'remark' in your markup, please use 'comment' instead.}% - \let\Changes@deleted@comment\Changes@deleted@remark% - }% - {% - \PackageWarning{changes}{You used both options 'comment' and the deprecated 'remark' in your markup, please use 'comment' only, the content of 'remark' will be ignored.}% - }% - }% -% \end{macrocode} -% End of check for use of deprecated \choption{remark} option. -% \begin{macrocode} \Changes@output% {deleted}% {\Changes@deleted@id}% {}% {#2}% {\Changes@deleted@comment}% - {\changesdeletename}% + {\changesdeletedname}% {#2}% } % \end{macrocode} @@ -1368,38 +1389,21 @@ % The command formats text as replaced text. % % Mandatory arguments: new text and old text. -% Optional argument (key-value): author's id, comment, remark (deprecated) +% Optional argument (key-value): author's id, comment % \begin{macrocode} -\newcommand{\replaced}[3][\@empty]{% +\Changes@set@commandname{replaced} +\expandafter\newcommand\expandafter{\csname\Changes@commandname\endcsname}[3][\@empty]{% % \end{macrocode} % Call \emph{setkeys} in order to evaluate the key-value-options and fill the value storage. % \begin{macrocode} \setkeys{Changes@replaced}{#1}% -% \end{macrocode} -% Check for use of deprecated \choption{remark} option. -% \begin{macrocode} - \ifIsEmpty{\Changes@replaced@remark}% - {}% - {% - \ifIsEmpty{\Changes@replaced@comment}% - {% - \PackageWarning{changes}{You used the deprecated option 'remark' in your markup, please use 'comment' instead.}% - \let\Changes@replaced@comment\Changes@replaced@remark% - }% - {% - \PackageWarning{changes}{You used both options 'comment' and the deprecated 'remark' in your markup, please use 'comment' only, the content of 'remark' will be ignored.}% - }% - }% -% \end{macrocode} -% End of check for use of deprecated \choption{remark} option. -% \begin{macrocode} \Changes@output% {replaced}% {\Changes@replaced@id}% {#2}% {#3}% {\Changes@replaced@comment}% - {\changesreplacename}% + {\changesreplacedname}% {#2}% } % \end{macrocode} @@ -1409,32 +1413,15 @@ % The command formats text as highlighted text. % % Mandatory argument: highlighted text. -% Optional argument (key-value): author's id, comment, remark (deprecated) +% Optional argument (key-value): author's id, comment % \begin{macrocode} -\newcommand{\highlight}[2][\@empty]{% +\Changes@set@commandname{highlight} +\expandafter\newcommand\expandafter{\csname\Changes@commandname\endcsname}[2][\@empty]{% % \end{macrocode} % % Call \emph{setkeys} in order to evaluate the key-value-options and fill the value storage. % \begin{macrocode} \setkeys{Changes@highlight}{#1}% -% \end{macrocode} -% Check for use of deprecated \choption{remark} option. -% \begin{macrocode} - \ifIsEmpty{\Changes@highlight@remark}% - {}% - {% - \ifIsEmpty{\Changes@highlight@comment}% - {% - \PackageWarning{changes}{You used the deprecated option 'remark' in your markup, please use 'comment' instead.}% - \let\Changes@highlight@comment\Changes@highlight@remark% - }% - {% - \PackageWarning{changes}{You used both options 'comment' and the deprecated 'remark' in your markup, please use 'comment' only, the content of 'remark' will be ignored.}% - }% - }% -% \end{macrocode} -% End of check for use of deprecated \choption{remark} option. -% \begin{macrocode} \Changes@output% {highlight}% {\Changes@highlight@id}% @@ -1453,7 +1440,8 @@ % Mandatory argument: comment text. % Optional argument (key-value): author's id % \begin{macrocode} -\newcommand{\comment}[2][\@empty]{% +\Changes@set@commandname{comment} +\expandafter\newcommand\expandafter{\csname\Changes@commandname\endcsname}[2][\@empty]{% % \end{macrocode} % % Call \emph{setkeys} in order to evaluate the key-value-options and fill the value storage. @@ -1473,9 +1461,9 @@ % % \subsection{List of changes} % -% The list of changes truncates text, therefore the \chpackage{truncate} package is used. +% The list of changes truncates text, therefore the \docpackage{truncate} package is used. % (Using fit and redefining the marker: suggestion and code by Frank Mittelbach) -% Providing the needed package options via \chcommand{ExecuteOptionsX}. +% Providing the needed package options via \doccommand{ExecuteOptionsX}. % \begin{macrocode} \RequirePackage{truncate} \renewcommand\TruncateMarker{ [\dots\negthinspace]\ } @@ -1488,14 +1476,14 @@ % The contents have to be separated by a semicolon. % \begin{macrocode} \def\changes@chopline#1;#2;#3;#4;#5;#6;#7;#8 \\{% - \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@InHighlight{#7}% - \def\Changes@InComment{#8}% + \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@Inhighlight{#7}% + \def\Changes@Incomment{#8}% } % \end{macrocode} % \end{macro} @@ -1507,33 +1495,23 @@ % This command has the following arguments: % \begin{enumerate} % \item change type (added, ...) +% \item change description with author % \item text % \item page % \end{enumerate} % % \begin{macrocode} \newcommand{\ChangesListline}[4]{% - \IfSubStr{\Changes@loc@show}{#1}{% + \IfIsInList{#1}{\Changes@loc@show}{% \@ifundefined{@dotsep}% - {\def\@dotsep{4.5}}{}% - \@dottedtocline{1}{0px}{2em}{#2: \truncate{\Changes@truncate@width}{#3}}{#4}% + {\def\@dotsep{4.5}}% + {}% + \@dottedtocline{1}{0pt}{2em}{#2: \truncate{\Changes@truncate@width}{#3}}{#4}% }{}% } % \end{macrocode} % \end{macro} % -% \begin{macro}{\Changes@truncate@width} -% -% Length for the width of the truncation. -% -% Default: two third of the text width -% -% \begin{macrocode} -\newlength{\Changes@truncate@width} -\setlength{\Changes@truncate@width}{.6\textwidth} -% \end{macrocode} -% \end{macro} -% % \begin{macro}{\settruncatewidth} % % Set the width of the truncation. @@ -1545,15 +1523,15 @@ % \end{macrocode} % \end{macro} % -% \begin{macro}{\Changes@summary@width} +% \begin{macro}{\Changes@truncate@width} % -% Length for the width of the change summary. +% Length for the width of the truncation. % -% Default: one third of the text width +% Default: two third of the text width % % \begin{macrocode} -\newlength{\Changes@summary@width} -\setlength{\Changes@summary@width}{.3\textwidth} +\newlength{\Changes@truncate@width} +\settruncatewidth{.6\textwidth} % \end{macrocode} % \end{macro} % @@ -1579,143 +1557,109 @@ % \end{macrocode} % \end{macro} % -% \begin{macro}{\Changes@summaryline} +% \begin{macro}{\Changes@summary@width} % -% Auxiliary command for output of a summary line. +% Length for the width of the change summary. % -% This command has the following arguments: -% \begin{enumerate} -% \item change type (added, ...) -% \item number of items -% \item name of items -% \item line delimiter -% \end{enumerate} +% Default: one third of the text width % % \begin{macrocode} -\newcommand{\Changes@summaryline}[4]{% - \IfSubStr{\Changes@loc@show}{#1}{% - \ifthenelse{\not\equal{\Changes@loc@style}{compactsummary} \or #2 > 0}% - {% - \parbox{\Changes@summary@width}{#3~\let\cleaders\leaders\dotfill~#2}#4% - }{}% - }{}% -} +\newlength{\Changes@summary@width} +\setsummarywidth{.3\textwidth} % \end{macrocode} % \end{macro} % % \begin{macro}{\listofchanges} % % This command outputs the list of changes. -% Options: \choption{style} and \choption{title}. +% Options: \docoption{title}, \docoption{style} and \docoption{show}. % % The following styles are available: % \begin{description} -% \item [\choption{list}] prints the list of changes like a list of figures -% \item [\choption{summary}] prints the number of changes grouped by author -% \item [\choption{compactsummary}] same as \choption{summary} but entries with count 0 are omitted +% \item [\docoption{list}] prints the list of changes like a list of figures +% \item [\docoption{summary}] prints the number of changes grouped by author +% \item [\docoption{compactsummary}] same as \docoption{summary} but entries with count 0 are omitted % \end{description} % -% For the list, the values are read from the auxiliary file. -% -% For the summary, the values are read from the loc-file, if it exists. -% If no loc-file exists, an according message is generated. +% The following show values are available: +% \begin{description} +% \item [\docoption{all}] all kinds of changes +% \item [\docoption{added}] print only additions (same for delete, replace, highlight, comment) +% \item [\docoption{added|deleted}] print additions and deletions (and other combinations with |) +% \end{description} % -% Some definitions that have to reside outside the command in order to use the command multiple times. -% \begin{macrocode} -\newboolean{Changes@MoreLines} -\newboolean{Changes@ShowOK} -% \end{macrocode} -% The definition of \chcommand{listofchanges}. +% For the lists, the values are read from the auxiliary files (loc and soc). +% If no loc/soc-files exists, an according message is generated. % \begin{macrocode} \newcommand{\listofchanges}[1][\@empty]{% \setkeys{Changes@loc}{#1}% % \end{macrocode} % All work is done only in draft mode. % \begin{macrocode} - \ifthenelse{\boolean{Changes@optiondraft}}% + \ifbool{Changes@optiondraft}% {% % \end{macrocode} % -% Check if style is known, otherwise use \choption{list} by default. +% Check if style is known, otherwise use \docoption{list} by default. % \begin{macrocode} - \ifIsEmpty{\Changes@loc@style}% - {\def\Changes@loc@style{list}}% + \IfIsInList{\Changes@loc@style}{list|summary|compactsummary}% + {}% {% - \ifthenelse{% - \equal{\Changes@loc@style}{list}\or% - \equal{\Changes@loc@style}{summary}\or% - \equal{\Changes@loc@style}{compactsummary}% - }% - {}% - {% - \PackageWarning{changes}{Wrong style for list of changes: '\Changes@loc@style', using 'list' instead.}% - \def\Changes@loc@style{list}% - }% + \PackageWarning{changes}{Wrong style for list of changes: '\Changes@loc@style', using 'list' instead.}% + \def\Changes@loc@style{}% }% + \IfIsEmpty{\Changes@loc@style}% + {\def\Changes@loc@style{list}}% + {}% % \end{macrocode} % -% Check if show-value is known, otherwise use \choption{all} by default. +% Check if show-value is known, otherwise use \docoption{all} by default. % \begin{macrocode} - \ifIsEmpty{\Changes@loc@show}% - {\def\Changes@loc@show{all}}% + \IfStrEq{\Changes@loc@show}{all}% + {\def\Changes@loc@show{added|deleted|replaced|highlight|comment}}% + {}% + \IfIsInList{\Changes@loc@show}{added|deleted|replaced|highlight|comment}% + {}% {% -% \end{macrocode} -% -% This check is complicated, because the \chcommand{isin} test of \chpackage{xifthen} does not work with macros. -% On the other hand I could not define a new text using the \chcommand{IfSubStr} macro of \chpackage{xstring}, -% \begin{macrocode} - \setboolean{Changes@ShowOK}{false}% - \ifthenelse{\equal{\Changes@loc@show}{all}}{\setboolean{Changes@ShowOK}{true}}{}% - \IfSubStr{\Changes@loc@show}{added}{\setboolean{Changes@ShowOK}{true}}{}% - \IfSubStr{\Changes@loc@show}{deleted}{\setboolean{Changes@ShowOK}{true}}{}% - \IfSubStr{\Changes@loc@show}{replaced}{\setboolean{Changes@ShowOK}{true}}{}% - \IfSubStr{\Changes@loc@show}{highlight}{\setboolean{Changes@ShowOK}{true}}{}% - \IfSubStr{\Changes@loc@show}{comment}{\setboolean{Changes@ShowOK}{true}}{}% - \ifthenelse{\boolean{Changes@ShowOK}}% - {}% - {% - \PackageWarning{changes}{Wrong show-value for list of changes: '\Changes@loc@show', using 'all' instead.}% - \def\Changes@loc@show{all}% - }% + \PackageWarning{changes}{Wrong show-value for list of changes: '\Changes@loc@show', using 'all' instead.}% + \def\Changes@loc@show{}% }% - \ifthenelse{\equal{\Changes@loc@show}{all}}% - {% - \def\Changes@loc@show{added|deleted|replaced|highlight|comment}% - }{}% + \IfIsEmpty{\Changes@loc@show}% + {\def\Changes@loc@show{added|deleted|replaced|highlight|comment}}% + {}% % \end{macrocode} % % Print heading. % \begin{macrocode} - \def\Changes@heading{\Changes@loc@title} - \ifIsEmpty{\Changes@loc@title}% + \IfIsEmpty{\Changes@loc@title}% {% - \ifthenelse{\equal{\Changes@loc@style}{list}}% + \IfStrEq{\Changes@loc@style}{list}% {\def\Changes@heading{\listofchangesname}}{}% - \ifthenelse{\equal{\Changes@loc@style}{summary}}% + \IfStrEq{\Changes@loc@style}{summary}% {\def\Changes@heading{\summaryofchangesname}}{}% - \ifthenelse{\equal{\Changes@loc@style}{compactsummary}}% + \IfStrEq{\Changes@loc@style}{compactsummary}% {\def\Changes@heading{\compactsummaryofchangesname}}{}% - }{}% + }% + {\def\Changes@heading{\Changes@loc@title}}% \section*{\Changes@heading} % \end{macrocode} % % Print list. +% +% The \doccommand{ifeof} command is neccessary in the loop too, otherwise there are problems with the last (empty) line of the file. % \begin{macrocode} - \ifthenelse{\equal{\Changes@loc@style}{list}}% + \IfIsInList{\Changes@loc@style}{list}% {% - \IfFileExists{\jobname.loc}% + \IfFileExists{\jobname.\Changes@locextension}% {% - \setboolean{Changes@MoreLines}{true}% \newread\Changes@InFile% - \openin\Changes@InFile = \jobname.loc% - \whiledo{\boolean{Changes@MoreLines}}{% + \openin\Changes@InFile=\jobname.\Changes@locextension% + \loop\unless\ifeof\Changes@InFile% \read\Changes@InFile to \Changes@Line% - \ifeof\Changes@InFile% - \setboolean{Changes@MoreLines}{false}% - \else% + \ifeof\Changes@InFile\else% \Changes@Line% - \fi% - }% + \fi + \repeat \closein\Changes@InFile% }{% \emph{\changesnoloc}% @@ -1724,52 +1668,73 @@ }{}% % \end{macrocode} % Print summary or compact summary. +% +% The \doccommand{ifeof} command is neccessary in the loop too, otherwise there are problems with the last (empty) line of the file. % \begin{macrocode} - \ifthenelse{\equal{\Changes@loc@style}{summary} \or \equal{\Changes@loc@style}{compactsummary}}% + \IfIsInList{\Changes@loc@style}{summary|compactsummary}% {% - \IfFileExists{\jobname.\Changes@extension}% + \IfFileExists{\jobname.\Changes@socextension}% {% - \setboolean{Changes@MoreLines}{true}% \newread\Changes@InFile% - \openin\Changes@InFile = \jobname.\Changes@extension% - \whiledo{\boolean{Changes@MoreLines}}{% + \openin\Changes@InFile = \jobname.\Changes@socextension% +% \end{macrocode} +% Every line contains the author's id, color and number of changes. +% \begin{macrocode} + \loop\unless\ifeof\Changes@InFile% \read\Changes@InFile to \Changes@Line% - \ifeof\Changes@InFile% - \setboolean{Changes@MoreLines}{false}% - \else% + \ifeof\Changes@InFile\else% \expandafter\changes@chopline\Changes@Line\\% \textbf{% - \ifthenelse{\isColored}% - {\color{\Changes@InColor}}% + \IfIsColored% + {\color{\Changes@Incolor}}% {}% - \ifthenelse{\equal{\Changes@InID}{\@empty}}% + \IfIsAnonymous{\Changes@Inid}% {\changesauthorname: \changesanonymousname}% {% - \changesauthorname: \Changes@InID% - \ifthenelse{\equal{\Changes@InName}{\@empty}}% + \changesauthorname: \Changes@Inid% + \IfIsEmpty{\Changes@Inname}% {}% - { (\Changes@InName)}% + { (\Changes@Inname)}% }% }\\% - \ifthenelse{% - \Changes@InAdded > 0 \or% - \Changes@InDeleted > 0 \or% - \Changes@InReplaced > 0 \or% - \Changes@InHighlight > 0 \or% - \Changes@InComment > 0% +% \end{macrocode} +% Compute the relevant sum of changes in order to print "no changes" correctly. +% \begin{macrocode} + \numdef{\Changes@InSum}{0}% + \renewcommand*{\do}[1]{% + \numdef{\Changes@InSum}{\Changes@InSum + \csuse{Changes@In########1}}% }% + \expandafter\dopsvlist\expandafter{\Changes@loc@show}% +% \end{macrocode} +% Print summary. +% \begin{macrocode} + \ifnumcomp{\Changes@InSum}{=}{0}% {% - \Changes@summaryline{added}{\Changes@InAdded}{\changesaddname}{\\}% - \Changes@summaryline{deleted}{\Changes@InDeleted}{\changesdeletename}{\\}% - \Changes@summaryline{replaced}{\Changes@InReplaced}{\changesreplacename}{\\}% - \Changes@summaryline{highlight}{\Changes@InHighlight}{\changeshighlightname}{\\}% - \Changes@summaryline{comment}{\Changes@InComment}{\changescommentname}{\\[1ex]}% + \parbox{\Changes@summary@width}{\changesnochanges}\\[1ex]% }% {% - \parbox{\Changes@summary@width}{\changesnochanges}\\[1ex]% + \numdef{\Changes@InCount}{0}% + \renewcommand*{\do}[1]{% + \numdef{\Changes@InCount}{\Changes@InCount + \csuse{Changes@In########1}}% + \ifboolexpr{% + not test {\IfStrEq{\Changes@loc@style}{compactsummary}} or% + test {\ifnumgreater{\csuse{Changes@In########1}}{0}}% + }% + {% + \parbox{\Changes@summary@width}{\csuse{changes########1name}~\let\cleaders\leaders\dotfill~\csuse{Changes@In########1}}% + \ifnumless{\Changes@InCount}{\Changes@InSum}% + {\\}% + {\\[1ex]}% + }% + {}% + }% + \expandafter\dopsvlist\expandafter{\Changes@loc@show}% }% \fi% - }% +% \end{macrocode} +% File read loop. +% \begin{macrocode} + \repeat \closein\Changes@InFile% }{% \emph{\changesnosoc}% @@ -1785,7 +1750,7 @@ % \end{macro} % % At the end of the document: write the list of changes in the loc-file, therefore open file, write values, close file. -% Changes are written as \hologo{LaTeX}-formatted text, so they can simply be read via \chcommand{input}. +% Changes are written as \hologo{LaTeX}-formatted text, so they can simply be read via \doccommand{input}. % % The order of entries is: id, color, name, added, deleted, replaced, comment, highlight. % The contents have to be separated by a semicolon. @@ -1795,10 +1760,10 @@ % Open output file. % \begin{macrocode} \newwrite\Changes@OutFile - \immediate\openout\Changes@OutFile = \jobname.\Changes@extension + \immediate\openout\Changes@OutFile = \jobname.\Changes@socextension % \end{macrocode} -% Redefine expandable of \chcommand{protect} in order to write correct special characters. -% Store original definition for resetting \chcommand{protect}. +% Redefine expandable of \doccommand{protect} in order to write correct special characters. +% Store original definition for resetting \doccommand{protect}. % \begin{macrocode} \let\Changes@protect\protect \let\protect\@unexpandable@protect @@ -1806,24 +1771,24 @@ % Output data for list of changes. % \begin{macrocode} \setcounter{Changes@Author}{0} - \whiledo{\value{Changes@Author} < \value{Changes@AuthorCount}}{% + \loop\unless\ifnum\theChanges@Author = \value{Changes@AuthorCount} \stepcounter{Changes@Author}% - \def\Changes@ID{\@nameuse{Changes@AuthorID\theChanges@Author}}% + \def\Changes@ID{\csuse{Changes@AuthorID\theChanges@Author}}% \immediate\write\Changes@OutFile{\Changes@ID;% - \@nameuse{Changes@AuthorColor\Changes@ID};% - \@nameuse{Changes@AuthorName\Changes@ID};% + \csuse{Changes@AuthorColor\Changes@ID};% + \csuse{Changes@AuthorName\Changes@ID};% \the\value{Changes@addedCount\Changes@ID};% \the\value{Changes@deletedCount\Changes@ID};% \the\value{Changes@replacedCount\Changes@ID};% \the\value{Changes@highlightCount\Changes@ID};% \the\value{Changes@commentCount\Changes@ID}}% - }% + \repeat % \end{macrocode} % Close output file. % \begin{macrocode} \immediate\closeout\Changes@OutFile % \end{macrocode} -% Restore original definition of \chcommand{protect}. +% Restore original definition of \doccommand{protect}. % \begin{macrocode} \let\protect\Changes@protect % \end{macrocode} @@ -1831,10 +1796,10 @@ % Write content of listofchanges to file. % \begin{macrocode} \if@filesw - \@ifundefined{tf@loc}{% - \expandafter\newwrite\csname tf@loc\endcsname - \immediate\openout \csname tf@loc\endcsname \jobname.loc\relax - }{}% + \@ifundefined{tf@\Changes@locextension}{ + \expandafter\newwrite\csname tf@\Changes@locextension\endcsname + \immediate\openout \csname tf@\Changes@locextension\endcsname \jobname.\Changes@locextension\relax + }{} \fi } % \end{macrocode} diff --git a/Master/texmf-dist/source/latex/changes/changes.ins b/Master/texmf-dist/source/latex/changes/changes.ins index 85d758ab514..f29e4e4417c 100644 --- a/Master/texmf-dist/source/latex/changes/changes.ins +++ b/Master/texmf-dist/source/latex/changes/changes.ins @@ -1,6 +1,6 @@ %% This file creates the needed files from changes.dtx %% -\def\filedate{2020/06/16} +\def\filedate{2021/01/28} \def\batchfile{changes.ins} \input docstrip @@ -10,7 +10,7 @@ \preamble changes.dtx -Copyright 2007-2020 Ekkart Kleinod (ekleinod@edgesoft.de) +Copyright 2007-2021 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 @@ -45,102 +45,109 @@ and the derived files \endpreamble \postamble -Copyright 2007-2020 Ekkart Kleinod +Copyright 2007-2021 Ekkart Kleinod \endpostamble \generate{ \file{changes.sty}{\from{changes.dtx}{changes}} % - \file{changes.example.simple.tex}{\from{examples.dtx}{example:simple}} - \file{changes.example.draft.tex}{\from{examples.dtx}{example:draft}} - \file{changes.example.final.tex}{\from{examples.dtx}{example:final}} -% - \file{changes.example.markup.default.tex}{\from{examples.dtx}{example:markup:default}} - \file{changes.example.markup.underlined.tex}{\from{examples.dtx}{example:markup:underlined}} - \file{changes.example.markup.bfit.tex}{\from{examples.dtx}{example:markup:bfit}} - \file{changes.example.markup.nocolor.tex}{\from{examples.dtx}{example:markup:nocolor}} - \file{changes.example.markup.wrong.tex}{\from{examples.dtx}{example:markup:wrong}} -% - \file{changes.example.addedmarkup.colored.tex}{\from{examples.dtx}{example:addedmarkup:colored}} - \file{changes.example.addedmarkup.uline.tex}{\from{examples.dtx}{example:addedmarkup:uline}} - \file{changes.example.addedmarkup.uuline.tex}{\from{examples.dtx}{example:addedmarkup:uuline}} - \file{changes.example.addedmarkup.uwave.tex}{\from{examples.dtx}{example:addedmarkup:uwave}} - \file{changes.example.addedmarkup.dashuline.tex}{\from{examples.dtx}{example:addedmarkup:dashuline}} - \file{changes.example.addedmarkup.dotuline.tex}{\from{examples.dtx}{example:addedmarkup:dotuline}} - \file{changes.example.addedmarkup.bf.tex}{\from{examples.dtx}{example:addedmarkup:bf}} - \file{changes.example.addedmarkup.it.tex}{\from{examples.dtx}{example:addedmarkup:it}} - \file{changes.example.addedmarkup.sl.tex}{\from{examples.dtx}{example:addedmarkup:sl}} - \file{changes.example.addedmarkup.em.tex}{\from{examples.dtx}{example:addedmarkup:em}} - \file{changes.example.addedmarkup.wrong.tex}{\from{examples.dtx}{example:addedmarkup:wrong}} -% - \file{changes.example.deletedmarkup.colored.tex}{\from{examples.dtx}{example:deletedmarkup:colored}} - \file{changes.example.deletedmarkup.uline.tex}{\from{examples.dtx}{example:deletedmarkup:uline}} - \file{changes.example.deletedmarkup.uuline.tex}{\from{examples.dtx}{example:deletedmarkup:uuline}} - \file{changes.example.deletedmarkup.uwave.tex}{\from{examples.dtx}{example:deletedmarkup:uwave}} - \file{changes.example.deletedmarkup.dashuline.tex}{\from{examples.dtx}{example:deletedmarkup:dashuline}} - \file{changes.example.deletedmarkup.dotuline.tex}{\from{examples.dtx}{example:deletedmarkup:dotuline}} - \file{changes.example.deletedmarkup.sout.tex}{\from{examples.dtx}{example:deletedmarkup:sout}} - \file{changes.example.deletedmarkup.xout.tex}{\from{examples.dtx}{example:deletedmarkup:xout}} - \file{changes.example.deletedmarkup.bf.tex}{\from{examples.dtx}{example:deletedmarkup:bf}} - \file{changes.example.deletedmarkup.it.tex}{\from{examples.dtx}{example:deletedmarkup:it}} - \file{changes.example.deletedmarkup.sl.tex}{\from{examples.dtx}{example:deletedmarkup:sl}} - \file{changes.example.deletedmarkup.em.tex}{\from{examples.dtx}{example:deletedmarkup:em}} - \file{changes.example.deletedmarkup.wrong.tex}{\from{examples.dtx}{example:deletedmarkup:wrong}} -% - \file{changes.example.commentmarkup.margin.tex}{\from{examples.dtx}{example:commentmarkup:margin}} - \file{changes.example.commentmarkup.footnote.tex}{\from{examples.dtx}{example:commentmarkup:footnote}} - \file{changes.example.commentmarkup.uwave.tex}{\from{examples.dtx}{example:commentmarkup:uwave}} - \file{changes.example.commentmarkup.todo.tex}{\from{examples.dtx}{example:commentmarkup:todo}} -% - \file{changes.example.highlightmarkup.background.tex}{\from{examples.dtx}{example:highlightmarkup:background}} - \file{changes.example.highlightmarkup.uuline.tex}{\from{examples.dtx}{example:highlightmarkup:uuline}} - \file{changes.example.highlightmarkup.uwave.tex}{\from{examples.dtx}{example:highlightmarkup:uwave}} -% - \file{changes.example.setaddedmarkup.tex}{\from{examples.dtx}{example:setaddedmarkup}} - \file{changes.example.setdeletedmarkup.tex}{\from{examples.dtx}{example:setdeletedmarkup}} - \file{changes.example.setcommentmarkup.tex}{\from{examples.dtx}{example:setcommentmarkup}} - \file{changes.example.sethighlightmarkup.tex}{\from{examples.dtx}{example:sethighlightmarkup}} -% - \file{changes.example.authormarkup.superscript.tex}{\from{examples.dtx}{example:authormarkup:superscript}} - \file{changes.example.authormarkup.subscript.tex}{\from{examples.dtx}{example:authormarkup:subscript}} - \file{changes.example.authormarkup.brackets.tex}{\from{examples.dtx}{example:authormarkup:brackets}} - \file{changes.example.authormarkup.footnote.tex}{\from{examples.dtx}{example:authormarkup:footnote}} - \file{changes.example.authormarkup.none.tex}{\from{examples.dtx}{example:authormarkup:none}} - \file{changes.example.authormarkup.wrong.tex}{\from{examples.dtx}{example:authormarkup:wrong}} -% - \file{changes.example.authormarkupposition.left.tex}{\from{examples.dtx}{example:authormarkupposition:left}} - \file{changes.example.authormarkupposition.right.tex}{\from{examples.dtx}{example:authormarkupposition:right}} - \file{changes.example.authormarkupposition.wrong.tex}{\from{examples.dtx}{example:authormarkupposition:wrong}} -% - \file{changes.example.authormarkuptext.id.tex}{\from{examples.dtx}{example:authormarkuptext:id}} - \file{changes.example.authormarkuptext.name.tex}{\from{examples.dtx}{example:authormarkuptext:name}} - \file{changes.example.authormarkuptext.wrong.tex}{\from{examples.dtx}{example:authormarkuptext:wrong}} -% - \file{changes.example.setauthormarkup.tex}{\from{examples.dtx}{example:setauthormarkup}} - \file{changes.example.setauthormarkupposition.tex}{\from{examples.dtx}{example:setauthormarkupposition}} - \file{changes.example.setauthormarkuptext.tex}{\from{examples.dtx}{example:setauthormarkuptext}} -% - \file{changes.example.settruncatewidth.tex}{\from{examples.dtx}{example:settruncatewidth}} -% - \file{changes.example.setsummarywidth.tex}{\from{examples.dtx}{example:setsummarywidth}} - \file{changes.example.setsummarytowidth.tex}{\from{examples.dtx}{example:setsummarytowidth}} -% - \file{changes.example.setsocextension.tex}{\from{examples.dtx}{example:setsocextension}} -% - \file{changes.example.listofchanges.list.tex}{\from{examples.dtx}{example:listofchanges:list}} - \file{changes.example.listofchanges.summary.tex}{\from{examples.dtx}{example:listofchanges:summary}} - \file{changes.example.listofchanges.compactsummary.tex}{\from{examples.dtx}{example:listofchanges:compactsummary}} - \file{changes.example.listofchanges.all.tex}{\from{examples.dtx}{example:listofchanges:all}} - \file{changes.example.listofchanges.title.tex}{\from{examples.dtx}{example:listofchanges:title}} - \file{changes.example.listofchanges.show.tex}{\from{examples.dtx}{example:listofchanges:show}} - \file{changes.example.listofchanges.wrong.tex}{\from{examples.dtx}{example:listofchanges:wrong}} -% - \file{changes.example.packageoptions.todonotes.tex}{\from{examples.dtx}{example:packageoptions.todonotes}} - \file{changes.example.packageoptions.truncate.tex}{\from{examples.dtx}{example:packageoptions.truncate}} - \file{changes.example.packageoptions.ulem.tex}{\from{examples.dtx}{example:packageoptions.ulem}} - \file{changes.example.packageoptions.xcolor.tex}{\from{examples.dtx}{example:packageoptions.xcolor}} -% - \file{changes.example.screenshot.tex}{\from{example-screenshot.dtx}{example:screenshot}} + \file{examples/changes.example.simple.tex}{\from{examples.dtx}{example:simple}} + \file{examples/changes.example.draft.tex}{\from{examples.dtx}{example:draft}} + \file{examples/changes.example.final.tex}{\from{examples.dtx}{example:final}} +% + \file{examples/changes.example.markup.default.tex}{\from{examples.dtx}{example:markup:default}} + \file{examples/changes.example.markup.underlined.tex}{\from{examples.dtx}{example:markup:underlined}} + \file{examples/changes.example.markup.bfit.tex}{\from{examples.dtx}{example:markup:bfit}} + \file{examples/changes.example.markup.nocolor.tex}{\from{examples.dtx}{example:markup:nocolor}} + \file{examples/changes.example.markup.wrong.tex}{\from{examples.dtx}{example:markup:wrong}} +% + \file{examples/changes.example.commandnameprefix.none.tex}{\from{examples.dtx}{example:commandnameprefix:none}} + \file{examples/changes.example.commandnameprefix.always.tex}{\from{examples.dtx}{example:commandnameprefix:always}} + \file{examples/changes.example.commandnameprefix.ifneeded.tex}{\from{examples.dtx}{example:commandnameprefix:ifneeded}} + \file{examples/changes.example.commandnameprefix.wrong.tex}{\from{examples.dtx}{example:commandnameprefix:wrong}} +% + \file{examples/changes.example.addedmarkup.colored.tex}{\from{examples.dtx}{example:addedmarkup:colored}} + \file{examples/changes.example.addedmarkup.uline.tex}{\from{examples.dtx}{example:addedmarkup:uline}} + \file{examples/changes.example.addedmarkup.uuline.tex}{\from{examples.dtx}{example:addedmarkup:uuline}} + \file{examples/changes.example.addedmarkup.uwave.tex}{\from{examples.dtx}{example:addedmarkup:uwave}} + \file{examples/changes.example.addedmarkup.dashuline.tex}{\from{examples.dtx}{example:addedmarkup:dashuline}} + \file{examples/changes.example.addedmarkup.dotuline.tex}{\from{examples.dtx}{example:addedmarkup:dotuline}} + \file{examples/changes.example.addedmarkup.bf.tex}{\from{examples.dtx}{example:addedmarkup:bf}} + \file{examples/changes.example.addedmarkup.it.tex}{\from{examples.dtx}{example:addedmarkup:it}} + \file{examples/changes.example.addedmarkup.sl.tex}{\from{examples.dtx}{example:addedmarkup:sl}} + \file{examples/changes.example.addedmarkup.em.tex}{\from{examples.dtx}{example:addedmarkup:em}} + \file{examples/changes.example.addedmarkup.wrong.tex}{\from{examples.dtx}{example:addedmarkup:wrong}} +% + \file{examples/changes.example.deletedmarkup.colored.tex}{\from{examples.dtx}{example:deletedmarkup:colored}} + \file{examples/changes.example.deletedmarkup.uline.tex}{\from{examples.dtx}{example:deletedmarkup:uline}} + \file{examples/changes.example.deletedmarkup.uuline.tex}{\from{examples.dtx}{example:deletedmarkup:uuline}} + \file{examples/changes.example.deletedmarkup.uwave.tex}{\from{examples.dtx}{example:deletedmarkup:uwave}} + \file{examples/changes.example.deletedmarkup.dashuline.tex}{\from{examples.dtx}{example:deletedmarkup:dashuline}} + \file{examples/changes.example.deletedmarkup.dotuline.tex}{\from{examples.dtx}{example:deletedmarkup:dotuline}} + \file{examples/changes.example.deletedmarkup.sout.tex}{\from{examples.dtx}{example:deletedmarkup:sout}} + \file{examples/changes.example.deletedmarkup.xout.tex}{\from{examples.dtx}{example:deletedmarkup:xout}} + \file{examples/changes.example.deletedmarkup.bf.tex}{\from{examples.dtx}{example:deletedmarkup:bf}} + \file{examples/changes.example.deletedmarkup.it.tex}{\from{examples.dtx}{example:deletedmarkup:it}} + \file{examples/changes.example.deletedmarkup.sl.tex}{\from{examples.dtx}{example:deletedmarkup:sl}} + \file{examples/changes.example.deletedmarkup.em.tex}{\from{examples.dtx}{example:deletedmarkup:em}} + \file{examples/changes.example.deletedmarkup.wrong.tex}{\from{examples.dtx}{example:deletedmarkup:wrong}} +% + \file{examples/changes.example.commentmarkup.margin.tex}{\from{examples.dtx}{example:commentmarkup:margin}} + \file{examples/changes.example.commentmarkup.footnote.tex}{\from{examples.dtx}{example:commentmarkup:footnote}} + \file{examples/changes.example.commentmarkup.uwave.tex}{\from{examples.dtx}{example:commentmarkup:uwave}} + \file{examples/changes.example.commentmarkup.todo.tex}{\from{examples.dtx}{example:commentmarkup:todo}} +% + \file{examples/changes.example.highlightmarkup.background.tex}{\from{examples.dtx}{example:highlightmarkup:background}} + \file{examples/changes.example.highlightmarkup.uuline.tex}{\from{examples.dtx}{example:highlightmarkup:uuline}} + \file{examples/changes.example.highlightmarkup.uwave.tex}{\from{examples.dtx}{example:highlightmarkup:uwave}} +% + \file{examples/changes.example.setaddedmarkup.tex}{\from{examples.dtx}{example:setaddedmarkup}} + \file{examples/changes.example.setdeletedmarkup.tex}{\from{examples.dtx}{example:setdeletedmarkup}} + \file{examples/changes.example.setcommentmarkup.tex}{\from{examples.dtx}{example:setcommentmarkup}} + \file{examples/changes.example.sethighlightmarkup.tex}{\from{examples.dtx}{example:sethighlightmarkup}} +% + \file{examples/changes.example.authormarkup.superscript.tex}{\from{examples.dtx}{example:authormarkup:superscript}} + \file{examples/changes.example.authormarkup.subscript.tex}{\from{examples.dtx}{example:authormarkup:subscript}} + \file{examples/changes.example.authormarkup.brackets.tex}{\from{examples.dtx}{example:authormarkup:brackets}} + \file{examples/changes.example.authormarkup.footnote.tex}{\from{examples.dtx}{example:authormarkup:footnote}} + \file{examples/changes.example.authormarkup.none.tex}{\from{examples.dtx}{example:authormarkup:none}} + \file{examples/changes.example.authormarkup.wrong.tex}{\from{examples.dtx}{example:authormarkup:wrong}} +% + \file{examples/changes.example.authormarkupposition.left.tex}{\from{examples.dtx}{example:authormarkupposition:left}} + \file{examples/changes.example.authormarkupposition.right.tex}{\from{examples.dtx}{example:authormarkupposition:right}} + \file{examples/changes.example.authormarkupposition.wrong.tex}{\from{examples.dtx}{example:authormarkupposition:wrong}} +% + \file{examples/changes.example.authormarkuptext.id.tex}{\from{examples.dtx}{example:authormarkuptext:id}} + \file{examples/changes.example.authormarkuptext.name.tex}{\from{examples.dtx}{example:authormarkuptext:name}} + \file{examples/changes.example.authormarkuptext.wrong.tex}{\from{examples.dtx}{example:authormarkuptext:wrong}} +% + \file{examples/changes.example.defaultcolor.tex}{\from{examples.dtx}{example:defaultcolor}} +% + \file{examples/changes.example.setauthormarkup.tex}{\from{examples.dtx}{example:setauthormarkup}} + \file{examples/changes.example.setauthormarkupposition.tex}{\from{examples.dtx}{example:setauthormarkupposition}} + \file{examples/changes.example.setauthormarkuptext.tex}{\from{examples.dtx}{example:setauthormarkuptext}} +% + \file{examples/changes.example.settruncatewidth.tex}{\from{examples.dtx}{example:settruncatewidth}} +% + \file{examples/changes.example.setsummarywidth.tex}{\from{examples.dtx}{example:setsummarywidth}} + \file{examples/changes.example.setsummarytowidth.tex}{\from{examples.dtx}{example:setsummarytowidth}} +% + \file{examples/changes.example.setsocextension.tex}{\from{examples.dtx}{example:setsocextension}} +% + \file{examples/changes.example.listofchanges.list.tex}{\from{examples.dtx}{example:listofchanges:list}} + \file{examples/changes.example.listofchanges.summary.tex}{\from{examples.dtx}{example:listofchanges:summary}} + \file{examples/changes.example.listofchanges.compactsummary.tex}{\from{examples.dtx}{example:listofchanges:compactsummary}} + \file{examples/changes.example.listofchanges.all.tex}{\from{examples.dtx}{example:listofchanges:all}} + \file{examples/changes.example.listofchanges.title.tex}{\from{examples.dtx}{example:listofchanges:title}} + \file{examples/changes.example.listofchanges.show.tex}{\from{examples.dtx}{example:listofchanges:show}} + \file{examples/changes.example.listofchanges.wrong.tex}{\from{examples.dtx}{example:listofchanges:wrong}} +% + \file{examples/changes.example.packageoptions.todonotes.tex}{\from{examples.dtx}{example:packageoptions.todonotes}} + \file{examples/changes.example.packageoptions.truncate.tex}{\from{examples.dtx}{example:packageoptions.truncate}} + \file{examples/changes.example.packageoptions.ulem.tex}{\from{examples.dtx}{example:packageoptions.ulem}} + \file{examples/changes.example.packageoptions.xcolor.tex}{\from{examples.dtx}{example:packageoptions.xcolor}} +% + \file{examples/changes.example.screenshot.tex}{\from{example-screenshot.dtx}{example:screenshot}} } \endinput diff --git a/Master/texmf-dist/source/latex/changes/example-screenshot.dtx b/Master/texmf-dist/source/latex/changes/example-screenshot.dtx index 251b4b5a7cb..7da50cf8892 100644 --- a/Master/texmf-dist/source/latex/changes/example-screenshot.dtx +++ b/Master/texmf-dist/source/latex/changes/example-screenshot.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -% Copyright (C) 2018-2018 +% Copyright (C) 2018-2021 % Ekkart Kleinod (ekleinod@edgesoft.de) % -------------------------------------------------------------------------- % diff --git a/Master/texmf-dist/source/latex/changes/examples.dtx b/Master/texmf-dist/source/latex/changes/examples.dtx index 78eaf393c1a..9dc8932bfaa 100644 --- a/Master/texmf-dist/source/latex/changes/examples.dtx +++ b/Master/texmf-dist/source/latex/changes/examples.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -% Copyright (C) 2007-2019 +% Copyright (C) 2007-2021 % Ekkart Kleinod (ekleinod@edgesoft.de) % -------------------------------------------------------------------------- % @@ -57,6 +57,20 @@ \usepackage[final]{changes} %</example:final> % +%<*example:commandnameprefix:none> +\usepackage[commandnameprefix=none]{changes} +%</example:commandnameprefix:none> +%<*example:commandnameprefix:always> +\usepackage[commandnameprefix=always]{changes} +%</example:commandnameprefix:always> +%<*example:commandnameprefix:ifneeded> +\newcommand{\added}{Definition of added} +\usepackage[commandnameprefix=ifneeded]{changes} +%</example:commandnameprefix:ifneeded> +%<*example:commandnameprefix:wrong> +\usepackage[commandnameprefix=wrong]{changes} +%</example:commandnameprefix:wrong> +% %<*example:markup:default> \usepackage[markup=default]{changes} %</example:markup:default> @@ -209,6 +223,10 @@ \usepackage[authormarkuptext=wrong]{changes} %</example:authormarkuptext:wrong> % +%<*example:defaultcolor> +\usepackage[defaultcolor=magenta]{changes} +%</example:defaultcolor> +% %<*example:packageoptions.todonotes> \usepackage[todonotes={textsize=tiny}]{changes} %</example:packageoptions.todonotes> @@ -229,7 +247,7 @@ \setdeletedmarkup{\emph{#1}} %</example:setdeletedmarkup> %<*example:setcommentmarkup> -\setcommentmarkup{\ifthenelse{\isColored}{\color{authorcolor}}{}---~\ifthenelse{\isAnonymous{#2}}{}{\textbf{#3} }#1~---} +\setcommentmarkup{\IfIsColored{\color{authorcolor}}{}---~\IfIsAnonymous{#2}{}{\textbf{#3} }#1~---} %</example:setcommentmarkup> %<*example:sethighlightmarkup> \sethighlightmarkup{\emph{#1}} @@ -279,7 +297,7 @@ %<example:listofchanges:summary>\verb|\listofchanges[style=summary]| %<example:setaddedmarkup>\verb|\setaddedmarkup{\emph{#1}}| %<example:setdeletedmarkup>\verb|\setdeletedmarkup{\emph{#1}}| -%<example:setcommentmarkup>\verb|\setcommentmarkup{\ifthenelse{\isColored}{\color{authorcolor}}{}---~\ifthenelse{\isAnonymous{#2}}{}{\textbf{#3} }#1~---}| +%<example:setcommentmarkup>\verb|\setcommentmarkup{\IfIsColored{\color{authorcolor}}{}---~\IfIsAnonymous{#2}{}{\textbf{#3} }#1~---}| %<example:sethighlightmarkup>\verb|\sethighlightmarkup{\emph{#1}}| %<example:setauthormarkup>\verb|\setauthormarkup{\xout{#1}}| %<example:setauthormarkupposition>\verb|\setauthormarkupposition{left}| diff --git a/Master/texmf-dist/tex/latex/changes/changes.sty b/Master/texmf-dist/tex/latex/changes/changes.sty index 9bd12597ece..58fa8e4e983 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-2020 Ekkart Kleinod (ekleinod@edgesoft.de) +%% Copyright 2007-2021 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,56 +41,83 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{changes} -[2020/06/16 v3.2.2 changes package] -\typeout{*** changes package 2020/06/16 v3.2.2 ***} +[2021/01/28 v4.0.0 changes package] +\typeout{*** changes package 2021/01/28 v4.0.0 ***} \RequirePackage{xkeyval} -\RequirePackage{xifthen} +\RequirePackage{etoolbox} \RequirePackage{xstring} -\newboolean{Changes@optiondraft} -\setboolean{Changes@optiondraft}{true} +\DeclareListParser{\dopsvlist}{|} +\DeclareListParser*{\forpsvlist}{|} +\newcommand{\Changes@tmplist}{} +\newbool{Changes@inlist} +\newrobustcmd{\IfIsInList}[4]{% +\renewcommand{\Changes@tmplist}{}% +\renewcommand*{\do}[1]{% +\listadd{\Changes@tmplist}{##1}% +}% +\expandafter\dopsvlist\expandafter{#2}% +\setbool{Changes@inlist}{false}% +\renewcommand*{\do}[1]{% +\ifinlist{##1}{\Changes@tmplist}% +{\setbool{Changes@inlist}{true}}% +{}% +}% +\expandafter\dopsvlist\expandafter{#1}% +\ifbool{Changes@inlist}% +{#3}% +{#4}% +} +\newbool{Changes@optiondraft} +\setbool{Changes@optiondraft}{true} \DeclareOptionX{draft}{ -\setboolean{Changes@optiondraft}{true} +\setbool{Changes@optiondraft}{true} \typeout{changes-option '\CurrentOption'} } \DeclareOptionX{final}{ -\setboolean{Changes@optiondraft}{false} +\setbool{Changes@optiondraft}{false} \typeout{changes-option '\CurrentOption'} } +\newcommand{\Changes@optioncommandnameprefix}{none} +\DeclareOptionX{commandnameprefix}{ +\ifblank{#1} +{} +{ +\IfIsInList{#1}{none|always|ifneeded} +{\renewcommand{\Changes@optioncommandnameprefix}{#1}} +{\PackageWarning{changes}{commandnameprefix '#1' unknown, using '\Changes@optioncommandnameprefix'}} +} +\typeout{changes-option 'commandnameprefix=\Changes@optioncommandnameprefix'} +} \newcommand{\Changes@optionaddedmarkup}{colored} \newcommand{\Changes@optiondeletedmarkup}{sout} \newcommand{\Changes@optionhighlightmarkup}{background} \newcommand{\Changes@optioncommentmarkup}{todo} \newcommand{\Changes@optionmarkup}{default} \DeclareOptionX{markup}{ -\ifthenelse{\equal{\@empty}{#1}} +\ifblank{#1} {} { -\ifthenelse{ -\equal{#1}{default}\or -\equal{#1}{underlined}\or -\equal{#1}{bfit}\or -\equal{#1}{nocolor} -} +\IfIsInList{#1}{bfit|default|nocolor|underlined} {\renewcommand{\Changes@optionmarkup}{#1}} {\PackageWarning{changes}{markup '#1' unknown, using '\Changes@optionmarkup'}} } -\ifthenelse{\equal{\Changes@optionmarkup}{default}} +\IfStrEq{\Changes@optionmarkup}{default} { } {} -\ifthenelse{\equal{\Changes@optionmarkup}{underlined}} +\IfStrEq{\Changes@optionmarkup}{underlined} { \renewcommand{\Changes@optionaddedmarkup}{uline} \renewcommand{\Changes@optionhighlightmarkup}{uwave} } {} -\ifthenelse{\equal{\Changes@optionmarkup}{bfit}} +\IfStrEq{\Changes@optionmarkup}{bfit} { \renewcommand{\Changes@optionaddedmarkup}{bf} \renewcommand{\Changes@optiondeletedmarkup}{it} } {} -\ifthenelse{\equal{\Changes@optionmarkup}{nocolor}} +\IfStrEq{\Changes@optionmarkup}{nocolor} { \renewcommand{\Changes@optionaddedmarkup}{uline} \renewcommand{\Changes@optionhighlightmarkup}{uwave} @@ -99,73 +126,40 @@ \typeout{changes-option 'markup=\Changes@optionmarkup'} } \DeclareOptionX{addedmarkup}{ -\ifthenelse{\equal{\@empty}{#1}} +\ifblank{#1} {} { -\ifthenelse{ -\equal{#1}{colored}\or -\equal{#1}{uline}\or -\equal{#1}{uuline}\or -\equal{#1}{uwave}\or -\equal{#1}{dashuline}\or -\equal{#1}{dotuline}\or -\equal{#1}{bf}\or -\equal{#1}{it}\or -\equal{#1}{sl}\or -\equal{#1}{em} -} +\IfIsInList{#1}{bf|colored|dashuline|dotuline|em|it|sl|uline|uuline|uwave} {\renewcommand{\Changes@optionaddedmarkup}{#1}} {\PackageWarning{changes}{addedmarkup '#1' unknown, using '\Changes@optionaddedmarkup'}} } \typeout{changes-option 'addedmarkup=\Changes@optionaddedmarkup'} } \DeclareOptionX{deletedmarkup}{ -\ifthenelse{\equal{\@empty}{#1}} +\ifblank{#1} {} { -\ifthenelse{ -\equal{#1}{sout}\or -\equal{#1}{colored}\or -\equal{#1}{uline}\or -\equal{#1}{uuline}\or -\equal{#1}{uwave}\or -\equal{#1}{dashuline}\or -\equal{#1}{dotuline}\or -\equal{#1}{xout}\or -\equal{#1}{bf}\or -\equal{#1}{it}\or -\equal{#1}{sl}\or -\equal{#1}{em} -} +\IfIsInList{#1}{bf|colored|dashuline|dotuline|em|it|sl|sout|uline|uuline|uwave|xout} {\renewcommand{\Changes@optiondeletedmarkup}{#1}} {\PackageWarning{changes}{deletedmarkup '#1' unknown, using '\Changes@optiondeletedmarkup'}} } \typeout{changes-option 'deletedmarkup=\Changes@optiondeletedmarkup'} } \DeclareOptionX{highlightmarkup}{ -\ifthenelse{\equal{\@empty}{#1}} +\ifblank{#1} {} { -\ifthenelse{ -\equal{#1}{background}\or -\equal{#1}{uuline}\or -\equal{#1}{uwave} -} +\IfIsInList{#1}{background|uuline|uwave} {\renewcommand{\Changes@optionhighlightmarkup}{#1}} {\PackageWarning{changes}{highlightmarkup '#1' unknown, using '\Changes@optionhighlightmarkup'}} } \typeout{changes-option 'highlightmarkup=\Changes@optionhighlightmarkup'} } \DeclareOptionX{commentmarkup}{ -\ifthenelse{\equal{\@empty}{#1}} +\ifblank{#1} {} { -\ifthenelse{ -\equal{#1}{todo}\or -\equal{#1}{margin}\or -\equal{#1}{footnote}\or -\equal{#1}{uwave} -} +\IfIsInList{#1}{footnote|margin|todo|uwave} {\renewcommand{\Changes@optioncommentmarkup}{#1}} {\PackageWarning{changes}{commentmarkup '#1' unknown, using '\Changes@optioncommentmarkup'}} } @@ -173,16 +167,10 @@ } \newcommand{\Changes@optionauthormarkup}{superscript} \DeclareOptionX{authormarkup}{ -\ifthenelse{\equal{\@empty}{#1}} +\ifblank{#1} {} { -\ifthenelse{ -\equal{#1}{superscript}\or -\equal{#1}{subscript}\or -\equal{#1}{brackets}\or -\equal{#1}{footnote}\or -\equal{#1}{none} -} +\IfIsInList{#1}{brackets|footnote|none|subscript|superscript} {\renewcommand{\Changes@optionauthormarkup}{#1}} {\PackageWarning{changes}{authormarkup '#1' unknown, using '\Changes@optionauthormarkup'}} } @@ -190,13 +178,10 @@ } \newcommand{\Changes@optionauthormarkupposition}{right} \DeclareOptionX{authormarkupposition}{ -\ifthenelse{\equal{\@empty}{#1}} +\ifblank{#1} {} { -\ifthenelse{ -\equal{#1}{right}\or -\equal{#1}{left} -} +\IfIsInList{#1}{left|right} {\renewcommand{\Changes@optionauthormarkupposition}{#1}} {\PackageWarning{changes}{authormarkupposition '#1' unknown, using '\Changes@optionauthormarkupposition'}} } @@ -204,18 +189,24 @@ } \newcommand{\Changes@optionauthormarkuptext}{id} \DeclareOptionX{authormarkuptext}{ -\ifthenelse{\equal{\@empty}{#1}} +\ifblank{#1} {} { -\ifthenelse{ -\equal{#1}{id}\or -\equal{#1}{name} -} +\IfIsInList{#1}{id|name} {\renewcommand{\Changes@optionauthormarkuptext}{#1}} {\PackageWarning{changes}{authormarkuptext '#1' unknown, using '\Changes@optionauthormarkuptext'}} } \typeout{changes-option 'authormarkuptext=\Changes@optionauthormarkuptext'} } +\newcommand{\Changes@optiondefaultcolor}{blue} +\DeclareOptionX{defaultcolor}{ +\ifblank{#1} +{} +{ +\renewcommand{\Changes@optiondefaultcolor}{#1} +} +\typeout{changes-option 'defaultcolor=\Changes@optiondefaultcolor'} +} \DeclareOptionX{todonotes}{ \typeout{todonotes-option '#1', passed to package todonotes} \PassOptionsToPackage{#1}{todonotes} @@ -239,38 +230,30 @@ \DeclareOptionX<Changes@definechangesauthor>{color}{\def\Changes@definechangesauthor@color{#1}} \presetkeys{Changes@definechangesauthor}{ name=\@empty, -color=blue +color=\Changes@optiondefaultcolor }{} \DeclareOptionX<Changes@added>{id}{\def\Changes@added@id{#1}} -\DeclareOptionX<Changes@added>{remark}{\def\Changes@added@remark{#1}} \DeclareOptionX<Changes@added>{comment}{\def\Changes@added@comment{#1}} \presetkeys{Changes@added}{ id=\@empty, -remark=\@empty, comment=\@empty, }{} \DeclareOptionX<Changes@deleted>{id}{\def\Changes@deleted@id{#1}} -\DeclareOptionX<Changes@deleted>{remark}{\def\Changes@deleted@remark{#1}} \DeclareOptionX<Changes@deleted>{comment}{\def\Changes@deleted@comment{#1}} \presetkeys{Changes@deleted}{ id=\@empty, -remark=\@empty, comment=\@empty, }{} \DeclareOptionX<Changes@replaced>{id}{\def\Changes@replaced@id{#1}} -\DeclareOptionX<Changes@replaced>{remark}{\def\Changes@replaced@remark{#1}} \DeclareOptionX<Changes@replaced>{comment}{\def\Changes@replaced@comment{#1}} \presetkeys{Changes@replaced}{ id=\@empty, -remark=\@empty, comment=\@empty, }{} \DeclareOptionX<Changes@highlight>{id}{\def\Changes@highlight@id{#1}} -\DeclareOptionX<Changes@highlight>{remark}{\def\Changes@highlight@remark{#1}} \DeclareOptionX<Changes@highlight>{comment}{\def\Changes@highlight@comment{#1}} \presetkeys{Changes@highlight}{ id=\@empty, -remark=\@empty, comment=\@empty, }{} \DeclareOptionX<Changes@comment>{id}{\def\Changes@comment@id{#1}} @@ -290,70 +273,71 @@ ulem={normalem,normalbf}, truncate={breakall,fit} } \ProcessOptionsX*\relax -\newtest{\isColored}{% -\not\equal{\Changes@optionmarkup}{nocolor}% +\newrobustcmd{\IfIsColored}[2]{% +\IfStrEq{\Changes@optionmarkup}{nocolor}% +{#2}% +{#1}% } -\ifthenelse{\isColored} -{ -\RequirePackage{xcolor} +\newrobustcmd{\IfIsEmpty}[3]{% +\ifboolexpr{% +test {\ifblank{#1}} or% +test {\IfStrEq{#1}{}} or% +test {\IfStrEq{#1}{\@empty}}% +}% +{#2}% +{#3}% +} +\newrobustcmd{\IfIsAnonymous}[3]{% +\IfIsEmpty{#1}{#2}{#3}% } +\newrobustcmd{\IfIsAuthorEmptyAtPosition}[4]{% +\ifboolexpr{% +test {\IfIsAnonymous{#1}} or% +not test {\IfStrEq{\Changes@optionauthormarkupposition}{#2}}% +}% +{#3}% +{#4}% +} +\IfIsColored +{\RequirePackage{xcolor}} {} -\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@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}\or -\equal{\Changes@optioncommentmarkup}{uwave}\or -\equal{\Changes@optionhighlightmarkup}{uuline}\or -\equal{\Changes@optionhighlightmarkup}{uwave} +\ifboolexpr{ +test {\IfIsInList{\Changes@optionaddedmarkup}{dashuline|dotuline|sout|uline|uuline|uwave|xout}} or +test {\IfIsInList{\Changes@optiondeletedmarkup}{dashuline|dotuline|sout|uline|uuline|uwave|xout}} or +test {\IfIsInList{\Changes@optionhighlightmarkup}{dashuline|dotuline|sout|uline|uuline|uwave|xout}} } {\RequirePackage{ulem}} {} -\ifthenelse{ -\equal{\Changes@optioncommentmarkup}{todo} -} +\IfStrEq{\Changes@optioncommentmarkup}{todo} {\RequirePackage{todonotes}} {} -\newcommand*\listofchangesname{List of changes} -\newcommand*\summaryofchangesname{Changes} -\newcommand*\compactsummaryofchangesname{Changes (compact)} -\newcommand*\changesaddname{Added} -\newcommand*\changesdeletename{Deleted} -\newcommand*\changesreplacename{Replaced} -\newcommand*\changeshighlightname{Highlighted} -\newcommand*\changescommentname{Commented} -\newcommand*\changesauthorname{Author} -\newcommand*\changesanonymousname{anonymous} -\newcommand*\changesnochanges{No changes.} -\newcommand*\changesnoloc{List of changes is available after the next \LaTeX\ run.} -\newcommand*\changesnosoc{Summary of changes is available after the next \LaTeX\ run.} -\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\compactsummaryofchangesname{Changes (compact)} +\def\changesaddedname{Added} +\def\changesdeletedname{Deleted} +\def\changesreplacedname{Replaced} +\def\changeshighlightname{Highlighted} +\def\changescommentname{Commented} +\def\changesauthorname{Author} +\def\changesanonymousname{anonymous} +\def\changesnochanges{No changes.} +\def\changesnoloc{List of changes is available after the next \LaTeX\ run.} +\def\changesnosoc{Summary of changes is available after the next \LaTeX\ run.} +\ifboolexpr{ +test {\@ifpackageloaded{babel}} or +test {\@ifpackageloaded{polyglossia}} +} { \addto\captionsngerman{\def\listofchangesname{Liste der \"Anderungen}} \addto\captionsngerman{\def\summaryofchangesname{\"Anderungen}} \addto\captionsngerman{\def\compactsummaryofchangesname{\"Anderungen (kompakt)}} -\addto\captionsngerman{\def\changesaddname{Eingef\"ugt}} -\addto\captionsngerman{\def\changesdeletename{Gel\"oscht}} -\addto\captionsngerman{\def\changesreplacename{Ersetzt}} +\addto\captionsngerman{\def\changesaddedname{Eingef\"ugt}} +\addto\captionsngerman{\def\changesdeletedname{Gel\"oscht}} +\addto\captionsngerman{\def\changesreplacedname{Ersetzt}} \addto\captionsngerman{\def\changeshighlightname{Hervorgehoben}} \addto\captionsngerman{\def\changescommentname{Kommentiert}} -\addto\captionsngerman{\def\changesauthorname{Autor}} +\addto\captionsngerman{\def\changesauthorname{Autor:in}} \addto\captionsngerman{\def\changesanonymousname{Anonym}} \addto\captionsngerman{\def\changesnochanges{Keine \"Anderungen.}} \addto\captionsngerman{\def\changesnoloc{Liste der \"Anderungen nach dem n\"achsten \LaTeX-Lauf verf\"ugbar.}} @@ -362,12 +346,12 @@ truncate={breakall,fit} \addto\captionsgerman{\def\listofchangesname{Liste der \"Anderungen}} \addto\captionsgerman{\def\summaryofchangesname{\"Anderungen}} \addto\captionsgerman{\def\compactsummaryofchangesname{\"Anderungen (kompakt)}} -\addto\captionsgerman{\def\changesaddname{Eingef\"ugt}} -\addto\captionsgerman{\def\changesdeletename{Gel\"oscht}} -\addto\captionsgerman{\def\changesreplacename{Ersetzt}} +\addto\captionsgerman{\def\changesaddedname{Eingef\"ugt}} +\addto\captionsgerman{\def\changesdeletedname{Gel\"oscht}} +\addto\captionsgerman{\def\changesreplacedname{Ersetzt}} \addto\captionsgerman{\def\changeshighlightname{Hervorgehoben}} \addto\captionsgerman{\def\changescommentname{Kommentiert}} -\addto\captionsgerman{\def\changesauthorname{Autor}} +\addto\captionsgerman{\def\changesauthorname{Autor:in}} \addto\captionsgerman{\def\changesanonymousname{Anonym}} \addto\captionsgerman{\def\changesnochanges{Keine \"Anderungen.}} \addto\captionsgerman{\def\changesnoloc{Liste der \"Anderungen nach dem n\"achsten \LaTeX-Lauf verf\"ugbar.}} @@ -376,9 +360,9 @@ truncate={breakall,fit} \addto\captionsenglish{\def\listofchangesname{List of changes}} \addto\captionsenglish{\def\summaryofchangesname{Changes}} \addto\captionsenglish{\def\compactsummaryofchangesname{Changes (compact)}} -\addto\captionsenglish{\def\changesaddname{Added}} -\addto\captionsenglish{\def\changesdeletename{Deleted}} -\addto\captionsenglish{\def\changesreplacename{Replaced}} +\addto\captionsenglish{\def\changesaddedname{Added}} +\addto\captionsenglish{\def\changesdeletedname{Deleted}} +\addto\captionsenglish{\def\changesreplacedname{Replaced}} \addto\captionsenglish{\def\changeshighlightname{Highlighted}} \addto\captionsenglish{\def\changescommentname{Commented}} \addto\captionsenglish{\def\changesauthorname{Author}} @@ -390,9 +374,9 @@ truncate={breakall,fit} \addto\captionsbritish{\def\listofchangesname{List of changes}} \addto\captionsbritish{\def\summaryofchangesname{Changes}} \addto\captionsbritish{\def\compactsummaryofchangesname{Changes (compact)}} -\addto\captionsbritish{\def\changesaddname{Added}} -\addto\captionsbritish{\def\changesdeletename{Deleted}} -\addto\captionsbritish{\def\changesreplacename{Replaced}} +\addto\captionsbritish{\def\changesaddedname{Added}} +\addto\captionsbritish{\def\changesdeletedname{Deleted}} +\addto\captionsbritish{\def\changesreplacedname{Replaced}} \addto\captionsbritish{\def\changeshighlightname{Highlighted}} \addto\captionsbritish{\def\changescommentname{Commented}} \addto\captionsbritish{\def\changesauthorname{Author}} @@ -404,9 +388,9 @@ truncate={breakall,fit} \addto\captionsitalian{\def\listofchangesname{Lista delle modifiche}} \addto\captionsitalian{\def\summaryofchangesname{Modifiche}} \addto\captionsitalian{\def\compactsummaryofchangesname{Modifiche (coerente)}} % translation by me (EK), please provide correct translation -\addto\captionsitalian{\def\changesaddname{Aggiunte}} -\addto\captionsitalian{\def\changesdeletename{Cancellazioni}} -\addto\captionsitalian{\def\changesreplacename{Sostituzioni}} +\addto\captionsitalian{\def\changesaddedname{Aggiunte}} +\addto\captionsitalian{\def\changesdeletedname{Cancellazioni}} +\addto\captionsitalian{\def\changesreplacedname{Sostituzioni}} \addto\captionsitalian{\def\changeshighlightname{Accentare}} % translation by me (EK), please provide correct translation \addto\captionsitalian{\def\changescommentname{Commenti}} % translation by me (EK), please provide correct translation \addto\captionsitalian{\def\changesauthorname{Autore}} @@ -416,9 +400,13 @@ truncate={breakall,fit} \addto\captionsitalian{\def\changesnosoc{Le modifiche sar\`a disponibile alla prossima esecuzione di \LaTeX.}} } {} -\newcommand{\Changes@extension}{soc} +\newcommand{\Changes@locextension}{loc} +\newcommand{\setlocextension}[1]{ +\renewcommand{\Changes@locextension}{#1} +} +\newcommand{\Changes@socextension}{soc} \newcommand{\setsocextension}[1]{ -\renewcommand{\Changes@extension}{#1} +\renewcommand{\Changes@socextension}{#1} } \newcounter{Changes@AuthorCount} \setcounter{Changes@AuthorCount}{0} @@ -437,11 +425,21 @@ truncate={breakall,fit} } \definechangesauthor{\@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}}{}% -\ifthenelse{\equal{\Changes@optionauthormarkup}{none}}{}{}% +\IfStrEq{\Changes@optionauthormarkup}{superscript}% +{\textsuperscript{#1}}% +{}% +\IfStrEq{\Changes@optionauthormarkup}{subscript}% +{\textsubscript{#1}}% +{}% +\IfStrEq{\Changes@optionauthormarkup}{brackets}% +{(#1)}% +{}% +\IfStrEq{\Changes@optionauthormarkup}{footnote}% +{\footnote{#1}}% +{}% +\IfStrEq{\Changes@optionauthormarkup}{none}% +{}% +{}% } \newcommand{\setauthormarkup}[1]{ \renewcommand{\Changes@Markup@author}[1]{#1} @@ -452,104 +450,101 @@ truncate={breakall,fit} \newcommand{\setauthormarkuptext}[1]{ \renewcommand{\Changes@optionauthormarkuptext}{#1} } +\newcommand{\Changes@Markup}[2]{% +\IfStrEq{#1}{background}% +{% +\IfIsColored% +{\colorbox{authorcolor!30}{#2}}% +{#2}% +}% +{}% +\IfStrEq{#1}{bf}% +{\textbf{#2}}% +{}% +\IfStrEq{#1}{colored}% +{#2}% +{}% +\IfStrEq{#1}{dashuline}% +{\dashuline{#2}}% +{}% +\IfStrEq{#1}{dotuline}% +{\dotuline{#2}}% +{}% +\IfStrEq{#1}{em}% +{\emph{#2}}% +{}% +\IfStrEq{#1}{it}% +{\textit{#2}}% +{}% +\IfStrEq{#1}{sl}% +{\textsl{#2}}% +{}% +\IfStrEq{#1}{sout}% +{\sout{#2}}% +{}% +\IfStrEq{#1}{uline}% +{\uline{#2}}% +{}% +\IfStrEq{#1}{uuline}% +{\uuline{#2}}% +{}% +\IfStrEq{#1}{uwave}% +{\uwave{#2}}% +{}% +\IfStrEq{#1}{xout}% +{\xout{#2}}% +{}% +} \newcommand{\Changes@Markup@added}[1]{% -\ifthenelse{\equal{\Changes@optionaddedmarkup}{colored}}{#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}{bf}}{\textbf{#1}}{}% -\ifthenelse{\equal{\Changes@optionaddedmarkup}{it}}{\textit{#1}}{}% -\ifthenelse{\equal{\Changes@optionaddedmarkup}{sl}}{\textsl{#1}}{}% -\ifthenelse{\equal{\Changes@optionaddedmarkup}{em}}{\emph{#1}}{}% +\Changes@Markup{\Changes@optionaddedmarkup}{#1}{}% } \newcommand{\setaddedmarkup}[1]{ \renewcommand{\Changes@Markup@added}[1]{#1} } \newcommand{\Changes@Markup@deleted}[1]{% -\ifthenelse{\equal{\Changes@optiondeletedmarkup}{sout}}{\sout{#1}}{}% -\ifthenelse{\equal{\Changes@optiondeletedmarkup}{colored}}{#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}{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}}{}% +\Changes@Markup{\Changes@optiondeletedmarkup}{#1}{}% } \newcommand{\setdeletedmarkup}[1]{ \renewcommand{\Changes@Markup@deleted}[1]{#1} } \newcommand{\Changes@Markup@highlight}[1]{% -\ifthenelse{\equal{\Changes@optionhighlightmarkup}{background}}% -{% -\ifthenelse{\isColored}% -{\colorbox{authorcolor!30}{#1}}% -{#1}% -}{}% -\ifthenelse{\equal{\Changes@optionhighlightmarkup}{uuline}}{\uuline{#1}}{}% -\ifthenelse{\equal{\Changes@optionhighlightmarkup}{uwave}}{\uwave{#1}}{}% +\Changes@Markup{\Changes@optionhighlightmarkup}{#1}{}% } \newcommand{\sethighlightmarkup}[1]{ \renewcommand{\Changes@Markup@highlight}[1]{#1} } \newcommand{\Changes@Markup@comment}[3]{% -\ifthenelse{\equal{\Changes@optioncommentmarkup}{todo}}% -{% -\ifthenelse{\isColored}% +\IfStrEq{\Changes@optioncommentmarkup}{todo}% {% -\ifthenelse{\isAnonymous{#2}}% -{% -\todo[color=authorcolor!10, bordercolor=authorcolor, linecolor=authorcolor!70, nolist]{\textbf{[\arabic{authorcommentcount}]} #1}% -}{% -\todo[color=authorcolor!10, bordercolor=authorcolor, linecolor=authorcolor!70, nolist]{\textbf{[#3~\arabic{authorcommentcount}]} #1}% -}% -}{% -\ifthenelse{\isAnonymous{#2}}% -{% -\todo[color=black!0, bordercolor=black, linecolor=black!70, nolist]{\textbf{[\arabic{authorcommentcount}]} #1}% -}{% -\todo[color=black!0, bordercolor=black, linecolor=black!70, nolist]{\textbf{[#3~\arabic{authorcommentcount}]:} #1}% -}% -}% +\IfIsColored% +{\colorlet{Changes@todocolor}{authorcolor}}% +{\colorlet{Changes@todocolor}{black}}% +\todo[color=Changes@todocolor!10, bordercolor=Changes@todocolor, linecolor=Changes@todocolor!70, nolist]{\textbf{[\IfIsAnonymous{#2}{}{#3~}\arabic{authorcommentcount}]} #1}% }{}% -\ifthenelse{\equal{\Changes@optioncommentmarkup}{margin}}% +\IfStrEq{\Changes@optioncommentmarkup}{margin}% {% \marginpar{% -\ifthenelse{\isColored}% +\IfIsColored% {\leavevmode\color{authorcolor}}% {}% -\ifthenelse{\isAnonymous{#2}}% -{\textbf{[\arabic{Changes@commentCount#2}]:} }% -{\textbf{[#3~\arabic{Changes@commentCount#2}]:} }% -#1% +\textbf{[\IfIsAnonymous{#2}{}{#3~}\arabic{Changes@commentCount#2}]:} #1% }% }{}% -\ifthenelse{\equal{\Changes@optioncommentmarkup}{footnote}}% +\IfStrEq{\Changes@optioncommentmarkup}{footnote}% {% \footnote{% -\ifthenelse{\isAnonymous{#2}}% -{\textbf{[\arabic{Changes@commentCount#2}]:} }% -{\textbf{[#3~\arabic{Changes@commentCount#2}]:} }% -#1% +\textbf{[\IfIsAnonymous{#2}{}{#3~}\arabic{Changes@commentCount#2}]:} #1% }% }{}% -\ifthenelse{\equal{\Changes@optioncommentmarkup}{uwave}}% +\IfStrEq{\Changes@optioncommentmarkup}{uwave}% {% {% -\ifthenelse{\isColored}% +\IfIsColored% {\color{authorcolor}}% {}% \allowbreak% \uwave{% -\ifthenelse{\isAnonymous{#2}}% -{\textbf{[\arabic{Changes@commentCount#2}]:} }% -{\textbf{[#3~\arabic{Changes@commentCount#2}]:} }% -#1% +\textbf{[\IfIsAnonymous{#2}{}{#3~}\arabic{Changes@commentCount#2}]:} #1% }% }% }{}% @@ -557,109 +552,116 @@ truncate={breakall,fit} \newcommand{\setcommentmarkup}[1]{ \renewcommand{\Changes@Markup@comment}[3]{#1} } -\DeclareRobustCommand{\ifIsEmpty}[3]{% -\ifthenelse{\equal{#1}{} \or \equal{#1}{\@empty}}% -{#2}% -{#3}% -} -\newtest{\isAnonymous}[1]{% -\equal{#1}{\@empty}% -} -\newtest{\isAuthorEmpty}[2]{% -\isAnonymous{#1} \or \not\equal{\Changes@optionauthormarkupposition}{#2}% -} -\newboolean{Changes@WrongID} +\newbool{Changes@WrongID} \newcommand{\Changes@check@author}[1]{% -\ifIsEmpty{#1}% +\IfIsEmpty{#1}% {}% {% -\setboolean{Changes@WrongID}{true}% +\setbool{Changes@WrongID}{true}% \setcounter{Changes@Author}{0}% -\whiledo{\value{Changes@Author} < \value{Changes@AuthorCount}}{% +\loop% \stepcounter{Changes@Author}% -\ifthenelse{\equal{#1}{\@nameuse{Changes@AuthorID\theChanges@Author}}}% -{\setboolean{Changes@WrongID}{false}}% +\IfStrEq{#1}{\csuse{Changes@AuthorID\theChanges@Author}}% +{\setbool{Changes@WrongID}{false}}% {}% -}% -\ifthenelse{\boolean{Changes@WrongID}}% -{\PackageError{changes}% +\ifnum\theChanges@Author<\theChanges@AuthorCount% +\repeat% +\ifbool{Changes@WrongID}% +{% +\PackageError{changes}% {Undefined changes author: #1}% -{You have to define the author #1 with e.g.: \definechangesauthor{#1}}}% +{You have to define the author #1 with e.g.: \definechangesauthor{#1}}% +}% {}% }% } -\DeclareRobustCommand{\Changes@output@author}[2]{% -\ifthenelse{\isAuthorEmpty{#1}{#2}}% +\newrobustcmd{\Changes@output@author}[2]{% +\IfIsAuthorEmptyAtPosition{#1}{#2}% {}% {% -\ifthenelse{\equal{\Changes@optionauthormarkuptext}{id}}% -{% -#1% -}% +\IfStrEq{\Changes@optionauthormarkuptext}{id}% +{#1}% {}% -\ifthenelse{\equal{\Changes@optionauthormarkuptext}{name}}% -{% -\ifIsEmpty{\@nameuse{Changes@AuthorName#1}}% +\IfStrEq{\Changes@optionauthormarkuptext}{name}% {% -#1% -}{% -\@nameuse{Changes@AuthorName#1}% -}% +\IfIsEmpty{\csuse{Changes@AuthorName#1}}% +{#1}% +{\csuse{Changes@AuthorName#1}}% }% {}% }% } -\newcommand{\Changes@set@color}[1]{% -\ifthenelse{\isColored}% -{\colorlet{authorcolor}{\@nameuse{Changes@AuthorColor#1}}}% +\newrobustcmd{\Changes@set@color}[1]{% +\IfIsColored% +{\colorlet{authorcolor}{\csuse{Changes@AuthorColor#1}}}% {}% } \newcounter{authorcommentcount} -\newcommand{\Changes@set@commentcount}[1]{% +\newrobustcmd{\Changes@set@commentcount}[1]{% \setcounter{authorcommentcount}{\value{Changes@commentCount#1}}% } -\newcommand{\Changes@output}[7]{% -\ifthenelse{\boolean{Changes@optiondraft}}% +\def\Changes@commandprefix{ch} +\newrobustcmd{\Changes@set@commandname}[1]{ +\def\Changes@commandname{#1} +\IfStrEq{\Changes@optioncommandnameprefix}{always} +{ +\def\Changes@commandname{\Changes@commandprefix#1} +\typeout{changes-package option commandnameprefix=always: using prefix on #1, new command name is \Changes@commandname.} +}{ +\ifcsdef{#1} +{ +\IfStrEq{\Changes@optioncommandnameprefix}{none} +{ +\PackageError{changes} +{Command #1 is already defined.} +{Try package option commandnameprefix with "always" or "ifneeded", e.g. usepackage[commandnameprefix=always]{changes}} +}{} +\IfStrEq{\Changes@optioncommandnameprefix}{ifneeded} +{ +\def\Changes@commandname{\Changes@commandprefix#1} +\PackageWarning{changes}{Command #1 is already defined, using \Changes@commandname} +}{} +} +{} +} +} +\newrobustcmd{\Changes@output}[7]{% +\ifbool{Changes@optiondraft}% {% \Changes@check@author{#2}% \Changes@set@color{#2}% {% -\ifthenelse{% -\equal{#1}{added}\or% -\equal{#1}{deleted}\or% -\equal{#1}{replaced}\or% -\equal{#1}{highlight}% -}% +\IfIsInList{#1}{added|deleted|replaced|highlight}% {% -\ifIsEmpty{#5}% +\IfIsEmpty{#5}% {% -\ifthenelse{\isAuthorEmpty{#2}{left}}% +\IfIsAuthorEmptyAtPosition{#2}{left}% {}% {{% -\ifthenelse{\isColored}% +\IfIsColored% {\color{authorcolor}}% {}% \Changes@Markup@author{\Changes@output@author{#2}{left}}% }}% }{}% {% -\ifthenelse{\not\equal{#1}{highlight}}% -{% -\ifthenelse{\isColored}% +\IfStrEq{#1}{highlight}% +{}{% +\IfIsColored% {\color{authorcolor}}% {}% -}{}% -\ifthenelse{\equal{#1}{added}}{\Changes@Markup@added{#3}}{}% -\ifthenelse{\equal{#1}{deleted}}{\Changes@Markup@deleted{#4}}{}% -\ifthenelse{\equal{#1}{replaced}}{{\Changes@Markup@added{#3}}\allowbreak\Changes@Markup@deleted{#4}}{}% -\ifthenelse{\equal{#1}{highlight}}{\Changes@Markup@highlight{#3}}{}% }% -\ifIsEmpty{#5}% +\IfStrEq{#1}{added}{\Changes@Markup@added{#3}}{}% +\IfStrEq{#1}{deleted}{\Changes@Markup@deleted{#4}}{}% +\IfStrEq{#1}{replaced}{{\Changes@Markup@added{#3}}\allowbreak\Changes@Markup@deleted{#4}}{}% +\IfStrEq{#1}{highlight}{\Changes@Markup@highlight{#3}}{}% +}% +\IfIsEmpty{#5}% {% -\ifthenelse{\isAuthorEmpty{#2}{right}}% +\IfIsAuthorEmptyAtPosition{#2}{right}% {}% {{% -\ifthenelse{\isColored}% +\IfIsColored% {\color{authorcolor}}% {}% \Changes@Markup@author{\Changes@output@author{#2}{right}}% @@ -667,7 +669,7 @@ truncate={breakall,fit} }{}% \stepcounter{Changes@#1Count#2}% }{}% -\ifIsEmpty{#5}% +\IfIsEmpty{#5}% {}% {% \stepcounter{Changes@commentCount#2}% @@ -678,100 +680,56 @@ truncate={breakall,fit} {\Changes@output@author{#2}{left}\Changes@output@author{#2}{right}}% }% }% -\ifIsEmpty{#2}% +\IfIsEmpty{#2}% {\def\Changes@locid{}}% {\def\Changes@locid{~(#2)}}% -\addtocontents{loc}{\protect\ChangesListline{#1}{#6\Changes@locid}{#7}{\thepage}}% +\addtocontents{\Changes@locextension}{\protect\ChangesListline{#1}{#6\Changes@locid}{#7}{\thepage}}% }% {% -\ifIsEmpty{#3}% +\IfIsEmpty{#3}% {\@bsphack\@esphack}% {#3}% }% } -\newcommand{\added}[2][\@empty]{% +\Changes@set@commandname{added} +\expandafter\newcommand\expandafter{\csname\Changes@commandname\endcsname}[2][\@empty]{% \setkeys{Changes@added}{#1}% -\ifIsEmpty{\Changes@added@remark}% -{}% -{% -\ifIsEmpty{\Changes@added@comment}% -{% -\PackageWarning{changes}{You used the deprecated option 'remark' in your markup, please use 'comment' instead.}% -\let\Changes@added@comment\Changes@added@remark% -}% -{% -\PackageWarning{changes}{You used both options 'comment' and the deprecated 'remark' in your markup, please use 'comment' only, the content of 'remark' will be ignored.}% -}% -}% \Changes@output% {added}% {\Changes@added@id}% {#2}% {}% {\Changes@added@comment}% -{\changesaddname}% +{\changesaddedname}% {#2}% } -\newcommand{\deleted}[2][\@empty]{% +\Changes@set@commandname{deleted} +\expandafter\newcommand\expandafter{\csname\Changes@commandname\endcsname}[2][\@empty]{% \setkeys{Changes@deleted}{#1}% -\ifIsEmpty{\Changes@deleted@remark}% -{}% -{% -\ifIsEmpty{\Changes@deleted@comment}% -{% -\PackageWarning{changes}{You used the deprecated option 'remark' in your markup, please use 'comment' instead.}% -\let\Changes@deleted@comment\Changes@deleted@remark% -}% -{% -\PackageWarning{changes}{You used both options 'comment' and the deprecated 'remark' in your markup, please use 'comment' only, the content of 'remark' will be ignored.}% -}% -}% \Changes@output% {deleted}% {\Changes@deleted@id}% {}% {#2}% {\Changes@deleted@comment}% -{\changesdeletename}% +{\changesdeletedname}% {#2}% } -\newcommand{\replaced}[3][\@empty]{% +\Changes@set@commandname{replaced} +\expandafter\newcommand\expandafter{\csname\Changes@commandname\endcsname}[3][\@empty]{% \setkeys{Changes@replaced}{#1}% -\ifIsEmpty{\Changes@replaced@remark}% -{}% -{% -\ifIsEmpty{\Changes@replaced@comment}% -{% -\PackageWarning{changes}{You used the deprecated option 'remark' in your markup, please use 'comment' instead.}% -\let\Changes@replaced@comment\Changes@replaced@remark% -}% -{% -\PackageWarning{changes}{You used both options 'comment' and the deprecated 'remark' in your markup, please use 'comment' only, the content of 'remark' will be ignored.}% -}% -}% \Changes@output% {replaced}% {\Changes@replaced@id}% {#2}% {#3}% {\Changes@replaced@comment}% -{\changesreplacename}% +{\changesreplacedname}% {#2}% } -\newcommand{\highlight}[2][\@empty]{% +\Changes@set@commandname{highlight} +\expandafter\newcommand\expandafter{\csname\Changes@commandname\endcsname}[2][\@empty]{% \setkeys{Changes@highlight}{#1}% -\ifIsEmpty{\Changes@highlight@remark}% -{}% -{% -\ifIsEmpty{\Changes@highlight@comment}% -{% -\PackageWarning{changes}{You used the deprecated option 'remark' in your markup, please use 'comment' instead.}% -\let\Changes@highlight@comment\Changes@highlight@remark% -}% -{% -\PackageWarning{changes}{You used both options 'comment' and the deprecated 'remark' in your markup, please use 'comment' only, the content of 'remark' will be ignored.}% -}% -}% \Changes@output% {highlight}% {\Changes@highlight@id}% @@ -781,7 +739,8 @@ truncate={breakall,fit} {\changeshighlightname}% {#2}% } -\newcommand{\comment}[2][\@empty]{% +\Changes@set@commandname{comment} +\expandafter\newcommand\expandafter{\csname\Changes@commandname\endcsname}[2][\@empty]{% \setkeys{Changes@comment}{#1}% \Changes@output% {comment}% @@ -795,161 +754,142 @@ truncate={breakall,fit} \RequirePackage{truncate} \renewcommand\TruncateMarker{ [\dots\negthinspace]\ } \def\changes@chopline#1;#2;#3;#4;#5;#6;#7;#8 \\{% -\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@InHighlight{#7}% -\def\Changes@InComment{#8}% +\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@Inhighlight{#7}% +\def\Changes@Incomment{#8}% } \newcommand{\ChangesListline}[4]{% -\IfSubStr{\Changes@loc@show}{#1}{% +\IfIsInList{#1}{\Changes@loc@show}{% \@ifundefined{@dotsep}% -{\def\@dotsep{4.5}}{}% -\@dottedtocline{1}{0px}{2em}{#2: \truncate{\Changes@truncate@width}{#3}}{#4}% +{\def\@dotsep{4.5}}% +{}% +\@dottedtocline{1}{0pt}{2em}{#2: \truncate{\Changes@truncate@width}{#3}}{#4}% }{}% } -\newlength{\Changes@truncate@width} -\setlength{\Changes@truncate@width}{.6\textwidth} \newcommand{\settruncatewidth}[1]{ \setlength{\Changes@truncate@width}{#1} } -\newlength{\Changes@summary@width} -\setlength{\Changes@summary@width}{.3\textwidth} +\newlength{\Changes@truncate@width} +\settruncatewidth{.6\textwidth} \newcommand{\setsummarywidth}[1]{ \setlength{\Changes@summary@width}{#1} } \newcommand{\setsummarytowidth}[1]{ \settowidth{\Changes@summary@width}{#1} } -\newcommand{\Changes@summaryline}[4]{% -\IfSubStr{\Changes@loc@show}{#1}{% -\ifthenelse{\not\equal{\Changes@loc@style}{compactsummary} \or #2 > 0}% -{% -\parbox{\Changes@summary@width}{#3~\let\cleaders\leaders\dotfill~#2}#4% -}{}% -}{}% -} -\newboolean{Changes@MoreLines} -\newboolean{Changes@ShowOK} +\newlength{\Changes@summary@width} +\setsummarywidth{.3\textwidth} \newcommand{\listofchanges}[1][\@empty]{% \setkeys{Changes@loc}{#1}% -\ifthenelse{\boolean{Changes@optiondraft}}% +\ifbool{Changes@optiondraft}% {% -\ifIsEmpty{\Changes@loc@style}% -{\def\Changes@loc@style{list}}% -{% -\ifthenelse{% -\equal{\Changes@loc@style}{list}\or% -\equal{\Changes@loc@style}{summary}\or% -\equal{\Changes@loc@style}{compactsummary}% -}% +\IfIsInList{\Changes@loc@style}{list|summary|compactsummary}% {}% {% \PackageWarning{changes}{Wrong style for list of changes: '\Changes@loc@style', using 'list' instead.}% -\def\Changes@loc@style{list}% +\def\Changes@loc@style{}% }% -}% -\ifIsEmpty{\Changes@loc@show}% -{\def\Changes@loc@show{all}}% -{% -\setboolean{Changes@ShowOK}{false}% -\ifthenelse{\equal{\Changes@loc@show}{all}}{\setboolean{Changes@ShowOK}{true}}{}% -\IfSubStr{\Changes@loc@show}{added}{\setboolean{Changes@ShowOK}{true}}{}% -\IfSubStr{\Changes@loc@show}{deleted}{\setboolean{Changes@ShowOK}{true}}{}% -\IfSubStr{\Changes@loc@show}{replaced}{\setboolean{Changes@ShowOK}{true}}{}% -\IfSubStr{\Changes@loc@show}{highlight}{\setboolean{Changes@ShowOK}{true}}{}% -\IfSubStr{\Changes@loc@show}{comment}{\setboolean{Changes@ShowOK}{true}}{}% -\ifthenelse{\boolean{Changes@ShowOK}}% +\IfIsEmpty{\Changes@loc@style}% +{\def\Changes@loc@style{list}}% +{}% +\IfStrEq{\Changes@loc@show}{all}% +{\def\Changes@loc@show{added|deleted|replaced|highlight|comment}}% +{}% +\IfIsInList{\Changes@loc@show}{added|deleted|replaced|highlight|comment}% {}% {% \PackageWarning{changes}{Wrong show-value for list of changes: '\Changes@loc@show', using 'all' instead.}% -\def\Changes@loc@show{all}% +\def\Changes@loc@show{}% }% -}% -\ifthenelse{\equal{\Changes@loc@show}{all}}% -{% -\def\Changes@loc@show{added|deleted|replaced|highlight|comment}% -}{}% -\def\Changes@heading{\Changes@loc@title} -\ifIsEmpty{\Changes@loc@title}% +\IfIsEmpty{\Changes@loc@show}% +{\def\Changes@loc@show{added|deleted|replaced|highlight|comment}}% +{}% +\IfIsEmpty{\Changes@loc@title}% {% -\ifthenelse{\equal{\Changes@loc@style}{list}}% +\IfStrEq{\Changes@loc@style}{list}% {\def\Changes@heading{\listofchangesname}}{}% -\ifthenelse{\equal{\Changes@loc@style}{summary}}% +\IfStrEq{\Changes@loc@style}{summary}% {\def\Changes@heading{\summaryofchangesname}}{}% -\ifthenelse{\equal{\Changes@loc@style}{compactsummary}}% +\IfStrEq{\Changes@loc@style}{compactsummary}% {\def\Changes@heading{\compactsummaryofchangesname}}{}% -}{}% +}% +{\def\Changes@heading{\Changes@loc@title}}% \section*{\Changes@heading} -\ifthenelse{\equal{\Changes@loc@style}{list}}% +\IfIsInList{\Changes@loc@style}{list}% {% -\IfFileExists{\jobname.loc}% +\IfFileExists{\jobname.\Changes@locextension}% {% -\setboolean{Changes@MoreLines}{true}% \newread\Changes@InFile% -\openin\Changes@InFile = \jobname.loc% -\whiledo{\boolean{Changes@MoreLines}}{% +\openin\Changes@InFile=\jobname.\Changes@locextension% +\loop\unless\ifeof\Changes@InFile% \read\Changes@InFile to \Changes@Line% -\ifeof\Changes@InFile% -\setboolean{Changes@MoreLines}{false}% -\else% +\ifeof\Changes@InFile\else% \Changes@Line% -\fi% -}% +\fi +\repeat \closein\Changes@InFile% }{% \emph{\changesnoloc}% \PackageWarning{changes}{LaTeX rerun needed for list of changes}% }% }{}% -\ifthenelse{\equal{\Changes@loc@style}{summary} \or \equal{\Changes@loc@style}{compactsummary}}% +\IfIsInList{\Changes@loc@style}{summary|compactsummary}% {% -\IfFileExists{\jobname.\Changes@extension}% +\IfFileExists{\jobname.\Changes@socextension}% {% -\setboolean{Changes@MoreLines}{true}% \newread\Changes@InFile% -\openin\Changes@InFile = \jobname.\Changes@extension% -\whiledo{\boolean{Changes@MoreLines}}{% +\openin\Changes@InFile = \jobname.\Changes@socextension% +\loop\unless\ifeof\Changes@InFile% \read\Changes@InFile to \Changes@Line% -\ifeof\Changes@InFile% -\setboolean{Changes@MoreLines}{false}% -\else% +\ifeof\Changes@InFile\else% \expandafter\changes@chopline\Changes@Line\\% \textbf{% -\ifthenelse{\isColored}% -{\color{\Changes@InColor}}% +\IfIsColored% +{\color{\Changes@Incolor}}% {}% -\ifthenelse{\equal{\Changes@InID}{\@empty}}% +\IfIsAnonymous{\Changes@Inid}% {\changesauthorname: \changesanonymousname}% {% -\changesauthorname: \Changes@InID% -\ifthenelse{\equal{\Changes@InName}{\@empty}}% +\changesauthorname: \Changes@Inid% +\IfIsEmpty{\Changes@Inname}% {}% -{ (\Changes@InName)}% +{ (\Changes@Inname)}% }% }\\% -\ifthenelse{% -\Changes@InAdded > 0 \or% -\Changes@InDeleted > 0 \or% -\Changes@InReplaced > 0 \or% -\Changes@InHighlight > 0 \or% -\Changes@InComment > 0% +\numdef{\Changes@InSum}{0}% +\renewcommand*{\do}[1]{% +\numdef{\Changes@InSum}{\Changes@InSum + \csuse{Changes@In########1}}% +}% +\expandafter\dopsvlist\expandafter{\Changes@loc@show}% +\ifnumcomp{\Changes@InSum}{=}{0}% +{% +\parbox{\Changes@summary@width}{\changesnochanges}\\[1ex]% }% {% -\Changes@summaryline{added}{\Changes@InAdded}{\changesaddname}{\\}% -\Changes@summaryline{deleted}{\Changes@InDeleted}{\changesdeletename}{\\}% -\Changes@summaryline{replaced}{\Changes@InReplaced}{\changesreplacename}{\\}% -\Changes@summaryline{highlight}{\Changes@InHighlight}{\changeshighlightname}{\\}% -\Changes@summaryline{comment}{\Changes@InComment}{\changescommentname}{\\[1ex]}% +\numdef{\Changes@InCount}{0}% +\renewcommand*{\do}[1]{% +\numdef{\Changes@InCount}{\Changes@InCount + \csuse{Changes@In########1}}% +\ifboolexpr{% +not test {\IfStrEq{\Changes@loc@style}{compactsummary}} or% +test {\ifnumgreater{\csuse{Changes@In########1}}{0}}% }% {% -\parbox{\Changes@summary@width}{\changesnochanges}\\[1ex]% +\parbox{\Changes@summary@width}{\csuse{changes########1name}~\let\cleaders\leaders\dotfill~\csuse{Changes@In########1}}% +\ifnumless{\Changes@InCount}{\Changes@InSum}% +{\\}% +{\\[1ex]}% }% -\fi% +{}% }% +\expandafter\dopsvlist\expandafter{\Changes@loc@show}% +}% +\fi% +\repeat \closein\Changes@InFile% }{% \emph{\changesnosoc}% @@ -960,31 +900,31 @@ truncate={breakall,fit} } \AtEndDocument{% \newwrite\Changes@OutFile -\immediate\openout\Changes@OutFile = \jobname.\Changes@extension +\immediate\openout\Changes@OutFile = \jobname.\Changes@socextension \let\Changes@protect\protect \let\protect\@unexpandable@protect \setcounter{Changes@Author}{0} -\whiledo{\value{Changes@Author} < \value{Changes@AuthorCount}}{% +\loop\unless\ifnum\theChanges@Author = \value{Changes@AuthorCount} \stepcounter{Changes@Author}% -\def\Changes@ID{\@nameuse{Changes@AuthorID\theChanges@Author}}% +\def\Changes@ID{\csuse{Changes@AuthorID\theChanges@Author}}% \immediate\write\Changes@OutFile{\Changes@ID;% -\@nameuse{Changes@AuthorColor\Changes@ID};% -\@nameuse{Changes@AuthorName\Changes@ID};% +\csuse{Changes@AuthorColor\Changes@ID};% +\csuse{Changes@AuthorName\Changes@ID};% \the\value{Changes@addedCount\Changes@ID};% \the\value{Changes@deletedCount\Changes@ID};% \the\value{Changes@replacedCount\Changes@ID};% \the\value{Changes@highlightCount\Changes@ID};% \the\value{Changes@commentCount\Changes@ID}}% -}% +\repeat \immediate\closeout\Changes@OutFile \let\protect\Changes@protect \if@filesw -\@ifundefined{tf@loc}{% -\expandafter\newwrite\csname tf@loc\endcsname -\immediate\openout \csname tf@loc\endcsname \jobname.loc\relax -}{}% +\@ifundefined{tf@\Changes@locextension}{ +\expandafter\newwrite\csname tf@\Changes@locextension\endcsname +\immediate\openout \csname tf@\Changes@locextension\endcsname \jobname.\Changes@locextension\relax +}{} \fi } -%% Copyright 2007-2020 Ekkart Kleinod +%% Copyright 2007-2021 Ekkart Kleinod %% %% End of file `changes.sty'. |