temml 0.10.17 → 0.10.19

package/dist/temmlPostProcess.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "temml",
-  "version": "0.10.17",
+  "version": "0.10.19",
   "description": "TeX to MathML conversion in JavaScript.",
   "main": "dist/temml.js",
   "engines": {

package/src/buildMathML.js

@@ -36,7 +36,7 @@ export const makeText = function(text, mode, style) {
 
 export const consolidateText = mrow => {
   // If possible, consolidate adjacent <mtext> elements into a single element.
-  if (mrow.type !== "mrow") { return mrow }
+  if (mrow.type !== "mrow" && mrow.type !== "mstyle") { return mrow }
   if (mrow.children.length === 0) { return mrow } // empty group, e.g., \text{}
   if (!mrow.children[0].attributes || mrow.children[0].type !== "mtext") { return mrow }
   const variant = mrow.children[0].attributes.mathvariant || ""
@@ -73,6 +73,9 @@ export const consolidateText = mrow => {
   if (L > 0 && mtext.children[0].text.charAt(L - 1) === " ") {
     mtext.children[0].text = mtext.children[0].text.slice(0, -1) + "\u00a0"
   }
+  for (const [key, value] of Object.entries(mrow.attributes)) {
+    mtext.attributes[key] = value
+  }
   return mtext
 }
 
@@ -115,6 +118,16 @@ const consolidateNumbers = expression => {
       expression[nums[i].start].text += expression[j].text
     }
     expression.splice(nums[i].start + 1, nums[i].end - nums[i].start)
+    // Check if the <mn> is followed by a numeric base in a supsub, e.g. the "3" in 123^4
+    // If so, merge the first <mn> into the base.
+    if (expression.length > nums[i].start + 1) {
+      const nextTerm = expression[nums[i].start + 1];
+      if (nextTerm.type === "supsub" && nextTerm.base && nextTerm.base.type === "textord" &&
+          numberRegEx.test(nextTerm.base.text)) {
+        nextTerm.base.text = expression[nums[i].start].text + nextTerm.base.text
+        expression.splice(nums[i].start, 1)
+      }
+    }
   }
 }
 
@@ -126,6 +139,14 @@ export const makeRow = function(body) {
   if (body.length === 1 && !(body[0] instanceof DocumentFragment)) {
     return body[0];
   } else {
+    // Suppress spacing on <mo> nodes at both ends of the row.
+    if (body[0] instanceof MathNode && body[0].type === "mo" && !body[0].attributes.fence) {
+      body[0].attributes.lspace = "0em"
+    }
+    const end = body.length - 1
+    if (body[end] instanceof MathNode && body[end].type === "mo" && !body[end].attributes.fence) {
+      body[end].attributes.rspace = "0em"
+    }
     return new mathMLTree.MathNode("mrow", body);
   }
 };

package/src/functions/delimsizing.js

@@ -38,6 +38,10 @@ export const delimiters = [
   "\\lbrace",
   "\\}",
   "\\rbrace",
+  "⦇",
+  "\\llparenthesis",
+  "⦈",
+  "\\rrparenthesis",
   "\\lfloor",
   "\\rfloor",
   "\u230a",
@@ -52,6 +56,14 @@ export const delimiters = [
   "\u27e8",
   "\\rangle",
   "\u27e9",
+  "\\lAngle",
+  "\u27ea",
+  "\\rAngle",
+  "\u27eb",
+  "\\llangle",
+  "⦉",
+  "\\rrangle",
+  "⦊",
   "\\lt",
   "\\gt",
   "\\lvert",
@@ -173,9 +185,9 @@ defineFunction({
       // defaults.
       node.setAttribute("fence", "false");
     }
-    if (group.delim === "\u2216" || group.delim.indexOf("arrow") > -1) {
-      // \backslash is not in the operator dictionary,
-      // so we have to explicitly set stretchy to true.
+    if (group.delim === "\u2216" || group.delim === "\\vert" ||
+        group.delim === "|" || group.delim.indexOf("arrow") > -1) {
+      // We have to explicitly set stretchy to true.
       node.setAttribute("stretchy", "true")
     }
     node.setAttribute("symmetric", "true"); // Needed for tall arrows in Firefox.

package/src/functions/hbox.js

@@ -1,10 +1,10 @@
 import defineFunction, { ordargument } from "../defineFunction";
 import { StyleLevel } from "../constants"
-import mathMLTree from "../mathMLTree";
 import * as mml from "../buildMathML";
 
 // \hbox is provided for compatibility with LaTeX functions that act on a box.
-// This function by itself doesn't do anything but prevent a soft line break.
+// This function by itself doesn't do anything but set scriptlevel to \textstyle
+// and prevent a soft line break.
 
 defineFunction({
   type: "hbox",
@@ -23,7 +23,8 @@ defineFunction({
     };
   },
   mathmlBuilder(group, style) {
-    const newOptions = style.withLevel(StyleLevel.TEXT)
-    return new mathMLTree.MathNode("mrow", mml.buildExpression(group.body, newOptions));
+    const newStyle = style.withLevel(StyleLevel.TEXT)
+    const mrow = mml.buildExpressionRow(group.body, newStyle)
+    return mml.consolidateText(mrow)
   }
 });

package/src/functions/op.js

@@ -71,7 +71,8 @@ const singleCharBigOps = {
   "\u2a02": "\\bigotimes",
   "\u2a04": "\\biguplus",
   "\u2a05": "\\bigsqcap",
-  "\u2a06": "\\bigsqcup"
+  "\u2a06": "\\bigsqcup",
+  "\u2a09": "\\bigtimes"
 };
 
 defineFunction({
@@ -91,6 +92,7 @@ defineFunction({
     "\\bigodot",
     "\\bigsqcap",
     "\\bigsqcup",
+    "\\bigtimes",
     "\\smallint",
     "\u220F",
     "\u2210",

package/src/functions.js

@@ -21,6 +21,7 @@ import "./functions/environment";
 import "./functions/envTag";
 import "./functions/font";
 import "./functions/genfrac";
+import "./functions/hbox";
 import "./functions/horizBrace";
 import "./functions/href";
 import "./functions/html";

package/src/macros.js

@@ -191,8 +191,6 @@ defineMacro("\\surd", '\\sqrt{\\vphantom{|}}')
 // See comment for \oplus in symbols.js.
 defineMacro("\u2295", "\\oplus")
 
-defineMacro("\\hbox", "\\text{#1}");
-
 // Per TeXbook p.122, "/" gets zero operator spacing.
 // And MDN recommends using U+2044 instead of / for inline
 defineMacro("/", "{\u2044}")
@@ -275,6 +273,7 @@ const dotsByToken = {
   "\\bigodot": "\\dotsb",
   "\\bigsqcap": "\\dotsb",
   "\\bigsqcup": "\\dotsb",
+  "\\bigtimes": "\\dotsb",
   "\\And": "\\dotsb",
   "\\longrightarrow": "\\dotsb",
   "\\Longrightarrow": "\\dotsb",
@@ -437,6 +436,8 @@ defineMacro("\\quad", "\\hskip1em\\relax");
 // \def\qquad{\hskip2em\relax}
 defineMacro("\\qquad", "\\hskip2em\\relax");
 
+defineMacro("\\AA", "\\TextOrMath{\\Angstrom}{\\mathring{A}}\\relax")
+
 // \tag@in@display form of \tag
 defineMacro("\\tag", "\\@ifstar\\tag@literal\\tag@paren");
 defineMacro("\\tag@paren", "\\tag@literal{({#1})}");

package/src/postProcess.js

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

package/src/symbols.js

@@ -132,8 +132,8 @@ defineSymbol(math, textord, "\u2207", "\\nabla", true);
 defineSymbol(math, textord, "\u266d", "\\flat", true);
 defineSymbol(math, textord, "\u2113", "\\ell", true);
 defineSymbol(math, textord, "\u266e", "\\natural", true);
-defineSymbol(math, textord, "Å", "\\AA", true);
-defineSymbol(text, textord, "Å", "\\AA", true);
+defineSymbol(math, textord, "Å", "\\Angstrom", true);
+defineSymbol(text, textord, "Å", "\\Angstrom", true);
 defineSymbol(math, textord, "\u2663", "\\clubsuit", true);
 defineSymbol(math, textord, "\u2667", "\\varclubsuit", true);
 defineSymbol(math, textord, "\u2118", "\\wp", true);
@@ -556,7 +556,7 @@ defineSymbol(math, open, "\u00ac", "\\lnot");
 defineSymbol(math, textord, "\u22a4", "\\top");
 defineSymbol(math, textord, "\u22a5", "\\bot");
 defineSymbol(math, textord, "\u2205", "\\emptyset");
-defineSymbol(math, textord, "\u00f8", "\\varnothing");
+defineSymbol(math, textord, "\u2300", "\\varnothing");
 defineSymbol(math, mathord, "\u03b1", "\\alpha", true);
 defineSymbol(math, mathord, "\u03b2", "\\beta", true);
 defineSymbol(math, mathord, "\u03b3", "\\gamma", true);
@@ -617,6 +617,8 @@ defineSymbol(math, bin, "\u2228", "\\vee", true);
 defineSymbol(math, open, "\u27e6", "\\llbracket", true); // stmaryrd/semantic packages
 defineSymbol(math, close, "\u27e7", "\\rrbracket", true);
 defineSymbol(math, open, "\u27e8", "\\langle", true);
+defineSymbol(math, open, "\u27ea", "\\lAngle", true);
+defineSymbol(math, open, "\u2989", "\\llangle", true);
 defineSymbol(math, open, "|", "\\lvert");
 defineSymbol(math, open, "\u2016", "\\lVert");
 defineSymbol(math, textord, "!", "\\oc"); // cmll package
@@ -628,6 +630,8 @@ defineSymbol(math, close, "?", "?");
 defineSymbol(math, close, "!", "!");
 defineSymbol(math, close, "‼", "‼");
 defineSymbol(math, close, "\u27e9", "\\rangle", true);
+defineSymbol(math, close, "\u27eb", "\\rAngle", true);
+defineSymbol(math, close, "\u298a", "\\rrangle", true);
 defineSymbol(math, close, "|", "\\rvert");
 defineSymbol(math, close, "\u2016", "\\rVert");
 defineSymbol(math, open, "\u2983", "\\lBrace", true); // stmaryrd/semantic packages
@@ -709,6 +713,8 @@ defineSymbol(math, close, "]", "\\rbrack", true);
 defineSymbol(text, textord, "]", "\\rbrack", true);
 defineSymbol(math, open, "(", "\\lparen", true);
 defineSymbol(math, close, ")", "\\rparen", true);
+defineSymbol(math, open, "⦇", "\\llparenthesis", true);
+defineSymbol(math, close, "⦈", "\\rrparenthesis", true);
 defineSymbol(text, textord, "<", "\\textless", true); // in T1 fontenc
 defineSymbol(text, textord, ">", "\\textgreater", true); // in T1 fontenc
 defineSymbol(math, open, "\u230a", "\\lfloor", true);
@@ -746,6 +752,7 @@ defineSymbol(math, op, "\u2211", "\\sum");
 defineSymbol(math, op, "\u2a02", "\\bigotimes");
 defineSymbol(math, op, "\u2a01", "\\bigoplus");
 defineSymbol(math, op, "\u2a00", "\\bigodot");
+defineSymbol(math, op, "\u2a09", "\\bigtimes");
 defineSymbol(math, op, "\u222e", "\\oint");
 defineSymbol(math, op, "\u222f", "\\oiint");
 defineSymbol(math, op, "\u2230", "\\oiiint");
@@ -865,6 +872,8 @@ defineSymbol(text, textord, "\u20ac", "\\euro", true);
 defineSymbol(text, textord, "\u20ac", "\\texteuro");
 defineSymbol(math, textord, "\u00a9", "\\copyright", true);
 defineSymbol(text, textord, "\u00a9", "\\textcopyright");
+defineSymbol(math, textord, "\u2300", "\\diameter", true);
+defineSymbol(text, textord, "\u2300", "\\diameter");
 
 // Italic Greek
 defineSymbol(math, textord, "𝛤", "\\varGamma");

package/temml.js

@@ -25,9 +25,9 @@ import { postProcess, version } from "./src/postProcess";
  * Parse and build an expression, and place that expression in the DOM node
  * given.
  */
-let render = function(expression, baseNode, options) {
+let render = function(expression, baseNode, options = {}) {
   baseNode.textContent = "";
-  const alreadyInMathElement = baseNode.tagName === "MATH"
+  const alreadyInMathElement = baseNode.tagName.toLowerCase() === "math"
   if (alreadyInMathElement) { options.wrap = "none" }
   const math = renderToMathMLTree(expression, options)
   if (alreadyInMathElement) {