temml 0.10.4 → 0.10.6

package/dist/temml.mjs

@@ -1759,125 +1759,102 @@ for (let i = 0; i < 10; i++) {
  * much of this module.
  */
 
-function setLineBreaks(expression, wrapMode, isDisplayMode, color) {
-  if (color === undefined && wrapMode !== "none") {
-    // First, make one pass through the expression and split any color nodes.
-    const upperLimit = expression.length - 1;
-    for (let i = upperLimit; i >= 0; i--) {
-      const node = expression[i];
-      if (node.type === "mstyle" && node.attributes.mathcolor) {
-        const color = node.attributes.mathcolor;
-        const fragment = setLineBreaks(node.children, wrapMode, isDisplayMode, color);
-        if (!(fragment.type && fragment.type !== "mtable")) {
-          expression.splice(i, 1, ...fragment.children);
-        }
-      }
-    }
-  }
-
-  const tagName = color ? "mstyle" : "mrow";
-
+function setLineBreaks(expression, wrapMode, isDisplayMode) {
   const mtrs = [];
   let mrows = [];
   let block = [];
   let numTopLevelEquals = 0;
   let canBeBIN = false; // The first node cannot be an infix binary operator.
-  for (let i = 0; i < expression.length; i++) {
-    const node = expression[i];
-    if (node.type && node.type === "mstyle" && node.attributes.mathcolor) {
-      if (block.length > 0) {
-        // Start a new block. (Insert a soft linebreak.)
-        mrows.push(new mathMLTree.MathNode(tagName, block));
-      }
-      // Insert the mstyle
-      mrows.push(node);
-      block = [];
-      continue
+  let i = 0;
+  while (i < expression.length) {
+    while (expression[i] instanceof DocumentFragment) {
+      expression.splice(i, 1, ...expression[i].children); // Expand the fragment.
     }
+    const node = expression[i];
     if (node.attributes && node.attributes.linebreak &&
       node.attributes.linebreak === "newline") {
       // A hard line break. Create a <mtr> for the current block.
       if (block.length > 0) {
-        const element = new mathMLTree.MathNode(tagName, block);
-        if (color) { element.setAttribute("mathcolor", color); }
-        mrows.push(new mathMLTree.MathNode(tagName, block));
+        mrows.push(new mathMLTree.MathNode("mrow", block));
       }
       mrows.push(node);
       block = [];
       const mtd = new mathMLTree.MathNode("mtd", mrows);
+      mtd.style.textAlign = "left";
       mtrs.push(new mathMLTree.MathNode("mtr", [mtd]));
       mrows = [];
+      i += 1;
       continue
     }
     block.push(node);
-    if (node.type && node.type === "mo" && wrapMode === "=") {
-      if (node.children.length === 1 && node.children[0].text === "=") {
+    if (node.type && node.type === "mo" && node.children.length === 1) {
+      if (wrapMode === "=" && node.children[0].text === "=") {
         numTopLevelEquals += 1;
         if (numTopLevelEquals > 1) {
           block.pop();
           // Start a new block. (Insert a soft linebreak.)
-          const element = new mathMLTree.MathNode(tagName, block);
-          if (color) { element.setAttribute("mathcolor", color); }
+          const element = new mathMLTree.MathNode("mrow", block);
           mrows.push(element);
           block = [node];
         }
-      }
-    } else if (node.type && node.type === "mo" && wrapMode === "tex") {
-      // This may be a place for a soft line break.
-      if (canBeBIN && !node.attributes.form) {
-        // Check if the following node is a \nobreak text node, e.g. "~""
-        const next = i < expression.length - 1 ? expression[i + 1] : null;
-        let glueIsFreeOfNobreak = true;
-        if (
-          !(
-            next &&
-            next.type === "mtext" &&
-            next.attributes.linebreak &&
-            next.attributes.linebreak === "nobreak"
-          )
-        ) {
-          // We may need to start a new block.
-          // First, put any post-operator glue on same line as operator.
-          for (let j = i + 1; j < expression.length; j++) {
-            const nd = expression[j];
-            if (
-              nd.type &&
-              nd.type === "mspace" &&
-              !(nd.attributes.linebreak && nd.attributes.linebreak === "newline")
-            ) {
-              block.push(nd);
-              i += 1;
+      } else if (wrapMode === "tex") {
+        // This may be a place for a soft line break.
+        if (canBeBIN && !node.attributes.form) {
+          // Check if the following node is a \nobreak text node, e.g. "~""
+          const next = i < expression.length - 1 ? expression[i + 1] : null;
+          let glueIsFreeOfNobreak = true;
+          if (
+            !(
+              next &&
+              next.type === "mtext" &&
+              next.attributes.linebreak &&
+              next.attributes.linebreak === "nobreak"
+            )
+          ) {
+            // We may need to start a new block.
+            // First, put any post-operator glue on same line as operator.
+            for (let j = i + 1; j < expression.length; j++) {
+              const nd = expression[j];
               if (
-                nd.attributes &&
-                nd.attributes.linebreak &&
-                nd.attributes.linebreak === "nobreak"
+                nd.type &&
+                nd.type === "mspace" &&
+                !(nd.attributes.linebreak && nd.attributes.linebreak === "newline")
               ) {
-                glueIsFreeOfNobreak = false;
+                block.push(nd);
+                i += 1;
+                if (
+                  nd.attributes &&
+                  nd.attributes.linebreak &&
+                  nd.attributes.linebreak === "nobreak"
+                ) {
+                  glueIsFreeOfNobreak = false;
+                }
+              } else {
+                break;
               }
-            } else {
-              break;
             }
           }
+          if (glueIsFreeOfNobreak) {
+            // Start a new block. (Insert a soft linebreak.)
+            const element = new mathMLTree.MathNode("mrow", block);
+            mrows.push(element);
+            block = [];
+          }
+          canBeBIN = false;
         }
-        if (glueIsFreeOfNobreak) {
-          // Start a new block. (Insert a soft linebreak.)
-          const element = new mathMLTree.MathNode(tagName, block);
-          if (color) { element.setAttribute("mathcolor", color); }
-          mrows.push(element);
-          block = [];
-        }
-        canBeBIN = false;
+        const isOpenDelimiter = node.attributes.form && node.attributes.form === "prefix";
+        // Any operator that follows an open delimiter is unary.
+        canBeBIN = !(node.attributes.separator || isOpenDelimiter);
+      } else {
+        canBeBIN = true;
       }
-      const isOpenDelimiter = node.attributes.form && node.attributes.form === "prefix";
-      // Any operator that follows an open delimiter is unary.
-      canBeBIN = !(node.attributes.separator || isOpenDelimiter);
     } else {
       canBeBIN = true;
     }
+    i += 1;
   }
   if (block.length > 0) {
-    const element = new mathMLTree.MathNode(tagName, block);
-    if (color) { element.setAttribute("mathcolor", color); }
+    const element = new mathMLTree.MathNode("mrow", block);
     mrows.push(element);
   }
   if (mtrs.length > 0) {
@@ -2012,7 +1989,9 @@ const consolidateNumbers = expression => {
  */
 const makeRow = function(body) {
   if (body.length === 1) {
-    return body[0];
+    return body[0] instanceof DocumentFragment
+      ? body[0]
+      : new mathMLTree.MathNode("mrow", body);
   } else {
     return new mathMLTree.MathNode("mrow", body);
   }
@@ -2126,7 +2105,6 @@ function buildMathML(tree, texExpression, style, settings) {
 
   const n1 = expression.length === 0 ? null : expression[0];
   let wrapper = expression.length === 1 && tag === null && (n1 instanceof MathNode)
-          && !(n1.type === "mstyle" && n1.attributes.mathcolor)
       ? expression[0]
       : setLineBreaks(expression, wrap, settings.displayMode);
 
@@ -3053,7 +3031,7 @@ const colorFromSpec = (model, spec) => {
     spec.split(",").map(e => {
       const num = Number(e.trim());
       if (num > 1) { throw new ParseError("Color rgb input must be < 1.") }
-      color += toHex((num * 255));
+      color += toHex(Number((num * 255).toFixed(0)));
     });
   }
   if (color.charAt(0) !== "#") { color = "#" + color; }
@@ -3080,11 +3058,15 @@ const validateColor = (color, macros, token) => {
 };
 
 const mathmlBuilder$9 = (group, style) => {
-  const inner = buildExpression(group.body, style.withColor(group.color));
-  // Wrap with an <mstyle> element.
-  const node = wrapWithMstyle(inner);
-  node.setAttribute("mathcolor", group.color);
-  return node
+  // In LaTeX, color is not supposed to change the spacing of any node.
+  // So instead of wrapping the group in an <mstyle>, we apply
+  // the color individually to each node and return a document fragment.
+  let expr = buildExpression(group.body, style.withColor(group.color));
+  expr = expr.map(e => {
+    e.style.color = group.color;
+    return e
+  });
+  return mathMLTree.newDocumentFragment(expr)
 };
 
 defineFunction({
@@ -3736,7 +3718,7 @@ defineFunction({
     if (group.right === "\u2216" || group.right.indexOf("arrow") > -1) {
       rightNode.setAttribute("stretchy", "true");
     }
-    if (group.rightColor) { rightNode.setAttribute("mathcolor", group.rightColor); }
+    if (group.rightColor) { rightNode.style.color =  group.rightColor; }
     inner.push(rightNode);
 
     return makeRow(inner);
@@ -4920,7 +4902,6 @@ const mathmlBuilder$6 = (group, style) => {
   for (let i = 1; i < mathGroup.children.length; i++) {
     mi.children.push(mathGroup.children[i].children[0]);
   }
-  if (mathGroup.attributes.mathcolor) { mi.attributes.mathcolor = mathGroup.attributes.mathcolor; }
   if (mi.attributes.mathvariant && mi.attributes.mathvariant === "normal") {
     // Workaround for a Firefox bug that renders spurious space around
     // a <mi mathvariant="normal">
@@ -12995,7 +12976,7 @@ class Style {
  * https://mit-license.org/
  */
 
-const version = "0.10.4";
+const version = "0.10.6";
 
 function postProcess(block) {
   const labelMap = {};

package/dist/temmlPostProcess.js

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

package/package.json

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

package/src/buildMathML.js

@@ -9,6 +9,7 @@ import ParseError from "./ParseError"
 import symbols, { ligatures } from "./symbols"
 import { _mathmlGroupBuilders as groupBuilders } from "./defineFunction"
 import { MathNode } from "./mathMLTree"
+import { DocumentFragment } from "./tree"
 import setLineBreaks from "./linebreaking"
 
 /**
@@ -123,7 +124,9 @@ const consolidateNumbers = expression => {
  */
 export const makeRow = function(body) {
   if (body.length === 1) {
-    return body[0];
+    return body[0] instanceof DocumentFragment
+      ? body[0]
+      : new mathMLTree.MathNode("mrow", body);
   } else {
     return new mathMLTree.MathNode("mrow", body);
   }
@@ -237,7 +240,6 @@ export default function buildMathML(tree, texExpression, style, settings) {
 
   const n1 = expression.length === 0 ? null : expression[0]
   let wrapper = expression.length === 1 && tag === null && (n1 instanceof MathNode)
-          && !(n1.type === "mstyle" && n1.attributes.mathcolor)
       ? expression[0]
       : setLineBreaks(expression, wrap, settings.displayMode)
 

package/src/functions/color.js

@@ -1,5 +1,5 @@
 import defineFunction, { ordargument } from "../defineFunction"
-import { wrapWithMstyle } from "../mathMLTree"
+import mathMLTree from "../mathMLTree"
 import { assertNodeType } from "../parseNode"
 import ParseError from "../ParseError"
 import * as mml from "../buildMathML"
@@ -125,7 +125,7 @@ export const colorFromSpec = (model, spec) => {
     spec.split(",").map(e => {
       const num = Number(e.trim())
       if (num > 1) { throw new ParseError("Color rgb input must be < 1.") }
-      color += toHex((num * 255))
+      color += toHex(Number((num * 255).toFixed(0)))
     })
   }
   if (color.charAt(0) !== "#") { color = "#" + color }
@@ -152,11 +152,15 @@ export const validateColor = (color, macros, token) => {
 }
 
 const mathmlBuilder = (group, style) => {
-  const inner = mml.buildExpression(group.body, style.withColor(group.color))
-  // Wrap with an <mstyle> element.
-  const node = wrapWithMstyle(inner)
-  node.setAttribute("mathcolor", group.color)
-  return node
+  // In LaTeX, color is not supposed to change the spacing of any node.
+  // So instead of wrapping the group in an <mstyle>, we apply
+  // the color individually to each node and return a document fragment.
+  let expr = mml.buildExpression(group.body, style.withColor(group.color))
+  expr = expr.map(e => {
+    e.style.color = group.color
+    return e
+  })
+  return mathMLTree.newDocumentFragment(expr)
 }
 
 defineFunction({

package/src/functions/delimsizing.js

@@ -264,7 +264,7 @@ defineFunction({
     if (group.right === "\u2216" || group.right.indexOf("arrow") > -1) {
       rightNode.setAttribute("stretchy", "true")
     }
-    if (group.rightColor) { rightNode.setAttribute("mathcolor", group.rightColor) }
+    if (group.rightColor) { rightNode.style.color =  group.rightColor }
     inner.push(rightNode)
 
     return mml.makeRow(inner);

package/src/functions/font.js

@@ -29,7 +29,6 @@ const mathmlBuilder = (group, style) => {
   for (let i = 1; i < mathGroup.children.length; i++) {
     mi.children.push(mathGroup.children[i].children[0])
   }
-  if (mathGroup.attributes.mathcolor) { mi.attributes.mathcolor = mathGroup.attributes.mathcolor }
   if (mi.attributes.mathvariant && mi.attributes.mathvariant === "normal") {
     // Workaround for a Firefox bug that renders spurious space around
     // a <mi mathvariant="normal">

package/src/linebreaking.js

@@ -1,4 +1,5 @@
 import mathMLTree from "./mathMLTree"
+import { DocumentFragment } from "./tree"
 
 /*
  * Neither Firefox nor Chrome support hard line breaks or soft line breaks.
@@ -25,125 +26,102 @@ import mathMLTree from "./mathMLTree"
  * much of this module.
  */
 
-export default function setLineBreaks(expression, wrapMode, isDisplayMode, color) {
-  if (color === undefined && wrapMode !== "none") {
-    // First, make one pass through the expression and split any color nodes.
-    const upperLimit = expression.length - 1
-    for (let i = upperLimit; i >= 0; i--) {
-      const node = expression[i];
-      if (node.type === "mstyle" && node.attributes.mathcolor) {
-        const color = node.attributes.mathcolor
-        const fragment = setLineBreaks(node.children, wrapMode, isDisplayMode, color)
-        if (!(fragment.type && fragment.type !== "mtable")) {
-          expression.splice(i, 1, ...fragment.children)
-        }
-      }
-    }
-  }
-
-  const tagName = color ? "mstyle" : "mrow"
-
+export default function setLineBreaks(expression, wrapMode, isDisplayMode) {
   const mtrs = [];
   let mrows = [];
   let block = [];
   let numTopLevelEquals = 0
   let canBeBIN = false // The first node cannot be an infix binary operator.
-  for (let i = 0; i < expression.length; i++) {
-    const node = expression[i];
-    if (node.type && node.type === "mstyle" && node.attributes.mathcolor) {
-      if (block.length > 0) {
-        // Start a new block. (Insert a soft linebreak.)
-        mrows.push(new mathMLTree.MathNode(tagName, block))
-      }
-      // Insert the mstyle
-      mrows.push(node)
-      block = [];
-      continue
+  let i = 0
+  while (i < expression.length) {
+    while (expression[i] instanceof DocumentFragment) {
+      expression.splice(i, 1, ...expression[i].children) // Expand the fragment.
     }
+    const node = expression[i];
     if (node.attributes && node.attributes.linebreak &&
       node.attributes.linebreak === "newline") {
       // A hard line break. Create a <mtr> for the current block.
       if (block.length > 0) {
-        const element = new mathMLTree.MathNode(tagName, block)
-        if (color) { element.setAttribute("mathcolor", color) }
-        mrows.push(new mathMLTree.MathNode(tagName, block))
+        mrows.push(new mathMLTree.MathNode("mrow", block))
       }
       mrows.push(node)
       block = [];
       const mtd = new mathMLTree.MathNode("mtd", mrows)
+      mtd.style.textAlign = "left"
       mtrs.push(new mathMLTree.MathNode("mtr", [mtd]))
       mrows = [];
+      i += 1
       continue
     }
     block.push(node);
-    if (node.type && node.type === "mo" && wrapMode === "=") {
-      if (node.children.length === 1 && node.children[0].text === "=") {
+    if (node.type && node.type === "mo" && node.children.length === 1) {
+      if (wrapMode === "=" && node.children[0].text === "=") {
         numTopLevelEquals += 1
         if (numTopLevelEquals > 1) {
           block.pop()
           // Start a new block. (Insert a soft linebreak.)
-          const element = new mathMLTree.MathNode(tagName, block)
-          if (color) { element.setAttribute("mathcolor", color) }
+          const element = new mathMLTree.MathNode("mrow", block)
           mrows.push(element)
           block = [node];
         }
-      }
-    } else if (node.type && node.type === "mo" && wrapMode === "tex") {
-      // This may be a place for a soft line break.
-      if (canBeBIN && !node.attributes.form) {
-        // Check if the following node is a \nobreak text node, e.g. "~""
-        const next = i < expression.length - 1 ? expression[i + 1] : null;
-        let glueIsFreeOfNobreak = true;
-        if (
-          !(
-            next &&
-            next.type === "mtext" &&
-            next.attributes.linebreak &&
-            next.attributes.linebreak === "nobreak"
-          )
-        ) {
-          // We may need to start a new block.
-          // First, put any post-operator glue on same line as operator.
-          for (let j = i + 1; j < expression.length; j++) {
-            const nd = expression[j];
-            if (
-              nd.type &&
-              nd.type === "mspace" &&
-              !(nd.attributes.linebreak && nd.attributes.linebreak === "newline")
-            ) {
-              block.push(nd);
-              i += 1;
+      } else if (wrapMode === "tex") {
+        // This may be a place for a soft line break.
+        if (canBeBIN && !node.attributes.form) {
+          // Check if the following node is a \nobreak text node, e.g. "~""
+          const next = i < expression.length - 1 ? expression[i + 1] : null;
+          let glueIsFreeOfNobreak = true;
+          if (
+            !(
+              next &&
+              next.type === "mtext" &&
+              next.attributes.linebreak &&
+              next.attributes.linebreak === "nobreak"
+            )
+          ) {
+            // We may need to start a new block.
+            // First, put any post-operator glue on same line as operator.
+            for (let j = i + 1; j < expression.length; j++) {
+              const nd = expression[j];
               if (
-                nd.attributes &&
-                nd.attributes.linebreak &&
-                nd.attributes.linebreak === "nobreak"
+                nd.type &&
+                nd.type === "mspace" &&
+                !(nd.attributes.linebreak && nd.attributes.linebreak === "newline")
               ) {
-                glueIsFreeOfNobreak = false;
+                block.push(nd);
+                i += 1;
+                if (
+                  nd.attributes &&
+                  nd.attributes.linebreak &&
+                  nd.attributes.linebreak === "nobreak"
+                ) {
+                  glueIsFreeOfNobreak = false;
+                }
+              } else {
+                break;
               }
-            } else {
-              break;
             }
           }
+          if (glueIsFreeOfNobreak) {
+            // Start a new block. (Insert a soft linebreak.)
+            const element = new mathMLTree.MathNode("mrow", block)
+            mrows.push(element)
+            block = [];
+          }
+          canBeBIN = false
         }
-        if (glueIsFreeOfNobreak) {
-          // Start a new block. (Insert a soft linebreak.)
-          const element = new mathMLTree.MathNode(tagName, block)
-          if (color) { element.setAttribute("mathcolor", color) }
-          mrows.push(element)
-          block = [];
-        }
-        canBeBIN = false;
+        const isOpenDelimiter = node.attributes.form && node.attributes.form === "prefix"
+        // Any operator that follows an open delimiter is unary.
+        canBeBIN = !(node.attributes.separator || isOpenDelimiter);
+      } else {
+        canBeBIN = true
       }
-      const isOpenDelimiter = node.attributes.form && node.attributes.form === "prefix";
-      // Any operator that follows an open delimiter is unary.
-      canBeBIN = !(node.attributes.separator || isOpenDelimiter);
     } else {
-      canBeBIN = true;
+      canBeBIN = true
     }
+    i += 1
   }
   if (block.length > 0) {
-    const element = new mathMLTree.MathNode(tagName, block)
-    if (color) { element.setAttribute("mathcolor", color) }
+    const element = new mathMLTree.MathNode("mrow", block)
     mrows.push(element)
   }
   if (mtrs.length > 0) {

package/src/postProcess.js

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