temml 0.9.1 → 0.10.0

package/dist/temml.mjs

@@ -1232,6 +1232,8 @@ defineSymbol(math, textord, "\u2018", "`");
 defineSymbol(math, textord, "$", "\\$");
 defineSymbol(text, textord, "$", "\\$");
 defineSymbol(text, textord, "$", "\\textdollar");
+defineSymbol(math, textord, "¢", "\\cent");
+defineSymbol(text, textord, "¢", "\\cent");
 defineSymbol(math, textord, "%", "\\%");
 defineSymbol(text, textord, "%", "\\%");
 defineSymbol(math, textord, "_", "\\_");
@@ -2077,8 +2079,6 @@ function buildMathML(tree, texExpression, style, settings) {
   let wrapper = expression.length === 1 && tag === null && (n1 instanceof MathNode)
           && !(n1.type === "mstyle" && n1.attributes.mathcolor)
       ? expression[0]
-      : expression.length > 1 && wrap === "none"
-      ? new mathMLTree.MathNode("mrow", expression)
       : setLineBreaks(expression, wrap, settings.displayMode);
 
   if (tag) {
@@ -2093,7 +2093,7 @@ function buildMathML(tree, texExpression, style, settings) {
     wrapper = new mathMLTree.MathNode("semantics", [wrapper, annotation]);
   }
 
-  if (wrap !== "none") {
+  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]]);
@@ -3148,13 +3148,12 @@ defineFunction({
   names: ["\\\\"],
   props: {
     numArgs: 0,
-    numOptionalArgs: 1,
-    argTypes: ["size"],
+    numOptionalArgs: 0,
     allowedInText: true
   },
 
   handler({ parser }, args, optArgs) {
-    const size = optArgs[0];
+    const size = parser.gullet.future().text === "[" ? parser.parseSizeGroup(true) : null;
     const newLine = !parser.settings.displayMode;
     return {
       type: "cr",
@@ -3907,7 +3906,7 @@ defineFunction({
 
 defineFunction({
   type: "enclose",
-  names: ["\\angl", "\\cancel", "\\bcancel", "\\xcancel", "\\sout", "\\overline", "\\underline"],
+  names: ["\\angl", "\\cancel", "\\bcancel", "\\xcancel", "\\sout", "\\overline"],
    // , "\\phase", "\\longdiv"
   props: {
     numArgs: 1
@@ -3924,6 +3923,25 @@ defineFunction({
   mathmlBuilder: mathmlBuilder$8
 });
 
+defineFunction({
+  type: "enclose",
+  names: ["\\underline"],
+  props: {
+    numArgs: 1,
+    allowedInText: true
+  },
+  handler({ parser, funcName }, args) {
+    const body = args[0];
+    return {
+      type: "enclose",
+      mode: parser.mode,
+      label: funcName,
+      body
+    };
+  },
+  mathmlBuilder: mathmlBuilder$8
+});
+
 /**
  * All registered environments.
  * `environments.js` exports this same dictionary again and makes it public.
@@ -4895,7 +4913,6 @@ defineFunction({
     "\\mathscr",
     "\\mathsf",
     "\\mathtt",
-    "\\oldstylenums",
 
     // aliases
     "\\Bbb",
@@ -6729,10 +6746,9 @@ defineFunction({
   }
 });
 
-// \pmb is a simulation of bold font.
+// In LaTeX, \pmb is a simulation of bold font.
 // The version of \pmb in ambsy.sty works by typesetting three copies of the argument
-// with small offsets. We use CSS text-shadow.
-// It's a hack. Not as good as a real bold font. Better than nothing.
+// with small offsets. We use CSS font-weight:bold.
 
 defineFunction({
   type: "pmb",
@@ -6752,7 +6768,7 @@ defineFunction({
     const inner = buildExpression(group.body, style);
     // Wrap with an <mstyle> element.
     const node = wrapWithMstyle(inner);
-    node.setAttribute("style", "text-shadow: 0.02em 0.01em 0.04px");
+    node.setAttribute("style", "font-weight:bold");
     return node
   }
 });
@@ -7310,8 +7326,7 @@ const fontMap = {
   mathfrak: "fraktur",
   mathscr: "script",
   mathsf: "sans-serif",
-  mathtt: "monospace",
-  oldstylenums: "oldstylenums"
+  mathtt: "monospace"
 };
 
 /**
@@ -7381,8 +7396,6 @@ const getVariant = function(group, style) {
       return "sans-serif"
     case "mathtt":
       return "monospace"
-    case "oldstylenums":
-      return "oldstylenums"
   }
 
   let text = group.text;
@@ -7625,8 +7638,8 @@ const smallCaps = Object.freeze({
 const numberRegEx$1 = /^\d(?:[\d,.]*\d)?$/;  // Keep in sync with numberRegEx in Parser.js
 const latinRegEx = /[A-Ba-z]/;
 
-const italicNumber = (text, variant) => {
-  const mn = new mathMLTree.MathNode("mn", [text]);
+const italicNumber = (text, variant, tag) => {
+  const mn = new mathMLTree.MathNode(tag, [text]);
   const wrapper = new mathMLTree.MathNode("mstyle", [mn]);
   wrapper.style["font-style"] = "italic";
   wrapper.style["font-family"] = "Cambria, 'Times New Roman', serif";
@@ -7676,28 +7689,21 @@ defineFunctionBuilders({
     const variant = getVariant(group, style) || "normal";
 
     let node;
-    if (group.mode === "text") {
+    if (numberRegEx$1.test(group.text)) {
+      const tag = group.mode === "text" ? "mtext" : "mn";
       if (variant === "italic" || variant === "bold-italic") {
-        if (numberRegEx$1.test(group.text)) {
-          return italicNumber(text, variant)
+        return italicNumber(text, variant, tag)
+      } else {
+        if (variant !== "normal") {
+          text.text = text.text.split("").map(c => variantChar(c, variant)).join("");
         }
+        node = new mathMLTree.MathNode(tag, [text]);
       }
+    } else if (group.mode === "text") {
       if (variant !== "normal") {
         text.text = variantChar(text.text, variant);
       }
       node = new mathMLTree.MathNode("mtext", [text]);
-    } else if (numberRegEx$1.test(group.text)) {
-      if (variant === "oldstylenums") {
-        const ms = new mathMLTree.MathNode("mstyle", [text], ["oldstylenums"]);
-        node = new mathMLTree.MathNode("mn", [ms]);
-      } else if (variant === "italic" || variant === "bold-italic") {
-        return italicNumber(text, variant)
-      } else {
-        if (variant !== "normal") {
-          text.text = text.text.split("").map(c => variantChar(c, variant)).join("");
-        }
-        node = new mathMLTree.MathNode("mn", [text]);
-      }
     } else if (group.text === "\\prime") {
       node = new mathMLTree.MathNode("mo", [text]);
       // TODO: If/when Chromium uses ssty variant for prime, remove the next line.
@@ -8396,7 +8402,7 @@ defineMacro("\\underbar", "\\underline{\\text{#1}}");
 // \kern6\p@\hbox{.}\hbox{.}\hbox{.}}}
 // We'll call \varvdots, which gets a glyph from symbols.js.
 // The zero-width rule gets us an equivalent to the vertical 6pt kern.
-defineMacro("\\vdots", "\\mathord{\\varvdots\\rule{0pt}{15pt}}");
+defineMacro("\\vdots", "{\\varvdots\\rule{0pt}{15pt}}");
 defineMacro("\u22ee", "\\vdots");
 
 //////////////////////////////////////////////////////////////////////
@@ -11416,6 +11422,36 @@ const uSubsAndSups = Object.freeze({
   '\u1DBF': 'θ'
 });
 
+// Used for Unicode input of calligraphic and script letters
+const asciiFromScript = Object.freeze({
+  "\ud835\udc9c": "A",
+  "\u212c": "B",
+  "\ud835\udc9e": "C",
+  "\ud835\udc9f": "D",
+  "\u2130": "E",
+  "\u2131": "F",
+  "\ud835\udca2": "G",
+  "\u210B": "H",
+  "\u2110": "I",
+  "\ud835\udca5": "J",
+  "\ud835\udca6": "K",
+  "\u2112": "L",
+  "\u2113": "M",
+  "\ud835\udca9": "N",
+  "\ud835\udcaa": "O",
+  "\ud835\udcab": "P",
+  "\ud835\udcac": "Q",
+  "\u211B": "R",
+  "\ud835\udcae": "S",
+  "\ud835\udcaf": "T",
+  "\ud835\udcb0": "U",
+  "\ud835\udcb1": "V",
+  "\ud835\udcb2": "W",
+  "\ud835\udcb3": "X",
+  "\ud835\udcb4": "Y",
+  "\ud835\udcb5": "Z"
+});
+
 // Mapping of Unicode accent characters to their LaTeX equivalent in text and
 // math mode (when they exist).
 var unicodeAccents = {
@@ -12651,6 +12687,22 @@ class Parser {
           text
         };
       } else {
+        if (asciiFromScript[text]) {
+          // Unicode 14 disambiguates chancery from roundhand.
+          // See https://www.unicode.org/charts/PDF/U1D400.pdf
+          this.consume();
+          const nextCode = this.fetch().text.charCodeAt(0);
+          // mathcal is Temml default. Use mathscript if called for.
+          const font = nextCode === 0xfe01 ? "mathscr" : "mathcal";
+          if (nextCode === 0xfe00 || nextCode === 0xfe01) { this.consume(); }
+          return {
+            type: "font",
+            mode: "math",
+            font,
+            body: { type: "mathord", mode: "math", loc, text: asciiFromScript[text] }
+          }
+        }
+        // Default ord character. No disambiguation necessary.
         s = {
           type: group,
           mode: this.mode,
@@ -12907,7 +12959,7 @@ class Style {
  * https://mit-license.org/
  */
 
-const version = "0.9.1";
+const version = "0.10.0";
 
 function postProcess(block) {
   const labelMap = {};

package/dist/temmlPostProcess.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "temml",
-  "version": "0.9.1",
+  "version": "0.10.0",
   "description": "TeX to MathML conversion in JavaScript.",
   "main": "dist/temml.js",
   "homepage": "https://temml.org",

package/src/Parser.js

@@ -7,6 +7,7 @@ import { supportedCodepoint } from "./unicodeScripts";
 import ParseError from "./ParseError";
 import { combiningDiacriticalMarksEndRegex } from "./Lexer";
 import { uSubsAndSups, unicodeSubRegEx } from "./unicodeSupOrSub"
+import { asciiFromScript } from "./asciiFromScript"
 import SourceLocation from "./SourceLocation";
 import { Token } from "./Token";
 
@@ -909,6 +910,22 @@ export default class Parser {
           text
         };
       } else {
+        if (asciiFromScript[text]) {
+          // Unicode 14 disambiguates chancery from roundhand.
+          // See https://www.unicode.org/charts/PDF/U1D400.pdf
+          this.consume()
+          const nextCode = this.fetch().text.charCodeAt(0)
+          // mathcal is Temml default. Use mathscript if called for.
+          const font = nextCode === 0xfe01 ? "mathscr" : "mathcal";
+          if (nextCode === 0xfe00 || nextCode === 0xfe01) { this.consume() }
+          return {
+            type: "font",
+            mode: "math",
+            font,
+            body: { type: "mathord", mode: "math", loc, text: asciiFromScript[text] }
+          }
+        }
+        // Default ord character. No disambiguation necessary.
         s = {
           type: group,
           mode: this.mode,

package/src/asciiFromScript.js

@@ -0,0 +1,29 @@
+// Used for Unicode input of calligraphic and script letters
+export const asciiFromScript = Object.freeze({
+  "\ud835\udc9c": "A",
+  "\u212c": "B",
+  "\ud835\udc9e": "C",
+  "\ud835\udc9f": "D",
+  "\u2130": "E",
+  "\u2131": "F",
+  "\ud835\udca2": "G",
+  "\u210B": "H",
+  "\u2110": "I",
+  "\ud835\udca5": "J",
+  "\ud835\udca6": "K",
+  "\u2112": "L",
+  "\u2113": "M",
+  "\ud835\udca9": "N",
+  "\ud835\udcaa": "O",
+  "\ud835\udcab": "P",
+  "\ud835\udcac": "Q",
+  "\u211B": "R",
+  "\ud835\udcae": "S",
+  "\ud835\udcaf": "T",
+  "\ud835\udcb0": "U",
+  "\ud835\udcb1": "V",
+  "\ud835\udcb2": "W",
+  "\ud835\udcb3": "X",
+  "\ud835\udcb4": "Y",
+  "\ud835\udcb5": "Z"
+})

package/src/buildMathML.js

@@ -195,8 +195,6 @@ export default function buildMathML(tree, texExpression, style, settings) {
   let wrapper = expression.length === 1 && tag === null && (n1 instanceof MathNode)
           && !(n1.type === "mstyle" && n1.attributes.mathcolor)
       ? expression[0]
-      : expression.length > 1 && wrap === "none"
-      ? new mathMLTree.MathNode("mrow", expression)
       : setLineBreaks(expression, wrap, settings.displayMode)
 
   if (tag) {
@@ -211,7 +209,7 @@ export default function buildMathML(tree, texExpression, style, settings) {
     wrapper = new mathMLTree.MathNode("semantics", [wrapper, annotation]);
   }
 
-  if (wrap !== "none") {
+  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]])

package/src/functions/cr.js

@@ -11,13 +11,12 @@ defineFunction({
   names: ["\\\\"],
   props: {
     numArgs: 0,
-    numOptionalArgs: 1,
-    argTypes: ["size"],
+    numOptionalArgs: 0,
     allowedInText: true
   },
 
   handler({ parser }, args, optArgs) {
-    const size = optArgs[0];
+    const size = parser.gullet.future().text === "[" ? parser.parseSizeGroup(true) : null;
     const newLine = !parser.settings.displayMode;
     return {
       type: "cr",

package/src/functions/enclose.js

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

package/src/functions/font.js

@@ -67,7 +67,6 @@ defineFunction({
     "\\mathscr",
     "\\mathsf",
     "\\mathtt",
-    "\\oldstylenums",
 
     // aliases
     "\\Bbb",

package/src/functions/pmb.js

@@ -2,10 +2,9 @@ import defineFunction, { ordargument } from "../defineFunction"
 import { wrapWithMstyle } from "../mathMLTree"
 import * as mml from "../buildMathML"
 
-// \pmb is a simulation of bold font.
+// In LaTeX, \pmb is a simulation of bold font.
 // The version of \pmb in ambsy.sty works by typesetting three copies of the argument
-// with small offsets. We use CSS text-shadow.
-// It's a hack. Not as good as a real bold font. Better than nothing.
+// with small offsets. We use CSS font-weight:bold.
 
 defineFunction({
   type: "pmb",
@@ -25,7 +24,7 @@ defineFunction({
     const inner = mml.buildExpression(group.body, style)
     // Wrap with an <mstyle> element.
     const node = wrapWithMstyle(inner)
-    node.setAttribute("style", "text-shadow: 0.02em 0.01em 0.04px")
+    node.setAttribute("style", "font-weight:bold")
     return node
   }
 })

package/src/functions/symbolsOrd.js

@@ -10,8 +10,8 @@ import * as mml from "../buildMathML"
 const numberRegEx = /^\d(?:[\d,.]*\d)?$/  // Keep in sync with numberRegEx in Parser.js
 const latinRegEx = /[A-Ba-z]/
 
-const italicNumber = (text, variant) => {
-  const mn = new mathMLTree.MathNode("mn", [text])
+const italicNumber = (text, variant, tag) => {
+  const mn = new mathMLTree.MathNode(tag, [text])
   const wrapper = new mathMLTree.MathNode("mstyle", [mn])
   wrapper.style["font-style"] = "italic"
   wrapper.style["font-family"] = "Cambria, 'Times New Roman', serif"
@@ -61,28 +61,21 @@ defineFunctionBuilders({
     const variant = getVariant(group, style) || "normal"
 
     let node
-    if (group.mode === "text") {
+    if (numberRegEx.test(group.text)) {
+      const tag = group.mode === "text" ? "mtext" : "mn"
       if (variant === "italic" || variant === "bold-italic") {
-        if (numberRegEx.test(group.text)) {
-          return italicNumber(text, variant)
+        return italicNumber(text, variant, tag)
+      } else {
+        if (variant !== "normal") {
+          text.text = text.text.split("").map(c => variantChar(c, variant)).join("")
         }
+        node = new mathMLTree.MathNode(tag, [text])
       }
+    } else if (group.mode === "text") {
       if (variant !== "normal") {
         text.text = variantChar(text.text, variant)
       }
       node = new mathMLTree.MathNode("mtext", [text])
-    } else if (numberRegEx.test(group.text)) {
-      if (variant === "oldstylenums") {
-        const ms = new mathMLTree.MathNode("mstyle", [text], ["oldstylenums"])
-        node = new mathMLTree.MathNode("mn", [ms])
-      } else if (variant === "italic" || variant === "bold-italic") {
-        return italicNumber(text, variant)
-      } else {
-        if (variant !== "normal") {
-          text.text = text.text.split("").map(c => variantChar(c, variant)).join("")
-        }
-        node = new mathMLTree.MathNode("mn", [text])
-      }
     } else if (group.text === "\\prime") {
       node = new mathMLTree.MathNode("mo", [text])
       // TODO: If/when Chromium uses ssty variant for prime, remove the next line.

package/src/macros.js

@@ -228,7 +228,7 @@ defineMacro("\\underbar", "\\underline{\\text{#1}}");
 // \kern6\p@\hbox{.}\hbox{.}\hbox{.}}}
 // We'll call \varvdots, which gets a glyph from symbols.js.
 // The zero-width rule gets us an equivalent to the vertical 6pt kern.
-defineMacro("\\vdots", "\\mathord{\\varvdots\\rule{0pt}{15pt}}");
+defineMacro("\\vdots", "{\\varvdots\\rule{0pt}{15pt}}");
 defineMacro("\u22ee", "\\vdots");
 
 //////////////////////////////////////////////////////////////////////

package/src/postProcess.js

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

package/src/symbols.js

@@ -474,6 +474,8 @@ defineSymbol(math, textord, "\u2018", "`");
 defineSymbol(math, textord, "$", "\\$");
 defineSymbol(text, textord, "$", "\\$");
 defineSymbol(text, textord, "$", "\\textdollar");
+defineSymbol(math, textord, "¢", "\\cent");
+defineSymbol(text, textord, "¢", "\\cent");
 defineSymbol(math, textord, "%", "\\%");
 defineSymbol(text, textord, "%", "\\%");
 defineSymbol(math, textord, "_", "\\_");

package/src/variant.js

@@ -17,8 +17,7 @@ const fontMap = {
   mathfrak: "fraktur",
   mathscr: "script",
   mathsf: "sans-serif",
-  mathtt: "monospace",
-  oldstylenums: "oldstylenums"
+  mathtt: "monospace"
 }
 
 /**
@@ -88,8 +87,6 @@ export const getVariant = function(group, style) {
       return "sans-serif"
     case "mathtt":
       return "monospace"
-    case "oldstylenums":
-      return "oldstylenums"
     default:
       break
   }