Ordered lists indexed from number of first item

js/markdown.js

@@ -1,3 +1,5 @@
+// FIXME: Nested lists not working right
+// FIXME: Nested blockquotes require blank line
 // TODO: HTML tags probably need better handling. Consider whether interior of matched tags should be interpreted as markdown.
 // TODO: {.class #cssid lang=fr}
 //     # Header {.class}
@@ -5,9 +7,6 @@
 //     ---
 //     [link](url){.class}
 //     ``` {.class}
-// FIXME: Nested lists not working right
-// FIXME: Nested blockquotes require blank line
-// FIXME: Ordered list should start with first number
 
 class _MDHAlign {
 	static Left = new _MDHAlign('Left');
@@ -561,12 +560,24 @@ class _MDOrderedListBlock extends _MDBlock {
 	/** @var {_MDListItemBlock[]} */
 	items;
 
+	/** @var {Number|null} */
+	startOrdinal;
+
 	/**
 	 * @param {_MDListItemBlock[]} items
 	 */
-	constructor(items) {
+	constructor(items, startOrdinal=null) {
 		super();
 		this.items = items;
+		this.startOrdinal = startOrdinal;
+	}
+
+	htmlAttributes() {
+		var html = super.htmlAttributes();
+		if (this.startOrdinal !== null) {
+			html += ` start="${this.startOrdinal}"`;
+		}
+		return html;
 	}
 
 	toHTML(state) {
@@ -578,13 +589,16 @@ class _MDOrderedListBlock extends _MDBlock {
 class _MDListItemBlock extends _MDBlock {
 	/** @var {_MDBlock} */
 	content;
+	/** @var {Number|null} */
+	ordinal;
 
 	/**
 	 * @param {_MDBlock} content
 	 */
-	constructor(content) {
+	constructor(content, ordinal=null) {
 		super();
 		this.content = content;
+		this.ordinal = ordinal;
 	}
 
 	toHTML(state) {
@@ -1627,7 +1641,9 @@ class Markdown {
 		let line = state.lines[p];
 		let groups = this.#orderedListRegex.exec(line);
 		if (groups === null) return null;
-		return new _MDListItemBlock(this.#readInteriorContent(state, groups[1].length + groups[2].length, this.#orderedListItemRegex, true));
+		let ordinal = parseInt(groups[1]);
+		let content = this.#readInteriorContent(state, groups[1].length + groups[2].length, this.#orderedListItemRegex, true);
+		return new _MDListItemBlock(content, ordinal);
 	}
 
 	/**
@@ -1642,7 +1658,7 @@ class Markdown {
 			if (item) items.push(item);
 		} while (item);
 		if (items.length == 0) return null;
-		return new _MDOrderedListBlock(items);
+		return new _MDOrderedListBlock(items, items[0].ordinal);
 	}
 
 	/**