temml 0.11.1 → 0.11.3

package/README.md

@@ -2,7 +2,7 @@
 
 | Library       | Minified JavaScript + CSS |
 |:--------------|:-------------------------:|
-| Temml         |         167 KB            |
+| Temml         |         168 KB            |
 | MathJax 2.7.5 |         338 KB            |
 | KaTeX         |         280 KB            |
 | TeXZilla      |         168 KB            |

package/dist/Temml-Local.css

@@ -12,7 +12,7 @@ Unicode range 1D49C to 1D4B5.
 }
 
 math {
-  font-family: "Cambria Math", 'STIXTwoMath-Regular', math;
+  font-family: "Cambria Math", 'STIXTwoMath-Regular', 'NotoSansMath-Regular', math;
   font-style: normal;
   font-weight: normal;
   line-height: normal;
@@ -34,6 +34,11 @@ math * {
  * Not in Chromium, which recognizes display: "block math" written inline. */
 math.tml-display { display: block; }
 
+*.mathcal {
+  /* NotoSans */
+  font-feature-settings: 'ss01';
+}
+
 math .mathscr {
   font-family: "Temml";
 }

package/dist/{Temml-Fira.css → Temml-NotoSans.css}

@@ -1,24 +1,13 @@
 /*
-Fira Math fonts are released under the SIL OPEN FONT LICENSE Version 1.1.
+Noto Math fonts are released under the SIL OPEN FONT LICENSE Version 1.1.
 
-The Fira Math WOFF2 font has been obtained from
-http://www.gust.org.pl/projects/e-foundry/
-
-The Temml.woff2 is a clone of KaTeX_Script-Regular, except that the code points
-have been changed from ASCII to Unicode Mathematical Alphanumeric Symbols Script capitals,
-Unicode range 1D49C to 1D4B5.
+The NotoMath font has been obtained from
+https://github.com/notofonts/math
 */
 
 @font-face {
-  font-family: 'Temml';
-  src: url('Temml.woff2') format('woff2');
-  font-weight: normal;
-  font-style: normal;
-}
-
-@font-face {
-  font-family: Fira Math;
-  src: url('FiraMath-Regular.woff2');
+  font-family: NotoSans Math;
+  src: url('NotoSansMath-Regular.ttf');
 }
 
 math {
@@ -40,20 +29,24 @@ math * {
 }
 
 math {
-  font-family: "Fira Math", math;
+  font-family: "NotoSans Math", math;
 }
 
 /* Next line is active in Firefox and Safari.
  * Not in Chromium, which recognizes display: "block math" written inline. */
 math.tml-display { display: block; }
 
-*.mathscr {
-  font-family: "Temml";
+math .mathscr {
+  font-family: "ssty1";
+}
+
+*.mathcal {
+  font-feature-settings: 'ss01';
 }
 
 /* Chromium prime alignment */
 mo.tml-prime {
-  font-family: Temml;
+  font-feature-settings: 'ssty';
 }
 
 /* Prevent f' from overlapping in Chromium */

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
@@ -1772,7 +1804,7 @@ defineSymbol(text, accent, "\u02d9", "\\."); // dot above
 defineSymbol(text, accent, "\u00b8", "\\c"); // cedilla
 defineSymbol(text, accent, "\u02da", "\\r"); // ring above
 defineSymbol(text, accent, "\u02c7", "\\v"); // caron
-defineSymbol(text, accent, "\u00a8", '\\"'); // diaresis
+defineSymbol(text, accent, "\u00a8", '\\"'); // diaeresis
 defineSymbol(text, accent, "\u02dd", "\\H"); // double acute
 defineSymbol(math, accent, "\u02ca", "\\'"); // acute
 defineSymbol(math, accent, "\u02cb", "\\`"); // grave
@@ -1784,7 +1816,7 @@ defineSymbol(math, accent, "\u02d9", "\\."); // dot above
 defineSymbol(math, accent, "\u00b8", "\\c"); // cedilla
 defineSymbol(math, accent, "\u02da", "\\r"); // ring above
 defineSymbol(math, accent, "\u02c7", "\\v"); // caron
-defineSymbol(math, accent, "\u00a8", '\\"'); // diaresis
+defineSymbol(math, accent, "\u00a8", '\\"'); // diaeresis
 defineSymbol(math, accent, "\u02dd", "\\H"); // double acute
 
 // These ligatures are detected and created in Parser.js's `formLigatures`.
@@ -2752,17 +2784,17 @@ const calculateSize = function(sizeValue, style) {
 
 // Helper functions
 
-const padding$2 = width => {
+const padding$1 = width => {
   const node = new mathMLTree.MathNode("mspace");
   node.setAttribute("width", width + "em");
   return node
 };
 
 const paddedNode = (group, lspace = 0.3, rspace = 0, mustSmash = false) => {
-  if (group == null && rspace === 0) { return padding$2(lspace) }
+  if (group == null && rspace === 0) { return padding$1(lspace) }
   const row = group ? [group] : [];
-  if (lspace !== 0)   { row.unshift(padding$2(lspace)); }
-  if (rspace > 0) { row.push(padding$2(rspace)); }
+  if (lspace !== 0)   { row.unshift(padding$1(lspace)); }
+  if (rspace > 0) { row.push(padding$1(rspace)); }
   if (mustSmash) {
     // Used for the bottom arrow in a {CD} environment
     const mpadded = new mathMLTree.MathNode("mpadded", row);
@@ -2889,8 +2921,8 @@ defineFunction({
     const node = munderoverNode(group.name, group.body, group.below, style);
     // Create operator spacing for a relation.
     const row = [node];
-    row.unshift(padding$2(0.2778));
-    row.push(padding$2(0.2778));
+    row.unshift(padding$1(0.2778));
+    row.push(padding$1(0.2778));
     return new mathMLTree.MathNode("mrow", row)
   }
 });
@@ -2965,13 +2997,13 @@ defineFunction({
       botNode.setAttribute("width", "0.5em");
       wrapper = new mathMLTree.MathNode(
         "mpadded",
-        [padding$2(0.2778), botNode, raiseNode, padding$2(0.2778)]
+        [padding$1(0.2778), botNode, raiseNode, padding$1(0.2778)]
       );
     } else {
       raiseNode.setAttribute("width", (group.name === "\\equilibriumRight" ? "0.5em" : "0"));
       wrapper = new mathMLTree.MathNode(
         "mpadded",
-        [padding$2(0.2778), raiseNode, botArrow, padding$2(0.2778)]
+        [padding$1(0.2778), raiseNode, botArrow, padding$1(0.2778)]
       );
     }
 
@@ -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.
@@ -8083,7 +8115,7 @@ defineFunction({
   }
 });
 
-const padding$1 = _ => {
+const padding = _ => {
   const node = new mathMLTree.MathNode("mspace");
   node.setAttribute("width", "3pt");
   return node
@@ -8096,9 +8128,9 @@ const mathmlBuilder$7 = (group, style) => {
     // Firefox does not reliably add side padding.
     // Insert <mspace>
     node = new mathMLTree.MathNode("mrow", [
-      padding$1(),
+      padding(),
       buildGroup$1(group.body, style),
-      padding$1()
+      padding()
     ]);
   } else {
     node = new mathMLTree.MathNode("menclose", [buildGroup$1(group.body, style)]);
@@ -8447,9 +8479,9 @@ const mathmlBuilder$6 = (group, style) => {
     const mi = mathGroup.children[0].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"));
@@ -9498,12 +9530,6 @@ defineFunction({
 
 const textAtomTypes = ["text", "textord", "mathord", "atom"];
 
-const padding = width => {
-  const node = new mathMLTree.MathNode("mspace");
-  node.setAttribute("width", width + "em");
-  return node
-};
-
 function mathmlBuilder$3(group, style) {
   let node;
   const inner = buildExpression(group.body, style);
@@ -9539,17 +9565,17 @@ function mathmlBuilder$3(group, style) {
       if (doSpacing ) {
         if (group.mclass === "mbin") {
           // medium space
-          node.children.unshift(padding(0.2222));
-          node.children.push(padding(0.2222));
+          node.children.unshift(padding$1(0.2222));
+          node.children.push(padding$1(0.2222));
         } else if (group.mclass === "mrel") {
           // thickspace
-          node.children.unshift(padding(0.2778));
-          node.children.push(padding(0.2778));
+          node.children.unshift(padding$1(0.2778));
+          node.children.push(padding$1(0.2778));
         } else if (group.mclass === "mpunct") {
-          node.children.push(padding(0.1667));
+          node.children.push(padding$1(0.1667));
         } else if (group.mclass === "minner") {
-          node.children.unshift(padding(0.0556));  // 1 mu is the most likely option
-          node.children.push(padding(0.0556));
+          node.children.unshift(padding$1(0.0556));  // 1 mu is the most likely option
+          node.children.push(padding$1(0.0556));
         }
       }
     } else {
@@ -9619,14 +9645,19 @@ defineFunction({
         break
       }
     }
-    return {
-      type: "mclass",
-      mode: parser.mode,
-      mclass: "m" + funcName.slice(5),
-      body: ordargument(mustPromote ? mord : body),
-      isCharacterBox,
-      mustPromote
-    };
+    if (mustPromote && funcName === "\\mathord" && mord.type === "mathord"
+                    && mord.text.length > 1) {
+      return mord
+    } else {
+      return {
+        type: "mclass",
+        mode: parser.mode,
+        mclass: "m" + funcName.slice(5),
+        body: ordargument(mustPromote ? mord : body),
+        isCharacterBox,
+        mustPromote
+      };
+    }
   },
   mathmlBuilder: mathmlBuilder$3
 });
@@ -9944,8 +9975,13 @@ defineFunction({
     "\u2a00",
     "\u2a01",
     "\u2a02",
+    "\u2a03",
     "\u2a04",
-    "\u2a06"
+    "\u2a05",
+    "\u2a06",
+    "\u2a07",
+    "\u2a08",
+    "\u2a09"
   ],
   props: {
     numArgs: 0
@@ -10188,7 +10224,7 @@ const mathmlBuilder$1 = (group, style) => {
   for (let i = 0; i < expression.length; i++) {
     let node = expression[i];
     if (node instanceof mathMLTree.MathNode) {
-      if (node.type === "mrow" && node.children.length === 1 &&
+      if ((node.type === "mrow" || node.type === "mpadded") && node.children.length === 1 &&
           node.children[0] instanceof mathMLTree.MathNode) {
         node = node.children[0];
       }
@@ -10806,7 +10842,7 @@ const symbolRegEx = /^m(over|under|underover)$/;
 defineFunctionBuilders({
   type: "supsub",
   mathmlBuilder(group, style) {
-    // Is the inner group a relevant horizonal brace?
+    // Is the inner group a relevant horizontal brace?
     let isBrace = false;
     let isOver;
     let isSup;
@@ -10989,6 +11025,14 @@ defineFunctionBuilders({
       // ":" is not in the MathML operator dictionary. Give it BIN spacing.
       node.attributes.lspace = "0.2222em";
       node.attributes.rspace = "0.2222em";
+    } else if (group.needsSpacing) {
+      // Fix a MathML bug that occurs when a <mo> is between two <mtext> elements.
+      if (group.family === "bin") {
+        return new mathMLTree.MathNode("mrow", [padding$1(0.222), node, padding$1(0.222)])
+      } else {
+        // REL spacing
+        return new mathMLTree.MathNode("mrow", [padding$1(0.2778), node, padding$1(0.2778)])
+      }
     }
     return node;
   }
@@ -11356,7 +11400,8 @@ defineFunctionBuilders({
       node.setAttribute("mathvariant", "normal");
       if (text.text.length === 1) {
         // A Firefox bug will apply spacing here, but there should be none. Fix it.
-        node = new mathMLTree.MathNode("mrow", [node]);
+        node = new mathMLTree.MathNode("mpadded", [node]);
+        node.setAttribute("lspace", "0");
       }
     }
     return node
@@ -12735,6 +12780,7 @@ var unicodeSymbols = {
 
 const binLeftCancellers = ["bin", "op", "open", "punct", "rel"];
 const sizeRegEx = /([-+]?) *(\d+(?:\.\d*)?|\.\d+) *([a-z]{2})/;
+const textRegEx = /^ *\\text/;
 
 /**
  * This file contains the parser used to parse out a TeX expression from the
@@ -13645,6 +13691,11 @@ class Parser {
           loc,
           text
         };
+        if ((family === "rel" || family === "bin") && this.prevAtomType === "text") {
+          if (textRegEx.test(loc.lexer.input.slice(loc.end))) {
+            s.needsSpacing = true;  // Fix a MathML bug.
+          }
+        }
       } else {
         if (asciiFromScript[text]) {
           // Unicode 14 disambiguates chancery from roundhand.
@@ -13902,7 +13953,7 @@ class Style {
  * https://mit-license.org/
  */
 
-const version = "0.11.01";
+const version = "0.11.03";
 
 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;