temml 0.10.12 → 0.10.14

package/dist/temml.js

@@ -971,6 +971,7 @@ var temml = (function () {
   defineSymbol(math, rel, "\u2196", "\\nwarrow", true);
   defineSymbol(math, rel, "\u21cc", "\\rightleftharpoons", true);
   defineSymbol(math, mathord, "\u21af", "\\lightning", true);
+  defineSymbol(math, mathord, "\u220E", "\\QED", true);
   defineSymbol(math, mathord, "\u2030", "\\permil", true);
   defineSymbol(text, textord, "\u2030", "\\permil");
 
@@ -1117,6 +1118,7 @@ var temml = (function () {
   defineSymbol(math, rel, "\u22b2", "\\vartriangleleft");
   defineSymbol(math, rel, "\u22b4", "\\trianglelefteq");
   defineSymbol(math, rel, "\u22a8", "\\vDash", true);
+  defineSymbol(math, rel, "\u22ab", "\\VDash", true);
   defineSymbol(math, rel, "\u22aa", "\\Vvdash", true);
   defineSymbol(math, rel, "\u2323", "\\smallsmile");
   defineSymbol(math, rel, "\u2322", "\\smallfrown");
@@ -1766,13 +1768,16 @@ var temml = (function () {
    * much of this module.
    */
 
+  const openDelims = "([{⌊⌈⟨⟮⎰⟦⦃";
+  const closeDelims = ")]}⌋⌉⟩⟯⎱⟦⦄";
+
   function setLineBreaks(expression, wrapMode, isDisplayMode) {
     const mtrs = [];
     let mrows = [];
     let block = [];
     let numTopLevelEquals = 0;
-    let canBeBIN = false; // The first node cannot be an infix binary operator.
     let i = 0;
+    let level = 0;
     while (i < expression.length) {
       while (expression[i] instanceof DocumentFragment) {
         expression.splice(i, 1, ...expression[i].children); // Expand the fragment.
@@ -1795,7 +1800,12 @@ var temml = (function () {
       }
       block.push(node);
       if (node.type && node.type === "mo" && node.children.length === 1) {
-        if (wrapMode === "=" && node.children[0].text === "=") {
+        const ch = node.children[0].text;
+        if (openDelims.indexOf(ch) > -1) {
+          level += 1;
+        } else if (closeDelims.indexOf(ch) > -1) {
+          level -= 1;
+        } else if (level === 0 && wrapMode === "=" && ch === "=") {
           numTopLevelEquals += 1;
           if (numTopLevelEquals > 1) {
             block.pop();
@@ -1804,59 +1814,48 @@ var temml = (function () {
             mrows.push(element);
             block = [node];
           }
-        } else if (wrapMode === "tex") {
-          // This may be a place for a soft line break.
-          if (canBeBIN && !node.attributes.form) {
-            // Check if the following node is a \nobreak text node, e.g. "~""
-            const next = i < expression.length - 1 ? expression[i + 1] : null;
-            let glueIsFreeOfNobreak = true;
-            if (
-              !(
-                next &&
-                next.type === "mtext" &&
-                next.attributes.linebreak &&
-                next.attributes.linebreak === "nobreak"
-              )
-            ) {
-              // We may need to start a new block.
-              // First, put any post-operator glue on same line as operator.
-              for (let j = i + 1; j < expression.length; j++) {
-                const nd = expression[j];
+        } else if (level === 0 && wrapMode === "tex") {
+          // Check if the following node is a \nobreak text node, e.g. "~""
+          const next = i < expression.length - 1 ? expression[i + 1] : null;
+          let glueIsFreeOfNobreak = true;
+          if (
+            !(
+              next &&
+              next.type === "mtext" &&
+              next.attributes.linebreak &&
+              next.attributes.linebreak === "nobreak"
+            )
+          ) {
+            // We may need to start a new block.
+            // First, put any post-operator glue on same line as operator.
+            for (let j = i + 1; j < expression.length; j++) {
+              const nd = expression[j];
+              if (
+                nd.type &&
+                nd.type === "mspace" &&
+                !(nd.attributes.linebreak && nd.attributes.linebreak === "newline")
+              ) {
+                block.push(nd);
+                i += 1;
                 if (
-                  nd.type &&
-                  nd.type === "mspace" &&
-                  !(nd.attributes.linebreak && nd.attributes.linebreak === "newline")
+                  nd.attributes &&
+                  nd.attributes.linebreak &&
+                  nd.attributes.linebreak === "nobreak"
                 ) {
-                  block.push(nd);
-                  i += 1;
-                  if (
-                    nd.attributes &&
-                    nd.attributes.linebreak &&
-                    nd.attributes.linebreak === "nobreak"
-                  ) {
-                    glueIsFreeOfNobreak = false;
-                  }
-                } else {
-                  break;
+                  glueIsFreeOfNobreak = false;
                 }
+              } else {
+                break;
               }
             }
-            if (glueIsFreeOfNobreak) {
-              // Start a new block. (Insert a soft linebreak.)
-              const element = new mathMLTree.MathNode("mrow", block);
-              mrows.push(element);
-              block = [];
-            }
-            canBeBIN = false;
           }
-          const isOpenDelimiter = node.attributes.form && node.attributes.form === "prefix";
-          // Any operator that follows an open delimiter is unary.
-          canBeBIN = !(node.attributes.separator || isOpenDelimiter);
-        } else {
-          canBeBIN = true;
+          if (glueIsFreeOfNobreak) {
+            // Start a new block. (Insert a soft linebreak.)
+            const element = new mathMLTree.MathNode("mrow", block);
+            mrows.push(element);
+            block = [];
+          }
         }
-      } else {
-        canBeBIN = true;
       }
       i += 1;
     }
@@ -2135,7 +2134,10 @@ var temml = (function () {
       math.setAttribute("display", "block");
       math.style.display = math.children.length === 1 && math.children[0].type === "mtable"
         ? "inline"
-        : "block math";
+        : "block math"; // necessary in Chromium.
+      // Firefox and Safari do not recognize display: "block math".
+      // Set a class so that the CSS file can set display: block.
+      math.classes = ["tml-display"];
     }
     return math;
   }
@@ -2419,43 +2421,69 @@ var temml = (function () {
     return new mathMLTree.MathNode("mrow", row)
   };
 
-  const labelSize = (size, scriptLevel) =>  (size / emScale(scriptLevel)).toFixed(4);
+  const labelSize = (size, scriptLevel) =>  Number(size) / emScale(scriptLevel);
 
-  const munderoverNode = (name, body, below, style) => {
-    const arrowNode = stretchy.mathMLnode(name);
+  const munderoverNode = (fName, body, below, style) => {
+    const arrowNode = stretchy.mathMLnode(fName);
     // Is this the short part of a mhchem equilibrium arrow?
-    const isEq = name.slice(1, 3) === "eq";
-    const minWidth = name.charAt(1) === "x"
-      ? "1.75"  // mathtools extensible arrows are 1.75em long
-      : name.slice(2, 4) === "cd"
+    const isEq = fName.slice(1, 3) === "eq";
+    const minWidth = fName.charAt(1) === "x"
+      ? "1.75"  // mathtools extensible arrows are ≥ 1.75em long
+      : fName.slice(2, 4) === "cd"
       ? "3.0"  // cd package arrows
       : isEq
       ? "1.0"  // The shorter harpoon of a mhchem equilibrium arrow
       : "2.0"; // other mhchem arrows
-    arrowNode.setAttribute("minsize", String(minWidth) + "em");
+    // TODO: When Firefox supports minsize, use the next line.
+    //arrowNode.setAttribute("minsize", String(minWidth) + "em")
     arrowNode.setAttribute("lspace", "0");
     arrowNode.setAttribute("rspace", (isEq ? "0.5em" : "0"));
 
     // <munderover> upper and lower labels are set to scriptlevel by MathML
-    // So we have to adjust our dimensions accordingly.
+    // So we have to adjust our label dimensions accordingly.
     const labelStyle = style.withLevel(style.level < 2 ? 2 : 3);
-    const emptyLabelWidth = labelSize(minWidth, labelStyle.level);
-    const lspace = labelSize((isEq ? 0 : 0.3), labelStyle.level);
-    const rspace = labelSize((isEq ? 0 : 0.3), labelStyle.level);
-
-    const upperNode = (body && body.body &&
+    const minArrowWidth = labelSize(minWidth, labelStyle.level);
+    // The dummyNode will be inside a <mover> inside a <mover>
+    // So it will be at scriptlevel 3
+    const dummyWidth = labelSize(minWidth, 3);
+    const emptyLabel = paddedNode(null, minArrowWidth.toFixed(4), 0);
+    const dummyNode = paddedNode(null, dummyWidth.toFixed(4), 0);
+    // The arrow is a little longer than the label. Set a spacer length.
+    const space = labelSize((isEq ? 0 : 0.3), labelStyle.level).toFixed(4);
+    let upperNode;
+    let lowerNode;
+
+    const gotUpper = (body && body.body &&
       // \hphantom        visible content
-      (body.body.body || body.body.length > 0))
-      ? paddedNode(buildGroup$1(body, labelStyle), lspace, rspace)
-        // Since Firefox does not recognize minsize set on the arrow,
-        // create an upper node w/correct width.
-      : paddedNode(null, emptyLabelWidth, 0);
-    const lowerNode = (below && below.body &&
-      (below.body.body || below.body.length > 0))
-      ? paddedNode(buildGroup$1(below, labelStyle), lspace, rspace)
-      : paddedNode(null, emptyLabelWidth, 0);
-    const node = new mathMLTree.MathNode("munderover", [arrowNode, lowerNode, upperNode]);
-    if (minWidth === "3.0") { node.style.height = "1em"; }
+      (body.body.body || body.body.length > 0));
+    if (gotUpper) {
+      let label =  buildGroup$1(body, labelStyle);
+      label = paddedNode(label, space, space);
+      // Since Firefox does not support minsize, stack a invisible node
+      // on top of the label. Its width will serve as a min-width.
+      // TODO: Refactor this after Firefox supports minsize.
+      upperNode = new mathMLTree.MathNode("mover", [label, dummyNode]);
+    }
+    const gotLower = (below && below.body &&
+      (below.body.body || below.body.length > 0));
+    if (gotLower) {
+      let label =  buildGroup$1(below, labelStyle);
+      label = paddedNode(label, space, space);
+      lowerNode = new mathMLTree.MathNode("munder", [label, dummyNode]);
+    }
+
+    let node;
+    if (!gotUpper && !gotLower) {
+      node = new mathMLTree.MathNode("mover", [arrowNode, emptyLabel]);
+    } else if (gotUpper && gotLower) {
+      node = new mathMLTree.MathNode("munderover", [arrowNode, lowerNode, upperNode]);
+    } else if (gotUpper) {
+      node = new mathMLTree.MathNode("mover", [arrowNode, upperNode]);
+    } else {
+      node = new mathMLTree.MathNode("munder", [arrowNode, lowerNode]);
+    }
+    if (minWidth === "3.0") { node.style.height = "1em"; } // CD environment
+    node.setAttribute("accent", "false"); // Necessary for MS Word
     return node
   };
 
@@ -2534,7 +2562,7 @@ var temml = (function () {
       "\\xleftrightharpoons",   // mathtools
       "\\xrightleftharpoons",   // mathtools
       "\\yieldsLeftRight",      // mhchem
-      "\\equilibrium",           // mhchem
+      "\\equilibrium",          // mhchem
       "\\equilibriumRight",
       "\\equilibriumLeft"
     ],
@@ -3638,10 +3666,9 @@ var temml = (function () {
         // so we have to explicitly set stretchy to true.
         node.setAttribute("stretchy", "true");
       }
-
       node.setAttribute("symmetric", "true"); // Needed for tall arrows in Firefox.
       node.setAttribute("minsize", sizeToMaxHeight[group.size] + "em");
-      // Don't set the maxsize attribute. It's broken in Chromium.
+      node.setAttribute("maxsize", sizeToMaxHeight[group.size] + "em");
       return node;
     }
   });
@@ -3776,33 +3803,31 @@ var temml = (function () {
 
   const mathmlBuilder$8 = (group, style) => {
     let node;
-    if (group.label.indexOf("colorbox") > -1) {
-      // Chrome mpadded +width attribute is broken. Insert <mspace>
-      node = new mathMLTree.MathNode("mpadded", [
+    if (group.label.indexOf("colorbox") > -1 || group.label === "\\boxed") {
+      // MathML core does not support +width attribute in <mpadded>.
+      // Firefox does not reliably add side padding.
+      // Insert <mspace>
+      node = new mathMLTree.MathNode("mrow", [
         padding$1(),
         buildGroup$1(group.body, style),
         padding$1()
       ]);
     } else {
-      node = new mathMLTree.MathNode("menclose", [buildGroup$1(group.body, style)]);
+      node = new mathMLTree.MathNode("mrow", [buildGroup$1(group.body, style)]);
     }
     switch (group.label) {
       case "\\overline":
-        node.setAttribute("notation", "top");
         node.style.padding = "0.1em 0 0 0";
         node.style.borderTop = "0.065em solid";
         break
       case "\\underline":
-        node.setAttribute("notation", "bottom");
         node.style.padding = "0 0 0.1em 0";
         node.style.borderBottom = "0.065em solid";
         break
       case "\\cancel":
-        node.setAttribute("notation", "updiagonalstrike");
         node.classes.push("cancel");
         break
       case "\\bcancel":
-        node.setAttribute("notation", "downdiagonalstrike");
         node.classes.push("bcancel");
         break
       /*
@@ -3813,18 +3838,21 @@ var temml = (function () {
         node.setAttribute("notation", "phasorangle");
         break */
       case "\\angl":
-        node.setAttribute("notation", "actuarial");
         node.style.padding = "0.03889em 0.03889em 0 0.03889em";
         node.style.borderTop = "0.049em solid";
         node.style.borderRight = "0.049em solid";
         node.style.marginRight = "0.03889em";
         break
       case "\\sout":
-        node.setAttribute("notation", "horizontalstrike");
         node.style["text-decoration"] = "line-through 0.08em solid";
         break
+      case "\\boxed":
+        // \newcommand{\boxed}[1]{\fbox{\m@th$\displaystyle#1$}} from amsmath.sty
+        node.style = { padding: "3pt 0 3pt 0", border: "1px solid" };
+        node.setAttribute("scriptlevel", "0");
+        node.setAttribute("displaystyle", "true");
+        break
       case "\\fbox":
-        node.setAttribute("notation", "box");
         node.style = { padding: "3pt", border: "1px solid" };
         break
       case "\\fcolorbox":
@@ -3844,7 +3872,6 @@ var temml = (function () {
         break
       }
       case "\\xcancel":
-        node.setAttribute("notation", "updiagonalstrike downdiagonalstrike");
         node.classes.push("xcancel");
         break
     }
@@ -3939,7 +3966,7 @@ var temml = (function () {
 
   defineFunction({
     type: "enclose",
-    names: ["\\angl", "\\cancel", "\\bcancel", "\\xcancel", "\\sout", "\\overline"],
+    names: ["\\angl", "\\cancel", "\\bcancel", "\\xcancel", "\\sout", "\\overline", "\\boxed"],
      // , "\\phase", "\\longdiv"
     props: {
       numArgs: 1
@@ -6805,8 +6832,6 @@ var temml = (function () {
     }
   });
 
-  const sign = num => num >= 0 ? "+" : "-";
-
   // \raise, \lower, and \raisebox
 
   const mathmlBuilder = (group, style) => {
@@ -6814,11 +6839,13 @@ var temml = (function () {
     const node = new mathMLTree.MathNode("mpadded", [buildGroup$1(group.body, newStyle)]);
     const dy = calculateSize(group.dy, style);
     node.setAttribute("voffset", dy.number + dy.unit);
-    const dyAbs = Math.abs(dy.number);
-    // The next two lines do not work in Chromium.
-    // TODO: Find some other way to adjust height and depth.
-    node.setAttribute("height", sign(dy.number) +  dyAbs + dy.unit);
-    node.setAttribute("depth", sign(-dy.number) +  dyAbs + dy.unit);
+    // Add padding, which acts to increase height in Chromium.
+    // TODO: Figure out some way to change height in Firefox w/o breaking Chromium.
+    if (dy.number > 0) {
+      node.style.padding = dy.number + dy.unit + " 0 0 0";
+    } else {
+      node.style.padding = "0 0 " + Math.abs(dy.number) + dy.unit + " 0";
+    }
     return node
   };
 
@@ -8447,9 +8474,6 @@ var temml = (function () {
   //\newcommand{\substack}[1]{\subarray{c}#1\endsubarray}
   defineMacro("\\substack", "\\begin{subarray}{c}#1\\end{subarray}");
 
-  // \newcommand{\boxed}[1]{\fbox{\m@th$\displaystyle#1$}}
-  defineMacro("\\boxed", "\\fbox{$\\displaystyle{#1}$}");
-
   // \def\iff{\DOTSB\;\Longleftrightarrow\;}
   // \def\implies{\DOTSB\;\Longrightarrow\;}
   // \def\impliedby{\DOTSB\;\Longleftarrow\;}
@@ -8698,7 +8722,7 @@ var temml = (function () {
   defineMacro(
     "\\Temml",
     // eslint-disable-next-line max-len
-    "\\textrm{T}\\kern-0.2em\\lower{0.2em}\\textrm{E}\\kern-0.08em{\\textrm{M}\\kern-0.08em\\raise{0.2em}\\textrm{M}\\kern-0.08em\\textrm{L}}"
+    "\\textrm{T}\\kern-0.2em\\lower{0.2em}{\\textrm{E}}\\kern-0.08em{\\textrm{M}\\kern-0.08em\\raise{0.2em}\\textrm{M}\\kern-0.08em\\textrm{L}}"
   );
 
   // \DeclareRobustCommand\hspace{\@ifstar\@hspacer\@hspace}
@@ -10978,7 +11002,7 @@ var temml = (function () {
    * https://mit-license.org/
    */
 
-  const version = "0.10.12";
+  const version = "0.10.14";
 
   function postProcess(block) {
     const labelMap = {};