temml 0.11.2 → 0.11.4

package/dist/Temml-NotoSans.css

@@ -2,12 +2,12 @@
 Noto Math fonts are released under the SIL OPEN FONT LICENSE Version 1.1.
 
 The NotoMath font has been obtained from
-https://gwfh.mranftl.com/fonts/noto-sans-math?subsets=math
+https://github.com/notofonts/math
 */
 
 @font-face {
   font-family: NotoSans Math;
-  src: url('noto-sans-math-v15-math-regular.woff2');
+  src: url('NotoSansMath-Regular.ttf');
 }
 
 math {

package/dist/Temml-STIX2.css

@@ -8,8 +8,8 @@ https://github.com/stipub/stixfonts
 
 @font-face {
   font-family: STIX2;
-  src: local('STIXTwoMath-Regular'),
-       url('./STIXTwoMath-Regular.woff2');
+  src: local('STIXTwoMath'),
+       url('./STIXTwoMath.woff2');
 }
 
 math {

package/dist/temml.cjs

@@ -1183,9 +1183,6 @@ defineSymbol(math, textord, "\u29eb", "\\blacklozenge");
 defineSymbol(math, textord, "\u2605", "\\bigstar");
 defineSymbol(math, textord, "\u2222", "\\sphericalangle", true);
 defineSymbol(math, textord, "\u2201", "\\complement", true);
-// unicode-math maps U+F0 to \matheth. We map to AMS function \eth
-defineSymbol(math, textord, "\u00f0", "\\eth", true);
-defineSymbol(text, textord, "\u00f0", "\u00f0");
 defineSymbol(math, textord, "\u2571", "\\diagup");
 defineSymbol(math, textord, "\u2572", "\\diagdown");
 defineSymbol(math, textord, "\u25a1", "\\square");
@@ -1545,6 +1542,46 @@ defineSymbol(math, mathord, "\u03e1", "\\sampi", true);
 defineSymbol(math, mathord, "\u03da", "\\Stigma", true);
 defineSymbol(math, mathord, "\u03db", "\\stigma", true);
 defineSymbol(math, mathord, "\u2aeb", "\\Bot");
+
+// unicode-math maps U+F0 to \matheth. We map to AMS function \eth
+defineSymbol(math, textord, "\u00f0", "\\eth", true); // ð
+defineSymbol(text, textord, "\u00f0", "\u00f0");
+// Extended ASCII and non-ASCII Letters
+defineSymbol(math, textord, "\u00C5", "\\AA"); // Å
+defineSymbol(text, textord, "\u00C5", "\\AA", true);
+defineSymbol(math, textord, "\u00C6", "\\AE", true); // Æ
+defineSymbol(text, textord, "\u00C6", "\\AE", true);
+defineSymbol(math, textord, "\u00D0", "\\DH", true); // Ð
+defineSymbol(text, textord, "\u00D0", "\\DH", true);
+defineSymbol(math, textord, "\u00DE", "\\TH", true); // Þ
+defineSymbol(text, textord, "\u00DE", "\\TH", true);
+defineSymbol(math, textord, "\u00DF", "\\ss", true); // ß
+defineSymbol(text, textord, "\u00DF", "\\ss", true);
+defineSymbol(math, textord, "\u00E5", "\\aa"); // å
+defineSymbol(text, textord, "\u00E5", "\\aa", true);
+defineSymbol(math, textord, "\u00E6", "\\ae", true); // æ
+defineSymbol(text, textord, "\u00E6", "\\ae", true);
+defineSymbol(math, textord, "\u00F0", "\\dh"); // ð
+defineSymbol(text, textord, "\u00F0", "\\dh", true);
+defineSymbol(math, textord, "\u00FE", "\\th", true); // þ
+defineSymbol(text, textord, "\u00FE", "\\th", true);
+defineSymbol(math, textord, "\u0110", "\\DJ", true); // Đ
+defineSymbol(text, textord, "\u0110", "\\DJ", true);
+defineSymbol(math, textord, "\u0111", "\\dj", true); // đ
+defineSymbol(text, textord, "\u0111", "\\dj", true);
+defineSymbol(math, textord, "\u0141", "\\L", true); // Ł
+defineSymbol(text, textord, "\u0141", "\\L", true);
+defineSymbol(math, textord, "\u0141", "\\l", true); // ł
+defineSymbol(text, textord, "\u0141", "\\l", true);
+defineSymbol(math, textord, "\u014A", "\\NG", true); // Ŋ
+defineSymbol(text, textord, "\u014A", "\\NG", true);
+defineSymbol(math, textord, "\u014B", "\\ng", true); // ŋ
+defineSymbol(text, textord, "\u014B", "\\ng", true);
+defineSymbol(math, textord, "\u0152", "\\OE", true); // Œ
+defineSymbol(text, textord, "\u0152", "\\OE", true);
+defineSymbol(math, textord, "\u0153", "\\oe", true); // œ
+defineSymbol(text, textord, "\u0153", "\\oe", true);
+
 defineSymbol(math, bin, "\u2217", "\u2217", true);
 defineSymbol(math, bin, "+", "+");
 defineSymbol(math, bin, "\u2217", "*");
@@ -1753,13 +1790,8 @@ defineSymbol(math, textord, "\u0131", "\u0131");
 defineSymbol(math, textord, "\u0237", "\u0237");
 defineSymbol(text, textord, "\u0131", "\\i", true);
 defineSymbol(text, textord, "\u0237", "\\j", true);
-defineSymbol(text, textord, "\u00df", "\\ss", true);
-defineSymbol(text, textord, "\u00e6", "\\ae", true);
-defineSymbol(text, textord, "\u0153", "\\oe", true);
 defineSymbol(text, textord, "\u00f8", "\\o", true);
 defineSymbol(math, mathord, "\u00f8", "\\o", true);
-defineSymbol(text, textord, "\u00c6", "\\AE", true);
-defineSymbol(text, textord, "\u0152", "\\OE", true);
 defineSymbol(text, textord, "\u00d8", "\\O", true);
 defineSymbol(math, mathord, "\u00d8", "\\O", true);
 defineSymbol(text, accent, "\u02ca", "\\'"); // acute
@@ -3347,7 +3379,7 @@ const bordermatrixParseTree = (matrix, delimiters) => {
     // A vphantom with contents from the pmatrix, to set minimum cell height
     const phantomBody = [];
     for (let j = 0; j < body[i].length; j++) {
-      phantomBody.push(structuredClone(body[i][j]));
+      phantomBody.push(body[i][j]);
     }
     leftColumnBody[i - 1].push(phantom(phantomBody, "vphantom"));
   }
@@ -3355,18 +3387,18 @@ const bordermatrixParseTree = (matrix, delimiters) => {
   // Create an array for the top row
   const topRowBody = new Array(body.length).fill().map(() => []);
   for (let j = 0; j < body[0].length; j++) {
-    topRowBody[0].push(structuredClone(body[0][j]));
+    topRowBody[0].push(body[0][j]);
   }
   // Copy the rest of the pmatrix, but squashed via \hphantom
   for (let i = 1; i < body.length; i++) {
     for (let j = 0; j < body[0].length; j++) {
-      topRowBody[i].push(phantom(structuredClone(body[i][j]).body, "hphantom"));
+      topRowBody[i].push(phantom(body[i][j].body, "hphantom"));
     }
   }
 
   // Squash the top row of the main {pmatrix}
   for (let j = 0; j < body[0].length; j++) {
-    body[0][j] = phantom(structuredClone(body[0][j]).body, "hphantom");
+    body[0][j] = phantom(body[0][j].body, "hphantom");
   }
 
   // Now wrap the arrays in the proper parse nodes.
@@ -6434,7 +6466,7 @@ const mathmlBuilder$9 = function(group, style) {
     const numColumns = group.body[0].length;
     // Fill out a short row with empty <mtd> elements.
     for (let k = 0; k < numColumns - rw.length; k++) {
-      row.push(new mathMLTree.MathNode("mtd", [], style));
+      row.push(new mathMLTree.MathNode("mtd", [], [], style));
     }
     if (group.autoTag) {
       const tag = group.tags[i];
@@ -6894,7 +6926,9 @@ defineEnvironment({
       }
     }
     const res = parseArray(context.parser, payload, "text");
-    res.cols = new Array(res.body[0].length).fill({ type: "align", align: colAlign });
+    res.cols = res.body.length > 0
+      ? new Array(res.body[0].length).fill({ type: "align", align: colAlign })
+      : [];
     const [arraystretch, arraycolsep] = arrayGaps(context.parser.gullet.macros);
     res.arraystretch = arraystretch;
     if (arraycolsep && !(arraycolsep === 6 && arraycolsep === "pt")) {
@@ -6923,7 +6957,9 @@ defineEnvironment({
   handler(context) {
     const payload = { cols: [], envClasses: ["bordermatrix"] };
     const res = parseArray(context.parser, payload, "text");
-    res.cols = new Array(res.body[0].length).fill({ type: "align", align: "c" });
+    res.cols = res.body.length > 0
+      ? new Array(res.body[0].length).fill({ type: "align", align: "c" })
+      : [];
     res.envClasses = [];
     res.arraystretch = 1;
     if (context.envName === "matrix") { return res}
@@ -7357,6 +7393,9 @@ const mathmlBuilder$8 = (group, style) => {
   // So instead of wrapping the group in an <mstyle>, we apply
   // the color individually to each node and return a document fragment.
   let expr = buildExpression(group.body, style.withColor(group.color));
+  if (expr.length === 0) {
+    expr.push(new mathMLTree.MathNode("mrow"));
+  }
   expr = expr.map(e => {
     e.style.color = group.color;
     return e
@@ -8443,17 +8482,20 @@ const mathmlBuilder$6 = (group, style) => {
   // Check if it is possible to consolidate elements into a single <mi> element.
   if (isLongVariableName(group, font)) {
     // This is a \mathrm{…} group. It gets special treatment because symbolsOrd.js
-    // wraps <mi> elements with <mrow>s to work around a Firefox bug.
-    const mi = mathGroup.children[0].children[0];
+    // wraps <mi> elements with <mpadded>s to work around a Firefox bug.
+    const mi = mathGroup.children[0].children[0].children
+      ? mathGroup.children[0].children[0]
+      : mathGroup.children[0];
     delete mi.attributes.mathvariant;
     for (let i = 1; i < mathGroup.children.length; i++) {
-      mi.children[0].text += mathGroup.children[i].type === "mn"
-        ? mathGroup.children[i].children[0].text
-        : mathGroup.children[i].children[0].children[0].text;
+      mi.children[0].text += mathGroup.children[i].children[0].children
+        ? mathGroup.children[i].children[0].children[0].text
+        : mathGroup.children[i].children[0].text;
     }
-    // Wrap in a <mrow> to prevent the same Firefox bug.
-    const bogus = new mathMLTree.MathNode("mtext", new mathMLTree.TextNode("\u200b"));
-    return new mathMLTree.MathNode("mrow", [bogus, mi])
+    // Wrap in a <mpadded> to prevent the same Firefox bug.
+    const mpadded = new mathMLTree.MathNode("mpadded", [mi]);
+    mpadded.setAttribute("lspace", "0");
+    return mpadded
   }
   let canConsolidate = mathGroup.children[0].type === "mo";
   for (let i = 1; i < mathGroup.children.length; i++) {
@@ -9943,8 +9985,13 @@ defineFunction({
     "\u2a00",
     "\u2a01",
     "\u2a02",
+    "\u2a03",
     "\u2a04",
-    "\u2a06"
+    "\u2a05",
+    "\u2a06",
+    "\u2a07",
+    "\u2a08",
+    "\u2a09"
   ],
   props: {
     numArgs: 0
@@ -11365,7 +11412,6 @@ defineFunctionBuilders({
         // A Firefox bug will apply spacing here, but there should be none. Fix it.
         node = new mathMLTree.MathNode("mpadded", [node]);
         node.setAttribute("lspace", "0");
-        node.setAttribute("rspace", "0");
       }
     }
     return node
@@ -13917,7 +13963,7 @@ class Style {
  * https://mit-license.org/
  */
 
-const version = "0.11.02";
+const version = "0.11.04";
 
 function postProcess(block) {
   const labelMap = {};

package/dist/temml.d.ts

@@ -4,7 +4,7 @@ export interface Options {
   leqno?: boolean;
   throwOnError?: boolean;
   errorColor?: string;
-  macros?: Record<string, string>;
+  macros?: Record<string, any>;
   wrap?: "tex" | "=" | "none";
   xml?: boolean;
   colorIsTextColor?: boolean;
@@ -16,7 +16,7 @@ export interface Options {
 
 export function render(
   expression: string,
-  baseNode: HTMLElement,
+  baseNode: HTMLElement | MathMLElement,
   options?: Options,
 ): void;
 

package/dist/temml.js

@@ -1184,9 +1184,6 @@ var temml = (function () {
   defineSymbol(math, textord, "\u2605", "\\bigstar");
   defineSymbol(math, textord, "\u2222", "\\sphericalangle", true);
   defineSymbol(math, textord, "\u2201", "\\complement", true);
-  // unicode-math maps U+F0 to \matheth. We map to AMS function \eth
-  defineSymbol(math, textord, "\u00f0", "\\eth", true);
-  defineSymbol(text, textord, "\u00f0", "\u00f0");
   defineSymbol(math, textord, "\u2571", "\\diagup");
   defineSymbol(math, textord, "\u2572", "\\diagdown");
   defineSymbol(math, textord, "\u25a1", "\\square");
@@ -1546,6 +1543,46 @@ var temml = (function () {
   defineSymbol(math, mathord, "\u03da", "\\Stigma", true);
   defineSymbol(math, mathord, "\u03db", "\\stigma", true);
   defineSymbol(math, mathord, "\u2aeb", "\\Bot");
+
+  // unicode-math maps U+F0 to \matheth. We map to AMS function \eth
+  defineSymbol(math, textord, "\u00f0", "\\eth", true); // ð
+  defineSymbol(text, textord, "\u00f0", "\u00f0");
+  // Extended ASCII and non-ASCII Letters
+  defineSymbol(math, textord, "\u00C5", "\\AA"); // Å
+  defineSymbol(text, textord, "\u00C5", "\\AA", true);
+  defineSymbol(math, textord, "\u00C6", "\\AE", true); // Æ
+  defineSymbol(text, textord, "\u00C6", "\\AE", true);
+  defineSymbol(math, textord, "\u00D0", "\\DH", true); // Ð
+  defineSymbol(text, textord, "\u00D0", "\\DH", true);
+  defineSymbol(math, textord, "\u00DE", "\\TH", true); // Þ
+  defineSymbol(text, textord, "\u00DE", "\\TH", true);
+  defineSymbol(math, textord, "\u00DF", "\\ss", true); // ß
+  defineSymbol(text, textord, "\u00DF", "\\ss", true);
+  defineSymbol(math, textord, "\u00E5", "\\aa"); // å
+  defineSymbol(text, textord, "\u00E5", "\\aa", true);
+  defineSymbol(math, textord, "\u00E6", "\\ae", true); // æ
+  defineSymbol(text, textord, "\u00E6", "\\ae", true);
+  defineSymbol(math, textord, "\u00F0", "\\dh"); // ð
+  defineSymbol(text, textord, "\u00F0", "\\dh", true);
+  defineSymbol(math, textord, "\u00FE", "\\th", true); // þ
+  defineSymbol(text, textord, "\u00FE", "\\th", true);
+  defineSymbol(math, textord, "\u0110", "\\DJ", true); // Đ
+  defineSymbol(text, textord, "\u0110", "\\DJ", true);
+  defineSymbol(math, textord, "\u0111", "\\dj", true); // đ
+  defineSymbol(text, textord, "\u0111", "\\dj", true);
+  defineSymbol(math, textord, "\u0141", "\\L", true); // Ł
+  defineSymbol(text, textord, "\u0141", "\\L", true);
+  defineSymbol(math, textord, "\u0141", "\\l", true); // ł
+  defineSymbol(text, textord, "\u0141", "\\l", true);
+  defineSymbol(math, textord, "\u014A", "\\NG", true); // Ŋ
+  defineSymbol(text, textord, "\u014A", "\\NG", true);
+  defineSymbol(math, textord, "\u014B", "\\ng", true); // ŋ
+  defineSymbol(text, textord, "\u014B", "\\ng", true);
+  defineSymbol(math, textord, "\u0152", "\\OE", true); // Œ
+  defineSymbol(text, textord, "\u0152", "\\OE", true);
+  defineSymbol(math, textord, "\u0153", "\\oe", true); // œ
+  defineSymbol(text, textord, "\u0153", "\\oe", true);
+
   defineSymbol(math, bin, "\u2217", "\u2217", true);
   defineSymbol(math, bin, "+", "+");
   defineSymbol(math, bin, "\u2217", "*");
@@ -1754,13 +1791,8 @@ var temml = (function () {
   defineSymbol(math, textord, "\u0237", "\u0237");
   defineSymbol(text, textord, "\u0131", "\\i", true);
   defineSymbol(text, textord, "\u0237", "\\j", true);
-  defineSymbol(text, textord, "\u00df", "\\ss", true);
-  defineSymbol(text, textord, "\u00e6", "\\ae", true);
-  defineSymbol(text, textord, "\u0153", "\\oe", true);
   defineSymbol(text, textord, "\u00f8", "\\o", true);
   defineSymbol(math, mathord, "\u00f8", "\\o", true);
-  defineSymbol(text, textord, "\u00c6", "\\AE", true);
-  defineSymbol(text, textord, "\u0152", "\\OE", true);
   defineSymbol(text, textord, "\u00d8", "\\O", true);
   defineSymbol(math, mathord, "\u00d8", "\\O", true);
   defineSymbol(text, accent, "\u02ca", "\\'"); // acute
@@ -3348,7 +3380,7 @@ var temml = (function () {
       // A vphantom with contents from the pmatrix, to set minimum cell height
       const phantomBody = [];
       for (let j = 0; j < body[i].length; j++) {
-        phantomBody.push(structuredClone(body[i][j]));
+        phantomBody.push(body[i][j]);
       }
       leftColumnBody[i - 1].push(phantom(phantomBody, "vphantom"));
     }
@@ -3356,18 +3388,18 @@ var temml = (function () {
     // Create an array for the top row
     const topRowBody = new Array(body.length).fill().map(() => []);
     for (let j = 0; j < body[0].length; j++) {
-      topRowBody[0].push(structuredClone(body[0][j]));
+      topRowBody[0].push(body[0][j]);
     }
     // Copy the rest of the pmatrix, but squashed via \hphantom
     for (let i = 1; i < body.length; i++) {
       for (let j = 0; j < body[0].length; j++) {
-        topRowBody[i].push(phantom(structuredClone(body[i][j]).body, "hphantom"));
+        topRowBody[i].push(phantom(body[i][j].body, "hphantom"));
       }
     }
 
     // Squash the top row of the main {pmatrix}
     for (let j = 0; j < body[0].length; j++) {
-      body[0][j] = phantom(structuredClone(body[0][j]).body, "hphantom");
+      body[0][j] = phantom(body[0][j].body, "hphantom");
     }
 
     // Now wrap the arrays in the proper parse nodes.
@@ -4521,7 +4553,7 @@ var temml = (function () {
       const numColumns = group.body[0].length;
       // Fill out a short row with empty <mtd> elements.
       for (let k = 0; k < numColumns - rw.length; k++) {
-        row.push(new mathMLTree.MathNode("mtd", [], style));
+        row.push(new mathMLTree.MathNode("mtd", [], [], style));
       }
       if (group.autoTag) {
         const tag = group.tags[i];
@@ -4981,7 +5013,9 @@ var temml = (function () {
         }
       }
       const res = parseArray(context.parser, payload, "text");
-      res.cols = new Array(res.body[0].length).fill({ type: "align", align: colAlign });
+      res.cols = res.body.length > 0
+        ? new Array(res.body[0].length).fill({ type: "align", align: colAlign })
+        : [];
       const [arraystretch, arraycolsep] = arrayGaps(context.parser.gullet.macros);
       res.arraystretch = arraystretch;
       if (arraycolsep && !(arraycolsep === 6 && arraycolsep === "pt")) {
@@ -5010,7 +5044,9 @@ var temml = (function () {
     handler(context) {
       const payload = { cols: [], envClasses: ["bordermatrix"] };
       const res = parseArray(context.parser, payload, "text");
-      res.cols = new Array(res.body[0].length).fill({ type: "align", align: "c" });
+      res.cols = res.body.length > 0
+        ? new Array(res.body[0].length).fill({ type: "align", align: "c" })
+        : [];
       res.envClasses = [];
       res.arraystretch = 1;
       if (context.envName === "matrix") { return res}
@@ -5444,6 +5480,9 @@ var temml = (function () {
     // So instead of wrapping the group in an <mstyle>, we apply
     // the color individually to each node and return a document fragment.
     let expr = buildExpression(group.body, style.withColor(group.color));
+    if (expr.length === 0) {
+      expr.push(new mathMLTree.MathNode("mrow"));
+    }
     expr = expr.map(e => {
       e.style.color = group.color;
       return e
@@ -6530,17 +6569,20 @@ var temml = (function () {
     // Check if it is possible to consolidate elements into a single <mi> element.
     if (isLongVariableName(group, font)) {
       // This is a \mathrm{…} group. It gets special treatment because symbolsOrd.js
-      // wraps <mi> elements with <mrow>s to work around a Firefox bug.
-      const mi = mathGroup.children[0].children[0];
+      // wraps <mi> elements with <mpadded>s to work around a Firefox bug.
+      const mi = mathGroup.children[0].children[0].children
+        ? mathGroup.children[0].children[0]
+        : mathGroup.children[0];
       delete mi.attributes.mathvariant;
       for (let i = 1; i < mathGroup.children.length; i++) {
-        mi.children[0].text += mathGroup.children[i].type === "mn"
-          ? mathGroup.children[i].children[0].text
-          : mathGroup.children[i].children[0].children[0].text;
+        mi.children[0].text += mathGroup.children[i].children[0].children
+          ? mathGroup.children[i].children[0].children[0].text
+          : mathGroup.children[i].children[0].text;
       }
-      // Wrap in a <mrow> to prevent the same Firefox bug.
-      const bogus = new mathMLTree.MathNode("mtext", new mathMLTree.TextNode("\u200b"));
-      return new mathMLTree.MathNode("mrow", [bogus, mi])
+      // Wrap in a <mpadded> to prevent the same Firefox bug.
+      const mpadded = new mathMLTree.MathNode("mpadded", [mi]);
+      mpadded.setAttribute("lspace", "0");
+      return mpadded
     }
     let canConsolidate = mathGroup.children[0].type === "mo";
     for (let i = 1; i < mathGroup.children.length; i++) {
@@ -8030,8 +8072,13 @@ var temml = (function () {
       "\u2a00",
       "\u2a01",
       "\u2a02",
+      "\u2a03",
       "\u2a04",
-      "\u2a06"
+      "\u2a05",
+      "\u2a06",
+      "\u2a07",
+      "\u2a08",
+      "\u2a09"
     ],
     props: {
       numArgs: 0
@@ -9452,7 +9499,6 @@ var temml = (function () {
           // A Firefox bug will apply spacing here, but there should be none. Fix it.
           node = new mathMLTree.MathNode("mpadded", [node]);
           node.setAttribute("lspace", "0");
-          node.setAttribute("rspace", "0");
         }
       }
       return node
@@ -12004,7 +12050,7 @@ var temml = (function () {
    * https://mit-license.org/
    */
 
-  const version = "0.11.02";
+  const version = "0.11.04";
 
   function postProcess(block) {
     const labelMap = {};