temml 0.11.4 → 0.11.6

package/dist/temml.mjs

@@ -769,10 +769,12 @@ var mathMLTree = {
 // TODO: Remove when Chromium stretches \widetilde & \widehat
 const estimatedWidth = node => {
   let width = 0;
-  if (node.body) {
+  if (node.body && Array.isArray(node.body)) {
     for (const item of node.body) {
       width += estimatedWidth(item);
     }
+  } else if (node.body) {
+    width += estimatedWidth(node.body);
   } else if (node.type === "supsub") {
     width += estimatedWidth(node.base);
     if (node.sub) { width += 0.7 * estimatedWidth(node.sub); }
@@ -2454,9 +2456,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.
@@ -10568,7 +10567,8 @@ defineFunction({
   names: ["\\relax"],
   props: {
     numArgs: 0,
-    allowedInText: true
+    allowedInText: true,
+    allowedInArgument: true
   },
   handler({ parser }) {
     return {
@@ -12984,6 +12984,7 @@ class Parser {
       if (!atom) {
         break;
       } else if (atom.type === "internal") {
+        // Internal nodes do not appear in parse tree
         continue;
       }
       body.push(atom);
@@ -13058,7 +13059,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);
@@ -13102,9 +13107,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.
@@ -13961,7 +13972,7 @@ class Style {
  * https://mit-license.org/
  */
 
-const version = "0.11.04";
+const version = "0.11.06";
 
 function postProcess(block) {
   const labelMap = {};

package/dist/temmlPostProcess.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "temml",
-  "version": "0.11.04",
+  "version": "0.11.06",
   "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/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.04";
+export const version = "0.11.06";
 
 export function postProcess(block) {
   const labelMap = {}

package/src/stretchy.js

@@ -7,10 +7,12 @@ import mathMLTree from "./mathMLTree"
 // TODO: Remove when Chromium stretches \widetilde & \widehat
 const estimatedWidth = node => {
   let width = 0
-  if (node.body) {
+  if (node.body && Array.isArray(node.body)) {
     for (const item of node.body) {
       width += estimatedWidth(item)
     }
+  } else if (node.body) {
+    width += estimatedWidth(node.body)
   } else if (node.type === "supsub") {
     width += estimatedWidth(node.base)
     if (node.sub) { width += 0.7 * estimatedWidth(node.sub) }