temml 0.11.1 → 0.11.2

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://gwfh.mranftl.com/fonts/noto-sans-math?subsets=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('noto-sans-math-v15-math-regular.woff2');
 }
 
 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.cjs

@@ -1772,7 +1772,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 +1784,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 +2752,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 +2889,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 +2965,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)]
       );
     }
 
@@ -8083,7 +8083,7 @@ defineFunction({
   }
 });
 
-const padding$1 = _ => {
+const padding = _ => {
   const node = new mathMLTree.MathNode("mspace");
   node.setAttribute("width", "3pt");
   return node
@@ -8096,9 +8096,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)]);
@@ -9498,12 +9498,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 +9533,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 +9613,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
 });
@@ -10188,7 +10187,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 +10805,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 +10988,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 +11363,9 @@ 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");
+        node.setAttribute("rspace", "0");
       }
     }
     return node
@@ -12735,6 +12744,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 +13655,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 +13917,7 @@ class Style {
  * https://mit-license.org/
  */
 
-const version = "0.11.01";
+const version = "0.11.02";
 
 function postProcess(block) {
   const labelMap = {};

package/dist/temml.js

@@ -1773,7 +1773,7 @@ var temml = (function () {
   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
@@ -1785,7 +1785,7 @@ var temml = (function () {
   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`.
@@ -2753,17 +2753,17 @@ var temml = (function () {
 
   // 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);
@@ -2890,8 +2890,8 @@ var temml = (function () {
       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)
     }
   });
@@ -2966,13 +2966,13 @@ var temml = (function () {
         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)]
         );
       }
 
@@ -6170,7 +6170,7 @@ var temml = (function () {
     }
   });
 
-  const padding$1 = _ => {
+  const padding = _ => {
     const node = new mathMLTree.MathNode("mspace");
     node.setAttribute("width", "3pt");
     return node
@@ -6183,9 +6183,9 @@ var temml = (function () {
       // 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)]);
@@ -7585,12 +7585,6 @@ var temml = (function () {
 
   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);
@@ -7626,17 +7620,17 @@ var temml = (function () {
         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 {
@@ -7706,14 +7700,19 @@ var temml = (function () {
           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
   });
@@ -8275,7 +8274,7 @@ var temml = (function () {
     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];
         }
@@ -8893,7 +8892,7 @@ var temml = (function () {
   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;
@@ -9076,6 +9075,14 @@ var temml = (function () {
         // ":" 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;
     }
@@ -9443,7 +9450,9 @@ var temml = (function () {
         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");
+          node.setAttribute("rspace", "0");
         }
       }
       return node
@@ -10822,6 +10831,7 @@ var temml = (function () {
 
   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
@@ -11732,6 +11742,11 @@ var temml = (function () {
             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.
@@ -11989,7 +12004,7 @@ var temml = (function () {
    * https://mit-license.org/
    */
 
-  const version = "0.11.01";
+  const version = "0.11.02";
 
   function postProcess(block) {
     const labelMap = {};