temml 0.11.3 → 0.11.5

package/dist/temml.mjs

@@ -2454,9 +2454,6 @@ function buildMathML(tree, texExpression, style, settings) {
   if (settings.xml) {
     math.setAttribute("xmlns", "http://www.w3.org/1998/Math/MathML");
   }
-  if (wrapper.style.width) {
-    math.style.width = "100%";
-  }
   if (settings.displayMode) {
     math.setAttribute("display", "block");
     math.style.display = "block math"; // necessary in Chromium.
@@ -6464,7 +6461,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];
@@ -6924,7 +6921,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")) {
@@ -6953,7 +6952,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}
@@ -7387,6 +7388,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
@@ -8473,17 +8477,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].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++) {
@@ -10558,7 +10565,8 @@ defineFunction({
   names: ["\\relax"],
   props: {
     numArgs: 0,
-    allowedInText: true
+    allowedInText: true,
+    allowedInArgument: true
   },
   handler({ parser }) {
     return {
@@ -12974,6 +12982,7 @@ class Parser {
       if (!atom) {
         break;
       } else if (atom.type === "internal") {
+        // Internal nodes do not appear in parse tree
         continue;
       }
       body.push(atom);
@@ -13048,7 +13057,11 @@ class Parser {
     const symbol = symbolToken.text;
     this.consume();
     this.consumeSpaces(); // ignore spaces before sup/subscript argument
-    const group = this.parseGroup(name);
+    // Skip over allowed internal nodes such as \relax
+    let group;
+    do {
+      group = this.parseGroup(name);
+    } while (group.type && group.type === "internal")
 
     if (!group) {
       throw new ParseError("Expected group after '" + symbol + "'", symbolToken);
@@ -13092,9 +13105,15 @@ class Parser {
     // \left(x\right)^2 work correctly.
     const base = this.parseGroup("atom", breakOnTokenText);
 
+    // Internal nodes (e.g. \relax) cannot support super/subscripts.
+    // Instead we will pick up super/subscripts with blank base next round.
+    if (base && base.type === "internal") {
+      return base
+    }
+
     // In text mode, we don't have superscripts or subscripts
     if (this.mode === "text") {
-      return base;
+      return base
     }
 
     // Note that base may be empty (i.e. null) at this point.
@@ -13951,7 +13970,7 @@ class Style {
  * https://mit-license.org/
  */
 
-const version = "0.11.03";
+const version = "0.11.05";
 
 function postProcess(block) {
   const labelMap = {};

package/dist/temmlPostProcess.js

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

package/package.json

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

package/src/Parser.js

@@ -213,6 +213,7 @@ export default class Parser {
       if (!atom) {
         break;
       } else if (atom.type === "internal") {
+        // Internal nodes do not appear in parse tree
         continue;
       }
       body.push(atom);
@@ -287,7 +288,11 @@ export default class Parser {
     const symbol = symbolToken.text;
     this.consume();
     this.consumeSpaces(); // ignore spaces before sup/subscript argument
-    const group = this.parseGroup(name);
+    // Skip over allowed internal nodes such as \relax
+    let group
+    do {
+      group = this.parseGroup(name);
+    } while (group.type && group.type === "internal")
 
     if (!group) {
       throw new ParseError("Expected group after '" + symbol + "'", symbolToken);
@@ -329,11 +334,17 @@ export default class Parser {
   parseAtom(breakOnTokenText) {
     // The body of an atom is an implicit group, so that things like
     // \left(x\right)^2 work correctly.
-    const base = this.parseGroup("atom", breakOnTokenText);
+    const base = this.parseGroup("atom", breakOnTokenText)
+
+    // Internal nodes (e.g. \relax) cannot support super/subscripts.
+    // Instead we will pick up super/subscripts with blank base next round.
+    if (base && base.type === "internal") {
+      return base
+    }
 
     // In text mode, we don't have superscripts or subscripts
     if (this.mode === "text") {
-      return base;
+      return base
     }
 
     // Note that base may be empty (i.e. null) at this point.

package/src/buildMathML.js

@@ -341,9 +341,6 @@ export default function buildMathML(tree, texExpression, style, settings) {
   if (settings.xml) {
     math.setAttribute("xmlns", "http://www.w3.org/1998/Math/MathML")
   }
-  if (wrapper.style.width) {
-    math.style.width = "100%"
-  }
   if (settings.displayMode) {
     math.setAttribute("display", "block");
     math.style.display = "block math" // necessary in Chromium.

package/src/environments/array.js

@@ -295,7 +295,7 @@ const mathmlBuilder = 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];
@@ -757,7 +757,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")) {
@@ -786,7 +788,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}

package/src/functions/color.js

@@ -156,6 +156,9 @@ const mathmlBuilder = (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 = mml.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

package/src/functions/font.js

@@ -30,17 +30,20 @@ const mathmlBuilder = (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].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++) {

package/src/functions/relax.js

@@ -5,7 +5,8 @@ defineFunction({
   names: ["\\relax"],
   props: {
     numArgs: 0,
-    allowedInText: true
+    allowedInText: true,
+    allowedInArgument: true
   },
   handler({ parser }) {
     return {

package/src/postProcess.js

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