temml 0.10.15 → 0.10.17

package/dist/temmlPostProcess.js

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

package/package.json

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

package/src/Parser.js

@@ -972,7 +972,6 @@ export default class Parser {
           loc: SourceLocation.range(nucleus),
           label: command,
           isStretchy: false,
-          isShifty: true,
           base: symbol
         };
       }

package/src/buildMathML.js

@@ -207,13 +207,8 @@ const taggedExpression = (expression, tag, style, leqno) => {
 
   expression = new mathMLTree.MathNode("mtd", [expression])
   const rowArray = [glue(), expression, glue()]
-  if (leqno) {
-    rowArray[0].children.push(tag)
-    rowArray[0].style.textAlign = "-webkit-left"
-  } else {
-    rowArray[2].children.push(tag)
-    rowArray[2].style.textAlign = "-webkit-right"
-  }
+  rowArray[leqno ? 0 : 2].classes.push(leqno ? "tml-left" : "tml-right")
+  rowArray[leqno ? 0 : 2].children.push(tag)
   const mtr = new mathMLTree.MathNode("mtr", rowArray, ["tml-tageqn"])
   const table = new mathMLTree.MathNode("mtable", [mtr])
   table.style.width = "100%"

package/src/domTree.js

@@ -134,7 +134,7 @@ export class TextNode {
   }
 }
 
-/**
+/*
  * This node represents an image embed (<img>) element.
  */
 export class Img {
@@ -179,7 +179,7 @@ export class Img {
       markup += ` style="${utils.escape(styles)}"`;
     }
 
-    markup += "/>";
+    markup += ">";
     return markup;
   }
 }

package/src/environments/array.js

@@ -2,6 +2,7 @@ import defineEnvironment from "../defineEnvironment";
 import { parseCD } from "./cd";
 import defineFunction from "../defineFunction";
 import mathMLTree from "../mathMLTree";
+import { Span } from "../domTree"
 import { StyleLevel } from "../constants"
 import ParseError from "../ParseError";
 import { assertNodeType, assertSymbolNodeType } from "../parseNode";
@@ -57,8 +58,9 @@ const getTag = (group, style, rowNum) => {
     return tag
   } else {
     // AMS automatcally numbered equaton.
-    // Insert a class so the element can be populated by a post-processor.
-    tag = new mathMLTree.MathNode("mtext", [], ["tml-eqn"])
+    // Insert a class so the element can be populated by a CSS counter.
+    // WebKit will display the CSS counter only inside a span.
+    tag = new mathMLTree.MathNode("mtext", [new Span(["tml-eqn"])])
   }
   return tag
 }
@@ -255,7 +257,7 @@ const mathmlBuilder = function(group, style) {
         const align = i === 0 ? "left" : i === numRows - 1 ? "right" : "center"
         mtd.setAttribute("columnalign", align)
         if (align !== "center") {
-          mtd.style.textAlign = "-webkit-" + align
+          mtd.classes.push("tml-" + align)
         }
       }
       row.push(mtd)
@@ -266,10 +268,10 @@ const mathmlBuilder = function(group, style) {
       const tag = getTag(group, style.withLevel(cellLevel), i)
       if (group.leqno) {
         row[0].children.push(tag)
-        row[0].style.textAlign = "-webkit-left"
+        row[0].classes.push("tml-left")
       } else {
         row[row.length - 1].children.push(tag)
-        row[row.length - 1].style.textAlign = "-webkit-right"
+        row[row.length - 1].classes.push("tml-right")
       }
     }
     const mtr = new mathMLTree.MathNode("mtr", row, [])
@@ -340,7 +342,11 @@ const mathmlBuilder = function(group, style) {
         for (let j = 0; j < row.children.length; j++) {
           // Chromium does not recognize text-align: left. Use -webkit-
           // TODO: Remove -webkit- when Chromium no longer needs it.
-          row.children[j].style.textAlign = "-webkit-" + (j % 2 ? "left" : "right")
+          row.children[j].classes = ["tml-" + (j % 2 ? "left" : "right")]
+        }
+        if (group.addEqnNum) {
+          const k = group.leqno ? 0 : row.children.length - 1
+          row.children[k].classes = ["tml-" + (group.leqno ? "left" : "right")]
         }
       }
       if (row.children.length > 1 && group.envClasses.includes("cases")) {
@@ -349,7 +355,7 @@ const mathmlBuilder = function(group, style) {
 
       if (group.envClasses.includes("cases") || group.envClasses.includes("subarray")) {
         for (const cell of row.children) {
-          cell.style.textAlign = "-webkit-" + "left"
+          cell.classes.push("tml-left")
         }
       }
     }
@@ -404,7 +410,7 @@ const mathmlBuilder = function(group, style) {
         iCol += 1
         for (const row of table.children) {
           if (colAlign.trim() !== "center" && iCol < row.children.length) {
-            row.children[iCol].style.textAlign = "-webkit-" + colAlign.trim()
+            row.children[iCol].classes = ["tml-" + colAlign.trim()]
           }
         }
         prevTypeWasAlign = true;

package/src/functions/accent.js

@@ -2,10 +2,20 @@ import defineFunction, { normalizeArgument } from "../defineFunction"
 import mathMLTree from "../mathMLTree"
 import stretchy from "../stretchy"
 import * as mml from "../buildMathML"
+import utils from "../utils"
+
+const smalls = "acegıȷmnopqrsuvwxyzαγεηικμνοπρςστυχωϕ𝐚𝐜𝐞𝐠𝐦𝐧𝐨𝐩𝐪𝐫𝐬𝐮𝐯𝐰𝐱𝐲𝐳"
+const talls = "ABCDEFGHIJKLMNOPQRSTUVWXYZbdfhkltΑΒΓΔΕΖΗΘΙΚΛΜΝΞΟΠΡΣΤΥΦΧΨΩβδλζφθψ"
+             + "𝐀𝐁𝐂𝐃𝐄𝐅𝐆𝐇𝐈𝐉𝐊𝐋𝐌𝐍𝐎𝐏𝐐𝐑𝐒𝐓𝐔𝐕𝐖𝐗𝐘𝐙𝐛𝐝𝐟𝐡𝐤𝐥𝐭"
+const longSmalls = new Set(["\\alpha", "\\gamma", "\\delta", "\\epsilon", "\\eta", "\\iota",
+  "\\kappa", "\\mu", "\\nu", "\\pi", "\\rho", "\\sigma", "\\tau", "\\upsilon", "\\chi", "\\psi",
+  "\\omega", "\\imath", "\\jmath"])
+const longTalls = new Set(["\\Gamma", "\\Delta", "\\Sigma", "\\Omega", "\\beta", "\\delta",
+  "\\lambda", "\\theta", "\\psi"])
 
 const mathmlBuilder = (group, style) => {
   const accentNode = group.isStretchy
-    ? stretchy.mathMLnode(group.label)
+    ? stretchy.accentNode(group)
     : new mathMLTree.MathNode("mo", [mml.makeText(group.label, group.mode)]);
 
   if (group.label === "\\vec") {
@@ -13,6 +23,13 @@ const mathmlBuilder = (group, style) => {
   } else {
     accentNode.style.mathStyle = "normal"
     accentNode.style.mathDepth = "0"
+    if (needWebkitShift.has(group.label) &&  utils.isCharacterBox(group.base)) {
+      let shift = ""
+      const ch = group.base.text
+      if (smalls.indexOf(ch) > -1 || longSmalls.has(ch)) { shift = "tml-xshift" }
+      if (talls.indexOf(ch) > -1  || longTalls.has(ch))  { shift = "tml-capshift" }
+      if (shift) { accentNode.classes.push(shift) }
+    }
   }
   if (!group.isStretchy) {
     accentNode.setAttribute("stretchy", "false")
@@ -25,25 +42,34 @@ const mathmlBuilder = (group, style) => {
   return node;
 };
 
-const NON_STRETCHY_ACCENT_REGEX = new RegExp(
-  [
-    "\\acute",
-    "\\grave",
-    "\\ddot",
-    "\\dddot",
-    "\\ddddot",
-    "\\tilde",
-    "\\bar",
-    "\\breve",
-    "\\check",
-    "\\hat",
-    "\\vec",
-    "\\dot",
-    "\\mathring"
-  ]
-    .map((accent) => `\\${accent}`)
-    .join("|")
-);
+const nonStretchyAccents = new Set([
+  "\\acute",
+  "\\grave",
+  "\\ddot",
+  "\\dddot",
+  "\\ddddot",
+  "\\tilde",
+  "\\bar",
+  "\\breve",
+  "\\check",
+  "\\hat",
+  "\\vec",
+  "\\dot",
+  "\\mathring"
+])
+
+const needWebkitShift = new Set([
+  "\\acute",
+  "\\bar",
+  "\\breve",
+  "\\check",
+  "\\dot",
+  "\\ddot",
+  "\\grave",
+  "\\hat",
+  "\\mathring",
+  "\\'", "\\^", "\\~", "\\=", "\\u", "\\.", '\\"', "\\r", "\\H", "\\v"
+])
 
 // Accents
 defineFunction({
@@ -81,7 +107,7 @@ defineFunction({
   handler: (context, args) => {
     const base = normalizeArgument(args[0]);
 
-    const isStretchy = !NON_STRETCHY_ACCENT_REGEX.test(context.funcName);
+    const isStretchy = !nonStretchyAccents.has(context.funcName);
 
     return {
       type: "accent",
@@ -119,7 +145,6 @@ defineFunction({
       mode: mode,
       label: context.funcName,
       isStretchy: false,
-      isShifty: true,
       base: base
     };
   },

package/src/functions/accentunder.js

@@ -27,7 +27,7 @@ defineFunction({
     };
   },
   mathmlBuilder: (group, style) => {
-    const accentNode = stretchy.mathMLnode(group.label);
+    const accentNode = stretchy.accentNode(group);
     accentNode.style["math-depth"] = 0
     const node = new mathMLTree.MathNode("munder", [
       mml.buildGroup(group.base, style),

package/src/functions/enclose.js

@@ -63,7 +63,10 @@ rgba(0,0,0,0) 100%);`
       node.style.marginRight = "0.03889em"
       break
     case "\\sout":
-      node.style["text-decoration"] = "line-through 0.08em solid"
+      node.style.backgroundImage = 'linear-gradient(black, black)'
+      node.style.backgroundRepeat = 'no-repeat'
+      node.style.backgroundSize = '100% 1.5px'
+      node.style.backgroundPosition = '0 center'
       break
     case "\\boxed":
       // \newcommand{\boxed}[1]{\fbox{\m@th$\displaystyle#1$}} from amsmath.sty

package/src/functions/lap.js

@@ -4,7 +4,7 @@ import mathMLTree from "../mathMLTree"
 import * as mml from "../buildMathML"
 import ParseError from "../ParseError";
 
-const textModeLap = ["\\clap", "\\llap", "\\rlap"]
+const textModeLap = ["\\clap", "\\llap", "\\rlap"];
 
 defineFunction({
   type: "lap",

package/src/functions/supsub.js

@@ -53,7 +53,14 @@ defineFunctionBuilders({
     }
 
     if (group.sup) {
-      children.push(mml.buildGroup(group.sup, childStyle))
+      const sup = mml.buildGroup(group.sup, childStyle)
+      const testNode = sup.type === "mrow" ? sup.children[0] : sup
+      if ((testNode.type === "mo" && testNode.classes.includes("tml-prime"))
+        && group.base && group.base.text && group.base.text === "f") {
+        // Chromium does not address italic correction on prime. Prevent f′ from overlapping.
+        testNode.classes.push("prime-pad")
+      }
+      children.push(sup)
     }
 
     let nodeType;

package/src/functions/symbolsOrd.js

@@ -9,6 +9,8 @@ import * as mml from "../buildMathML"
 
 const numberRegEx = /^\d(?:[\d,.]*\d)?$/
 const latinRegEx = /[A-Ba-z]/
+const primes = new Set(["\\prime", "\\dprime", "\\trprime", "\\qprime",
+  "\\backprime", "\\backdprime", "\\backtrprime"]);
 
 const italicNumber = (text, variant, tag) => {
   const mn = new mathMLTree.MathNode(tag, [text])
@@ -76,7 +78,7 @@ defineFunctionBuilders({
         text.text = variantChar(text.text, variant)
       }
       node = new mathMLTree.MathNode("mtext", [text])
-    } else if (group.text === "\\prime") {
+    } else if (primes.has(group.text)) {
       node = new mathMLTree.MathNode("mo", [text])
       // TODO: If/when Chromium uses ssty variant for prime, remove the next line.
       node.classes.push("tml-prime")

package/src/macros.js

@@ -188,6 +188,9 @@ defineMacro("\\char", function(context) {
 // This macro provides a better rendering.
 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.

package/src/postProcess.js

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

package/src/stretchy.js

@@ -4,6 +4,34 @@
 
 import mathMLTree from "./mathMLTree"
 
+// TODO: Remove when Chromium stretches \widetilde & \widehat
+const estimatedWidth = node => {
+  let width = 0
+  if (node.body) {
+    for (const item of node.body) {
+      width += estimatedWidth(item)
+    }
+  } else if (node.type === "supsub") {
+    width += estimatedWidth(node.base)
+    if (node.sub) { width += 0.7 * estimatedWidth(node.sub) }
+    if (node.sup) { width += 0.7 * estimatedWidth(node.sup) }
+  } else if (node.type === "mathord" || node.type === "textord") {
+    for (const ch of node.text.split('')) {
+      const codePoint = ch.codePointAt(0)
+      if ((0x60 < codePoint && codePoint < 0x7B) || (0x03B0 < codePoint && codePoint < 0x3CA)) {
+        width += 0.56 // lower case latin or greek. Use advance width of letter n
+      } else if (0x2F < codePoint && codePoint < 0x3A) {
+        width += 0.50 // numerals.
+      } else {
+        width += 0.92 // advance width of letter M
+      }
+    }
+  } else {
+    width += 1.0
+  }
+  return width
+}
+
 const stretchyCodePoint = {
   widehat: "^",
   widecheck: "ˇ",
@@ -61,6 +89,25 @@ const mathMLnode = function(label) {
   return node
 }
 
+const crookedWides = ["\\widetilde", "\\widehat", "\\widecheck", "\\utilde"]
+
+// TODO: Remove when Chromium stretches \widetilde & \widehat
+const accentNode = (group) => {
+  const mo = mathMLnode(group.label)
+  if (crookedWides.includes(group.label)) {
+    const width = estimatedWidth(group.base)
+    if (1 < width && width < 1.6) {
+      mo.classes.push("tml-crooked-2")
+    } else if (1.6 <= width && width < 2.5) {
+      mo.classes.push("tml-crooked-3")
+    } else if (2.5 <= width) {
+      mo.classes.push("tml-crooked-4")
+    }
+  }
+  return mo
+}
+
 export default {
-  mathMLnode
+  mathMLnode,
+  accentNode
 }

package/src/symbols.js

@@ -294,6 +294,8 @@ defineSymbol(math, textord, "\u2127", "\\mho");
 defineSymbol(math, textord, "\u2132", "\\Finv", true);
 defineSymbol(math, textord, "\u2141", "\\Game", true);
 defineSymbol(math, textord, "\u2035", "\\backprime");
+defineSymbol(math, textord, "\u2036", "\\backdprime");
+defineSymbol(math, textord, "\u2037", "\\backtrprime");
 defineSymbol(math, textord, "\u25b2", "\\blacktriangle");
 defineSymbol(math, textord, "\u25bc", "\\blacktriangledown");
 defineSymbol(math, textord, "\u25a0", "\\blacksquare");
@@ -497,6 +499,9 @@ defineSymbol(text, textord, "\u2423", "\\textvisiblespace", true);
 defineSymbol(math, textord, "\u2220", "\\angle", true);
 defineSymbol(math, textord, "\u221e", "\\infty", true);
 defineSymbol(math, textord, "\u2032", "\\prime");
+defineSymbol(math, textord, "\u2033", "\\dprime");
+defineSymbol(math, textord, "\u2034", "\\trprime");
+defineSymbol(math, textord, "\u2057", "\\qprime");
 defineSymbol(math, textord, "\u25b3", "\\triangle");
 defineSymbol(text, textord, "\u0391", "\\Alpha", true);
 defineSymbol(text, textord, "\u0392", "\\Beta", true);
@@ -676,7 +681,8 @@ defineSymbol(math, punct, ";", ";");
 defineSymbol(math, bin, "\u22bc", "\\barwedge", true);
 defineSymbol(math, bin, "\u22bb", "\\veebar", true);
 defineSymbol(math, bin, "\u2299", "\\odot", true);
-defineSymbol(math, bin, "\u2295", "\\oplus", true);
+// Firefox turns ⊕ into an emoji. So append \uFE0E. Define Unicode character in macros, not here.
+defineSymbol(math, bin, "\u2295\uFE0E", "\\oplus");
 defineSymbol(math, bin, "\u2297", "\\otimes", true);
 defineSymbol(math, textord, "\u2202", "\\partial", true);
 defineSymbol(math, bin, "\u2298", "\\oslash", true);