temml 0.10.32 → 0.10.34

package/src/functions/vcenter.js

@@ -0,0 +1,30 @@
+import defineFunction from "../defineFunction";
+import mathMLTree from "../mathMLTree";
+import * as mml from "../buildMathML";
+
+// \vcenter:  Vertically center the argument group on the math axis.
+
+defineFunction({
+  type: "vcenter",
+  names: ["\\vcenter"],
+  props: {
+    numArgs: 1,
+    argTypes: ["original"],
+    allowedInText: false
+  },
+  handler({ parser }, args) {
+    return {
+      type: "vcenter",
+      mode: parser.mode,
+      body: args[0]
+    };
+  },
+  mathmlBuilder(group, style) {
+    // Use a math table to create vertically centered content.
+    const mtd = new mathMLTree.MathNode("mtd", [mml.buildGroup(group.body, style)])
+    mtd.style.padding = "0"
+    const mtr = new mathMLTree.MathNode("mtr", [mtd])
+    return new mathMLTree.MathNode("mtable", [mtr])
+  }
+});
+

package/src/functions.js

@@ -56,4 +56,5 @@ import "./functions/tag";
 import "./functions/text";
 // import "./functions/tip";
 // import "./functions/toggle";
+import "./functions/vcenter";
 import "./functions/verb";

package/src/macros.js

@@ -243,7 +243,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", "\\TextOrMath{\\textvdots}{{\\varvdots\\rule{0pt}{15pt}}}\\relax");
+defineMacro("\\vdots", "{\\varvdots\\rule{0pt}{15pt}}")
 defineMacro("\u22ee", "\\vdots");
 
 // {array} environment gaps
@@ -463,8 +463,10 @@ defineMacro("\\tag@literal", (context) => {
   if (context.macros.get("\\df@tag")) {
     throw new ParseError("Multiple \\tag");
   }
-  return "\\def\\df@tag{\\text{#1}}";
+  return "\\gdef\\df@tag{\\text{#1}}";
 });
+defineMacro("\\notag", "\\nonumber");
+defineMacro("\\nonumber", "\\gdef\\@eqnsw{0}")
 
 // \renewcommand{\bmod}{\nonscript\mskip-\medmuskip\mkern5mu\mathbin
 //   {\operator@font mod}\penalty900

package/src/mathMLTree.js

@@ -25,6 +25,7 @@ export class MathNode {
     this.children = children || [];
     this.classes = classes || [];
     this.style = style || {};   // Used for <mstyle> elements
+    this.label = "";
   }
 
   /**
@@ -42,6 +43,10 @@ export class MathNode {
     return this.attributes[name];
   }
 
+  setLabel(value) {
+    this.label = value
+  }
+
   /**
    * Converts the math node into a MathML-namespaced DOM element.
    */

package/src/postProcess.js

@@ -1,40 +1,49 @@
 /* Temml Post Process
- * Perform two tasks not done by Temml when it created each individual Temml <math> element.
- * Given a block,
- *   1. At each AMS auto-numbered environment, assign an id.
- *   2. Populate the text contents of each \ref & \eqref
+ * Populate the text contents of each \ref & \eqref
  *
  * As with other Temml code, this file is released under terms of the MIT license.
  * https://mit-license.org/
  */
 
-export const version = "0.10.32";
+export const version = "0.10.34";
 
 export function postProcess(block) {
   const labelMap = {}
   let i = 0
 
   // Get a collection of the parents of each \tag & auto-numbered equation
-  const parents = block.getElementsByClassName("tml-tageqn");
-  for (const parent of parents) {
-    const eqns = parent.getElementsByClassName("tml-eqn")
-    if (eqns. length > 0 ) {
-      // AMS automatically numbered equation.
-      // Assign an id.
-      i += 1;
-      eqns[0].id = "tml-eqn-" + i
-      // No need to write a number into the text content of the element.
-      // A CSS counter does that even if this postProcess() function is not used.
+  const amsEqns = document.getElementsByClassName('tml-eqn')
+  for (let parent of amsEqns) {
+    // AMS automatically numbered equation.
+    // Assign an id.
+    i += 1;
+    parent.setAttribute("id", "tml-eqn-" + String(i))
+    // No need to write a number into the text content of the element.
+    // A CSS counter has done that even if this postProcess() function is not used.
+
+    // Find any \label that refers to an AMS automatic eqn number.
+    while (true) {
+      if (parent.tagName === "mtable") { break }
+      const labels = parent.getElementsByClassName("tml-label")
+      if (labels.length > 0) {
+        const id = parent.attributes.id.value
+        labelMap[id] = String(i)
+        break
+      } else {
+        parent = parent.parentElement
+      }
     }
-    // If there is a \label, add it to labelMap
+  }
+
+  // Find \labels associated with \tag
+  const taggedEqns = document.getElementsByClassName('tml-tageqn')
+  for (const parent of taggedEqns) {
     const labels = parent.getElementsByClassName("tml-label")
-    if (labels.length === 0) { continue }
-    if (eqns.length > 0) {
-      labelMap[labels[0].id] = String(i)
-    } else {
+    if (labels.length > 0) {
       const tags = parent.getElementsByClassName("tml-tag")
       if (tags.length > 0) {
-        labelMap[labels[0].id] = tags[0].textContent
+        const id = parent.attributes.id.value
+        labelMap[id] = tags[0].textContent
       }
     }
   }
@@ -42,16 +51,21 @@ export function postProcess(block) {
   // Populate \ref & \eqref text content
   const refs = block.getElementsByClassName("tml-ref");
   [...refs].forEach(ref => {
-    let str = labelMap[ref.getAttribute("href").slice(1)];
+    const attr = ref.getAttribute("href")
+    let str = labelMap[attr.slice(1)];
     if (ref.className.indexOf("tml-eqref") === -1) {
       // \ref. Omit parens.
       str = str.replace(/^\(/, "")
-      str = str.replace(/\($/, "")
-    }  {
+      str = str.replace(/\)$/, "")
+    } else {
       // \eqref. Include parens
       if (str.charAt(0) !== "(") { str = "(" + str }
       if (str.slice(-1) !== ")") { str =  str + ")" }
     }
-    ref.textContent = str
+    const mtext = document.createElementNS("http://www.w3.org/1998/Math/MathML", "mtext")
+    mtext.appendChild(document.createTextNode(str))
+    const math =  document.createElementNS("http://www.w3.org/1998/Math/MathML", "math")
+    math.appendChild(mtext)
+    ref.appendChild(math)
   })
 }

package/src/symbols.js

@@ -670,7 +670,7 @@ defineSymbol(math, mathord, "\u03db", "\\stigma", true);
 defineSymbol(math, mathord, "\u2aeb", "\\Bot");
 defineSymbol(math, bin, "\u2217", "\u2217", true);
 defineSymbol(math, bin, "+", "+");
-defineSymbol(math, bin, "*", "*");
+defineSymbol(math, bin, "\u2217", "*");
 defineSymbol(math, bin, "\u2044", "/", true);
 defineSymbol(math, bin, "\u2044", "\u2044");
 defineSymbol(math, bin, "\u2212", "-", true);
@@ -692,7 +692,7 @@ defineSymbol(math, open, "\u27e8", "\\langle", true);
 defineSymbol(math, open, "\u27ea", "\\lAngle", true);
 defineSymbol(math, open, "\u2989", "\\llangle", true);
 defineSymbol(math, open, "|", "\\lvert");
-defineSymbol(math, open, "\u2016", "\\lVert");
+defineSymbol(math, open, "\u2016", "\\lVert", true);
 defineSymbol(math, textord, "!", "\\oc"); // cmll package
 defineSymbol(math, textord, "?", "\\wn");
 defineSymbol(math, textord, "\u2193", "\\shpos");
@@ -856,7 +856,7 @@ defineSymbol(math, inner, "\u22f0", "\\iddots", 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", "\\textvdots");
+defineSymbol(text, textord, "\u22ee", "\\varvdots");
 defineSymbol(math, accent, "\u02ca", "\\acute");
 defineSymbol(math, accent, "\u0060", "\\grave");
 defineSymbol(math, accent, "\u00a8", "\\ddot");

package/src/variant.js

@@ -85,6 +85,8 @@ export const getVariant = function(group, style) {
       return "script"
     case "mathsf":
       return "sans-serif"
+    case "mathsfit":
+      return "sans-serif-italic"
     case "mathtt":
       return "monospace"
     default: