Refactor to unified MDReader, MDNode. More syntax readers.

js/spreadsheet.js

@@ -2891,38 +2891,34 @@ class SpreadsheetCell {
  * post-process step on any tables in the document tree. Must be used with
  * `MDTableBlockReader`. Tables without at least one formula will not be altered.
  */
-class MDSpreadsheetBlockReader extends MDBlockReader {
-	readBlock(state) {
-		return null;
-	}
-
-	postProcess(state, blocks) {
-		for (const block of blocks) {
-			if (block instanceof MDTableBlock) {
-				this.#processTable(block, state);
+class MDSpreadsheetReader extends MDReader {
+	postProcess(state, nodes) {
+		for (const node of nodes) {
+			if (node instanceof MDTableNode) {
+				this.#processTable(node, state);
 			}
 		}
 	}
 
 	/**
-	 * @param {MDTableBlock} tableBlock
+	 * @param {MDTableNode} tableNode
 	 * @param {MDState} state
 	 */
-	#processTable(tableBlock, state) {
+	#processTable(tableNode, state) {
 		// Measure table
-		const rowCount = tableBlock.bodyRows.length;
+		const rowCount = tableNode.bodyRows.length;
 		var columnCount = 0;
-		for (const row of tableBlock.bodyRows) {
-			columnCount = Math.max(columnCount, row.cells.length);
+		for (const row of tableNode.bodyRows) {
+			columnCount = Math.max(columnCount, row.children.length);
 		}
 
 		// Create and populate grid
 		const grid = new SpreadsheetGrid(columnCount, rowCount);
 		for (var c = 0; c < columnCount; c++) {
 			for (var r = 0; r < rowCount; r++) {
-				const cellBlock = tableBlock.bodyRows[r].cells[c];
-				if (cellBlock === undefined) continue;
-				const cellText = cellBlock.toPlaintext(state);
+				const cellNode = tableNode.bodyRows[r].children[c];
+				if (cellNode === undefined) continue;
+				const cellText = cellNode.toPlaintext(state);
 				const gridCell = grid.cells[c][r];
 				gridCell.originalValue = CellValue.fromCellString(cellText);
 			}
@@ -2947,26 +2943,26 @@ class MDSpreadsheetBlockReader extends MDBlockReader {
 		// Copy results back to table
 		for (var c = 0; c < columnCount; c++) {
 			for (var r = 0; r < rowCount; r++) {
-				const cellBlock = tableBlock.bodyRows[r].cells[c];
-				if (cellBlock === undefined) continue;
+				const cellNode = tableNode.bodyRows[r].children[c];
+				if (cellNode === undefined) continue;
 				const gridCell = grid.cells[c][r];
 				const gridValue = gridCell.outputValue;
 				const cellText = gridValue.formattedValue;
-				cellBlock.content = new MDInlineBlock(new MDTextSpan(cellText));
+				cellNode.children = [ new MDTextNode(cellText) ];
 				if (gridCell.isCalculated) {
-					cellBlock.cssClasses.push('calculated');
+					cellNode.cssClasses.push('calculated');
 				}
-				cellBlock.cssClasses.push(`spreadsheet-type-${gridValue.type}`);
+				cellNode.cssClasses.push(`spreadsheet-type-${gridValue.type}`);
 				if (gridValue.type == CellValue.TYPE_ERROR) {
-					cellBlock.attributes['title'] = gridValue.value;
+					cellNode.attributes['title'] = gridValue.value;
 				}
 				const gridNumber = gridValue.numericValue();
 				if (gridNumber !== null) {
-					cellBlock.attributes['data-numeric-value'] = `${gridNumber}`;
+					cellNode.attributes['data-numeric-value'] = `${gridNumber}`;
 				}
 				const gridString = gridValue.stringValue(false);
 				if (gridString !== null) {
-					cellBlock.attributes['data-string-value'] = gridString;
+					cellNode.attributes['data-string-value'] = gridString;
 				}
 			}
 		}

markdownjs.html

@@ -86,7 +86,7 @@
 		<script src="js/markdown.js"></script>
 		<script src="js/spreadsheet.js"></script>
 		<script>
-			var parser = new Markdown([ ...Markdown.allBlockReaders, new MDSpreadsheetBlockReader() ], Markdown.allInlineReaders);
+			var parser = new Markdown([ ...Markdown.allReaders, new MDSpreadsheetReader() ]);
 			function onDocumentLoad() {
 				document.getElementById('markdowninput').addEventListener('input', onMarkdownChange);
 				setTimeout(onMarkdownChange, 0);

testjs.html

@@ -737,14 +737,14 @@
 
 				test_strikethrough_single() {
 					let markdown = 'Lorem ~ipsum~ dolor';
-					let expected = 'Lorem <strike>ipsum</strike> dolor';
+					let expected = 'Lorem <s>ipsum</s> dolor';
 					let actual = this.md(markdown);
 					this.assertEqual(actual, expected);
 				}
 
 				test_strikethrough_double() {
 					let markdown = 'Lorem ~~ipsum~~ dolor';
-					let expected = 'Lorem <strike>ipsum</strike> dolor';
+					let expected = 'Lorem <s>ipsum</s> dolor';
 					let actual = this.md(markdown);
 					this.assertEqual(actual, expected);
 				}
@@ -850,7 +850,7 @@
 
 				test_htmlTags() {
 					let markdown = 'Lorem <strong title="value" foo=\'with " quote\' bar="with \' apostrophe" attr=unquoted checked>ipsum</strong> dolor';
-					let expected = markdown;
+					let expected = 'Lorem <strong title="value" foo="with &quot; quote" bar="with \' apostrophe" attr="unquoted" checked>ipsum</strong> dolor';
 					let actual = this.md(markdown);
 					this.assertEqual(actual, expected);
 				}
@@ -918,7 +918,7 @@
 
 				test_unorderedList_nested() {
 					let markdown = "* Lorem\n + Ipsum\n* Dolor";
-					let expected = '<ul> <li>Lorem <ul> <li>Ipsum</li> </ul></li> <li>Dolor</li> </ul>';
+					let expected = '<ul> <li>Lorem<ul> <li>Ipsum</li> </ul> </li> <li>Dolor</li> </ul>';
 					let actual = this.md(markdown);
 					this.assertEqual(actual, expected);
 				}
@@ -950,21 +950,21 @@
 
 				test_orderedList_nested1() {
 					let markdown = "1. Lorem\n 1. Ipsum\n1. Dolor";
-					let expected = '<ol> <li>Lorem <ol> <li>Ipsum</li> </ol></li> <li>Dolor</li> </ol>';
+					let expected = '<ol> <li>Lorem<ol> <li>Ipsum</li> </ol> </li> <li>Dolor</li> </ol>';
 					let actual = this.md(markdown);
 					this.assertEqual(actual, expected);
 				}
 
 				test_orderedList_nested2() {
 					let markdown = "1. Lorem\n 1. Ipsum\n      1. Dolor\n 1. Sit\n1. Amet";
-					let expected = '<ol> <li>Lorem <ol> <li>Ipsum <ol> <li>Dolor</li> </ol></li> <li>Sit</li> </ol></li> <li>Amet</li> </ol>';
+					let expected = '<ol> <li>Lorem<ol> <li>Ipsum<ol> <li>Dolor</li> </ol> </li> <li>Sit</li> </ol> </li> <li>Amet</li> </ol>';
 					let actual = this.md(markdown);
 					this.assertEqual(actual, expected);
 				}
 
 				test_blockquote() {
 					let markdown = '> Lorem ipsum dolor';
-					let expected = '<blockquote> Lorem ipsum dolor </blockquote>';
+					let expected = '<blockquote>Lorem ipsum dolor</blockquote>';
 					let actual = this.md(markdown);
 					this.assertEqual(actual, expected);
 				}
@@ -985,15 +985,15 @@
 
 				test_codeBlock_indented() {
 					let markdown = "Code\n\n    function foo() {\n        return 'bar';\n    }\n\nend";
-					let expected = "<p>Code</p>\n\n<pre><code>function foo() {\n    return 'bar';\n}</code></pre>\n<p>end</p>\n";
-					let actual = this.parser.toHTML(markdown); // don't normalize whitespace
+					let expected = "<p>Code</p>\n\n<pre><code>function foo() {\n    return 'bar';\n}</code></pre>\n\n<p>end</p>";
+					let actual = this.parser.toHTML(markdown).trim(); // don't normalize whitespace
 					this.assertEqual(actual.replace(/ /g, '⎵'), expected.replace(/ /g, '⎵'));
 				}
 
 				test_codeBlock_fenced() {
 					let markdown = "Code\n\n```\nfunction foo() {\n    return 'bar';\n}\n```\n\nend";
-					let expected = "<p>Code</p>\n\n<pre><code>function foo() {\n    return 'bar';\n}</code></pre>\n<p>end</p>\n";
-					let actual = this.parser.toHTML(markdown); // don't normalize whitespace
+					let expected = "<p>Code</p>\n\n<pre><code>function foo() {\n    return 'bar';\n}</code></pre>\n\n<p>end</p>";
+					let actual = this.parser.toHTML(markdown).trim(); // don't normalize whitespace
 					this.assertEqual(actual.replace(/ /g, '⎵'), expected.replace(/ /g, '⎵'));
 				}
 
@@ -1026,21 +1026,21 @@
 					let expected = '<table> ' +
 						'<thead> ' +
 						'<tr> ' +
-						'<th align="left">Column A</th> ' +
-						'<th align="center">Column B</th> ' +
-						'<th align="right">Column C</th> ' +
+						'<th style="text-align: left;">Column A</th> ' +
+						'<th style="text-align: center;">Column B</th> ' +
+						'<th style="text-align: right;">Column C</th> ' +
 						'</tr> ' +
 						'</thead> ' +
 						'<tbody> ' +
 						'<tr> ' +
-						'<td align="left">1</td> ' +
-						'<td align="center">2</td> ' +
-						'<td align="right">3</td> ' +
+						'<td style="text-align: left;">1</td> ' +
+						'<td style="text-align: center;">2</td> ' +
+						'<td style="text-align: right;">3</td> ' +
 						'</tr> ' +
 						'<tr> ' +
-						'<td align="left">4</td> ' +
-						'<td align="center">5</td> ' +
-						'<td align="right">6</td> ' +
+						'<td style="text-align: left;">4</td> ' +
+						'<td style="text-align: center;">5</td> ' +
+						'<td style="text-align: right;">6</td> ' +
 						'</tr> ' +
 						'</tbody> ' +
 						'</table>';
@@ -1702,7 +1702,7 @@
 				parser;
 
 				setUp() {
-					this.parser = new Markdown([ ...Markdown.allBlockReaders, new MDSpreadsheetBlockReader() ], Markdown.allInlineReaders);
+					this.parser = new Markdown([ ...Markdown.allReaders, new MDSpreadsheetReader() ]);
 				}
 
 				md(markdown) {