temml 0.13.5 → 0.14.0

package/dist/temml.mjs

@@ -1803,9 +1803,11 @@ defineSymbol(math, op, "\u222b", "\\smallint");
 defineSymbol(text, inner, "\u2026", "\\textellipsis");
 defineSymbol(math, inner, "\u2026", "\\mathellipsis");
 defineSymbol(text, inner, "\u2026", "\\ldots", true);
+defineSymbol(math, inner, "\u2026", "\\dotso");
+defineSymbol(math, inner, "\u2026", "\\dotsc");
 defineSymbol(math, inner, "\u2026", "\\ldots", true);
 defineSymbol(math, inner, "\u22f0", "\\iddots", true);
-defineSymbol(math, inner, "\u22ef", "\\@cdots", true);
+defineSymbol(math, inner, "\u22ef", "\\cdots", true);
 defineSymbol(math, inner, "\u22f1", "\\ddots", true);
 defineSymbol(math, textord, "\u22ee", "\\varvdots"); // \vdots is a macro
 defineSymbol(text, textord, "\u22ee", "\\varvdots");
@@ -3940,60 +3942,6 @@ defineMacro("\\dots", function(context) {
   return thedots;
 });
 
-const spaceAfterDots = {
-  // \rightdelim@ checks for the following:
-  ")": true,
-  "]": true,
-  "\\rbrack": true,
-  "\\}": true,
-  "\\rbrace": true,
-  "\\rangle": true,
-  "\\rceil": true,
-  "\\rfloor": true,
-  "\\rgroup": true,
-  "\\rmoustache": true,
-  "\\right": true,
-  "\\bigr": true,
-  "\\biggr": true,
-  "\\Bigr": true,
-  "\\Biggr": true,
-  // \extra@ also tests for the following:
-  $: true,
-  // \extrap@ checks for the following:
-  ";": true,
-  ".": true,
-  ",": true
-};
-
-defineMacro("\\dotso", function(context) {
-  const next = context.future().text;
-  if (next in spaceAfterDots) {
-    return "\\ldots\\,";
-  } else {
-    return "\\ldots";
-  }
-});
-
-defineMacro("\\dotsc", function(context) {
-  const next = context.future().text;
-  // \dotsc uses \extra@ but not \extrap@, instead specially checking for
-  // ';' and '.', but doesn't check for ','.
-  if (next in spaceAfterDots && next !== ",") {
-    return "\\ldots\\,";
-  } else {
-    return "\\ldots";
-  }
-});
-
-defineMacro("\\cdots", function(context) {
-  const next = context.future().text;
-  if (next in spaceAfterDots) {
-    return "\\@cdots\\,";
-  } else {
-    return "\\@cdots";
-  }
-});
-
 defineMacro("\\dotsb", "\\cdots");
 defineMacro("\\dotsm", "\\cdots");
 defineMacro("\\dotsi", "\\!\\cdots");
@@ -4123,7 +4071,7 @@ defineMacro("\\colon", `\\mathpunct{\\char"3a}`);
 //////////////////////////////////////////////////////////////////////
 // mathtools.sty
 
-defineMacro("\\prescript", "\\pres@cript{_{#1}^{#2}}{}{#3}");
+defineMacro("\\prescript", "\\pres@cript{^{#1}_{#2}}{}{#3}");
 
 //\providecommand\ordinarycolon{:}
 defineMacro("\\ordinarycolon", `\\char"3a`);
@@ -11481,6 +11429,11 @@ const isArrow = str => {
 defineFunctionBuilders({
   type: "atom",
   mathmlBuilder(group, style) {
+    if (group.family === "inner") {
+      // Give \dots ORD spacing, not OP spacing.
+      const tag = group.mode === "text" ? "mtext" : "mi";
+      return new MathNode(tag, [makeText(group.text, group.mode)])
+    }
     const node = new MathNode("mo", [makeText(group.text, group.mode)]);
     if (group.family === "punct") {
       node.setAttribute("separator", "true");
@@ -14244,7 +14197,7 @@ class Style {
  * https://mit-license.org/
  */
 
-const version = "0.13.5";
+const version = "0.14.0";
 
 function postProcess(block) {
   const labelMap = {};

package/dist/temmlPostProcess.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "temml",
-  "version": "0.13.5",
+  "version": "0.14.0",
   "description": "TeX to MathML conversion in JavaScript.",
   "main": "dist/temml.js",
   "engines": {
@@ -17,7 +17,7 @@
   "homepage": "https://temml.org",
   "repository": {
     "type": "git",
-    "url": "git://github.com/ronkok/Temml"
+    "url": "git+https://github.com/ronkok/Temml.git"
   },
   "packageManager": "yarn@3.3.1",
   "files": [

package/src/functions/symbolsOp.js

@@ -21,6 +21,11 @@ const isArrow = str => {
 defineFunctionBuilders({
   type: "atom",
   mathmlBuilder(group, style) {
+    if (group.family === "inner") {
+      // Give \dots ORD spacing, not OP spacing.
+      const tag = group.mode === "text" ? "mtext" : "mi"
+      return new mathMLTree.MathNode(tag, [mml.makeText(group.text, group.mode)])
+    }
     const node = new mathMLTree.MathNode("mo", [mml.makeText(group.text, group.mode)]);
     if (group.family === "punct") {
       node.setAttribute("separator", "true");

package/src/macros.js

@@ -342,60 +342,6 @@ defineMacro("\\dots", function(context) {
   return thedots;
 });
 
-const spaceAfterDots = {
-  // \rightdelim@ checks for the following:
-  ")": true,
-  "]": true,
-  "\\rbrack": true,
-  "\\}": true,
-  "\\rbrace": true,
-  "\\rangle": true,
-  "\\rceil": true,
-  "\\rfloor": true,
-  "\\rgroup": true,
-  "\\rmoustache": true,
-  "\\right": true,
-  "\\bigr": true,
-  "\\biggr": true,
-  "\\Bigr": true,
-  "\\Biggr": true,
-  // \extra@ also tests for the following:
-  $: true,
-  // \extrap@ checks for the following:
-  ";": true,
-  ".": true,
-  ",": true
-};
-
-defineMacro("\\dotso", function(context) {
-  const next = context.future().text;
-  if (next in spaceAfterDots) {
-    return "\\ldots\\,";
-  } else {
-    return "\\ldots";
-  }
-});
-
-defineMacro("\\dotsc", function(context) {
-  const next = context.future().text;
-  // \dotsc uses \extra@ but not \extrap@, instead specially checking for
-  // ';' and '.', but doesn't check for ','.
-  if (next in spaceAfterDots && next !== ",") {
-    return "\\ldots\\,";
-  } else {
-    return "\\ldots";
-  }
-});
-
-defineMacro("\\cdots", function(context) {
-  const next = context.future().text;
-  if (next in spaceAfterDots) {
-    return "\\@cdots\\,";
-  } else {
-    return "\\@cdots";
-  }
-});
-
 defineMacro("\\dotsb", "\\cdots");
 defineMacro("\\dotsm", "\\cdots");
 defineMacro("\\dotsi", "\\!\\cdots");
@@ -525,7 +471,7 @@ defineMacro("\\colon", `\\mathpunct{\\char"3a}`)
 //////////////////////////////////////////////////////////////////////
 // mathtools.sty
 
-defineMacro("\\prescript", "\\pres@cript{_{#1}^{#2}}{}{#3}")
+defineMacro("\\prescript", "\\pres@cript{^{#1}_{#2}}{}{#3}")
 
 //\providecommand\ordinarycolon{:}
 defineMacro("\\ordinarycolon", `\\char"3a`);

package/src/postProcess.js

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

package/src/symbols.js

@@ -891,9 +891,11 @@ defineSymbol(math, op, "\u222b", "\\smallint");
 defineSymbol(text, inner, "\u2026", "\\textellipsis");
 defineSymbol(math, inner, "\u2026", "\\mathellipsis");
 defineSymbol(text, inner, "\u2026", "\\ldots", true);
+defineSymbol(math, inner, "\u2026", "\\dotso");
+defineSymbol(math, inner, "\u2026", "\\dotsc");
 defineSymbol(math, inner, "\u2026", "\\ldots", true);
 defineSymbol(math, inner, "\u22f0", "\\iddots", true);
-defineSymbol(math, inner, "\u22ef", "\\@cdots", true);
+defineSymbol(math, inner, "\u22ef", "\\cdots", true);
 defineSymbol(math, inner, "\u22f1", "\\ddots", true);
 defineSymbol(math, textord, "\u22ee", "\\varvdots"); // \vdots is a macro
 defineSymbol(text, textord, "\u22ee", "\\varvdots");