From 97f5151099967e6c823d640a90d87bca92c44035 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Tue, 29 Oct 2019 03:00:39 +0000 Subject: CTAN sync 201910290300 --- macros/latex/contrib/changes/changes.drv | 4 +- macros/latex/contrib/changes/changes.dtx | 5 ++- macros/latex/contrib/changes/changes.english.pdf | Bin 182297 -> 184162 bytes .../contrib/changes/changes.english.withcode.pdf | Bin 263736 -> 265996 bytes macros/latex/contrib/changes/changes.ins | 2 +- macros/latex/contrib/changes/changes.ngerman.pdf | Bin 194643 -> 195579 bytes macros/latex/contrib/changes/examples.dtx | 2 +- macros/latex/contrib/changes/pyMergeChanges.py | 34 +++++++------- .../latex/contrib/changes/userdoc/changes.de.tex | 48 +++++++++++++------- .../latex/contrib/changes/userdoc/changes.en.tex | 50 +++++++++++++-------- 10 files changed, 87 insertions(+), 58 deletions(-) (limited to 'macros/latex/contrib/changes') diff --git a/macros/latex/contrib/changes/changes.drv b/macros/latex/contrib/changes/changes.drv index 13ee48a492..f10e708732 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.1.3} + \subtitle{Manual change markup --- version 3.2.0} \fi \ifGERMAN \title{Das \chpackage{changes}-Paket} - \subtitle{Manuelle Änderungsmarkierung -- Version 3.1.3} + \subtitle{Manuelle Änderungsmarkierung -- Version 3.2.0} \fi \author{Ekkart Kleinod} diff --git a/macros/latex/contrib/changes/changes.dtx b/macros/latex/contrib/changes/changes.dtx index 1ca69d8a93..8d6fa6e251 100644 --- a/macros/latex/contrib/changes/changes.dtx +++ b/macros/latex/contrib/changes/changes.dtx @@ -59,6 +59,7 @@ % \changes{v3.1.1}{2018/12/18}{bugfix: uneven dot fills in summaries} % \changes{v3.1.2}{2019/01/26}{bugfix: problems with amsart class} % \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} % \GetFileInfo{changes.dtx} % \RecordChanges % @@ -99,8 +100,8 @@ % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{changes} -[2019/07/21 v3.1.3 changes package] -\typeout{*** changes package 2019/07/21 v3.1.3 ***} +[2019/10/28 v3.2.0 changes package] +\typeout{*** changes package 2019/10/28 v3.2.0 ***} % \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 9c82f24bef..12ca7fa7ca 100644 Binary files a/macros/latex/contrib/changes/changes.english.pdf and b/macros/latex/contrib/changes/changes.english.pdf differ diff --git a/macros/latex/contrib/changes/changes.english.withcode.pdf b/macros/latex/contrib/changes/changes.english.withcode.pdf index 9a7fd6423d..d8bfff1dfc 100644 Binary files a/macros/latex/contrib/changes/changes.english.withcode.pdf and b/macros/latex/contrib/changes/changes.english.withcode.pdf differ diff --git a/macros/latex/contrib/changes/changes.ins b/macros/latex/contrib/changes/changes.ins index 46e9854344..06da2e778c 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/01/26} +\def\filedate{2019/10/28} \def\batchfile{changes.ins} \input docstrip diff --git a/macros/latex/contrib/changes/changes.ngerman.pdf b/macros/latex/contrib/changes/changes.ngerman.pdf index 638fea2946..497dad2b47 100644 Binary files a/macros/latex/contrib/changes/changes.ngerman.pdf and b/macros/latex/contrib/changes/changes.ngerman.pdf differ diff --git a/macros/latex/contrib/changes/examples.dtx b/macros/latex/contrib/changes/examples.dtx index 4b617a95c9..78eaf393c1 100644 --- a/macros/latex/contrib/changes/examples.dtx +++ b/macros/latex/contrib/changes/examples.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -% Copyright (C) 2007-2018 +% Copyright (C) 2007-2019 % Ekkart Kleinod (ekleinod@edgesoft.de) % -------------------------------------------------------------------------- % diff --git a/macros/latex/contrib/changes/pyMergeChanges.py b/macros/latex/contrib/changes/pyMergeChanges.py index 37209bdc64..39c8b22007 100644 --- a/macros/latex/contrib/changes/pyMergeChanges.py +++ b/macros/latex/contrib/changes/pyMergeChanges.py @@ -30,6 +30,7 @@ Options: If no option is given, runs interactively. Created on Wed Dec 5 20:28:40 2018 +Revised on Tue Aug 27 17:51:58 2019 """ @@ -131,11 +132,11 @@ if INPUTFILE == OUTPUTFILE: print('Input File and Output File must be different.') sys.exit(1) -RE_ADDED = re.compile(r'\\added(\[[^\]]*\]){0,1}\{([^\}]*)\}') -RE_DELETED = re.compile(r'\\deleted(\[[^\]]*\]){0,1}\{([^\}]*)\}') -RE_REPLACED = re.compile(r'\\replaced(\[[^\]]*\]){0,1}\{([^\}]*)\}\{([^\}]*)\}') -RE_HIGHLIGHT = re.compile(r'\\highlight(\[[^\]]*\]){0,1}\{([^\}]*)\}') -RE_COMMENT = re.compile(r'\\comment(\[[^\]]*\]){0,1}\{([^\}]*)\}') +RE_ADDED = re.compile(r'(\\added)(\[[^\]]*\])?\{(([^\}]?(\{[^\}]*\})?)*)\}') +RE_DELETED = re.compile(r'(\\deleted)(\[[^\]]*\])?\{(([^\}]?(\{[^\}]*\})?)*)\}') +RE_REPLACED = re.compile(r'(\\replaced)(\[[^\]]*\])?\{(([^\}]?(\{[^\}]*\})?)*)\}\{(([^\}]?(\{[^\}]*\})?)*)\}') +RE_HIGHLIGHT = re.compile(r'(\\highlight)(\[[^\]]*\])?\{(([^\}]?(\{[^\}]*\})?)*)\}') +RE_COMMENT = re.compile(r'(\\comment)(\[[^\]]*\])?\{(([^\}]?(\{[^\}]*\})?)*)\}') codecs.open(OUTPUTFILE, mode='w', encoding='utf8').close() with codecs.open(INPUTFILE, mode='r', encoding='utf8') as fin, \ @@ -164,9 +165,9 @@ codecs.open(OUTPUTFILE, mode='a', encoding='utf8') as fout: answer = ask1() if answer == 'a': lineout = (lineout[:matchAdded.start(0)] - + matchAdded.group(2) + lineout[matchAdded.end(0):]) + + matchAdded.group(3) + lineout[matchAdded.end(0):]) lineout = trim_space(lineout, matchAdded.start(0) - + len(matchAdded.group(2))) + + len(matchAdded.group(3))) lineout = trim_space(lineout, matchAdded.start(0)) elif answer == 'r': lineout = (lineout[:matchAdded.start(0)] + lineout[matchAdded.end(0):]) @@ -189,7 +190,7 @@ codecs.open(OUTPUTFILE, mode='a', encoding='utf8') as fout: lineout = (lineout[:matchDeleted.start(0)] + lineout[matchDeleted.end(0):]) lineout = trim_space(lineout, matchDeleted.start(0)) elif answer == 'r': - lineout = (lineout[:matchDeleted.start(0)] + matchDeleted.group(2) + lineout = (lineout[:matchDeleted.start(0)] + matchDeleted.group(3) + lineout[matchDeleted.end(0):]) elif answer == 'k': lineout = lineout @@ -207,15 +208,15 @@ codecs.open(OUTPUTFILE, mode='a', encoding='utf8') as fout: answer = ask1() if answer == 'a': lineout = (lineout[:matchReplaced.start(0)] - + matchReplaced.group(2) + lineout[matchReplaced.end(0):]) + + matchReplaced.group(3) + lineout[matchReplaced.end(0):]) lineout = trim_space(lineout, matchReplaced.start(0) - + len(matchReplaced.group(2))) + + len(matchReplaced.group(3))) lineout = trim_space(lineout, matchReplaced.start(0)) elif answer == 'r': lineout = (lineout[:matchReplaced.start(0)] - + matchReplaced.group(3) + lineout[matchReplaced.end(0):]) + + matchReplaced.group(6) + lineout[matchReplaced.end(0):]) lineout = trim_space(lineout, matchReplaced.start(0) - + len(matchReplaced.group(3))) + + len(matchReplaced.group(6))) lineout = trim_space(lineout, matchReplaced.start(0)) elif answer == 'k': lineout = lineout @@ -233,9 +234,9 @@ codecs.open(OUTPUTFILE, mode='a', encoding='utf8') as fout: answer = ask2() if answer == 'r': lineout = (lineout[:matchHighlight.start(0)] - + matchHighlight.group(2) + lineout[matchHighlight.end(0):]) + + matchHighlight.group(3) + lineout[matchHighlight.end(0):]) lineout = trim_space(lineout, matchHighlight.start(0) - + len(matchHighlight.group(2))) + + len(matchHighlight.group(3))) lineout = trim_space(lineout, matchHighlight.start(0)) elif answer == 'k': lineout = lineout @@ -252,10 +253,7 @@ codecs.open(OUTPUTFILE, mode='a', encoding='utf8') as fout: print('\n** comment commit ** \n' + matchComment.group()) answer = ask2() if answer == 'r': - lineout = (lineout[:matchComment.start(0)] - + matchComment.group(2) + lineout[matchComment.end(0):]) - lineout = trim_space(lineout, matchComment.start(0) - + len(matchComment.group(2))) + lineout = (lineout[:matchComment.start(0)] + lineout[matchComment.end(0):]) lineout = trim_space(lineout, matchComment.start(0)) elif answer == 'k': lineout = lineout diff --git a/macros/latex/contrib/changes/userdoc/changes.de.tex b/macros/latex/contrib/changes/userdoc/changes.de.tex index f63ad7309d..e9c9dd7690 100644 --- a/macros/latex/contrib/changes/userdoc/changes.de.tex +++ b/macros/latex/contrib/changes/userdoc/changes.de.tex @@ -167,22 +167,7 @@ Das Script liegt im Verzeichnis: Das Script entfernt alle Markierungen, indem die Änderungen angenommen oder abgelehnt werden. Sie können die zu entfernenden Markierungen individuell im interaktiven Modus selektieren bzw.\ selektieren, indem Sie das Skript ohne Optionen starten. -Das Skript benötigt \emph{python3}. - -Nutzen Sie das Skript wie folgt: - -\chinputlisting{, language=bash}{userdoc/script_pymergechanges} - -Starten Sie das Skript ohne Optionen und Dateien für eine kurze Hilfe: - -\chinputlisting{, language=bash}{userdoc/script_pymergechanges_empty} - -Bekannte Probleme: - -\begin{itemize} - \item entfernt nur Markierungen, die in einer Zeile stehen, Markierungen, die mehrere Zeilen umfassen, werden ignoriert - \item Probleme mit vernesteten Kommandos -\end{itemize} +Für Details lesen Sie bitte \autoref{sec:remove-markup}. @@ -862,6 +847,37 @@ Die folgenden Pakete sind manchmal notwendig und müssen installiert sein, wenn \end{description} +%^^A ---- Remove markup from file +\cleardoublepage +\section{Markierungen aus den Dateien entfernen} +\label{sec:remove-markup} + +Die Entfernung der Markierungen aus dem Quelltext müssen Sie von Hand vornehmen, dafür steht auch ein Script von Yvon Cui zur Verfügung. +Das Script liegt im Verzeichnis: + +\chinline[, language=bash]{path_script} + +Das Script entfernt alle Markierungen, indem die Änderungen angenommen oder abgelehnt werden. +Sie können die zu entfernenden Markierungen individuell im interaktiven Modus selektieren bzw.\ selektieren, indem Sie das Skript ohne Optionen starten. + +Das Skript benötigt \emph{python3}. + +Nutzen Sie das Skript wie folgt: + +\chinputlisting{, language=bash}{userdoc/script_pymergechanges} + +Starten Sie das Skript ohne Optionen und Dateien für eine kurze Hilfe: + +\chinputlisting{, language=bash}{userdoc/script_pymergechanges_empty} + +Bekannte Probleme: + +\begin{itemize} + \item entfernt nur Markierungen, die in einer Zeile stehen, Markierungen, die mehrere Zeilen umfassen, werden ignoriert +\end{itemize} + + + %^^A ---- Known problems and solutions \cleardoublepage \section{Bekannte Probleme und Lösungen} diff --git a/macros/latex/contrib/changes/userdoc/changes.en.tex b/macros/latex/contrib/changes/userdoc/changes.en.tex index 2a6fb3964a..2e721a02dc 100644 --- a/macros/latex/contrib/changes/userdoc/changes.en.tex +++ b/macros/latex/contrib/changes/userdoc/changes.en.tex @@ -161,30 +161,14 @@ You can suppress the output of changes with: \chinline{usepackage_final_changes} In order to remove the markup from the \hologo{LaTeX} files, you have to remove the commands by hand or use the script by Yvon Cui. -You find the script in the directory: +You find the script \texttt{pyMergeChanges.py} in the directory: \chinline[, language=bash]{path_script} The script removes all markups either keeping or rejecting the change. You can select or deselect markup from removal using the interactive mode by starting the script without options. -The script requires \emph{python3}. - -Use the script as follows: - -\chinputlisting{, language=bash}{userdoc/script_pymergechanges} - -Run the script with no options and files for a short help text: - -\chinputlisting{, language=bash}{userdoc/script_pymergechanges_empty} - -Known issues: - -\begin{itemize} - \item removes only markup that is used in one line, not markup that spans multiple lines - \item problems with nested commands -\end{itemize} - +For detailed information please refer to \autoref{sec:remove-markup}. @@ -867,6 +851,36 @@ The following packages are sometimes required and have to be installed if used b \end{description} +%^^A ---- Remove markup from file +\cleardoublepage +\section{Remove markup from file} +\label{sec:remove-markup} + +In order to remove the markup from the \hologo{LaTeX} files, you have to remove the commands by hand or use the script by Yvon Cui. +You find the script in the directory: + +\chinline[, language=bash]{path_script} + +The script removes all markups either keeping or rejecting the change. +You can select or deselect markup from removal using the interactive mode by starting the script without options. + +The script requires \emph{python3}. + +Use the script as follows: + +\chinputlisting{, language=bash}{userdoc/script_pymergechanges} + +Run the script with no options and files for a short help text: + +\chinputlisting{, language=bash}{userdoc/script_pymergechanges_empty} + +Known issues: + +\begin{itemize} + \item removes only markup that is used in one line, not markup that spans multiple lines +\end{itemize} + + %^^A ---- Known problems and solutions \cleardoublepage \section{Known problems and solutions} -- cgit v1.2.3