summaryrefslogtreecommitdiff
path: root/macros/latex/contrib/changes
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2020-06-18 03:02:56 +0000
committerNorbert Preining <norbert@preining.info>2020-06-18 03:02:56 +0000
commit7a78c3b8b21b6842d27bb48f37197f8c380ccc5e (patch)
treeaaa0da455d5784ca3b21e12a88b6a739bb543e84 /macros/latex/contrib/changes
parentda248962ebaf9445ca3c9dde54c05c3baa8715ab (diff)
CTAN sync 202006180302
Diffstat (limited to 'macros/latex/contrib/changes')
-rw-r--r--macros/latex/contrib/changes/changes.drv4
-rw-r--r--macros/latex/contrib/changes/changes.dtx5
-rw-r--r--macros/latex/contrib/changes/changes.english.pdfbin184119 -> 353819 bytes
-rw-r--r--macros/latex/contrib/changes/changes.english.withcode.pdfbin265818 -> 443839 bytes
-rw-r--r--macros/latex/contrib/changes/changes.ins8
-rw-r--r--macros/latex/contrib/changes/changes.ngerman.pdfbin195534 -> 362269 bytes
-rw-r--r--macros/latex/contrib/changes/pyMergeChanges.py4
-rw-r--r--macros/latex/contrib/changes/userdoc/changes.de.tex3
-rw-r--r--macros/latex/contrib/changes/userdoc/changes.en.tex3
-rw-r--r--macros/latex/contrib/changes/userdoc/ex_listofchanges.tex2
-rw-r--r--macros/latex/contrib/changes/userdoc/ex_usepackage_addedmarkup_changes.tex2
-rw-r--r--macros/latex/contrib/changes/userdoc/ex_usepackage_authormarkup_changes.tex2
-rw-r--r--macros/latex/contrib/changes/userdoc/ex_usepackage_authormarkupposition_changes.tex2
-rw-r--r--macros/latex/contrib/changes/userdoc/ex_usepackage_authormarkuptext_changes.tex2
-rw-r--r--macros/latex/contrib/changes/userdoc/ex_usepackage_commentmarkup_changes.tex2
-rw-r--r--macros/latex/contrib/changes/userdoc/ex_usepackage_deletedmarkup_changes.tex2
-rw-r--r--macros/latex/contrib/changes/userdoc/ex_usepackage_highlightmarkup_changes.tex2
-rw-r--r--macros/latex/contrib/changes/userdoc/ex_usepackage_markup_changes.tex2
-rw-r--r--macros/latex/contrib/changes/userdoc/in_usepackage_draft_changes.tex2
19 files changed, 27 insertions, 20 deletions
diff --git a/macros/latex/contrib/changes/changes.drv b/macros/latex/contrib/changes/changes.drv
index 0ca29f10a1..9b744e7298 100644
--- a/macros/latex/contrib/changes/changes.drv
+++ b/macros/latex/contrib/changes/changes.drv
@@ -260,11 +260,11 @@
% document title
\ifENGLISH
\title{The \chpackage{changes}-package}
- \subtitle{Manual change markup --- version 3.2.1}
+ \subtitle{Manual change markup --- version 3.2.2}
\fi
\ifGERMAN
\title{Das \chpackage{changes}-Paket}
- \subtitle{Manuelle Änderungsmarkierung -- Version 3.2.1}
+ \subtitle{Manuelle Änderungsmarkierung -- Version 3.2.2}
\fi
\author{Ekkart Kleinod}
diff --git a/macros/latex/contrib/changes/changes.dtx b/macros/latex/contrib/changes/changes.dtx
index 0604223858..7a7fba693e 100644
--- a/macros/latex/contrib/changes/changes.dtx
+++ b/macros/latex/contrib/changes/changes.dtx
@@ -61,6 +61,7 @@
% \changes{v3.1.3}{2019/07/21}{bugfix: option clash for ulem and truncate; documentation of known problems and solutions}
% \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}
% \GetFileInfo{changes.dtx}
% \RecordChanges
%
@@ -101,8 +102,8 @@
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{changes}
-[2019/11/17 v3.2.1 changes package]
-\typeout{*** changes package 2019/11/17 v3.2.1 ***}
+[2020/06/16 v3.2.2 changes package]
+\typeout{*** changes package 2020/06/16 v3.2.2 ***}
% \end{macrocode}
%
% Package \chpackage{xkeyval} provides options with key-value-pairs.
diff --git a/macros/latex/contrib/changes/changes.english.pdf b/macros/latex/contrib/changes/changes.english.pdf
index d3033ecd1d..028860caa3 100644
--- a/macros/latex/contrib/changes/changes.english.pdf
+++ b/macros/latex/contrib/changes/changes.english.pdf
Binary files differ
diff --git a/macros/latex/contrib/changes/changes.english.withcode.pdf b/macros/latex/contrib/changes/changes.english.withcode.pdf
index 38254d42a2..fbc104e48d 100644
--- a/macros/latex/contrib/changes/changes.english.withcode.pdf
+++ b/macros/latex/contrib/changes/changes.english.withcode.pdf
Binary files differ
diff --git a/macros/latex/contrib/changes/changes.ins b/macros/latex/contrib/changes/changes.ins
index acf9b77468..85d758ab51 100644
--- a/macros/latex/contrib/changes/changes.ins
+++ b/macros/latex/contrib/changes/changes.ins
@@ -1,6 +1,6 @@
%% This file creates the needed files from changes.dtx
%%
-\def\filedate{2019/11/17}
+\def\filedate{2020/06/16}
\def\batchfile{changes.ins}
\input docstrip
@@ -10,7 +10,7 @@
\preamble
changes.dtx
-Copyright 2007-2019 Ekkart Kleinod (ekleinod@edgesoft.de)
+Copyright 2007-2020 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
@@ -31,7 +31,7 @@ This work consists of the files
source/latex/changes/README
source/latex/changes/userdoc/*.tex
- scripts/changes/delcmdchanges.bash
+ scripts/changes/pyMergeChanges.py
and the derived files
doc/latex/changes/changes.english.pdf
doc/latex/changes/changes.english.withcode.pdf
@@ -45,7 +45,7 @@ and the derived files
\endpreamble
\postamble
-Copyright 2007-2019 Ekkart Kleinod
+Copyright 2007-2020 Ekkart Kleinod
\endpostamble
\generate{
diff --git a/macros/latex/contrib/changes/changes.ngerman.pdf b/macros/latex/contrib/changes/changes.ngerman.pdf
index 037fd7967f..92372fc548 100644
--- a/macros/latex/contrib/changes/changes.ngerman.pdf
+++ b/macros/latex/contrib/changes/changes.ngerman.pdf
Binary files differ
diff --git a/macros/latex/contrib/changes/pyMergeChanges.py b/macros/latex/contrib/changes/pyMergeChanges.py
index 39c8b22007..b93de6f408 100644
--- a/macros/latex/contrib/changes/pyMergeChanges.py
+++ b/macros/latex/contrib/changes/pyMergeChanges.py
@@ -181,6 +181,7 @@ codecs.open(OUTPUTFILE, mode='a', encoding='utf8') as fout:
matchAdded = RE_ADDED.search(lineout, next_pos) # redo matching for updated text
next_pos = 0
+ matchDeleted = RE_DELETED.search(lineout, next_pos) # redo matching for (potentially) updated text
while matchDeleted:
if FLAG_FAST_BREAK:
break
@@ -201,6 +202,7 @@ codecs.open(OUTPUTFILE, mode='a', encoding='utf8') as fout:
matchDeleted = RE_DELETED.search(lineout, next_pos)
next_pos = 0
+ matchReplaced = RE_REPLACED.search(lineout, next_pos) # redo matching for (potentially) updated text
while matchReplaced:
if FLAG_FAST_BREAK:
break
@@ -227,6 +229,7 @@ codecs.open(OUTPUTFILE, mode='a', encoding='utf8') as fout:
matchReplaced = RE_REPLACED.search(lineout, next_pos)
next_pos = 0
+ matchHighlight = RE_HIGHLIGHT.search(lineout, next_pos) # redo matching for (potentially) updated text
while matchHighlight:
if FLAG_FAST_BREAK:
break
@@ -247,6 +250,7 @@ codecs.open(OUTPUTFILE, mode='a', encoding='utf8') as fout:
matchHighlight = RE_HIGHLIGHT.search(lineout, next_pos)
next_pos = 0
+ matchComment = RE_COMMENT.search(lineout, next_pos) # redo matching for (potentially) updated text
while matchComment:
if FLAG_FAST_BREAK:
break
diff --git a/macros/latex/contrib/changes/userdoc/changes.de.tex b/macros/latex/contrib/changes/userdoc/changes.de.tex
index e9c9dd7690..912223f32d 100644
--- a/macros/latex/contrib/changes/userdoc/changes.de.tex
+++ b/macros/latex/contrib/changes/userdoc/changes.de.tex
@@ -948,6 +948,7 @@ Die Autorinnen und Autoren sind in alphabetischer Reihenfolge:
\item Giovannini, Daniele
\item Kleinod, Ekkart
\item Mittelbach, Frank
+ \item Richardson, Alexander
\item Voss, Herbert
\item Wölfel, Philipp
\item Wolter, Steve
@@ -975,7 +976,7 @@ Wenn Sie an geplanten, zukünftigen Änderungen interessiert sind, finden Sie di
\cleardoublepage
\section{Weitergabe, Copyright, Lizenz}
-Copyright 2007-2019 Ekkart Kleinod (\href{mailto:ekleinod@edgesoft.de}{ekleinod@edgesoft.de})
+Copyright 2007-2020 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/macros/latex/contrib/changes/userdoc/changes.en.tex b/macros/latex/contrib/changes/userdoc/changes.en.tex
index 2e721a02dc..a146dcf8f9 100644
--- a/macros/latex/contrib/changes/userdoc/changes.en.tex
+++ b/macros/latex/contrib/changes/userdoc/changes.en.tex
@@ -954,6 +954,7 @@ The authors are (in alphabetical order):
\item Giovannini, Daniele
\item Kleinod, Ekkart
\item Mittelbach, Frank
+ \item Richardson, Alexander
\item Voss, Herbert
\item Wölfel, Philipp
\item Wolter, Steve
@@ -981,7 +982,7 @@ If you are interested in planned new features, please see
\cleardoublepage
\section{Distribution, Copyright, License}
-Copyright 2007-2019 Ekkart Kleinod (\href{mailto:ekleinod@edgesoft.de}{ekleinod@edgesoft.de})
+Copyright 2007-2020 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/macros/latex/contrib/changes/userdoc/ex_listofchanges.tex b/macros/latex/contrib/changes/userdoc/ex_listofchanges.tex
index 28670de33e..2c1bf1e4b5 100644
--- a/macros/latex/contrib/changes/userdoc/ex_listofchanges.tex
+++ b/macros/latex/contrib/changes/userdoc/ex_listofchanges.tex
@@ -1,5 +1,5 @@
\listofchanges
-\listofchanges[style=list] !\Corresponds! \listofchanges
+\listofchanges[style=list] ~ \listofchanges
\listofchanges[style=summary, title={My Summary}]
\listofchanges[title={List of comments}, show=comment]}
\listofchanges[style=compactsummary, show=added|deleted|replaced, title={Text changes}]}
diff --git a/macros/latex/contrib/changes/userdoc/ex_usepackage_addedmarkup_changes.tex b/macros/latex/contrib/changes/userdoc/ex_usepackage_addedmarkup_changes.tex
index 32a2415bf3..e89bdf4372 100644
--- a/macros/latex/contrib/changes/userdoc/ex_usepackage_addedmarkup_changes.tex
+++ b/macros/latex/contrib/changes/userdoc/ex_usepackage_addedmarkup_changes.tex
@@ -1,3 +1,3 @@
-\usepackage[addedmarkup=colored]{changes} !\Corresponds! \usepackage{changes}
+\usepackage[addedmarkup=colored]{changes} ~ \usepackage{changes}
\usepackage[addedmarkup=uline]{changes}
\usepackage[addedmarkup=bf]{changes}
diff --git a/macros/latex/contrib/changes/userdoc/ex_usepackage_authormarkup_changes.tex b/macros/latex/contrib/changes/userdoc/ex_usepackage_authormarkup_changes.tex
index 4008a8f784..ca023e61ef 100644
--- a/macros/latex/contrib/changes/userdoc/ex_usepackage_authormarkup_changes.tex
+++ b/macros/latex/contrib/changes/userdoc/ex_usepackage_authormarkup_changes.tex
@@ -1,3 +1,3 @@
-\usepackage[authormarkup=superscript]{changes} !\Corresponds! \usepackage{changes}
+\usepackage[authormarkup=superscript]{changes} ~ \usepackage{changes}
\usepackage[authormarkup=brackets]{changes}
\usepackage[authormarkup=none]{changes}
diff --git a/macros/latex/contrib/changes/userdoc/ex_usepackage_authormarkupposition_changes.tex b/macros/latex/contrib/changes/userdoc/ex_usepackage_authormarkupposition_changes.tex
index 9467a99c55..f6cad295da 100644
--- a/macros/latex/contrib/changes/userdoc/ex_usepackage_authormarkupposition_changes.tex
+++ b/macros/latex/contrib/changes/userdoc/ex_usepackage_authormarkupposition_changes.tex
@@ -1,2 +1,2 @@
-\usepackage[authormarkupposition=right]{changes} !\Corresponds! \usepackage{changes}
+\usepackage[authormarkupposition=right]{changes} ~ \usepackage{changes}
\usepackage[authormarkupposition=left]{changes}
diff --git a/macros/latex/contrib/changes/userdoc/ex_usepackage_authormarkuptext_changes.tex b/macros/latex/contrib/changes/userdoc/ex_usepackage_authormarkuptext_changes.tex
index 9d07908314..8698dda5a3 100644
--- a/macros/latex/contrib/changes/userdoc/ex_usepackage_authormarkuptext_changes.tex
+++ b/macros/latex/contrib/changes/userdoc/ex_usepackage_authormarkuptext_changes.tex
@@ -1,2 +1,2 @@
-\usepackage[authormarkuptext=id]{changes} !\Corresponds! \usepackage{changes}
+\usepackage[authormarkuptext=id]{changes} ~ \usepackage{changes}
\usepackage[authormarkuptext=name]{changes}
diff --git a/macros/latex/contrib/changes/userdoc/ex_usepackage_commentmarkup_changes.tex b/macros/latex/contrib/changes/userdoc/ex_usepackage_commentmarkup_changes.tex
index 5d590fa14f..571595b1ee 100644
--- a/macros/latex/contrib/changes/userdoc/ex_usepackage_commentmarkup_changes.tex
+++ b/macros/latex/contrib/changes/userdoc/ex_usepackage_commentmarkup_changes.tex
@@ -1,3 +1,3 @@
-\usepackage[commentmarkup=todo]{changes} !\Corresponds! \usepackage{changes}
+\usepackage[commentmarkup=todo]{changes} ~ \usepackage{changes}
\usepackage[commentmarkup=footnote]{changes}
\usepackage[commentmarkup=uwave]{changes}
diff --git a/macros/latex/contrib/changes/userdoc/ex_usepackage_deletedmarkup_changes.tex b/macros/latex/contrib/changes/userdoc/ex_usepackage_deletedmarkup_changes.tex
index 474ad61388..096b60ba89 100644
--- a/macros/latex/contrib/changes/userdoc/ex_usepackage_deletedmarkup_changes.tex
+++ b/macros/latex/contrib/changes/userdoc/ex_usepackage_deletedmarkup_changes.tex
@@ -1,3 +1,3 @@
-\usepackage[deletedmarkup=sout]{changes} !\Corresponds! \usepackage{changes}
+\usepackage[deletedmarkup=sout]{changes} ~ \usepackage{changes}
\usepackage[deletedmarkup=xout]{changes}
\usepackage[deletedmarkup=uwave]{changes}
diff --git a/macros/latex/contrib/changes/userdoc/ex_usepackage_highlightmarkup_changes.tex b/macros/latex/contrib/changes/userdoc/ex_usepackage_highlightmarkup_changes.tex
index 282d033540..f4b7c1ea0e 100644
--- a/macros/latex/contrib/changes/userdoc/ex_usepackage_highlightmarkup_changes.tex
+++ b/macros/latex/contrib/changes/userdoc/ex_usepackage_highlightmarkup_changes.tex
@@ -1,2 +1,2 @@
-\usepackage[highlightmarkup=background]{changes} !\Corresponds! \usepackage{changes}
+\usepackage[highlightmarkup=background]{changes} ~ \usepackage{changes}
\usepackage[highlightmarkup=uuline]{changes}
diff --git a/macros/latex/contrib/changes/userdoc/ex_usepackage_markup_changes.tex b/macros/latex/contrib/changes/userdoc/ex_usepackage_markup_changes.tex
index 897656139c..59d99829e1 100644
--- a/macros/latex/contrib/changes/userdoc/ex_usepackage_markup_changes.tex
+++ b/macros/latex/contrib/changes/userdoc/ex_usepackage_markup_changes.tex
@@ -1,4 +1,4 @@
-\usepackage[markup=default]{changes} !\Corresponds! \usepackage{changes}
+\usepackage[markup=default]{changes} ~ \usepackage{changes}
\usepackage[markup=underlined]{changes}
\usepackage[markup=bfit]{changes}
\usepackage[markup=nocolor]{changes}
diff --git a/macros/latex/contrib/changes/userdoc/in_usepackage_draft_changes.tex b/macros/latex/contrib/changes/userdoc/in_usepackage_draft_changes.tex
index 5d6c17eea2..20d23104b2 100644
--- a/macros/latex/contrib/changes/userdoc/in_usepackage_draft_changes.tex
+++ b/macros/latex/contrib/changes/userdoc/in_usepackage_draft_changes.tex
@@ -1 +1 @@
-\usepackage[draft]{changes} !\Corresponds! \usepackage{changes}
+\usepackage[draft]{changes} ~ \usepackage{changes}