temml 0.10.0 → 0.10.3

package/dist/temml.js

@@ -191,7 +191,7 @@ var temml = (function () {
       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
@@ -669,7 +669,7 @@ var temml = (function () {
 
     /**
      * Converts the text node into a string
-     * (representing the text iteself).
+     * (representing the text itself).
      */
     toText() {
       return this.text;
@@ -846,7 +846,6 @@ var temml = (function () {
   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);
@@ -1163,7 +1162,6 @@ var temml = (function () {
   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);
@@ -1189,6 +1187,11 @@ var temml = (function () {
   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.
@@ -1747,10 +1750,12 @@ var temml = (function () {
    * 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
@@ -1893,7 +1898,7 @@ var temml = (function () {
   }
 
   /**
-   * 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.
    */
@@ -2096,18 +2101,6 @@ var temml = (function () {
       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) {
@@ -2115,6 +2108,9 @@ var temml = (function () {
     }
     if (settings.displayMode) {
       math.setAttribute("display", "block");
+      math.style.display = math.children.length === 1 && math.children[0].type === "mtable"
+        ? "inline"
+        : "inline-block";
     }
     return math;
   }
@@ -3524,6 +3520,11 @@ var temml = (function () {
     "."
   ];
 
+  // 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.
@@ -6206,10 +6207,6 @@ var temml = (function () {
   // 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.
 
@@ -6430,7 +6427,7 @@ var temml = (function () {
         parentIsSupSub: false,
         symbol: false,
         stack: false,
-        isFollowedByDelimiter: isDelimiter$1(next),
+        isFollowedByDelimiter: isDelimiter(next),
         needsLeadingSpace: prevAtomType.length > 0 && ordTypes.includes(prevAtomType),
         name: funcName
       };
@@ -6455,7 +6452,7 @@ var temml = (function () {
         parentIsSupSub: false,
         symbol: false,
         stack: false,
-        isFollowedByDelimiter: isDelimiter$1(next),
+        isFollowedByDelimiter: isDelimiter(next),
         needsLeadingSpace: prevAtomType.length > 0 && ordTypes.includes(prevAtomType),
         name: funcName
       };
@@ -6541,11 +6538,7 @@ var temml = (function () {
     _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.
 
@@ -6555,8 +6548,12 @@ var temml = (function () {
     // 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":
@@ -6614,7 +6611,9 @@ var temml = (function () {
     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);
     }
@@ -7152,6 +7151,7 @@ var temml = (function () {
       let isOver;
       let isSup;
       let appendApplyFunction = false;
+      let appendSpace = false;
       let needsLeadingSpace = false;
 
       if (group.base && group.base.type === "horizBrace") {
@@ -7166,6 +7166,7 @@ var temml = (function () {
         (group.base.type === "op" || group.base.type === "operatorname")) {
         group.base.parentIsSupSub = true;
         appendApplyFunction = !group.base.symbol;
+        appendSpace = appendApplyFunction && !group.isFollowedByDelimiter;
         needsLeadingSpace = group.base.needsLeadingSpace;
       }
 
@@ -7253,6 +7254,11 @@ var temml = (function () {
         } 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]);
@@ -9107,15 +9113,15 @@ var temml = (function () {
      * 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`.
      *
@@ -9131,7 +9137,7 @@ var temml = (function () {
           throw new ParseError("Undefined control sequence: " + name);
         }
         this.pushToken(topToken);
-        return topToken;
+        return false;
       }
       this.expansionCount++;
       if (this.expansionCount > this.settings.maxExpand) {
@@ -9165,7 +9171,7 @@ var temml = (function () {
       }
       // Concatenate expansion onto top of stack.
       this.pushTokens(tokens);
-      return tokens;
+      return tokens.length;
     }
 
     /**
@@ -9184,14 +9190,13 @@ var temml = (function () {
      */
     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
         }
       }
 
@@ -9217,15 +9222,15 @@ var temml = (function () {
       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;
@@ -10053,7 +10058,7 @@ var temml = (function () {
      * 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
@@ -10304,12 +10309,16 @@ var temml = (function () {
           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 {
@@ -10470,7 +10479,7 @@ var temml = (function () {
       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
@@ -11062,7 +11071,7 @@ var temml = (function () {
    * https://mit-license.org/
    */
 
-  const version = "0.10.0";
+  const version = "0.10.3";
 
   function postProcess(block) {
     const labelMap = {};