marked-katex-extension 4.0.0 → 4.0.2

package/lib/index.cjs

@@ -2,7 +2,6 @@
 
 var katex = require('katex');
 
-const inlineStartRule = /(\s|^)\${1,2}(?!\$)/;
 const inlineRule = /^(\${1,2})(?!\$)((?:\\.|[^\\\n])*?(?:\\.|[^\\\n\$]))\1(?=[\s?!\.,:]|$)/;
 const blockRule = /^(\${1,2})\n((?:\\[^]|[^\\])+?)\n\1(?:\n|$)/;
 
@@ -24,16 +23,24 @@ function inlineKatex(options, renderer) {
     name: 'inlineKatex',
     level: 'inline',
     start(src) {
-      const match = src.match(inlineStartRule);
-      if (!match) {
-        return;
-      }
+      let index;
+      let indexSrc = src;
+
+      while (indexSrc) {
+        index = indexSrc.indexOf('$');
+        if (index === -1) {
+          return;
+        }
+
+        if (index === 0 || indexSrc.charAt(index - 1) === ' ') {
+          const possibleKatex = indexSrc.substring(index);
 
-      const index = match.index + match[1].length;
-      const possibleKatex = src.substring(index);
+          if (possibleKatex.match(inlineRule)) {
+            return index;
+          }
+        }
 
-      if (possibleKatex.match(inlineRule)) {
-        return index;
+        indexSrc = indexSrc.substring(index + 1).replace(/^\$+/, '');
       }
     },
     tokenizer(src, tokens) {

package/lib/index.umd.js

@@ -5176,6 +5176,10 @@
     defineSymbol(text, main, textord, _ch3, wideChar);
     wideChar = String.fromCharCode(0xD835, 0xDD04 + _i3); // A-Z a-z Fractur
 
+    defineSymbol(math, main, mathord, _ch3, wideChar);
+    defineSymbol(text, main, textord, _ch3, wideChar);
+    wideChar = String.fromCharCode(0xD835, 0xDD6C + _i3); // A-Z a-z bold Fractur
+
     defineSymbol(math, main, mathord, _ch3, wideChar);
     defineSymbol(text, main, textord, _ch3, wideChar);
     wideChar = String.fromCharCode(0xD835, 0xDDA0 + _i3); // A-Z a-z sans-serif
@@ -5283,8 +5287,9 @@
   ["mathfrak", "textfrak", "Fraktur-Regular"], // a-z Fraktur
   ["mathbb", "textbb", "AMS-Regular"], // A-Z double-struck
   ["mathbb", "textbb", "AMS-Regular"], // k double-struck
-  ["", "", ""], // A-Z bold Fraktur No font metrics
-  ["", "", ""], // a-z bold Fraktur.   No font.
+  // Note that we are using a bold font, but font metrics for regular Fraktur.
+  ["mathboldfrak", "textboldfrak", "Fraktur-Regular"], // A-Z bold Fraktur
+  ["mathboldfrak", "textboldfrak", "Fraktur-Regular"], // a-z bold Fraktur
   ["mathsf", "textsf", "SansSerif-Regular"], // A-Z sans-serif
   ["mathsf", "textsf", "SansSerif-Regular"], // a-z sans-serif
   ["mathboldsf", "textboldsf", "SansSerif-Bold"], // A-Z bold sans-serif
@@ -5460,10 +5465,15 @@
 
     var isFont = mode === "math" || mode === "text" && options.font;
     var fontOrFamily = isFont ? options.font : options.fontFamily;
+    var wideFontName = "";
+    var wideFontClass = "";
 
     if (text.charCodeAt(0) === 0xD835) {
+      [wideFontName, wideFontClass] = wideCharacterFont(text, mode);
+    }
+
+    if (wideFontName.length > 0) {
       // surrogate pairs get special treatment
-      var [wideFontName, wideFontClass] = wideCharacterFont(text, mode);
       return makeSymbol(text, wideFontName, mode, options, classes.concat(wideFontClass));
     } else if (fontOrFamily) {
       var fontName;
@@ -18315,7 +18325,7 @@
     /**
      * Current KaTeX version
      */
-    version: "0.16.8",
+    version: "0.16.9",
 
     /**
      * Renders the given LaTeX into an HTML+MathML combination, and adds
@@ -18409,7 +18419,6 @@
     }
   };
 
-  const inlineStartRule = /(\s|^)\${1,2}(?!\$)/;
   const inlineRule = /^(\${1,2})(?!\$)((?:\\.|[^\\\n])*?(?:\\.|[^\\\n\$]))\1(?=[\s?!\.,:]|$)/;
   const blockRule = /^(\${1,2})\n((?:\\[^]|[^\\])+?)\n\1(?:\n|$)/;
 
@@ -18431,16 +18440,24 @@
       name: 'inlineKatex',
       level: 'inline',
       start(src) {
-        const match = src.match(inlineStartRule);
-        if (!match) {
-          return;
-        }
+        let index;
+        let indexSrc = src;
+
+        while (indexSrc) {
+          index = indexSrc.indexOf('$');
+          if (index === -1) {
+            return;
+          }
 
-        const index = match.index + match[1].length;
-        const possibleKatex = src.substring(index);
+          if (index === 0 || indexSrc.charAt(index - 1) === ' ') {
+            const possibleKatex = indexSrc.substring(index);
+
+            if (possibleKatex.match(inlineRule)) {
+              return index;
+            }
+          }
 
-        if (possibleKatex.match(inlineRule)) {
-          return index;
+          indexSrc = indexSrc.substring(index + 1).replace(/^\$+/, '');
         }
       },
       tokenizer(src, tokens) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "marked-katex-extension",
-  "version": "4.0.0",
+  "version": "4.0.2",
   "description": "MarkedJS extesion to render katex",
   "main": "./lib/index.cjs",
   "module": "./src/index.js",
@@ -23,7 +23,9 @@
     }
   },
   "scripts": {
-    "test": "jest --verbose",
+    "test": "npm run build && npm run test:cover && npm run test:spec && npm run test:types && npm run lint",
+    "test:katex": "jest --verbose",
+    "test:spec": "node --test spec/marked-tests.js",
     "test:cover": "jest --coverage",
     "test:types": "tsd -f spec/index.test-d.ts -t src/index.d.ts",
     "lint": "eslint .",
@@ -46,11 +48,12 @@
   "devDependencies": {
     "@babel/core": "^7.23.0",
     "@babel/preset-env": "^7.22.20",
+    "@markedjs/testutils": "9.1.0-3",
     "@rollup/plugin-node-resolve": "^15.2.1",
     "@semantic-release/changelog": "^6.0.3",
     "@semantic-release/commit-analyzer": "^11.0.0",
     "@semantic-release/git": "^10.0.1",
-    "@semantic-release/github": "^9.0.7",
+    "@semantic-release/github": "^9.2.1",
     "@semantic-release/npm": "^11.0.0",
     "@semantic-release/release-notes-generator": "^12.0.0",
     "babel-jest": "^29.7.0",
@@ -63,12 +66,12 @@
     "jest-cli": "^29.7.0",
     "marked": "^9.0.3",
     "node-fetch": "^3.3.2",
-    "rollup": "^3.29.3",
+    "rollup": "^3.29.4",
     "semantic-release": "^22.0.5",
     "tsd": "^0.29.0"
   },
   "dependencies": {
     "@types/katex": "^0.16.3",
-    "katex": "^0.16.8"
+    "katex": "^0.16.9"
   }
 }

package/src/index.js

@@ -1,6 +1,5 @@
 import katex from 'katex';
 
-const inlineStartRule = /(\s|^)\${1,2}(?!\$)/;
 const inlineRule = /^(\${1,2})(?!\$)((?:\\.|[^\\\n])*?(?:\\.|[^\\\n\$]))\1(?=[\s?!\.,:]|$)/;
 const blockRule = /^(\${1,2})\n((?:\\[^]|[^\\])+?)\n\1(?:\n|$)/;
 
@@ -22,16 +21,24 @@ function inlineKatex(options, renderer) {
     name: 'inlineKatex',
     level: 'inline',
     start(src) {
-      const match = src.match(inlineStartRule);
-      if (!match) {
-        return;
-      }
+      let index;
+      let indexSrc = src;
+
+      while (indexSrc) {
+        index = indexSrc.indexOf('$');
+        if (index === -1) {
+          return;
+        }
+
+        if (index === 0 || indexSrc.charAt(index - 1) === ' ') {
+          const possibleKatex = indexSrc.substring(index);
 
-      const index = match.index + match[1].length;
-      const possibleKatex = src.substring(index);
+          if (possibleKatex.match(inlineRule)) {
+            return index;
+          }
+        }
 
-      if (possibleKatex.match(inlineRule)) {
-        return index;
+        indexSrc = indexSrc.substring(index + 1).replace(/^\$+/, '');
       }
     },
     tokenizer(src, tokens) {