Commit aa2066fb authored by Miguel Angel Reina Ortega's avatar Miguel Angel Reina Ortega
Browse files

Split content in multilines

parent 82e607ec

generateSpecWebSite/gridTableTools.py

+4 −4
Original line number Original line Diff line number Diff line
@@ -173,8 +173,7 @@ def parseGridTableWithSpans(gridTable:str) -> tuple[GridTableRowList, GridTableR 
			cell.leadingSpaces = len(_c) - len(_c.lstrip())

			cell.leadingSpaces = len(_c) - len(_c.lstrip())

			_c = _c[cell.leadingSpaces:]

			_c = _c[cell.leadingSpaces:]

			

			

			if _c.startswith('- '):  # List

			if re.match(r'^(?:>?\s*(?:[-*+]\s|\d+\.\s|\d+\)\s).*)', _c.lstrip()): # List in a cell

			#if re.match(r'^(?:>?\s*(?:[-*+]|\d+\.|\d+\)\s).*)', _c.lstrip()): # List in a cell

				cell.listFlag = True

				cell.listFlag = True

				_c = re.sub(r'\\\s*$', '\n', _c)

				_c = re.sub(r'\\\s*$', '\n', _c)

				cell.content = _c + _nextListElementMark  # Add list element end mark to know when the list element ends		

				cell.content = _c + _nextListElementMark  # Add list element end mark to know when the list element ends
@@ -187,8 +186,7 @@ def parseGridTableWithSpans(gridTable:str) -> tuple[GridTableRowList, GridTableR 
			else:

			else:

				cell.content = re.sub(r'\\\s*$', '\n', _c)

				cell.content = re.sub(r'\\\s*$', '\n', _c)

		else: # Cell has content

		else: # Cell has content

			if _c.startswith('- '):  # List

			if re.match(r'^(?:>?\s*(?:[-*+]\s|\d+\.\s|\d+\)\s).*)', _c.lstrip()): # List in a cell

			#if re.match(r'^(?:>?\s*(?:[-*+]|\d+\.|\d+\)\s).*)', _c.lstrip()): # List in a cell

				if not cell.listFlag:

				if not cell.listFlag:

					cell.content += '\n'

					cell.content += '\n'

					#cell['content'] = cell['content'].strip("\n")

					#cell['content'] = cell['content'].strip("\n")
@@ -759,6 +757,8 @@ def generateHtmlTableWithSpans(gridTable:str) -> str: 
						# Enforce left alignment if cell contains a list

						# Enforce left alignment if cell contains a list

						cell.alignment = _alignLeft

						cell.alignment = _alignLeft





				#Split content into multilines but keeping the separator

				cell.content = '\n\n'.join(re.split(r'(<br\s*/?>\s*<br\s*/?>)', cell.content))

				#contentWithBreaklines = cell.content

				#contentWithBreaklines = cell.content

				#contentWithBreaklines = contentWithBreaklines.replace(_nextListElementMark, "<br />")

				#contentWithBreaklines = contentWithBreaklines.replace(_nextListElementMark, "<br />")

				#multilineContent = '\n'.join(contentWithBreaklines.split("<br />"))

				#multilineContent = '\n'.join(contentWithBreaklines.split("<br />"))