texlive[52552] Master/texmf-dist: changes (28oct19)
commits+karl at tug.org
commits+karl at tug.org
Mon Oct 28 21:56:33 CET 2019
Revision: 52552
http://tug.org/svn/texlive?view=revision&revision=52552
Author: karl
Date: 2019-10-28 21:56:32 +0100 (Mon, 28 Oct 2019)
Log Message:
-----------
changes (28oct19)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/changes/changes.english.pdf
trunk/Master/texmf-dist/doc/latex/changes/changes.english.withcode.pdf
trunk/Master/texmf-dist/doc/latex/changes/changes.ngerman.pdf
trunk/Master/texmf-dist/doc/latex/changes/userdoc/changes.de.tex
trunk/Master/texmf-dist/doc/latex/changes/userdoc/changes.en.tex
trunk/Master/texmf-dist/scripts/changes/pyMergeChanges.py
trunk/Master/texmf-dist/source/latex/changes/changes.drv
trunk/Master/texmf-dist/source/latex/changes/changes.dtx
trunk/Master/texmf-dist/source/latex/changes/changes.ins
trunk/Master/texmf-dist/source/latex/changes/examples.dtx
trunk/Master/texmf-dist/tex/latex/changes/changes.sty
Modified: trunk/Master/texmf-dist/doc/latex/changes/changes.english.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/changes/changes.english.withcode.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/changes/changes.ngerman.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/changes/userdoc/changes.de.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/changes/userdoc/changes.de.tex 2019-10-28 20:55:51 UTC (rev 52551)
+++ trunk/Master/texmf-dist/doc/latex/changes/userdoc/changes.de.tex 2019-10-28 20:56:32 UTC (rev 52552)
@@ -167,25 +167,10 @@
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}.
+Für Details lesen Sie bitte \autoref{sec:remove-markup}.
-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}
-
-
-
%^^A ---- limitations
\cleardoublepage
\section{Einschränkungen und Erweiterungsmöglichkeiten}
@@ -862,6 +847,37 @@
\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}
Modified: trunk/Master/texmf-dist/doc/latex/changes/userdoc/changes.en.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/changes/userdoc/changes.en.tex 2019-10-28 20:55:51 UTC (rev 52551)
+++ trunk/Master/texmf-dist/doc/latex/changes/userdoc/changes.en.tex 2019-10-28 20:56:32 UTC (rev 52552)
@@ -161,7 +161,7 @@
\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}
@@ -168,27 +168,11 @@
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}.
+For detailed information please refer to \autoref{sec:remove-markup}.
-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}
-
-
-
-
-
%^^A ---- limitations
\cleardoublepage
\section{Limitations and possible enhancements}
@@ -867,6 +851,36 @@
\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}
Modified: trunk/Master/texmf-dist/scripts/changes/pyMergeChanges.py
===================================================================
--- trunk/Master/texmf-dist/scripts/changes/pyMergeChanges.py 2019-10-28 20:55:51 UTC (rev 52551)
+++ trunk/Master/texmf-dist/scripts/changes/pyMergeChanges.py 2019-10-28 20:56:32 UTC (rev 52552)
@@ -30,6 +30,7 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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
Modified: trunk/Master/texmf-dist/source/latex/changes/changes.drv
===================================================================
--- trunk/Master/texmf-dist/source/latex/changes/changes.drv 2019-10-28 20:55:51 UTC (rev 52551)
+++ trunk/Master/texmf-dist/source/latex/changes/changes.drv 2019-10-28 20:56:32 UTC (rev 52552)
@@ -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}
Modified: trunk/Master/texmf-dist/source/latex/changes/changes.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/changes/changes.dtx 2019-10-28 20:55:51 UTC (rev 52551)
+++ trunk/Master/texmf-dist/source/latex/changes/changes.dtx 2019-10-28 20:56:32 UTC (rev 52552)
@@ -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.
Modified: trunk/Master/texmf-dist/source/latex/changes/changes.ins
===================================================================
--- trunk/Master/texmf-dist/source/latex/changes/changes.ins 2019-10-28 20:55:51 UTC (rev 52551)
+++ trunk/Master/texmf-dist/source/latex/changes/changes.ins 2019-10-28 20:56:32 UTC (rev 52552)
@@ -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
Modified: trunk/Master/texmf-dist/source/latex/changes/examples.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/changes/examples.dtx 2019-10-28 20:55:51 UTC (rev 52551)
+++ trunk/Master/texmf-dist/source/latex/changes/examples.dtx 2019-10-28 20:56:32 UTC (rev 52552)
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright (C) 2007-2018
+% Copyright (C) 2007-2019
% Ekkart Kleinod (ekleinod at edgesoft.de)
% --------------------------------------------------------------------------
%
Modified: trunk/Master/texmf-dist/tex/latex/changes/changes.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/changes/changes.sty 2019-10-28 20:55:51 UTC (rev 52551)
+++ trunk/Master/texmf-dist/tex/latex/changes/changes.sty 2019-10-28 20:56:32 UTC (rev 52552)
@@ -41,8 +41,8 @@
%%
\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 ***}
\RequirePackage{xkeyval}
\RequirePackage{xifthen}
\RequirePackage{xstring}
More information about the tex-live-commits
mailing list