summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/scripts/changes
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-06-17 21:35:17 +0000
committerKarl Berry <karl@freefriends.org>2020-06-17 21:35:17 +0000
commit09ba5fe2ac681664b0e6081fe99ecd96466bf991 (patch)
tree602113a94878be54f265b7a77df9f257bf831a81 /Master/texmf-dist/scripts/changes
parentf1f08454a69f26b09f7697a5591be470dc98a58b (diff)
changes (17jun20)
git-svn-id: svn://tug.org/texlive/trunk@55577 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/scripts/changes')
-rwxr-xr-xMaster/texmf-dist/scripts/changes/pyMergeChanges.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/Master/texmf-dist/scripts/changes/pyMergeChanges.py b/Master/texmf-dist/scripts/changes/pyMergeChanges.py
index 39c8b220076..b93de6f4088 100755
--- a/Master/texmf-dist/scripts/changes/pyMergeChanges.py
+++ b/Master/texmf-dist/scripts/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