mathpix-markdown-it 1.0.83 → 1.0.85

package/lib/markdown/mdPluginText.js

@@ -1,23 +1,36 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.resetTextCounter = exports.resetCounter = void 0;
+exports.renderInlineContent = exports.headingSection = exports.setTextCounterSection = exports.resetTextCounter = exports.resetCounter = exports.subSubCount = exports.subCount = exports.sectionCount = void 0;
+var isSpace = require('markdown-it/lib/common/utils').isSpace;
 var render_tabular_1 = require("./md-renderer-rules/render-tabular");
 var consts_1 = require("./common/consts");
+var common_1 = require("./common");
 // import { escapeHtml }  from 'markdown-it/lib/common/utils';
-var subsectionParentCount = 0;
-var sectionCount = 0;
-var subCount = 0;
-var subSubCount = 0;
+exports.sectionCount = 0;
+exports.subCount = 0;
+exports.subSubCount = 0;
 var isNewSect = false;
 var isNewSubSection = false;
 exports.resetCounter = function () {
-    subsectionParentCount = 0;
+    exports.resetTextCounter();
 };
 exports.resetTextCounter = function () {
-    subsectionParentCount = 0;
-    sectionCount = 0;
-    subCount = 0;
-    subSubCount = 0;
+    exports.sectionCount = 0;
+    exports.subCount = 0;
+    exports.subSubCount = 0;
+};
+exports.setTextCounterSection = function (envName, num) {
+    switch (envName) {
+        case "section":
+            exports.sectionCount = num;
+            break;
+        case "subsection":
+            exports.subCount = num;
+            break;
+        case "subsubsection":
+            exports.subSubCount = num;
+            break;
+    }
 };
 var separatingSpan = function (state, startLine, endLine) {
     var lineText, pos = state.bMarks[startLine] + state.tShift[startLine], max = state.eMarks[startLine];
@@ -56,11 +69,136 @@ var separatingSpan = function (state, startLine, endLine) {
     // state.pos = nextPos;
     return true;
 };
-var headingSection = function (state, startLine, endLine) {
+/**
+ * To add an unnumbered section to the table of contents, use the \addcontentsline command like this:
+ * \addcontentsline{toc}{section}{Unnumbered Section}
+ * */
+var addContentsLineBlock = function (state, startLine, endLine) {
+    var _a, _b;
+    var token, lineText, pos = state.bMarks[startLine] + state.tShift[startLine], max = state.eMarks[startLine];
+    var startPos = 0;
+    var nextLine = startLine + 1;
+    var latex = '';
+    lineText = state.src.slice(pos, max).trim();
+    if (state.src.charCodeAt(pos) !== 0x5c /* \ */) {
+        return false;
+    }
+    var match = lineText
+        .slice(startPos)
+        .match(consts_1.reAddContentsLine);
+    if (!match) {
+        return false;
+    }
+    var envExp = ((_a = match.groups) === null || _a === void 0 ? void 0 : _a.exp) ? match.groups.exp : match[1];
+    if (envExp !== 'toc') {
+        return false;
+    }
+    var envUnit = ((_b = match.groups) === null || _b === void 0 ? void 0 : _b.unit) ? match.groups.unit : match[2];
+    if (!['section', 'subsection', 'subsubsection'].includes(envUnit)) {
+        return false;
+    }
+    startPos += match[0].length;
+    latex = match[0];
+    // nextPos += match[0].length;
+    // \addcontentsline{toc}{section} {Unnumbered Section}
+    //                               ^^ skipping these spaces
+    for (; startPos < max; startPos++) {
+        var code = lineText.charCodeAt(startPos);
+        if (!isSpace(code) && code !== 0x0A) {
+            break;
+        }
+    }
+    if (startPos >= max) {
+        return false;
+    }
+    // \addcontentsline{toc}{section}{Unnumbered Section}
+    //                               ^^ should be { 
+    if (lineText.charCodeAt(startPos) !== 123 /* { */) {
+        return false;
+    }
+    var _c = common_1.findEndMarker(lineText, startPos), _d = _c.res, res = _d === void 0 ? false : _d, _e = _c.content, content = _e === void 0 ? '' : _e, _f = _c.nextPos, nextPos = _f === void 0 ? 0 : _f;
+    var resString = content;
+    var hasEndMarker = false;
+    var last = nextLine;
+    var inlineStr = '';
+    if (!res) {
+        for (; nextLine <= endLine; nextLine++) {
+            if (lineText === '') {
+                break;
+            }
+            pos = state.bMarks[nextLine] + state.tShift[nextLine];
+            max = state.eMarks[nextLine];
+            lineText = state.src.slice(pos, max);
+            var _g = common_1.findEndMarker(lineText, -1, "{", "}", true), _h = _g.res, res_1 = _h === void 0 ? false : _h, _j = _g.content, content_1 = _j === void 0 ? '' : _j, _k = _g.nextPos, nextPos_1 = _k === void 0 ? 0 : _k;
+            if (res_1) {
+                resString += resString ? ' ' : '';
+                resString += content_1;
+                hasEndMarker = true;
+                if (nextPos_1 && nextPos_1 < lineText.length) {
+                    inlineStr = lineText.slice(nextPos_1);
+                }
+                break;
+            }
+            resString += resString ? ' ' : '';
+            resString += lineText;
+        }
+        last = nextLine + 1;
+    }
+    else {
+        hasEndMarker = true;
+        last = nextLine;
+        if (nextPos && nextPos < lineText.length) {
+            inlineStr = lineText.slice(nextPos);
+        }
+    }
+    if (!hasEndMarker) {
+        return false;
+    }
+    var level;
+    switch (envUnit) {
+        case 'section':
+            level = 2;
+            break;
+        case 'subsection':
+            level = 3;
+            break;
+        case 'subsubsection':
+            level = 4;
+            break;
+    }
+    state.line = last;
+    token = state.push('addcontentsline_open', 'div', 1);
+    if (state.md.options.forLatex) {
+        token.latex = latex + '{';
+    }
+    token.map = [startLine, state.line];
+    token.envLevel = level;
+    token.attrJoin('class', 'addcontentsline');
+    token.attrSet('style', 'margin-top: 0; margin-bottom: 0;');
+    token = state.push('inline', '', 0);
+    token.content = resString;
+    token.type = "addcontentsline";
+    token.map = [startLine, state.line];
+    if (state.md.options.forLatex) {
+        token.latex = resString;
+    }
+    var children = [];
+    state.md.inline.parse(token.content.trim(), state.md, state.env, children);
+    token.children = children;
+    token = state.push('addcontentsline_close', 'div', -1);
+    token.envLevel = level;
+    if (state.md.options.forLatex) {
+        token.latex = '}';
+    }
+    if (inlineStr && inlineStr.trim()) {
+        token = state.push('inline', '', 0);
+        token.content = inlineStr;
+        token.children = [];
+    }
+    return true;
+};
+exports.headingSection = function (state, startLine, endLine, silent) {
     var _a;
-    sectionCount = 0;
-    subCount = 0;
-    subSubCount = 0;
     var token, lineText, pos = state.bMarks[startLine] + state.tShift[startLine], max = state.eMarks[startLine];
     var nextLine = startLine + 1;
     var startPos = 0, type, className = '', is_numerable = false, beginMarker = "{", level = 1;
@@ -70,11 +208,12 @@ var headingSection = function (state, startLine, endLine) {
     }
     var match = lineText
         .slice(++startPos)
-        .match(/^(?:title|section|subsection|subsubsection)/);
+        .match(/^(?:title|section\*|section|subsection\*|subsection|subsubsection\*|subsubsection)/);
     if (!match) {
         return false;
     }
     var attrStyle = '';
+    var isUnNumbered = false;
     startPos += match[0].length;
     switch (match[0]) {
         case "title":
@@ -87,7 +226,6 @@ var headingSection = function (state, startLine, endLine) {
             level = 2;
             type = "section";
             is_numerable = true;
-            subsectionParentCount++;
             isNewSect = true;
             className = "section-title";
             attrStyle = 'margin-top: 1.5em;';
@@ -103,13 +241,32 @@ var headingSection = function (state, startLine, endLine) {
             type = "subsubsection";
             className = "sub_sub_section-title";
             break;
+        case "section*":
+            isUnNumbered = true;
+            level = 2;
+            type = "section";
+            className = "section-title";
+            attrStyle = 'margin-top: 1.5em;';
+            break;
+        case "subsection*":
+            isUnNumbered = true;
+            level = 3;
+            type = "subsection";
+            className = "sub_section-title";
+            break;
+        case "subsubsection*":
+            isUnNumbered = true;
+            level = 4;
+            type = "subsubsection";
+            className = "sub_sub_section-title";
+            break;
         default:
             break;
     }
     if (lineText[startPos] !== beginMarker) {
         return false;
     }
-    var _b = findEndMarker(lineText, startPos), _c = _b.res, res = _c === void 0 ? false : _c, _d = _b.content, content = _d === void 0 ? '' : _d, _e = _b.nextPos, nextPos = _e === void 0 ? 0 : _e;
+    var _b = common_1.findEndMarker(lineText, startPos), _c = _b.res, res = _c === void 0 ? false : _c, _d = _b.content, content = _d === void 0 ? '' : _d, _e = _b.nextPos, nextPos = _e === void 0 ? 0 : _e;
     var resString = content;
     resString = resString.split('\\\\').join('\n');
     var hasEndMarker = false;
@@ -123,14 +280,14 @@ var headingSection = function (state, startLine, endLine) {
             pos = state.bMarks[nextLine] + state.tShift[nextLine];
             max = state.eMarks[nextLine];
             lineText = state.src.slice(pos, max);
-            var _f = findEndMarker(lineText, -1, "{", "}", true), _g = _f.res, res_1 = _g === void 0 ? false : _g, _h = _f.content, content_1 = _h === void 0 ? '' : _h, _j = _f.nextPos, nextPos_1 = _j === void 0 ? 0 : _j;
-            if (res_1) {
+            var _f = common_1.findEndMarker(lineText, -1, "{", "}", true), _g = _f.res, res_2 = _g === void 0 ? false : _g, _h = _f.content, content_2 = _h === void 0 ? '' : _h, _j = _f.nextPos, nextPos_2 = _j === void 0 ? 0 : _j;
+            if (res_2) {
                 resString += resString ? ' ' : '';
-                content_1 = content_1.split('\\\\').join('\n');
-                resString += content_1;
+                content_2 = content_2.split('\\\\').join('\n');
+                resString += content_2;
                 hasEndMarker = true;
-                if (nextPos_1 && nextPos_1 < lineText.length) {
-                    inlineStr = lineText.slice(nextPos_1);
+                if (nextPos_2 && nextPos_2 < lineText.length) {
+                    inlineStr = lineText.slice(nextPos_2);
                 }
                 break;
             }
@@ -150,6 +307,10 @@ var headingSection = function (state, startLine, endLine) {
     if (!hasEndMarker) {
         return false;
     }
+    /** For validation mode we can terminate immediately */
+    if (silent) {
+        return true;
+    }
     state.line = last;
     token = state.push('heading_open', 'h' + String(level), 1);
     if (state.md.options.forLatex) {
@@ -158,6 +319,10 @@ var headingSection = function (state, startLine, endLine) {
     token.markup = '########'.slice(0, level);
     token.map = [startLine, state.line];
     token.attrJoin('type', type);
+    token.isUnNumbered = isUnNumbered;
+    if (isUnNumbered) {
+        token.attrJoin('data-unnumbered', "true");
+    }
     token.attrJoin('class', className);
     if (((_a = state.md.options) === null || _a === void 0 ? void 0 : _a.forDocx) && attrStyle) {
         token.attrSet('style', attrStyle);
@@ -166,29 +331,50 @@ var headingSection = function (state, startLine, endLine) {
     token.content = resString;
     token.type = type;
     token.is_numerable = is_numerable;
+    token.isUnNumbered = isUnNumbered;
     token.map = [startLine, state.line];
     var children = [];
     state.md.inline.parse(token.content.trim(), state.md, state.env, children);
     token.children = children;
-    if (type === "section") {
-        state.env.section = state.env.section ? state.env.section + 1 : 1;
+    if (type === "section" && !isUnNumbered) {
+        exports.sectionCount = exports.sectionCount ? exports.sectionCount + 1 : 1;
+        state.env.section = exports.sectionCount;
+        token.section = exports.sectionCount;
     }
-    if (type === "subsection") {
-        token.secNumber = subsectionParentCount;
+    if (type === "subsection" && !isUnNumbered) {
         token.isNewSect = isNewSect;
         isNewSect = false;
-        state.env.subsection = !token.isNewSect
-            ? state.env.subsection ? state.env.subsection + 1 : 1 : 1;
+        exports.subCount = !token.isNewSect
+            ? exports.subCount ? exports.subCount + 1 : 1 : 1;
+        state.env.subsection = exports.subCount;
+        token.section = exports.sectionCount;
+        token.subsection = exports.subCount;
     }
-    if (type === "subsubsection") {
-        token.secNumber = subsectionParentCount;
+    if (type === "subsubsection" && !isUnNumbered) {
         token.isNewSubSection = isNewSubSection;
         isNewSubSection = false;
-        state.env.subsubsection = !token.isNewSubSection
-            ? state.env.subsubsection ? state.env.subsubsection + 1 : 1 : 1;
+        if (isNewSect) {
+            token.isNewSect = isNewSect;
+            isNewSect = false;
+            if (state.env.hasOwnProperty('subsection') && state.env.subsection === exports.subCount) {
+                exports.subCount = 0;
+                state.env.subsection = exports.subCount;
+            }
+            exports.subSubCount = 1;
+        }
+        else {
+            exports.subSubCount = !token.isNewSubSection
+                ? exports.subSubCount ? exports.subSubCount + 1 : 1 : 1;
+        }
+        state.env.subsubsection = exports.subSubCount;
+        token.section = exports.sectionCount;
+        token.subsection = exports.subCount;
+        token.subsubsection = exports.subSubCount;
     }
     token = state.push('heading_close', 'h' + String(level), -1);
+    token.isUnNumbered = isUnNumbered;
     token.markup = '########'.slice(0, level);
+    state.parentType = 'paragraph';
     if (state.md.options.forLatex) {
         token.latex = type;
     }
@@ -381,56 +567,6 @@ var pageBreaksBlock = function (state, startLine) {
     state.line = nextLine;
     return true;
 };
-var findEndMarker = function (str, startPos, beginMarker, endMarker, onlyEnd) {
-    if (startPos === void 0) { startPos = 0; }
-    if (beginMarker === void 0) { beginMarker = "{"; }
-    if (endMarker === void 0) { endMarker = "}"; }
-    if (onlyEnd === void 0) { onlyEnd = false; }
-    var content = '';
-    var nextPos = 0;
-    if (str[startPos] !== beginMarker && !onlyEnd) {
-        return { res: false };
-    }
-    var openBrackets = 1;
-    var openCode = 0;
-    for (var i = startPos + 1; i < str.length; i++) {
-        var chr = str[i];
-        nextPos = i;
-        if (chr === '`') {
-            if (openCode > 0) {
-                openCode--;
-            }
-            else {
-                openCode++;
-            }
-        }
-        if (chr === beginMarker && openCode === 0) {
-            content += chr;
-            openBrackets++;
-            continue;
-        }
-        if (chr === endMarker && openCode === 0) {
-            openBrackets--;
-            if (openBrackets > 0) {
-                content += chr;
-                continue;
-            }
-            break;
-        }
-        content += chr;
-    }
-    if (openBrackets > 0) {
-        return {
-            res: false,
-            content: content
-        };
-    }
-    return {
-        res: true,
-        content: content,
-        nextPos: nextPos + endMarker.length
-    };
-};
 var textAuthor = function (state) {
     var _a;
     var startPos = state.pos;
@@ -444,7 +580,7 @@ var textAuthor = function (state) {
         return false;
     }
     startPos += match[0].length;
-    var _b = findEndMarker(state.src, startPos), _c = _b.res, res = _c === void 0 ? false : _c, _d = _b.content, content = _d === void 0 ? '' : _d, _e = _b.nextPos, nextPos = _e === void 0 ? 0 : _e;
+    var _b = common_1.findEndMarker(state.src, startPos), _c = _b.res, res = _c === void 0 ? false : _c, _d = _b.content, content = _d === void 0 ? '' : _d, _e = _b.nextPos, nextPos = _e === void 0 ? 0 : _e;
     if (!res) {
         return false;
     }
@@ -517,7 +653,7 @@ var textTypes = function (state) {
     if (!type || type === '') {
         return false;
     }
-    var _b = findEndMarker(state.src, startPos), _c = _b.res, res = _c === void 0 ? false : _c, _d = _b.content, content = _d === void 0 ? '' : _d, _e = _b.nextPos, nextPos = _e === void 0 ? 0 : _e;
+    var _b = common_1.findEndMarker(state.src, startPos), _c = _b.res, res = _c === void 0 ? false : _c, _d = _b.content, content = _d === void 0 ? '' : _d, _e = _b.nextPos, nextPos = _e === void 0 ? 0 : _e;
     if (!res) {
         return false;
     }
@@ -654,10 +790,10 @@ var linkifyURL = function (state) {
 };
 var renderDocTitle = function (tokens, index, options, env, slf) {
     var token = tokens[index];
-    var content = renderInlineContent(token, options, env, slf);
+    var content = exports.renderInlineContent(token, options, env, slf);
     return content;
 };
-var renderInlineContent = function (token, options, env, slf) {
+exports.renderInlineContent = function (token, options, env, slf) {
     var sContent = '';
     var content = '';
     if (token.children && token.children.length) {
@@ -682,32 +818,35 @@ var renderInlineContent = function (token, options, env, slf) {
 };
 var renderSectionTitle = function (tokens, index, options, env, slf) {
     var token = tokens[index];
+    var content = exports.renderInlineContent(token, options, env, slf);
+    if (token.isUnNumbered) {
+        return content;
+    }
     var sectionNumber = token.is_numerable
-        ? "<span class=\"section-number\">" + ++sectionCount + ". </span>"
+        ? "<span class=\"section-number\">" + token.section + ". </span>"
         : "";
-    var content = renderInlineContent(token, options, env, slf);
     return "" + sectionNumber + content;
 };
 var renderSubsectionTitle = function (tokens, index, options, env, slf) {
     var token = tokens[index];
-    if (token.isNewSect) {
-        subCount = 0;
+    var content = exports.renderInlineContent(token, options, env, slf);
+    if (token.isUnNumbered) {
+        return content;
     }
-    var content = renderInlineContent(token, options, env, slf);
-    return "<span class=\"section-number\">" + token.secNumber + ".</span><span class=\"sub_section-number\">" + ++subCount + ".</span> " + content;
+    return "<span class=\"section-number\">" + token.section + ".</span><span class=\"sub_section-number\">" + token.subsection + ".</span> " + content;
 };
 var renderSubSubsectionTitle = function (tokens, index, options, env, slf) {
     var token = tokens[index];
-    if (token.isNewSubSection) {
-        subSubCount = 0;
+    var content = exports.renderInlineContent(token, options, env, slf);
+    if (token.isUnNumbered) {
+        return content;
     }
-    var content = renderInlineContent(token, options, env, slf);
-    return "<span class=\"section-number\">" + token.secNumber + ".</span><span class=\"sub_section-number\">" + subCount + "." + ++subSubCount + ".</span> " + content;
+    return "<span class=\"section-number\">" + token.section + ".</span><span class=\"sub_section-number\">" + token.subsection + "." + token.subsubsection + ".</span> " + content;
 };
 var getAuthorItemToken = function (tokens, index, options, env, slf) {
     var res = '';
     var token = tokens[index];
-    var content = renderInlineContent(token, options, env, slf);
+    var content = exports.renderInlineContent(token, options, env, slf);
     var attrStyle = options.forDocx
         ? ' display: block; text-align: center;'
         : '';
@@ -724,7 +863,7 @@ var getAuthorColumnToken = function (tokens, index, options, env, slf) {
         : '';
     var content = token.children && token.children.length
         ? slf.renderInline(token.children, options)
-        : renderInlineContent(token, options, env, slf);
+        : exports.renderInlineContent(token, options, env, slf);
     if (attrStyle) {
         res += "<p style=\"" + attrStyle + "\">" + content + "</p>";
     }
@@ -740,7 +879,7 @@ var renderAuthorToken = function (tokens, index, options, env, slf) {
         : '';
     var res = token.children && token.children.length
         ? slf.renderInline(token.children, options)
-        : renderInlineContent(token, options, env, slf);
+        : exports.renderInlineContent(token, options, env, slf);
     if (divStyle) {
         return "<div class=\"author\" style=\"" + divStyle + "\">\n          " + res + "\n        </div>";
     }
@@ -750,12 +889,12 @@ var renderAuthorToken = function (tokens, index, options, env, slf) {
 };
 var renderBoldText = function (tokens, idx, options, env, slf) {
     var token = tokens[idx];
-    var content = renderInlineContent(token, options, env, slf);
+    var content = exports.renderInlineContent(token, options, env, slf);
     return content;
 };
 var renderItalicText = function (tokens, idx, options, env, slf) {
     var token = tokens[idx];
-    var content = renderInlineContent(token, options, env, slf);
+    var content = exports.renderInlineContent(token, options, env, slf);
     return content;
 };
 var renderCodeInlineOpen = function (tokens, idx, options, env, slf) {
@@ -768,7 +907,7 @@ var renderCodeInlineClose = function () {
 var renderCodeInline = function (tokens, idx, options, env, slf) {
     var token = tokens[idx];
     // return escapeHtml(token.content);
-    var content = renderInlineContent(token, options, env, slf);
+    var content = exports.renderInlineContent(token, options, env, slf);
     return content;
 };
 var renderUrl = function (token) { return "<a href=\"" + token.content + "\">" + token.content + "</a>"; };
@@ -808,12 +947,14 @@ var mapping = {
     subsection: "Subsection",
     subsubsection: "Subsubsection",
     url: "Url",
-    textUrl: "textUrl"
+    textUrl: "textUrl",
+    addcontentsline: "addcontentsline"
 };
 exports.default = (function () {
     return function (md) {
         exports.resetCounter();
-        md.block.ruler.before("heading", "headingSection", headingSection);
+        md.block.ruler.before("heading", "headingSection", exports.headingSection);
+        md.block.ruler.before("heading", "addContentsLineBlock", addContentsLineBlock);
         md.block.ruler.before("headingSection", "separatingSpan", separatingSpan);
         md.block.ruler.before("paragraphDiv", "abstractBlock", abstractBlock);
         md.block.ruler.before("paragraphDiv", "pageBreaksBlock", pageBreaksBlock);
@@ -869,6 +1010,8 @@ exports.default = (function () {
                         return renderUrl(tokens[idx]);
                     case "textUrl":
                         return renderTextUrl(tokens[idx]);
+                    case "addcontentsline":
+                        return '';
                     default:
                         return '';
                 }