temml 0.9.2 → 0.10.2

package/src/functions/op.js

@@ -2,7 +2,7 @@
 import defineFunction, { ordargument } from "../defineFunction";
 import * as mathMLTree from "../mathMLTree";
 import * as mml from "../buildMathML";
-import { delimiters, delimiterSizes } from "./delimsizing"
+import { isDelimiter } from "./delimsizing"
 
 // Some helpers
 
@@ -14,10 +14,6 @@ const noSuccessor = ["\\smallint"];
 // Math operators (e.g. \sin) need a space between these types and themselves:
 export const ordTypes = ["textord", "mathord", "ordgroup", "close", "leftright"];
 
-const dels = ["}", "\\left", "\\middle", "\\right"]
-const isDelimiter = str => str.length > 0 &&
-  (delimiters.includes(str) || delimiterSizes[str] || dels.includes(str))
-
 // NOTE: Unlike most `builders`s, this one handles not only "op", but also
 // "supsub" since some of them (like \int) can affect super/subscripting.
 

package/src/functions/operatorname.js

@@ -3,15 +3,11 @@ import defineMacro from "../defineMacro";
 import mathMLTree from "../mathMLTree"
 import { spaceCharacter } from "./kern"
 import { ordTypes } from "./op"
-import { delimiters, delimiterSizes } from "./delimsizing"
+import { isDelimiter } from "./delimsizing"
 
 import * as mml from "../buildMathML"
 
-const dels = ["}", "\\left", "\\middle", "\\right"]
-const isDelimiter = str => str.length > 0 &&
-  (delimiters.includes(str) || delimiterSizes[str] || dels.includes(str))
-
-  // NOTE: Unlike most builders, this one handles not only
+// NOTE: Unlike most builders, this one handles not only
 // "operatorname", but also  "supsub" since \operatorname* can
 // affect super/subscripting.
 
@@ -21,8 +17,12 @@ const mathmlBuilder = (group, style) => {
   // Is expression a string or has it something like a fraction?
   let isAllString = true; // default
   for (let i = 0; i < expression.length; i++) {
-    const node = expression[i]
+    let node = expression[i]
     if (node instanceof mathMLTree.MathNode) {
+      if (node.type === "mrow" && node.children.length === 1 &&
+          node.children[0] instanceof mathMLTree.MathNode) {
+        node = node.children[0]
+      }
       switch (node.type) {
         case "mi":
         case "mn":
@@ -80,7 +80,9 @@ const mathmlBuilder = (group, style) => {
   let wrapper;
   if (isAllString) {
     wrapper = new mathMLTree.MathNode("mi", expression)
-    wrapper.setAttribute("mathvariant", "normal")
+    if (expression[0].text.length === 1) {
+      wrapper.setAttribute("mathvariant", "normal")
+    }
   } else {
     wrapper = new mathMLTree.MathNode("mrow", expression)
   }

package/src/functions/supsub.js

@@ -24,6 +24,7 @@ defineFunctionBuilders({
     let isOver
     let isSup
     let appendApplyFunction = false
+    let appendSpace = false
     let needsLeadingSpace = false
 
     if (group.base && group.base.type === "horizBrace") {
@@ -38,6 +39,7 @@ defineFunctionBuilders({
       (group.base.type === "op" || group.base.type === "operatorname")) {
       group.base.parentIsSupSub = true
       appendApplyFunction = !group.base.symbol
+      appendSpace = appendApplyFunction && !group.isFollowedByDelimiter
       needsLeadingSpace = group.base.needsLeadingSpace
     }
 
@@ -125,6 +127,11 @@ defineFunctionBuilders({
       } else {
         node = mathMLTree.newDocumentFragment([node, operator])
       }
+      if (appendSpace) {
+        const space = new mathMLTree.MathNode("mspace")
+        space.setAttribute("width", "0.1667em") // thin space.
+        node.children.push(space)
+      }
     } else if (symbolRegEx.test(nodeType)) {
       // Wrap in a <mrow>. Otherwise Firefox stretchy parens will not stretch to include limits.
       node = new mathMLTree.MathNode("mrow", [node])

package/src/functions/symbolsOrd.js

@@ -63,10 +63,7 @@ defineFunctionBuilders({
     let node
     if (numberRegEx.test(group.text)) {
       const tag = group.mode === "text" ? "mtext" : "mn"
-      if (variant === "oldstylenums") {
-        const ms = new mathMLTree.MathNode("mstyle", [text], ["oldstylenums"])
-        node = new mathMLTree.MathNode(tag, [ms])
-      } else if (variant === "italic" || variant === "bold-italic") {
+      if (variant === "italic" || variant === "bold-italic") {
         return italicNumber(text, variant, tag)
       } else {
         if (variant !== "normal") {

package/src/mathMLTree.js

@@ -148,7 +148,7 @@ export class TextNode {
 
   /**
    * Converts the text node into a string
-   * (representing the text iteself).
+   * (representing the text itself).
    */
   toText() {
     return this.text;

package/src/postProcess.js

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

package/src/symbols.js

@@ -85,7 +85,6 @@ defineSymbol(math, rel, "\u226a", "\\ll", true);
 defineSymbol(math, rel, "\u226b", "\\gg", true);
 defineSymbol(math, rel, "\u224d", "\\asymp", true);
 defineSymbol(math, rel, "\u2225", "\\parallel");
-defineSymbol(math, rel, "\u22c8", "\\bowtie", true);
 defineSymbol(math, rel, "\u2323", "\\smile", true);
 defineSymbol(math, rel, "\u2291", "\\sqsubseteq", true);
 defineSymbol(math, rel, "\u2292", "\\sqsupseteq", true);
@@ -402,7 +401,6 @@ defineSymbol(math, rel, "\u22d9", "\\gggtr");
 defineSymbol(math, bin, "\u22b2", "\\lhd");
 defineSymbol(math, bin, "\u22b3", "\\rhd");
 defineSymbol(math, rel, "\u2242", "\\eqsim", true);
-defineSymbol(math, rel, "\u22c8", "\\Join");
 defineSymbol(math, rel, "\u2251", "\\Doteq", true);
 defineSymbol(math, rel, "\u297d", "\\strictif", true);
 defineSymbol(math, rel, "\u297c", "\\strictfi", true);
@@ -428,6 +426,11 @@ defineSymbol(math, bin, "\u22ba", "\\intercal", true);
 defineSymbol(math, bin, "\u22d2", "\\doublecap");
 defineSymbol(math, bin, "\u22d3", "\\doublecup");
 defineSymbol(math, bin, "\u22a0", "\\boxtimes", true);
+defineSymbol(math, bin, "\u22c8", "\\bowtie", true);
+defineSymbol(math, bin, "\u22c8", "\\Join");
+defineSymbol(math, bin, "\u27d5", "\\leftouterjoin", true);
+defineSymbol(math, bin, "\u27d6", "\\rightouterjoin", true);
+defineSymbol(math, bin, "\u27d7", "\\fullouterjoin", true);
 
 // AMS Arrows
 // Note: unicode-math maps \u21e2 to their own function \rightdasharrow.
@@ -474,6 +477,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
   }