Commit 0dd27c0b authored by ankraft's avatar ankraft
Browse files

Improved printing

parent 45b89e6a

toMkdocs/gridTableFilter.py

+3 −1
Original line number Diff line number Diff line
@@ -11,6 +11,8 @@ 
	result to stdout.

"""



_print = print	# save the original print function

from rich import print

import argparse, sys

from markdownTools import analyseMarkdown, setLoggers
@@ -27,7 +29,7 @@ def main() -> None: 
			   error=lambda m: print(f'[red]{m}', file=sys.stderr) if args.verbose else None)  



	# Read the input from stdin and write the result to stdout

	print(analyseMarkdown(inLines=sys.stdin.readlines()), file=sys.stdout)

	_print(analyseMarkdown(inLines=sys.stdin.readlines()), file=sys.stdout)





if __name__ == '__main__':

toMkdocs/gridTableTools.py

+3 −3
Original line number Diff line number Diff line
@@ -484,7 +484,7 @@ def parseGridTableWithSpans(gridTable:str) -> tuple[GridTableRowList, GridTableR 


	# Check if there are any data rows

	if not dataRows and not headerRows:

		raise ValueError('No valid rows found in the provided grid table.')

		raise ValueError('No valid rows found in the provided grid table. Wrong format of line separator?')



	# Format text

	for gridRows in [headerRows, dataRows]:
@@ -538,7 +538,7 @@ def parseGridTableWithSpans(gridTable:str) -> tuple[GridTableRowList, GridTableR 
					colspan += 1



		if not sum == numberOfColumns:

			raise ValueError('Grid table not converted properly')

			raise ValueError(f'Grid table not converted properly. Number of columns in header row {idx} is {sum} instead of {numberOfColumns}')



	# Checking the data rows

	forwardRowspan = []
@@ -561,7 +561,7 @@ def parseGridTableWithSpans(gridTable:str) -> tuple[GridTableRowList, GridTableR 
					colspan += 1

					

		if not sum == numberOfColumns:

			raise ValueError('Grid table not converted properly')

			raise ValueError(f'Grid table not converted properly. Number of columns in data row {idx} is {sum} instead of {numberOfColumns}')



	return headerRows, dataRows

toMkdocs/markdownTools.py

+1 −0
Original line number Diff line number Diff line
@@ -429,6 +429,7 @@ def analyseMarkdown(filename:Optional[str]=None, inLines:Optional[list[str]]=Non 
			printDebug(htmltable)

		except Exception as e:

			printError(f"Error: {e}")

			htmltable = f'<mark>Conversion error: {e}</mark>\n'

		outClauses[-1].append(Line(htmltable, LineType.RAWHTML))

		gridTable = ''