@minamorl/markdown-next 2.0.1 → 2.1.1

package/lib/src/parser.js

@@ -118,7 +118,12 @@ class Parser {
                 return mapper(tag)(join(children));
             });
         });
-        const inline = P.alt(pluginInline, aozoraRuby, anchor, img, em, strong, code, htmlElement, htmlSelfClosing, P.regexp(/[^\r\n<=-\[\]\*\`\@｜]+/), P.regexp(/./));
+        // Math expressions (KaTeX-compatible)
+        // Inline math: $...$
+        const mathInline = P.seqMap(P.string("$").notFollowedBy(P.string("$")), P.regexp(/[^\$\r\n]+/), P.string("$"), (_1, content, _3) => {
+            return mapper("span", { class: "math math-inline", "data-math": content })(content);
+        });
+        const inline = P.alt(pluginInline, aozoraRuby, anchor, img, em, strong, code, mathInline, htmlSelfClosing, htmlElement, P.regexp(/[^\r\n<=-\[\]\*\`\@｜\$]+/), P.regexp(/./));
         // Table cell content - supports inline elements
         const tableCellInline = P.alt(anchor, img, em, strong, code, P.regexp(/[^\r\n\[\]\*|`]+/));
         // Parse a single table row: |cell|cell|cell| with flexible spacing
@@ -163,10 +168,9 @@ class Parser {
             if (headerCells.length === 0) {
                 return P.makeFailure(0, 'No header cells');
             }
-            return mapper("table")(join([
-                mapper("tr")(join(headerCells.map(h => mapper("th")(parseCellContent(h))))),
-                join(bodyCells.map(row => mapper("tr")(join(row.map(cell => mapper("td")(parseCellContent(cell)))))))
-            ]));
+            const headerRow = mapper("tr")(join(headerCells.map(h => mapper("th")(parseCellContent(h)))));
+            const bodyRows = bodyCells.map(row => mapper("tr")(join(row.map(cell => mapper("td")(parseCellContent(cell))))));
+            return mapper("table")(join([headerRow, ...bodyRows]));
         });
         const inlines = inline.atLeast(1).map(join);
         const paragraphBegin = inlines;
@@ -175,7 +179,9 @@ class Parser {
         const paragraph = paragraphLine
             .map(mapper("p"));
         const listIndent = P.string("  ");
-        const liSingleLine = P.regexp(/[^`\r\n]*/);
+        // List item content - supports inline elements including math
+        const liInlineContent = P.alt(mathInline, anchor, img, em, strong, code, P.regexp(/[^\r\n\[\]\*\`\$]+/), P.regexp(/./));
+        const liSingleLine = liInlineContent.atLeast(0).map(join);
         const ulStart = P.string("- ").or(P.string("* "));
         const olStart = P.regexp(/[0-9]+\. /);
         let liLevel = [1];
@@ -284,8 +290,8 @@ class Parser {
             return mapper("pre", { "data-language": definition })(mapper("code")(join(code)));
         });
         const blockquoteBegin = P.string("> ");
-        // Parse blockquote content using inlines to support HTML tags and ruby
-        const blockquoteInline = P.alt(pluginInline, aozoraRuby, anchor, img, em, strong, code, htmlElement, htmlSelfClosing, P.regexp(/[^\r\n<｜\[\]\*\`\@]+/), P.regexp(/./));
+        // Parse blockquote content using inlines to support HTML tags, ruby, and math
+        const blockquoteInline = P.alt(pluginInline, aozoraRuby, anchor, img, em, strong, code, mathInline, htmlSelfClosing, htmlElement, P.regexp(/[^\r\n<｜\[\]\*\`\@\$]+/), P.regexp(/./));
         const blockquoteContent = blockquoteInline.atLeast(1).map(join);
         const blockquoteLine = P.lazy(() => {
             let blockquoteLevel = 0;
@@ -352,7 +358,13 @@ class Parser {
             return this.opts.plugins && this.opts.plugins[pluginName] ? this.opts.plugins[pluginName](args, content, mapper, join)
                 : join([_1, pluginName, args, _2, content]);
         });
-        const block = P.alt(P.regexp(/\s+/).result(""), pluginBlock, h1Special, h2Special, h6, h5, h4, h3, h2, h1, table, codeBlock, lists, blockquote, paragraph, linebreak.result(""));
+        // Block math: $$...$$ (must be on its own line or surrounded by newlines)
+        // Content can include anything except $$ (including single $, newlines, etc.)
+        const mathBlockContent = P.regexp(/[\s\S]*?(?=\$\$)/);
+        const mathBlock = P.seqMap(P.regexp(/^\$\$/), mathBlockContent, P.string("$$"), P.alt(linebreak, P.eof), (_1, content, _3, _4) => {
+            return mapper("div", { class: "math math-display", "data-math": content.trim() })(content.trim());
+        });
+        const block = P.alt(P.regexp(/\s+/).result(""), pluginBlock, h1Special, h2Special, h6, h5, h4, h3, h2, h1, table, codeBlock, mathBlock, lists, blockquote, paragraph, linebreak.result(""));
         this.acceptables = P.alt(block).many().map(join);
     }
     parse(s) {

package/package.json

@@ -37,5 +37,5 @@
     "url": "https://github.com/minamorl/markdown-next/issues"
   },
   "homepage": "https://github.com/minamorl/markdown-next#readme",
-  "version": "2.0.1"
+  "version": "2.1.1"
 }