temml 0.13.1 → 0.13.3

package/src/functions/mclass.js

@@ -148,8 +148,16 @@ export const binrelClass = (arg) => {
   const atom = arg.type === "ordgroup" && arg.body.length && arg.body.length === 1
     ? arg.body[0]
     : arg;
-  if (atom.type === "atom" && (atom.family === "bin" || atom.family === "rel")) {
-    return "m" + atom.family;
+  if (atom.type === "atom") {
+    // BIN args are sometimes changed to OPEN, so check the original family.
+    const family = arg.body.length > 0 && arg.body[0].text && symbols.math[arg.body[0].text]
+      ? symbols.math[arg.body[0].text].group
+      : atom.family
+    if (family === "bin" || family === "rel") {
+      return "m" + family;
+    } else {
+      return "mord";
+    }
   } else {
     return "mord";
   }

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 { isDelimiter } from "./delimsizing"
+import { isDelimiter } from "./delimiter"
 
 // Some helpers
 

package/src/functions/operatorname.js

@@ -3,7 +3,7 @@ import defineMacro from "../defineMacro";
 import * as mathMLTree from "../mathMLTree"
 import { spaceCharacter } from "./kern"
 import { ordTypes } from "./op"
-import { isDelimiter } from "./delimsizing"
+import { isDelimiter } from "./delimiter"
 
 import * as mml from "../buildMathML"
 
@@ -22,6 +22,14 @@ const mathmlBuilder = (group, style) => {
       if ((node.type === "mrow" || node.type === "mpadded") && node.children.length === 1 &&
           node.children[0] instanceof mathMLTree.MathNode) {
         node = node.children[0]
+      } else if (node.type === "mrow" && node.children.length === 2 &&
+                 node.children[0] instanceof mathMLTree.MathNode &&
+                 node.children[1] instanceof mathMLTree.MathNode &&
+                 node.children[1].type === "mspace" && !node.children[1].attributes.width &&
+                 node.children[1].children.length === 0) {
+        // This is a workaround for a Firefox bug that applies spacing to
+        // an <mi> with mathvariant="normal".
+        node = node.children[0];
       }
       switch (node.type) {
         case "mi":

package/src/functions/phantom.js

@@ -67,7 +67,7 @@ defineFunction({
     const inner = mml.buildExpression(ordargument(group.body), style);
     const phantom = new mathMLTree.MathNode("mphantom", inner);
     const node = new mathMLTree.MathNode("mpadded", [phantom]);
-    node.setAttribute("width", "0px");
+    node.setAttribute("width", "0.1px");
     return node;
   }
 });

package/src/functions/symbolsOrd.js

@@ -41,8 +41,8 @@ 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("mpadded", [node])
-        node.setAttribute("lspace", "0")
+        const mspace = new mathMLTree.MathNode("mspace", [])
+        node = new mathMLTree.MathNode("mrow", [node, mspace])
       }
     }
     return node

package/src/functions.js

@@ -16,7 +16,7 @@ import "./functions/char";
 import "./functions/color";
 import "./functions/cr";
 import "./functions/def";
-import "./functions/delimsizing";
+import "./functions/delimiter";
 import "./functions/enclose";
 import "./functions/environment";
 import "./functions/envTag";

package/src/linebreaking.js

@@ -26,16 +26,12 @@ import { DocumentFragment } from "./tree"
  * much of this module.
  */
 
-const openDelims = "([{⌊⌈⟨⟮⎰⟦⦃"
-const closeDelims = ")]}⌋⌉⟩⟯⎱⟦⦄"
-
 export default function setLineBreaks(expression, wrapMode, isDisplayMode) {
   const mtrs = [];
   let mrows = [];
   let block = [];
   let numTopLevelEquals = 0
   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.
@@ -58,13 +54,10 @@ export default function setLineBreaks(expression, wrapMode, isDisplayMode) {
     }
     block.push(node);
     if (node.type && node.type === "mo" && node.children.length === 1 &&
+        !(node.attributes.form && node.attributes.form === "prefix") && // unary operators
         !Object.prototype.hasOwnProperty.call(node.attributes, "movablelimits")) {
       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 === "=") {
+      if (wrapMode === "=" && ch === "=") {
         numTopLevelEquals += 1
         if (numTopLevelEquals > 1) {
           block.pop()
@@ -73,7 +66,7 @@ export default function setLineBreaks(expression, wrapMode, isDisplayMode) {
           mrows.push(element)
           block = [node];
         }
-      } else if (level === 0 && wrapMode === "tex" && ch !== "∇") {
+      } else if (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;

package/src/macros.js

@@ -694,6 +694,7 @@ defineMacro("\\upomega", "\\up@greek{\\omega}");
 // cmll package
 defineMacro("\\invamp", '\\mathbin{\\char"214b}')
 defineMacro("\\parr", '\\mathbin{\\char"214b}')
+defineMacro("\\upand", '\\mathbin{\\char"214b}') // STIX package
 defineMacro("\\with", '\\mathbin{\\char"26}')
 defineMacro("\\multimapinv", '\\mathrel{\\char"27dc}')
 defineMacro("\\multimapboth", '\\mathrel{\\char"29df}')

package/src/parseNode.js

@@ -34,7 +34,7 @@ export function assertSymbolNodeType(node) {
  * returns null.
  */
 export function checkSymbolNodeType(node) {
-  if (node && (node.type === "atom" ||
+  if (node && (node.type === "atom" || node.type === "delimiter" ||
       Object.prototype.hasOwnProperty.call(NON_ATOMS, node.type))) {
     return node;
   }

package/src/parseTree.js

@@ -8,11 +8,27 @@ const parseTree = function(toParse, settings) {
   if (!(typeof toParse === "string" || toParse instanceof String)) {
     throw new TypeError("Temml can only parse string typed expression")
   }
-  const parser = new Parser(toParse, settings)
-  // Blank out any \df@tag to avoid spurious "Duplicate \tag" errors
-  delete parser.gullet.macros.current["\\df@tag"]
+  let tree;
+  let parser;
+  try {
+    parser = new Parser(toParse, settings)
+    // Blank out any \df@tag to avoid spurious "Duplicate \tag" errors
+    delete parser.gullet.macros.current["\\df@tag"]
 
-  let tree = parser.parse()
+    tree = parser.parse()
+  } catch (error) {
+    if (error.toString() === "ParseError:  Unmatched delimiter") {
+      // Abandon the attempt to wrap delimiter pairs in an <mrow>.
+      // Try again, and put each delimiter into an <mo> element.
+      settings.wrapDelimiterPairs = false;
+      parser = new Parser(toParse, settings)
+      // Blank out any \df@tag to avoid spurious "Duplicate \tag" errors
+      delete parser.gullet.macros.current["\\df@tag"]
+      tree = parser.parse()
+    } else {
+      throw error;
+    }
+  }
 
   // LaTeX ignores a \tag placed outside an AMS environment.
   if (!(tree.length > 0 &&  tree[0].type && tree[0].type === "array" && tree[0].addEqnNum)) {

package/src/postProcess.js

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

package/src/symbols.js

@@ -128,8 +128,7 @@ defineSymbol(math, textord, "\u2135", "\\aleph", true);
 defineSymbol(math, textord, "\u2200", "\\forall", true);
 defineSymbol(math, textord, "\u210f", "\\hbar", true);
 defineSymbol(math, textord, "\u2203", "\\exists", true);
-// ∇ is actually a unary operator, not binary. But this works.
-defineSymbol(math, bin, "\u2207", "\\nabla", true);
+defineSymbol(math, open, "\u2207", "\\nabla", true);
 defineSymbol(math, textord, "\u266d", "\\flat", true);
 defineSymbol(math, textord, "\u2113", "\\ell", true);
 defineSymbol(math, textord, "\u266e", "\\natural", true);
@@ -222,7 +221,7 @@ defineSymbol(math, mathord, "\u2295", "\\Earth");
 
 // AMS Negated Binary Relations
 defineSymbol(math, rel, "\u226e", "\\nless", true);
-// Symbol names preceeded by "@" each have a corresponding macro.
+// Symbol names preceded by "@" each have a corresponding macro.
 defineSymbol(math, rel, "\u2a87", "\\lneq", true);
 defineSymbol(math, rel, "\u2268", "\\lneqq", true);
 defineSymbol(math, rel, "\u2268\ufe00", "\\lvertneqq");