diff options
author | Norbert Preining <norbert@preining.info> | 2020-06-18 03:02:56 +0000 |
---|---|---|
committer | Norbert Preining <norbert@preining.info> | 2020-06-18 03:02:56 +0000 |
commit | 7a78c3b8b21b6842d27bb48f37197f8c380ccc5e (patch) | |
tree | aaa0da455d5784ca3b21e12a88b6a739bb543e84 /macros/latex/contrib/changes/pyMergeChanges.py | |
parent | da248962ebaf9445ca3c9dde54c05c3baa8715ab (diff) |
CTAN sync 202006180302
Diffstat (limited to 'macros/latex/contrib/changes/pyMergeChanges.py')
-rw-r--r-- | macros/latex/contrib/changes/pyMergeChanges.py | 4 |
1 files changed, 4 insertions, 0 deletions
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 |