From 0c7bd06a938309d4ea772503bb37050f46c9d2ed Mon Sep 17 00:00:00 2001
From: Miguel Angel Reina Ortega <miguelangel.reinaortega@etsi.org>
Date: Thu, 7 Dec 2023 05:01:15 +0100
Subject: [PATCH] Some small fixes when dealing with empty lines
---
generateChangemarks/changemarks.py | 25 ++++++++++++++-----------
1 file changed, 14 insertions(+), 11 deletions(-)
diff --git a/generateChangemarks/changemarks.py b/generateChangemarks/changemarks.py
index a4e1728..600e551 100644
--- a/generateChangemarks/changemarks.py
+++ b/generateChangemarks/changemarks.py
@@ -273,15 +273,16 @@ https://forge.etsi.org/rep/cdm/pipeline-scripts/-/blob/main/common/Dockerfile.st
index_gap = change.source_start - change.target_start
if existing_clause:
- j = j + 1
+ j = j + previous_change_lines_added
logging.info(f"Change.source_start {change.source_start}")
logging.info(f"Changed_clause.from_id {changed_clause.from_id}")
for line in change:
- if line.source_line_no != None and line.source_line_no < changed_clause.from_id:
- j = j # It should deal with the case where source line number is not within the changed clause index (too many removed lines in other clauses, i.e.)
- continue
- else:
+ # It should deal with the case where source line number is not within the changed clause index (too many removed lines in other clauses, i.e.)
+ #if line.source_line_no != None and line.source_line_no < changed_clause.from_id:
+ # j = j
+ # continue
+ #else:
#if (not (line.value.strip() == '') and (line.is_added)):
#print(vars(line))
if line.is_added:
@@ -300,15 +301,15 @@ https://forge.etsi.org/rep/cdm/pipeline-scripts/-/blob/main/common/Dockerfile.st
else:
if not line.value.strip() == '':
if line.value.startswith("!["): # It is a figure
- clauseMDlines.insert(j, line.value.strip() + "\n")
+ clauseMDlines.insert(j, line.value.strip() + "\n\n")
# clauseMDlines.insert(j, "<span class=\"underline\">" + line.value.strip() + "</span>\n") #Track change OK Caption Not OK
else:
- clauseMDlines.insert(j, "<span class=\"underline\">" + line.value.strip() + "</span>\n") #it works for simple lines, not for lines in a list
+ clauseMDlines.insert(j, "<span class=\"underline\">" + line.value.strip() + "</span>\n\n") #it works for simple lines, not for lines in a list
#clauseMDlines.insert(j, "<mark>" + line.value.strip("\n") + "</mark>\n\n")
#if (j + 1) <= len(clauseMDlines):
# clauseMDlines.pop(j+1)
else:
- clauseMDlines.insert(j, "<span class=\"underline\">\t<\span>\n") #Add tab to simulate a added line - Not working in lines in list
+ clauseMDlines.insert(j, "\n") #Add an extra line not marked as added
#elif (not (line.value.strip() == '') and (line.is_removed)):
elif line.is_removed:
if line.value.strip().startswith("|"): # It is a table
@@ -327,11 +328,13 @@ https://forge.etsi.org/rep/cdm/pipeline-scripts/-/blob/main/common/Dockerfile.st
else:
logging.debug(f"Index to delete is {j}")
if not line.value.strip() == '':
- clauseMDlines.insert(j, "~~" + line.value.strip() + "~~\n")
- else:
+ clauseMDlines.insert(j, "~~" + line.value.strip() + "~~\n\n")
+ #else:
# clauseMDlines.insert(j, "~~\t~~\n")
- clauseMDlines.insert(j, "\n")
+ #clauseMDlines.insert(j, "\n")
if (j + 1) <= len(clauseMDlines):
+ logging.debug(f'Line marked as removed: {clauseMDlines[j]}')
+ logging.debug(f'Line being removed: {clauseMDlines[j+1]}')
clauseMDlines.pop(j+1)
j = j + 1
--
GitLab