temml 0.11.1 → 0.11.2

package/dist/temml.mjs

@@ -1770,7 +1770,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
@@ -1782,7 +1782,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`.
@@ -2750,17 +2750,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);
@@ -2887,8 +2887,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)
   }
 });
@@ -2963,13 +2963,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)]
       );
     }
 
@@ -8081,7 +8081,7 @@ defineFunction({
   }
 });
 
-const padding$1 = _ => {
+const padding = _ => {
   const node = new mathMLTree.MathNode("mspace");
   node.setAttribute("width", "3pt");
   return node
@@ -8094,9 +8094,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)]);
@@ -9496,12 +9496,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);
@@ -9537,17 +9531,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 {
@@ -9617,14 +9611,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
 });
@@ -10186,7 +10185,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];
       }
@@ -10804,7 +10803,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;
@@ -10987,6 +10986,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;
   }
@@ -11354,7 +11361,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
@@ -12733,6 +12742,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
@@ -13643,6 +13653,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.
@@ -13900,7 +13915,7 @@ class Style {
  * https://mit-license.org/
  */
 
-const version = "0.11.01";
+const version = "0.11.02";
 
 function postProcess(block) {
   const labelMap = {};

package/dist/temmlPostProcess.js

@@ -11,7 +11,7 @@
    * https://mit-license.org/
    */
 
-  const version = "0.11.01";
+  const version = "0.11.02";
 
   function postProcess(block) {
     const labelMap = {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "temml",
-  "version": "0.11.01",
+  "version": "0.11.02",
   "description": "TeX to MathML conversion in JavaScript.",
   "main": "dist/temml.js",
   "engines": {

package/src/Parser.js

@@ -17,6 +17,7 @@ import unicodeSymbols from /*preval*/ "./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
@@ -926,7 +927,12 @@ export default class Parser {
           family,
           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.

package/src/functions/arrow.js

@@ -6,7 +6,7 @@ import * as mml from "../buildMathML";
 
 // Helper functions
 
-const padding = width => {
+export const padding = width => {
   const node = new mathMLTree.MathNode("mspace")
   node.setAttribute("width", width + "em")
   return node

package/src/functions/mclass.js

@@ -1,18 +1,13 @@
 import defineFunction, { ordargument } from "../defineFunction";
 import symbols from "../symbols";
 import mathMLTree from "../mathMLTree";
-import utils from "../utils";
+import utils from "../utils.js"
+import { padding } from "./arrow";
 
 import * as mml from "../buildMathML";
 
 const textAtomTypes = ["text", "textord", "mathord", "atom"]
 
-const padding = width => {
-  const node = new mathMLTree.MathNode("mspace")
-  node.setAttribute("width", width + "em")
-  return node
-}
-
 function mathmlBuilder(group, style) {
   let node;
   const inner = mml.buildExpression(group.body, style);
@@ -128,14 +123,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
 });

package/src/functions/operatorname.js

@@ -19,7 +19,7 @@ const mathmlBuilder = (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]
       }

package/src/functions/supsub.js

@@ -19,7 +19,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

package/src/functions/symbolsOp.js

@@ -1,6 +1,7 @@
 import { defineFunctionBuilders } from "../defineFunction";
 import mathMLTree from "../mathMLTree";
 import * as mml from "../buildMathML";
+import { padding } from "./arrow";
 
 // Operator ParseNodes created in Parser.js from symbol Groups in src/symbols.js.
 
@@ -47,6 +48,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(0.222), node, padding(0.222)])
+      } else {
+        // REL spacing
+        return new mathMLTree.MathNode("mrow", [padding(0.2778), node, padding(0.2778)])
+      }
     }
     return node;
   }

package/src/functions/symbolsOrd.js

@@ -41,7 +41,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

package/src/postProcess.js

@@ -5,7 +5,7 @@
  * https://mit-license.org/
  */
 
-export const version = "0.11.01";
+export const version = "0.11.02";
 
 export function postProcess(block) {
   const labelMap = {}

package/src/symbols.js

@@ -895,7 +895,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
@@ -907,7 +907,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`.