temml 0.13.2 → 0.13.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "temml",
-  "version": "0.13.02",
+  "version": "0.13.4",
   "description": "TeX to MathML conversion in JavaScript.",
   "main": "dist/temml.js",
   "engines": {
@@ -34,7 +34,8 @@
     "esm": "^3.2.25",
     "globals": "^15.9.0",
     "rollup": "^4.59.0",
-    "terser": "^5.34.0"
+    "terser": "^5.34.0",
+    "ws": "^8.20.0"
   },
   "scripts": {
     "lint": "eslint temml.js src",
@@ -44,6 +45,7 @@
     "minify": "terser test/temml.js -o site/assets/temml.min.js -c -m && terser contrib/mhchem/mhchem.js -o site/assets/mhchem.min.js -c -m",
     "build": "rollup --config ./utils/rollupConfig.mjs && yarn minify && node utils/insertPlugins.js",
     "docs": "node utils/buildDocs.js",
-    "dist": "yarn build && node ./utils/copyfiles.js"
+    "dist": "yarn build && node ./utils/copyfiles.js",
+    "serve": "node utils/server.cjs site/docs/en/mathml-status.html 8000"
   }
 }

package/src/MacroExpander.js

@@ -9,6 +9,7 @@ import Lexer from "./Lexer";
 import { Token } from "./Token";
 
 import ParseError from "./ParseError";
+import SourceLocation from "./SourceLocation";
 import Namespace from "./Namespace";
 import macros from "./macros";
 
@@ -118,7 +119,7 @@ export default class MacroExpander {
     this.pushToken(new Token("EOF", end.loc));
 
     this.pushTokens(tokens);
-    return start.range(end, "");
+    return new Token("", SourceLocation.range(start, end));
   }
 
   /**

package/src/environments/array.js

@@ -358,9 +358,9 @@ const mathmlBuilder = function(group, style) {
     }
     if (mustSquashRow) {
       // All the cell contents are \hphantom. Squash the cell.
+      // TODO: Remove the next line when Firefox no longer needs it.
+      mtr.classes.push("ff-squash") // necessary in Firefox only.
       for (let j = 0; j < mtr.children.length; j++) {
-        mtr.children[j].style.display = "block"  // necessary in Firefox only
-        mtr.children[j].style.height = "0"       // necessary in Firefox only
         mtr.children[j].style.paddingTop = "0"
         mtr.children[j].style.paddingBottom = "0"
       }

package/src/functions/bordermatrix.js

@@ -14,13 +14,11 @@ defineFunction({
   },
   handler: ({ parser, funcName }, args, optArgs) => {
     // Find out if the author has defined custom delimiters
-    let delimiters = ["(", ")"]
+    let delimiters = ["(", ")"]; // default
     if (funcName === "\\bordermatrix" && optArgs[0] && optArgs[0].body) {
       const body = optArgs[0].body
-      if (body.length === 2 && body[0].type === "atom" && body[1].type === "atom") {
-        if (body[0].family === "open" && body[1].family === "close") {
-          delimiters = [body[0].text, body[1].text]
-        }
+      if (body.length === 1 && body[0].type === "delimiter") {
+        delimiters = [body[0].left, body[0].right]
       }
     }
     // consume the opening brace

package/src/functions/delimiter.js

@@ -424,17 +424,14 @@ defineFunction({
   mathmlBuilder: (group) => {
     const textNode = mml.makeText(group.delim, group.mode);
     const middleNode = new mathMLTree.MathNode("mo", [textNode]);
-    middleNode.setAttribute("fence", "true");
-    if (group.delim.indexOf("arrow") > -1) {
-      middleNode.setAttribute("stretchy", "true")
+    middleNode.setAttribute("stretchy", "true")
+    middleNode.setAttribute("form", "infix")
+    if (textNode.text !== "/") {
+      // MathML gives 5/18em spacing to each <mo> element.
+      // \middle should get delimiter spacing instead.
+      middleNode.setAttribute("lspace", "0.05em");
+      middleNode.setAttribute("rspace", "0.05em");
     }
-    // The next line is not semantically correct, but
-    // Chromium fails to stretch if it is not there.
-    middleNode.setAttribute("form", "prefix")
-    // MathML gives 5/18em spacing to each <mo> element.
-    // \middle should get delimiter spacing instead.
-    middleNode.setAttribute("lspace", "0.05em");
-    middleNode.setAttribute("rspace", "0.05em");
     return middleNode;
   }
 });

package/src/functions/enclose.js

@@ -166,7 +166,7 @@ defineFunction({
 
 defineFunction({
   type: "enclose",
-  names: ["\\angl", "\\cancel", "\\bcancel", "\\xcancel", "\\sout", "\\overline",
+  names: ["\\angl", "\\cancel", "\\bcancel", "\\xcancel", "\\overline",
     "\\boxed", "\\longdiv", "\\phase"],
   props: {
     numArgs: 1
@@ -183,6 +183,25 @@ defineFunction({
   mathmlBuilder
 });
 
+defineFunction({
+  type: "enclose",
+  names: ["\\sout"],
+  props: {
+    numArgs: 1,
+    allowedInText: true
+  },
+  handler({ parser, funcName }, args) {
+    const body = args[0];
+    return {
+      type: "enclose",
+      mode: parser.mode,
+      label: funcName,
+      body
+    };
+  },
+  mathmlBuilder
+});
+
 defineFunction({
   type: "enclose",
   names: ["\\underline"],

package/src/functions/font.js

@@ -1,9 +1,13 @@
 import defineFunction, { normalizeArgument } from "../defineFunction"
 import * as mml from "../buildMathML"
 import * as mathMLTree from "../mathMLTree"
+import { variantChar } from "../replace"
+
+const varNameFonts = ["mathrm", "mathit"];
 
 const isLongVariableName = (group, font) => {
-  if (font !== "mathrm" || group.body.type !== "ordgroup" || group.body.body.length === 1) {
+  if (!varNameFonts.includes(font) || !group.body || group.body.type !== "ordgroup" ||
+      group.body.body.length === 1) {
     return false
   }
   if (group.body.body[0].type !== "mathord") { return false }
@@ -29,8 +33,7 @@ const mathmlBuilder = (group, style) => {
   }
   // Check if it is possible to consolidate elements into a single <mi> element.
   if (isLongVariableName(group, font)) {
-    // This is a \mathrm{…} group. It gets special treatment because symbolsOrd.js
-    // wraps <mi> elements with <mpadded>s to work around a Firefox bug.
+    // This is a \mathrm{…} or \mathit{…} group. It gets special treatment.
     const mi = mathGroup.children[0].children[0].children
       ? mathGroup.children[0].children[0]
       : mathGroup.children[0];
@@ -40,7 +43,14 @@ const mathmlBuilder = (group, style) => {
         ? mathGroup.children[i].children[0].children[0].text
         : mathGroup.children[i].children[0].text
     }
-    // Wrap in a <mpadded> to prevent the same Firefox bug.
+    if (font === "mathit") {
+      // Long <mi> elements are normally rendered in upright font.
+      // To get italic, we need to convert each character to the corresponding italic character.
+      mi.children[0].text = mi.children[0].text.split("")
+        .map(c => variantChar(c, "italic")).join("")
+      return mi
+    }
+    // Otherwise, font is "mathrm". Wrap in a <mpadded> to prevent a Firefox spacing bug.
     const mpadded = new mathMLTree.MathNode("mpadded", [mi])
     mpadded.setAttribute("lspace", "0")
     return mpadded

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/postProcess.js

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

package/src/stretchy.js

@@ -35,7 +35,7 @@ const estimatedWidth = node => {
 }
 
 const stretchyCodePoint = {
-  widehat: "^",
+  widehat: "\u02c6", // Shorter than \u005e, which is appropriate for an accent.
   widecheck: "ˇ",
   widetilde: "~",
   wideparen: "⏜", // \u23dc
@@ -98,19 +98,30 @@ export const mathMLnode = function(label) {
   return node
 }
 
-const crookedWides = ["\\widetilde", "\\widehat", "\\widecheck", "\\utilde"]
+const wideHats = ["\\widehat", "\\widecheck"];
 
-// TODO: Remove when Chromium stretches \widetilde & \widehat
+// TODO: Remove if/when Chromium stretches \widetilde & \widehat
 export const accentNode = (group) => {
   const mo = mathMLnode(group.label)
-  if (crookedWides.includes(group.label)) {
+  if (group.label.indexOf("tilde") > -1) {
     const width = estimatedWidth(group.base)
     if (1 < width && width < 1.6) {
-      mo.classes.push("tml-crooked-2")
+      mo.classes.push("tml-tilde-2")
+    } else if (1.6 <= width && width < 2.5) {
+      mo.classes.push("tml-tilde-3")
+    } else if (2.5 <= width) {
+      mo.classes.push("tml-tilde-4")
+    }
+  } else if (wideHats.includes(group.label)) {
+    const width = estimatedWidth(group.base)
+    if (0 < width && width <= 1) {
+      mo.classes.push("tml-hat-1")
+    } else if (1 < width && width < 1.6) {
+      mo.classes.push("tml-hat-2")
     } else if (1.6 <= width && width < 2.5) {
-      mo.classes.push("tml-crooked-3")
+      mo.classes.push("tml-hat-3")
     } else if (2.5 <= width) {
-      mo.classes.push("tml-crooked-4")
+      mo.classes.push("tml-hat-4")
     }
   }
   return mo

package/src/symbols.js

@@ -902,7 +902,7 @@ defineSymbol(math, accent, "\u007e", "\\tilde");
 defineSymbol(math, accent, "\u203e", "\\bar");
 defineSymbol(math, accent, "\u02d8", "\\breve");
 defineSymbol(math, accent, "\u02c7", "\\check");
-defineSymbol(math, accent, "\u005e", "\\hat");
+defineSymbol(math, accent, "\u02c6", "\\hat");
 defineSymbol(math, accent, "\u2192", "\\vec");
 defineSymbol(math, accent, "\u02d9", "\\dot");
 defineSymbol(math, accent, "\u02da", "\\mathring");