temml 0.10.0 → 0.10.3

package/dist/temml.mjs

@@ -188,7 +188,7 @@ class Settings {
     this.leqno = utils.deflt(options.leqno, false);                // boolean
     this.errorColor = utils.deflt(options.errorColor, "#b22222");  // string
     this.macros = options.macros || {};
-    this.wrap = utils.deflt(options.wrap, "none");         // "none" | "tex" | "="
+    this.wrap = utils.deflt(options.wrap, "tex");                    // "tex" | "="
     this.xml = utils.deflt(options.xml, false);                     // boolean
     this.colorIsTextColor = utils.deflt(options.colorIsTextColor, false);  // booelean
     this.strict = utils.deflt(options.strict, false);    // boolean
@@ -666,7 +666,7 @@ class TextNode {
 
   /**
    * Converts the text node into a string
-   * (representing the text iteself).
+   * (representing the text itself).
    */
   toText() {
     return this.text;
@@ -843,7 +843,6 @@ defineSymbol(math, rel, "\u226a", "\\ll", true);
 defineSymbol(math, rel, "\u226b", "\\gg", true);
 defineSymbol(math, rel, "\u224d", "\\asymp", true);
 defineSymbol(math, rel, "\u2225", "\\parallel");
-defineSymbol(math, rel, "\u22c8", "\\bowtie", true);
 defineSymbol(math, rel, "\u2323", "\\smile", true);
 defineSymbol(math, rel, "\u2291", "\\sqsubseteq", true);
 defineSymbol(math, rel, "\u2292", "\\sqsupseteq", true);
@@ -1160,7 +1159,6 @@ defineSymbol(math, rel, "\u22d9", "\\gggtr");
 defineSymbol(math, bin, "\u22b2", "\\lhd");
 defineSymbol(math, bin, "\u22b3", "\\rhd");
 defineSymbol(math, rel, "\u2242", "\\eqsim", true);
-defineSymbol(math, rel, "\u22c8", "\\Join");
 defineSymbol(math, rel, "\u2251", "\\Doteq", true);
 defineSymbol(math, rel, "\u297d", "\\strictif", true);
 defineSymbol(math, rel, "\u297c", "\\strictfi", true);
@@ -1186,6 +1184,11 @@ defineSymbol(math, bin, "\u22ba", "\\intercal", true);
 defineSymbol(math, bin, "\u22d2", "\\doublecap");
 defineSymbol(math, bin, "\u22d3", "\\doublecup");
 defineSymbol(math, bin, "\u22a0", "\\boxtimes", true);
+defineSymbol(math, bin, "\u22c8", "\\bowtie", true);
+defineSymbol(math, bin, "\u22c8", "\\Join");
+defineSymbol(math, bin, "\u27d5", "\\leftouterjoin", true);
+defineSymbol(math, bin, "\u27d6", "\\rightouterjoin", true);
+defineSymbol(math, bin, "\u27d7", "\\fullouterjoin", true);
 
 // AMS Arrows
 // Note: unicode-math maps \u21e2 to their own function \rightdasharrow.
@@ -1744,10 +1747,12 @@ for (let i = 0; i < 10; i++) {
  * Then the top level of a <math> element can be occupied by <mrow> elements, and the browser
  * will break after a <mrow> if the expression extends beyond the container limit.
  *
- * We want the expression to render with soft line breaks after each top-level binary or
+ * The default is for soft line breaks after each top-level binary or
  * relational operator, per TeXbook p. 173. So we gather the expression into <mrow>s so that
  * each <mrow> ends in a binary or relational operator.
  *
+ * An option is for soft line breaks before an "=" sign. That changes the <mrow>s.
+ *
  * Soft line breaks will not work in Chromium and Safari, only Firefox.
  *
  * Hopefully browsers will someday do their own linebreaking and we will be able to delete
@@ -1890,7 +1895,7 @@ function setLineBreaks(expression, wrapMode, isDisplayMode, color) {
 }
 
 /**
- * This file converts a parse tree into a cooresponding MathML tree. The main
+ * This file converts a parse tree into a corresponding MathML tree. The main
  * entry point is the `buildMathML` function, which takes a parse tree from the
  * parser.
  */
@@ -2093,18 +2098,6 @@ function buildMathML(tree, texExpression, style, settings) {
     wrapper = new mathMLTree.MathNode("semantics", [wrapper, annotation]);
   }
 
-  if (wrap !== "none" && wrapper.children.length > 1) {
-    const maths = [];
-    for (let i = 0; i < wrapper.children.length; i++) {
-      const math = new mathMLTree.MathNode("math", [wrapper.children[i]]);
-      if (settings.xml) {
-        math.setAttribute("xmlns", "http://www.w3.org/1998/Math/MathML");
-      }
-      maths.push(math);
-    }
-    return mathMLTree.newDocumentFragment(maths)
-  }
-
   const math = new mathMLTree.MathNode("math", [wrapper]);
 
   if (settings.xml) {
@@ -2112,6 +2105,9 @@ function buildMathML(tree, texExpression, style, settings) {
   }
   if (settings.displayMode) {
     math.setAttribute("display", "block");
+    math.style.display = math.children.length === 1 && math.children[0].type === "mtable"
+      ? "inline"
+      : "inline-block";
   }
   return math;
 }
@@ -3521,6 +3517,11 @@ const delimiters = [
   "."
 ];
 
+// Export isDelimiter for benefit of parser.
+const dels = ["}", "\\left", "\\middle", "\\right"];
+const isDelimiter = str => str.length > 0 &&
+  (delimiters.includes(str) || delimiterSizes[str] || dels.includes(str));
+
 // Metrics of the different sizes. Found by looking at TeX's output of
 // $\bigl| // \Bigl| \biggl| \Biggl| \showlists$
 // Used to create stacked delimiters of appropriate sizes in makeSizedDelim.
@@ -6203,10 +6204,6 @@ const noSuccessor = ["\\smallint"];
 // Math operators (e.g. \sin) need a space between these types and themselves:
 const ordTypes = ["textord", "mathord", "ordgroup", "close", "leftright"];
 
-const dels$1 = ["}", "\\left", "\\middle", "\\right"];
-const isDelimiter$1 = str => str.length > 0 &&
-  (delimiters.includes(str) || delimiterSizes[str] || dels$1.includes(str));
-
 // NOTE: Unlike most `builders`s, this one handles not only "op", but also
 // "supsub" since some of them (like \int) can affect super/subscripting.
 
@@ -6427,7 +6424,7 @@ defineFunction({
       parentIsSupSub: false,
       symbol: false,
       stack: false,
-      isFollowedByDelimiter: isDelimiter$1(next),
+      isFollowedByDelimiter: isDelimiter(next),
       needsLeadingSpace: prevAtomType.length > 0 && ordTypes.includes(prevAtomType),
       name: funcName
     };
@@ -6452,7 +6449,7 @@ defineFunction({
       parentIsSupSub: false,
       symbol: false,
       stack: false,
-      isFollowedByDelimiter: isDelimiter$1(next),
+      isFollowedByDelimiter: isDelimiter(next),
       needsLeadingSpace: prevAtomType.length > 0 && ordTypes.includes(prevAtomType),
       name: funcName
     };
@@ -6538,11 +6535,7 @@ function defineMacro(name, body) {
   _macros[name] = body;
 }
 
-const dels = ["}", "\\left", "\\middle", "\\right"];
-const isDelimiter = str => str.length > 0 &&
-  (delimiters.includes(str) || delimiterSizes[str] || dels.includes(str));
-
-  // NOTE: Unlike most builders, this one handles not only
+// NOTE: Unlike most builders, this one handles not only
 // "operatorname", but also  "supsub" since \operatorname* can
 // affect super/subscripting.
 
@@ -6552,8 +6545,12 @@ const mathmlBuilder$1 = (group, style) => {
   // Is expression a string or has it something like a fraction?
   let isAllString = true; // default
   for (let i = 0; i < expression.length; i++) {
-    const node = expression[i];
+    let node = expression[i];
     if (node instanceof mathMLTree.MathNode) {
+      if (node.type === "mrow" && node.children.length === 1 &&
+          node.children[0] instanceof mathMLTree.MathNode) {
+        node = node.children[0];
+      }
       switch (node.type) {
         case "mi":
         case "mn":
@@ -6611,7 +6608,9 @@ const mathmlBuilder$1 = (group, style) => {
   let wrapper;
   if (isAllString) {
     wrapper = new mathMLTree.MathNode("mi", expression);
-    wrapper.setAttribute("mathvariant", "normal");
+    if (expression[0].text.length === 1) {
+      wrapper.setAttribute("mathvariant", "normal");
+    }
   } else {
     wrapper = new mathMLTree.MathNode("mrow", expression);
   }
@@ -7149,6 +7148,7 @@ defineFunctionBuilders({
     let isOver;
     let isSup;
     let appendApplyFunction = false;
+    let appendSpace = false;
     let needsLeadingSpace = false;
 
     if (group.base && group.base.type === "horizBrace") {
@@ -7163,6 +7163,7 @@ defineFunctionBuilders({
       (group.base.type === "op" || group.base.type === "operatorname")) {
       group.base.parentIsSupSub = true;
       appendApplyFunction = !group.base.symbol;
+      appendSpace = appendApplyFunction && !group.isFollowedByDelimiter;
       needsLeadingSpace = group.base.needsLeadingSpace;
     }
 
@@ -7250,6 +7251,11 @@ defineFunctionBuilders({
       } else {
         node = mathMLTree.newDocumentFragment([node, operator]);
       }
+      if (appendSpace) {
+        const space = new mathMLTree.MathNode("mspace");
+        space.setAttribute("width", "0.1667em"); // thin space.
+        node.children.push(space);
+      }
     } else if (symbolRegEx.test(nodeType)) {
       // Wrap in a <mrow>. Otherwise Firefox stretchy parens will not stretch to include limits.
       node = new mathMLTree.MathNode("mrow", [node]);
@@ -8882,7 +8888,7 @@ defineMacro("\\incoh", `{\\mkern5mu\\rule{}{0.7em}\\mathrlap{\\smash{\\raise2mu{
 defineMacro("\\standardstate", "\\text{\\tiny\\char`⦵}");
 
 /* eslint-disable */
-/* -*- Mode: Javascript; indent-tabs-mode:nil; js-indent-level: 2 -*- */
+/* -*- Mode: JavaScript; indent-tabs-mode:nil; js-indent-level: 2 -*- */
 /* vim: set ts=2 et sw=2 tw=80: */
 
 /*************************************************************
@@ -10579,7 +10585,7 @@ defineMacro("\\tripleDashBetweenDoubleLine", `\\kern0.075em\\mathrlap{\\mathrlap
   };
 
   //
-  // Helpers for code anaylsis
+  // Helpers for code analysis
   // Will show type error at calling position
   //
   /** @param {number} a */
@@ -11004,15 +11010,15 @@ class MacroExpander {
    * Expand the next token only once if possible.
    *
    * If the token is expanded, the resulting tokens will be pushed onto
-   * the stack in reverse order and will be returned as an array,
-   * also in reverse order.
+   * the stack in reverse order, and the number of such tokens will be
+   * returned.  This number might be zero or positive.
    *
-   * If not, the next token will be returned without removing it
-   * from the stack.  This case can be detected by a `Token` return value
-   * instead of an `Array` return value.
+   * If not, the return value is `false`, and the next token remains at the
+   * top of the stack.
    *
    * In either case, the next token will be on the top of the stack,
-   * or the stack will be empty.
+   * or the stack will be empty (in case of empty expansion
+   * and no other tokens).
    *
    * Used to implement `expandAfterFuture` and `expandNextToken`.
    *
@@ -11028,7 +11034,7 @@ class MacroExpander {
         throw new ParseError("Undefined control sequence: " + name);
       }
       this.pushToken(topToken);
-      return topToken;
+      return false;
     }
     this.expansionCount++;
     if (this.expansionCount > this.settings.maxExpand) {
@@ -11062,7 +11068,7 @@ class MacroExpander {
     }
     // Concatenate expansion onto top of stack.
     this.pushTokens(tokens);
-    return tokens;
+    return tokens.length;
   }
 
   /**
@@ -11081,14 +11087,13 @@ class MacroExpander {
    */
   expandNextToken() {
     for (;;) {
-      const expanded = this.expandOnce();
-      // expandOnce returns Token if and only if it's fully expanded.
-      if (expanded instanceof Token) {
+      if (this.expandOnce() === false) { // fully expanded
+        const token = this.stack.pop();
         // The token after \noexpand is interpreted as if its meaning were ‘\relax’
-        if (expanded.treatAsRelax) {
-          expanded.text = "\\relax";
+        if (token.treatAsRelax) {
+          token.text = "\\relax";
         }
-        return this.stack.pop(); // === expanded
+        return token
       }
     }
 
@@ -11114,15 +11119,15 @@ class MacroExpander {
     const oldStackLength = this.stack.length;
     this.pushTokens(tokens);
     while (this.stack.length > oldStackLength) {
-      const expanded = this.expandOnce(true); // expand only expandable tokens
-      // expandOnce returns Token if and only if it's fully expanded.
-      if (expanded instanceof Token) {
-        if (expanded.treatAsRelax) {
+      // Expand only expandable tokens
+      if (this.expandOnce(true) === false) {  // fully expanded
+        const token = this.stack.pop();
+        if (token.treatAsRelax) {
           // the expansion of \noexpand is the token itself
-          expanded.noexpand = false;
-          expanded.treatAsRelax = false;
+          token.noexpand = false;
+          token.treatAsRelax = false;
         }
-        output.push(this.stack.pop());
+        output.push(token);
       }
     }
     return output;
@@ -11950,7 +11955,7 @@ class Parser {
    * Parses an "expression", which is a list of atoms.
    *
    * `breakOnInfix`: Should the parsing stop when we hit infix nodes? This
-   *                 happens when functions have higher precendence han infix
+   *                 happens when functions have higher precedence han infix
    *                 nodes in implicit parses.
    *
    * `breakOnTokenText`: The text of the token that the expression should end
@@ -12201,12 +12206,16 @@ class Parser {
         return base
       } else {
         // We got either a superscript or subscript, create a supsub
+        const isFollowedByDelimiter = (!base || base.type !== "op" && base.type !== "operatorname")
+          ? undefined
+          : isDelimiter(this.nextToken.text);
         return {
           type: "supsub",
           mode: this.mode,
           base: base,
           sup: superscript,
-          sub: subscript
+          sub: subscript,
+          isFollowedByDelimiter
         }
       }
     } else {
@@ -12367,7 +12376,7 @@ class Parser {
     while (true) {
       const ch = this.fetch().text;
       // \ufe0e is the Unicode variation selector to supress emoji. Ignore it.
-      if (ch === " " || ch === "\ufe0e") {
+      if (ch === " " || ch === "\u00a0" || ch === "\ufe0e") {
         this.consume();
       } else {
         break
@@ -12959,7 +12968,7 @@ class Style {
  * https://mit-license.org/
  */
 
-const version = "0.10.0";
+const version = "0.10.3";
 
 function postProcess(block) {
   const labelMap = {};

package/dist/temmlPostProcess.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "temml",
-  "version": "0.10.0",
+  "version": "0.10.3",
   "description": "TeX to MathML conversion in JavaScript.",
   "main": "dist/temml.js",
   "homepage": "https://temml.org",
@@ -8,6 +8,7 @@
     "type": "git",
     "url": "git://github.com/ronkok/Temml"
   },
+  "packageManager": "yarn@3.3.1",
   "files": [
     "temml.js",
     "src/",

package/src/MacroExpander.js

@@ -230,15 +230,15 @@ export default class MacroExpander {
    * Expand the next token only once if possible.
    *
    * If the token is expanded, the resulting tokens will be pushed onto
-   * the stack in reverse order and will be returned as an array,
-   * also in reverse order.
+   * the stack in reverse order, and the number of such tokens will be
+   * returned.  This number might be zero or positive.
    *
-   * If not, the next token will be returned without removing it
-   * from the stack.  This case can be detected by a `Token` return value
-   * instead of an `Array` return value.
+   * If not, the return value is `false`, and the next token remains at the
+   * top of the stack.
    *
    * In either case, the next token will be on the top of the stack,
-   * or the stack will be empty.
+   * or the stack will be empty (in case of empty expansion
+   * and no other tokens).
    *
    * Used to implement `expandAfterFuture` and `expandNextToken`.
    *
@@ -254,7 +254,7 @@ export default class MacroExpander {
         throw new ParseError("Undefined control sequence: " + name);
       }
       this.pushToken(topToken);
-      return topToken;
+      return false;
     }
     this.expansionCount++;
     if (this.expansionCount > this.settings.maxExpand) {
@@ -288,7 +288,7 @@ export default class MacroExpander {
     }
     // Concatenate expansion onto top of stack.
     this.pushTokens(tokens);
-    return tokens;
+    return tokens.length;
   }
 
   /**
@@ -307,14 +307,13 @@ export default class MacroExpander {
    */
   expandNextToken() {
     for (;;) {
-      const expanded = this.expandOnce();
-      // expandOnce returns Token if and only if it's fully expanded.
-      if (expanded instanceof Token) {
+      if (this.expandOnce() === false) { // fully expanded
+        const token = this.stack.pop();
         // The token after \noexpand is interpreted as if its meaning were ‘\relax’
-        if (expanded.treatAsRelax) {
-          expanded.text = "\\relax"
+        if (token.treatAsRelax) {
+          token.text = "\\relax"
         }
-        return this.stack.pop(); // === expanded
+        return token
       }
     }
 
@@ -340,15 +339,15 @@ export default class MacroExpander {
     const oldStackLength = this.stack.length;
     this.pushTokens(tokens);
     while (this.stack.length > oldStackLength) {
-      const expanded = this.expandOnce(true); // expand only expandable tokens
-      // expandOnce returns Token if and only if it's fully expanded.
-      if (expanded instanceof Token) {
-        if (expanded.treatAsRelax) {
+      // Expand only expandable tokens
+      if (this.expandOnce(true) === false) {  // fully expanded
+        const token = this.stack.pop();
+        if (token.treatAsRelax) {
           // the expansion of \noexpand is the token itself
-          expanded.noexpand = false;
-          expanded.treatAsRelax = false;
+          token.noexpand = false;
+          token.treatAsRelax = false;
         }
-        output.push(this.stack.pop());
+        output.push(token);
       }
     }
     return output;

package/src/Parser.js

@@ -10,6 +10,7 @@ import { uSubsAndSups, unicodeSubRegEx } from "./unicodeSupOrSub"
 import { asciiFromScript } from "./asciiFromScript"
 import SourceLocation from "./SourceLocation";
 import { Token } from "./Token";
+import { isDelimiter } from "./functions/delimsizing"
 
 // Pre-evaluate both modules as unicodeSymbols require String.normalize()
 import unicodeAccents from /*preval*/ "./unicodeAccents";
@@ -173,7 +174,7 @@ export default class Parser {
    * Parses an "expression", which is a list of atoms.
    *
    * `breakOnInfix`: Should the parsing stop when we hit infix nodes? This
-   *                 happens when functions have higher precendence han infix
+   *                 happens when functions have higher precedence han infix
    *                 nodes in implicit parses.
    *
    * `breakOnTokenText`: The text of the token that the expression should end
@@ -424,12 +425,16 @@ export default class Parser {
         return base
       } else {
         // We got either a superscript or subscript, create a supsub
+        const isFollowedByDelimiter = (!base || base.type !== "op" && base.type !== "operatorname")
+          ? undefined
+          : isDelimiter(this.nextToken.text);
         return {
           type: "supsub",
           mode: this.mode,
           base: base,
           sup: superscript,
-          sub: subscript
+          sub: subscript,
+          isFollowedByDelimiter
         }
       }
     } else {
@@ -590,7 +595,7 @@ export default class Parser {
     while (true) {
       const ch = this.fetch().text
       // \ufe0e is the Unicode variation selector to supress emoji. Ignore it.
-      if (ch === " " || ch === "\ufe0e") {
+      if (ch === " " || ch === "\u00a0" || ch === "\ufe0e") {
         this.consume()
       } else {
         break

package/src/Settings.js

@@ -17,7 +17,7 @@ export default class Settings {
     this.leqno = utils.deflt(options.leqno, false);                // boolean
     this.errorColor = utils.deflt(options.errorColor, "#b22222");  // string
     this.macros = options.macros || {};
-    this.wrap = utils.deflt(options.wrap, "none")         // "none" | "tex" | "="
+    this.wrap = utils.deflt(options.wrap, "tex")                    // "tex" | "="
     this.xml = utils.deflt(options.xml, false);                     // boolean
     this.colorIsTextColor = utils.deflt(options.colorIsTextColor, false);  // booelean
     this.strict = utils.deflt(options.strict, false);    // boolean

package/src/buildMathML.js

@@ -1,5 +1,5 @@
 /**
- * This file converts a parse tree into a cooresponding MathML tree. The main
+ * This file converts a parse tree into a corresponding MathML tree. The main
  * entry point is the `buildMathML` function, which takes a parse tree from the
  * parser.
  */
@@ -209,18 +209,6 @@ export default function buildMathML(tree, texExpression, style, settings) {
     wrapper = new mathMLTree.MathNode("semantics", [wrapper, annotation]);
   }
 
-  if (wrap !== "none" && wrapper.children.length > 1) {
-    const maths = []
-    for (let i = 0; i < wrapper.children.length; i++) {
-      const math = new mathMLTree.MathNode("math", [wrapper.children[i]])
-      if (settings.xml) {
-        math.setAttribute("xmlns", "http://www.w3.org/1998/Math/MathML")
-      }
-      maths.push(math)
-    }
-    return mathMLTree.newDocumentFragment(maths)
-  }
-
   const math = new mathMLTree.MathNode("math", [wrapper])
 
   if (settings.xml) {
@@ -228,6 +216,9 @@ export default function buildMathML(tree, texExpression, style, settings) {
   }
   if (settings.displayMode) {
     math.setAttribute("display", "block");
+    math.style.display = math.children.length === 1 && math.children[0].type === "mtable"
+      ? "inline"
+      : "inline-block"
   }
   return math;
 }

package/src/functions/delimsizing.js

@@ -89,6 +89,11 @@ export const delimiters = [
   "."
 ];
 
+// Export isDelimiter for benefit of parser.
+const dels = ["}", "\\left", "\\middle", "\\right"]
+export const isDelimiter = str => str.length > 0 &&
+  (delimiters.includes(str) || delimiterSizes[str] || dels.includes(str))
+
 // Metrics of the different sizes. Found by looking at TeX's output of
 // $\bigl| // \Bigl| \biggl| \Biggl| \showlists$
 // Used to create stacked delimiters of appropriate sizes in makeSizedDelim.

package/src/functions/op.js

@@ -2,7 +2,7 @@
 import defineFunction, { ordargument } from "../defineFunction";
 import * as mathMLTree from "../mathMLTree";
 import * as mml from "../buildMathML";
-import { delimiters, delimiterSizes } from "./delimsizing"
+import { isDelimiter } from "./delimsizing"
 
 // Some helpers
 
@@ -14,10 +14,6 @@ const noSuccessor = ["\\smallint"];
 // Math operators (e.g. \sin) need a space between these types and themselves:
 export const ordTypes = ["textord", "mathord", "ordgroup", "close", "leftright"];
 
-const dels = ["}", "\\left", "\\middle", "\\right"]
-const isDelimiter = str => str.length > 0 &&
-  (delimiters.includes(str) || delimiterSizes[str] || dels.includes(str))
-
 // NOTE: Unlike most `builders`s, this one handles not only "op", but also
 // "supsub" since some of them (like \int) can affect super/subscripting.
 

package/src/functions/operatorname.js

@@ -3,15 +3,11 @@ import defineMacro from "../defineMacro";
 import mathMLTree from "../mathMLTree"
 import { spaceCharacter } from "./kern"
 import { ordTypes } from "./op"
-import { delimiters, delimiterSizes } from "./delimsizing"
+import { isDelimiter } from "./delimsizing"
 
 import * as mml from "../buildMathML"
 
-const dels = ["}", "\\left", "\\middle", "\\right"]
-const isDelimiter = str => str.length > 0 &&
-  (delimiters.includes(str) || delimiterSizes[str] || dels.includes(str))
-
-  // NOTE: Unlike most builders, this one handles not only
+// NOTE: Unlike most builders, this one handles not only
 // "operatorname", but also  "supsub" since \operatorname* can
 // affect super/subscripting.
 
@@ -21,8 +17,12 @@ const mathmlBuilder = (group, style) => {
   // Is expression a string or has it something like a fraction?
   let isAllString = true; // default
   for (let i = 0; i < expression.length; i++) {
-    const node = expression[i]
+    let node = expression[i]
     if (node instanceof mathMLTree.MathNode) {
+      if (node.type === "mrow" && node.children.length === 1 &&
+          node.children[0] instanceof mathMLTree.MathNode) {
+        node = node.children[0]
+      }
       switch (node.type) {
         case "mi":
         case "mn":
@@ -80,7 +80,9 @@ const mathmlBuilder = (group, style) => {
   let wrapper;
   if (isAllString) {
     wrapper = new mathMLTree.MathNode("mi", expression)
-    wrapper.setAttribute("mathvariant", "normal")
+    if (expression[0].text.length === 1) {
+      wrapper.setAttribute("mathvariant", "normal")
+    }
   } else {
     wrapper = new mathMLTree.MathNode("mrow", expression)
   }

package/src/functions/supsub.js

@@ -24,6 +24,7 @@ defineFunctionBuilders({
     let isOver
     let isSup
     let appendApplyFunction = false
+    let appendSpace = false
     let needsLeadingSpace = false
 
     if (group.base && group.base.type === "horizBrace") {
@@ -38,6 +39,7 @@ defineFunctionBuilders({
       (group.base.type === "op" || group.base.type === "operatorname")) {
       group.base.parentIsSupSub = true
       appendApplyFunction = !group.base.symbol
+      appendSpace = appendApplyFunction && !group.isFollowedByDelimiter
       needsLeadingSpace = group.base.needsLeadingSpace
     }
 
@@ -125,6 +127,11 @@ defineFunctionBuilders({
       } else {
         node = mathMLTree.newDocumentFragment([node, operator])
       }
+      if (appendSpace) {
+        const space = new mathMLTree.MathNode("mspace")
+        space.setAttribute("width", "0.1667em") // thin space.
+        node.children.push(space)
+      }
     } else if (symbolRegEx.test(nodeType)) {
       // Wrap in a <mrow>. Otherwise Firefox stretchy parens will not stretch to include limits.
       node = new mathMLTree.MathNode("mrow", [node])

package/src/linebreaking.js

@@ -13,10 +13,12 @@ import mathMLTree from "./mathMLTree"
  * Then the top level of a <math> element can be occupied by <mrow> elements, and the browser
  * will break after a <mrow> if the expression extends beyond the container limit.
  *
- * We want the expression to render with soft line breaks after each top-level binary or
+ * The default is for soft line breaks after each top-level binary or
  * relational operator, per TeXbook p. 173. So we gather the expression into <mrow>s so that
  * each <mrow> ends in a binary or relational operator.
  *
+ * An option is for soft line breaks before an "=" sign. That changes the <mrow>s.
+ *
  * Soft line breaks will not work in Chromium and Safari, only Firefox.
  *
  * Hopefully browsers will someday do their own linebreaking and we will be able to delete