temml 0.11.5 → 0.11.7

package/dist/temml.mjs

@@ -769,10 +769,12 @@ var mathMLTree = {
 // TODO: Remove when Chromium stretches \widetilde & \widehat
 const estimatedWidth = node => {
   let width = 0;
-  if (node.body) {
+  if (node.body && Array.isArray(node.body)) {
     for (const item of node.body) {
       width += estimatedWidth(item);
     }
+  } else if (node.body) {
+    width += estimatedWidth(node.body);
   } else if (node.type === "supsub") {
     width += estimatedWidth(node.base);
     if (node.sub) { width += 0.7 * estimatedWidth(node.sub); }
@@ -8990,88 +8992,6 @@ defineFunction({
   mathmlBuilder: mathmlBuilder$4
 });
 
-defineFunction({
-  type: "href",
-  names: ["\\href"],
-  props: {
-    numArgs: 2,
-    argTypes: ["url", "original"],
-    allowedInText: true
-  },
-  handler: ({ parser, token }, args) => {
-    const body = args[1];
-    const href = assertNodeType(args[0], "url").url;
-
-    if (
-      !parser.settings.isTrusted({
-        command: "\\href",
-        url: href
-      })
-    ) {
-      throw new ParseError(`Function "\\href" is not trusted`, token)
-    }
-
-    return {
-      type: "href",
-      mode: parser.mode,
-      href,
-      body: ordargument(body)
-    };
-  },
-  mathmlBuilder: (group, style) => {
-    const math = new MathNode("math", [buildExpressionRow(group.body, style)]);
-    const anchorNode = new AnchorNode(group.href, [], [math]);
-    return anchorNode
-  }
-});
-
-defineFunction({
-  type: "href",
-  names: ["\\url"],
-  props: {
-    numArgs: 1,
-    argTypes: ["url"],
-    allowedInText: true
-  },
-  handler: ({ parser, token }, args) => {
-    const href = assertNodeType(args[0], "url").url;
-
-    if (
-      !parser.settings.isTrusted({
-        command: "\\url",
-        url: href
-      })
-    ) {
-      throw new ParseError(`Function "\\url" is not trusted`, token)
-    }
-
-    const chars = [];
-    for (let i = 0; i < href.length; i++) {
-      let c = href[i];
-      if (c === "~") {
-        c = "\\textasciitilde";
-      }
-      chars.push({
-        type: "textord",
-        mode: "text",
-        text: c
-      });
-    }
-    const body = {
-      type: "text",
-      mode: parser.mode,
-      font: "\\texttt",
-      body: chars
-    };
-    return {
-      type: "href",
-      mode: parser.mode,
-      href,
-      body: ordargument(body)
-    };
-  }
-});
-
 defineFunction({
   type: "html",
   names: ["\\class", "\\id", "\\style", "\\data"],
@@ -9329,17 +9249,24 @@ defineFunction({
   },
   mathmlBuilder(group, style) {
     const dimension = calculateSize(group.dimension, style);
-    const ch = dimension.unit === "em" ? spaceCharacter(dimension.number) : "";
+    const ch = dimension.number > 0 && dimension.unit === "em"
+      ? spaceCharacter(dimension.number)
+      : "";
     if (group.mode === "text" && ch.length > 0) {
       const character = new mathMLTree.TextNode(ch);
       return new mathMLTree.MathNode("mtext", [character]);
     } else {
-      const node = new mathMLTree.MathNode("mspace");
-      node.setAttribute("width", dimension.number + dimension.unit);
-      if (dimension.number < 0) {
+      if (dimension.number >= 0) {
+        const node = new mathMLTree.MathNode("mspace");
+        node.setAttribute("width", dimension.number + dimension.unit);
+        return node
+      } else {
+        // Don't use <mspace> or <mpadded> because
+        // WebKit recognizes negative left margin only on a <mrow> element
+        const node = new mathMLTree.MathNode("mrow");
         node.style.marginLeft = dimension.number + dimension.unit;
+        return node
       }
-      return node;
     }
   }
 });
@@ -13970,7 +13897,7 @@ class Style {
  * https://mit-license.org/
  */
 
-const version = "0.11.05";
+const version = "0.11.07";
 
 function postProcess(block) {
   const labelMap = {};

package/dist/temmlPostProcess.js

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

package/package.json

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

package/src/functions/kern.js

@@ -45,17 +45,24 @@ defineFunction({
   },
   mathmlBuilder(group, style) {
     const dimension = calculateSize(group.dimension, style);
-    const ch = dimension.unit === "em" ? spaceCharacter(dimension.number) : "";
+    const ch = dimension.number > 0 && dimension.unit === "em"
+      ? spaceCharacter(dimension.number)
+      : "";
     if (group.mode === "text" && ch.length > 0) {
       const character = new mathMLTree.TextNode(ch);
       return new mathMLTree.MathNode("mtext", [character]);
     } else {
-      const node = new mathMLTree.MathNode("mspace");
-      node.setAttribute("width", dimension.number + dimension.unit);
-      if (dimension.number < 0) {
+      if (dimension.number >= 0) {
+        const node = new mathMLTree.MathNode("mspace")
+        node.setAttribute("width", dimension.number + dimension.unit)
+        return node
+      } else {
+        // Don't use <mspace> or <mpadded> because
+        // WebKit recognizes negative left margin only on a <mrow> element
+        const node = new mathMLTree.MathNode("mrow")
         node.style.marginLeft = dimension.number + dimension.unit
+        return node
       }
-      return node;
     }
   }
 });

package/src/functions.js

@@ -24,7 +24,6 @@ import "./functions/font";
 import "./functions/genfrac";
 import "./functions/hbox";
 import "./functions/horizBrace";
-import "./functions/href";
 import "./functions/html";
 import "./functions/includegraphics";
 import "./functions/kern";

package/src/postProcess.js

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

package/src/stretchy.js

@@ -7,10 +7,12 @@ import mathMLTree from "./mathMLTree"
 // TODO: Remove when Chromium stretches \widetilde & \widehat
 const estimatedWidth = node => {
   let width = 0
-  if (node.body) {
+  if (node.body && Array.isArray(node.body)) {
     for (const item of node.body) {
       width += estimatedWidth(item)
     }
+  } else if (node.body) {
+    width += estimatedWidth(node.body)
   } else if (node.type === "supsub") {
     width += estimatedWidth(node.base)
     if (node.sub) { width += 0.7 * estimatedWidth(node.sub) }

package/src/functions/href.js

@@ -1,88 +0,0 @@
-import defineFunction, { ordargument } from "../defineFunction";
-import { assertNodeType } from "../parseNode";
-import { MathNode } from "../mathMLTree";
-import { AnchorNode } from "../domTree";
-import * as mml from "../buildMathML";
-import ParseError from "../ParseError";
-
-defineFunction({
-  type: "href",
-  names: ["\\href"],
-  props: {
-    numArgs: 2,
-    argTypes: ["url", "original"],
-    allowedInText: true
-  },
-  handler: ({ parser, token }, args) => {
-    const body = args[1];
-    const href = assertNodeType(args[0], "url").url;
-
-    if (
-      !parser.settings.isTrusted({
-        command: "\\href",
-        url: href
-      })
-    ) {
-      throw new ParseError(`Function "\\href" is not trusted`, token)
-    }
-
-    return {
-      type: "href",
-      mode: parser.mode,
-      href,
-      body: ordargument(body)
-    };
-  },
-  mathmlBuilder: (group, style) => {
-    const math = new MathNode("math", [mml.buildExpressionRow(group.body, style)])
-    const anchorNode = new AnchorNode(group.href, [], [math])
-    return anchorNode
-  }
-});
-
-defineFunction({
-  type: "href",
-  names: ["\\url"],
-  props: {
-    numArgs: 1,
-    argTypes: ["url"],
-    allowedInText: true
-  },
-  handler: ({ parser, token }, args) => {
-    const href = assertNodeType(args[0], "url").url;
-
-    if (
-      !parser.settings.isTrusted({
-        command: "\\url",
-        url: href
-      })
-    ) {
-      throw new ParseError(`Function "\\url" is not trusted`, token)
-    }
-
-    const chars = [];
-    for (let i = 0; i < href.length; i++) {
-      let c = href[i];
-      if (c === "~") {
-        c = "\\textasciitilde";
-      }
-      chars.push({
-        type: "textord",
-        mode: "text",
-        text: c
-      });
-    }
-    const body = {
-      type: "text",
-      mode: parser.mode,
-      font: "\\texttt",
-      body: chars
-    };
-    return {
-      type: "href",
-      mode: parser.mode,
-      href,
-      body: ordargument(body)
-    };
-  }
-});