temml 0.11.10 → 0.12.1

package/dist/temmlPostProcess.js

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

package/package.json

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

package/src/Settings.js

@@ -3,7 +3,7 @@
  * default settings.
  */
 
-import utils from "./utils";
+import * as utils from "./utils";
 
 /**
  * The main Settings object
@@ -18,9 +18,9 @@ export default class Settings {
     this.throwOnError = utils.deflt(options.throwOnError, false);  // boolean
     this.errorColor = utils.deflt(options.errorColor, "#b22222");  // string
     this.macros = options.macros || {};
-    this.wrap = utils.deflt(options.wrap, "tex")                    // "tex" | "="
+    this.wrap = utils.deflt(options.wrap, "none")                   // "none" | "tex" | "="
     this.xml = utils.deflt(options.xml, false);                     // boolean
-    this.colorIsTextColor = utils.deflt(options.colorIsTextColor, false);  // booelean
+    this.colorIsTextColor = utils.deflt(options.colorIsTextColor, false);  // boolean
     this.strict = utils.deflt(options.strict, false);    // boolean
     this.trust = utils.deflt(options.trust, false);  // trust context. See html.js.
     this.maxSize = (options.maxSize === undefined

package/src/buildMathML.js

@@ -4,7 +4,7 @@
  * parser.
  */
 
-import mathMLTree from "./mathMLTree"
+import * as mathMLTree from "./mathMLTree"
 import ParseError from "./ParseError"
 import symbols, { ligatures } from "./symbols"
 import { _mathmlGroupBuilders as groupBuilders } from "./defineFunction"

package/src/domTree.js

@@ -8,7 +8,7 @@
  * Similar functions for working with MathML nodes exist in mathMLTree.js.
  *
  */
-import utils from "./utils";
+import * as utils from "./utils";
 
 /**
  * Create an HTML className based on a list of classes. In addition to joining

package/src/environments/array.js

@@ -2,7 +2,7 @@ import defineEnvironment from "../defineEnvironment";
 import { parseCD } from "./cd";
 import { bordermatrixParseTree } from "./borderTree.js"
 import defineFunction from "../defineFunction";
-import mathMLTree from "../mathMLTree";
+import * as mathMLTree from "../mathMLTree";
 import { Span } from "../domTree"
 import { Token } from "../Token";
 import { StyleLevel } from "../constants"
@@ -794,9 +794,8 @@ defineEnvironment({
     numArgs: 0
   },
   handler(context) {
-    const payload = { type: "small" };
+    const payload = { envClasses: ["small"] };
     const res = parseArray(context.parser, payload, "script");
-    res.envClasses = ["small"];
     return res;
   },
   mathmlBuilder

package/src/environments/cd.js

@@ -1,5 +1,5 @@
 import defineFunction from "../defineFunction";
-import mathMLTree from "../mathMLTree";
+import * as mathMLTree from "../mathMLTree";
 import * as mml from "../buildMathML";
 import { assertSymbolNodeType } from "../parseNode";
 import ParseError from "../ParseError";

package/src/functions/accent.js

@@ -1,6 +1,6 @@
 import defineFunction, { normalizeArgument } from "../defineFunction"
-import mathMLTree from "../mathMLTree"
-import stretchy from "../stretchy"
+import * as mathMLTree from "../mathMLTree"
+import * as stretchy from "../stretchy"
 import * as mml from "../buildMathML"
 
 // Identify letters to which we'll attach a combining accent character

package/src/functions/accentunder.js

@@ -1,6 +1,6 @@
 import defineFunction from "../defineFunction";
-import mathMLTree from "../mathMLTree";
-import stretchy from "../stretchy";
+import * as mathMLTree from "../mathMLTree";
+import * as stretchy from "../stretchy";
 
 import * as mml from "../buildMathML";
 

package/src/functions/arrow.js

@@ -1,6 +1,6 @@
 import defineFunction from "../defineFunction";
-import mathMLTree from "../mathMLTree";
-import stretchy from "../stretchy";
+import * as mathMLTree from "../mathMLTree";
+import * as stretchy from "../stretchy";
 import { emScale } from "../units";
 import * as mml from "../buildMathML";
 

package/src/functions/cancelto.js

@@ -1,5 +1,5 @@
 import defineFunction from "../defineFunction";
-import mathMLTree from "../mathMLTree";
+import * as mathMLTree from "../mathMLTree";
 import * as mml from "../buildMathML";
 
 defineFunction({

package/src/functions/color.js

@@ -1,5 +1,5 @@
 import defineFunction, { ordargument } from "../defineFunction"
-import mathMLTree from "../mathMLTree"
+import * as mathMLTree from "../mathMLTree"
 import { assertNodeType } from "../parseNode"
 import ParseError from "../ParseError"
 import * as mml from "../buildMathML"

package/src/functions/cr.js

@@ -1,7 +1,7 @@
 // Row breaks within tabular environments, and line breaks at top level
 
 import defineFunction from "../defineFunction"
-import mathMLTree from "../mathMLTree"
+import * as mathMLTree from "../mathMLTree"
 import { calculateSize } from "../units"
 import { assertNodeType } from "../parseNode"
 

package/src/functions/delimsizing.js

@@ -1,5 +1,5 @@
 import defineFunction from "../defineFunction";
-import mathMLTree from "../mathMLTree";
+import * as mathMLTree from "../mathMLTree";
 import ParseError from "../ParseError";
 import { assertNodeType, checkSymbolNodeType } from "../parseNode";
 
@@ -115,6 +115,9 @@ const sizeToMaxHeight = [0, 1.2, 1.8, 2.4, 3.0];
 
 // Delimiter functions
 function checkDelimiter(delim, context) {
+  if (delim.type === "ordgroup" && delim.body.length === 1) {
+    delim = delim.body[0]; // Unwrap the braces
+  }
   const symDelim = checkSymbolNodeType(delim)
   if (symDelim && delimiters.includes(symDelim.text)) {
     // If a character is not in the MathML operator dictionary, it will not stretch.

package/src/functions/enclose.js

@@ -1,29 +1,12 @@
 import defineFunction from "../defineFunction";
-import mathMLTree from "../mathMLTree";
+import * as mathMLTree from "../mathMLTree";
 import { assertNodeType } from "../parseNode";
 import { colorFromSpec, validateColor } from "./color"
 import * as mml from "../buildMathML";
 
-const padding = _ => {
-  const node = new mathMLTree.MathNode("mspace")
-  node.setAttribute("width", "3pt")
-  return node
-}
-
 const mathmlBuilder = (group, style) => {
-  let node
-  if (group.label.indexOf("colorbox") > -1 || group.label === "\\boxed") {
-    // MathML core does not support +width attribute in <mpadded>.
-    // Firefox does not reliably add side padding.
-    // Insert <mspace>
-    node = new mathMLTree.MathNode("mrow", [
-      padding(),
-      mml.buildGroup(group.body, style),
-      padding()
-    ])
-  } else {
-    node = new mathMLTree.MathNode("menclose", [mml.buildGroup(group.body, style)])
-  }
+  const tag = group.label === "\\boxed" ? "mrow" : "menclose"
+  const node = new mathMLTree.MathNode(tag, [mml.buildGroup(group.body, style)])
   switch (group.label) {
     case "\\overline":
       node.setAttribute("notation", "top") // for Firefox & WebKit
@@ -70,8 +53,7 @@ const mathmlBuilder = (group, style) => {
       break
     case "\\boxed":
       // \newcommand{\boxed}[1]{\fbox{\m@th$\displaystyle#1$}} from amsmath.sty
-      node.setAttribute("notation", "box")
-      node.style.padding = "padding: 3pt 0 3pt 0"
+      node.style.padding = "3pt"
       node.style.border = "1px solid"
       node.setAttribute("scriptlevel", "0")
       node.setAttribute("displaystyle", "true")
@@ -88,12 +70,10 @@ const mathmlBuilder = (group, style) => {
       //const fboxsep = 3; // 3 pt from LaTeX source2e
       //node.setAttribute("height", `+${2 * fboxsep}pt`)
       //node.setAttribute("voffset", `${fboxsep}pt`)
-      const style = { padding: "3pt 0 3pt 0" }
-
+      node.style.padding = "3pt"
       if (group.label === "\\fcolorbox") {
-        style.border = "0.0667em solid " + String(group.borderColor)
+        node.style.border = "0.0667em solid " + String(group.borderColor)
       }
-      node.style = style
       break
     }
   }

package/src/functions/envTag.js

@@ -1,5 +1,5 @@
 import defineFunction from "../defineFunction";
-import mathMLTree from "../mathMLTree";
+import * as mathMLTree from "../mathMLTree";
 
 defineFunction({
   type: "envTag",

package/src/functions/font.js

@@ -1,6 +1,6 @@
 import defineFunction, { normalizeArgument } from "../defineFunction"
 import * as mml from "../buildMathML"
-import mathMLTree from "../mathMLTree"
+import * as mathMLTree from "../mathMLTree"
 
 const isLongVariableName = (group, font) => {
   if (font !== "mathrm" || group.body.type !== "ordgroup" || group.body.body.length === 1) {

package/src/functions/genfrac.js

@@ -1,5 +1,5 @@
 import defineFunction, { normalizeArgument } from "../defineFunction";
-import mathMLTree from "../mathMLTree";
+import * as mathMLTree from "../mathMLTree";
 import { StyleLevel } from "../constants"
 import { assertNodeType } from "../parseNode";
 import { assert } from "../utils";

package/src/functions/horizBrace.js

@@ -1,6 +1,6 @@
 import defineFunction from "../defineFunction";
-import mathMLTree from "../mathMLTree";
-import stretchy from "../stretchy";
+import * as mathMLTree from "../mathMLTree";
+import * as stretchy from "../stretchy";
 import * as mml from "../buildMathML";
 
 const mathmlBuilder = (group, style) => {

package/src/functions/includegraphics.js

@@ -2,7 +2,7 @@ import defineFunction from "../defineFunction"
 import { calculateSize, validUnit } from "../units"
 import ParseError from "../ParseError"
 import { Img } from "../domTree"
-import mathMLTree from "../mathMLTree"
+import * as mathMLTree from "../mathMLTree"
 import { assertNodeType } from "../parseNode"
 
 const sizeData = function(str) {

package/src/functions/kern.js

@@ -1,7 +1,7 @@
 // Horizontal spacing commands
 
 import defineFunction from "../defineFunction";
-import mathMLTree from "../mathMLTree";
+import * as mathMLTree from "../mathMLTree";
 import { calculateSize } from "../units";
 import { assertNodeType } from "../parseNode";
 import ParseError from "../ParseError"

package/src/functions/label.js

@@ -1,5 +1,5 @@
 import defineFunction from "../defineFunction";
-import mathMLTree from "../mathMLTree";
+import * as mathMLTree from "../mathMLTree";
 
 // Limit valid characters to a small set, for safety.
 export const invalidIdRegEx = /[^A-Za-z_0-9-]/g

package/src/functions/lap.js

@@ -1,6 +1,6 @@
 // Horizontal overlap functions
 import defineFunction, { ordargument } from "../defineFunction";
-import mathMLTree from "../mathMLTree"
+import * as mathMLTree from "../mathMLTree"
 import * as mml from "../buildMathML"
 import ParseError from "../ParseError";
 

package/src/functions/mclass.js

@@ -1,7 +1,7 @@
 import defineFunction, { ordargument } from "../defineFunction";
 import symbols from "../symbols";
-import mathMLTree from "../mathMLTree";
-import utils from "../utils.js"
+import * as mathMLTree from "../mathMLTree";
+import * as utils from "../utils.js"
 import { padding } from "./arrow";
 
 import * as mml from "../buildMathML";

package/src/functions/multiscript.js

@@ -1,5 +1,5 @@
 import defineFunction from "../defineFunction";
-import mathMLTree from "../mathMLTree";
+import * as mathMLTree from "../mathMLTree";
 import * as mml from "../buildMathML"
 import ParseError from "../ParseError";
 

package/src/functions/not.js

@@ -1,7 +1,7 @@
 import defineFunction, { ordargument } from "../defineFunction";
 import symbols from "../symbols";
 import * as mml from "../buildMathML";
-import utils from "../utils"
+import * as utils from "../utils"
 
 defineFunction({
   type: "not",

package/src/functions/operatorname.js

@@ -1,6 +1,6 @@
 import defineFunction, { ordargument } from "../defineFunction"
 import defineMacro from "../defineMacro";
-import mathMLTree from "../mathMLTree"
+import * as mathMLTree from "../mathMLTree"
 import { spaceCharacter } from "./kern"
 import { ordTypes } from "./op"
 import { isDelimiter } from "./delimsizing"

package/src/functions/phantom.js

@@ -1,5 +1,5 @@
 import defineFunction, { ordargument } from "../defineFunction";
-import mathMLTree from "../mathMLTree";
+import * as mathMLTree from "../mathMLTree";
 import * as mml from "../buildMathML";
 
 defineFunction({

package/src/functions/raise.js

@@ -1,6 +1,6 @@
 import defineFunction from "../defineFunction"
 import { StyleLevel } from "../constants"
-import mathMLTree from "../mathMLTree"
+import * as mathMLTree from "../mathMLTree"
 import { assertNodeType } from "../parseNode"
 import { calculateSize } from "../units"
 import * as mml from "../buildMathML"

package/src/functions/rule.js

@@ -1,5 +1,5 @@
 import defineFunction from "../defineFunction";
-import mathMLTree from "../mathMLTree";
+import * as mathMLTree from "../mathMLTree";
 import { assertNodeType } from "../parseNode";
 import { calculateSize } from "../units";
 

package/src/functions/sfrac.js

@@ -1,5 +1,5 @@
 import defineFunction from "../defineFunction";
-import mathMLTree from "../mathMLTree";
+import * as mathMLTree from "../mathMLTree";
 import ParseError from "../ParseError"
 
 const numRegEx = /^[0-9]$/

package/src/functions/smash.js

@@ -1,6 +1,6 @@
 // smash, with optional [tb], as in AMS
 import defineFunction from "../defineFunction";
-import mathMLTree from "../mathMLTree";
+import * as mathMLTree from "../mathMLTree";
 import { assertNodeType } from "../parseNode";
 
 import * as mml from "../buildMathML";

package/src/functions/sqrt.js

@@ -1,5 +1,5 @@
 import defineFunction from "../defineFunction";
-import mathMLTree from "../mathMLTree";
+import * as mathMLTree from "../mathMLTree";
 import * as mml from "../buildMathML";
 
 // Letters that are x-height w/o a descender.

package/src/functions/supsub.js

@@ -1,6 +1,6 @@
 import { defineFunctionBuilders } from "../defineFunction"
 import { StyleLevel } from "../constants"
-import mathMLTree from "../mathMLTree"
+import * as mathMLTree from "../mathMLTree"
 import * as mml from "../buildMathML"
 
 /**

package/src/functions/symbolsOp.js

@@ -1,5 +1,5 @@
 import { defineFunctionBuilders } from "../defineFunction";
-import mathMLTree from "../mathMLTree";
+import * as mathMLTree from "../mathMLTree";
 import * as mml from "../buildMathML";
 import { padding } from "./arrow";
 

package/src/functions/symbolsOrd.js

@@ -1,7 +1,7 @@
 import { defineFunctionBuilders } from "../defineFunction"
 import { getVariant } from "../variant"
 import { variantChar, smallCaps } from "../replace"
-import mathMLTree from "../mathMLTree"
+import * as mathMLTree from "../mathMLTree"
 import * as mml from "../buildMathML"
 
 // "mathord" and "textord" ParseNodes created in Parser.js from symbol Groups in

package/src/functions/symbolsSpacing.js

@@ -1,5 +1,5 @@
 import { defineFunctionBuilders } from "../defineFunction"
-import mathMLTree from "../mathMLTree"
+import * as mathMLTree from "../mathMLTree"
 import ParseError from "../ParseError"
 
 // A map of CSS-based spacing functions to their CSS class.

package/src/functions/tip.js

@@ -1,5 +1,5 @@
 import defineFunction from "../defineFunction";
-import mathMLTree from "../mathMLTree";
+import * as mathMLTree from "../mathMLTree";
 import * as mml from "../buildMathML";
 
 // Two functions included to enable migration from Mathjax.

package/src/functions/toggle.js

@@ -1,5 +1,5 @@
 import { defineFunctionBuilders } from "../defineFunction";
-import mathMLTree from "../mathMLTree";
+import * as mathMLTree from "../mathMLTree";
 import * as mml from "../buildMathML";
 
 defineFunctionBuilders({

package/src/functions/vcenter.js

@@ -1,5 +1,5 @@
 import defineFunction from "../defineFunction";
-import mathMLTree from "../mathMLTree";
+import * as mathMLTree from "../mathMLTree";
 import * as mml from "../buildMathML";
 
 // \vcenter:  Vertically center the argument group on the math axis.

package/src/functions/verb.js

@@ -1,5 +1,5 @@
 import defineFunction from "../defineFunction";
-import mathMLTree from "../mathMLTree";
+import * as mathMLTree from "../mathMLTree";
 import ParseError from "../ParseError";
 
 defineFunction({

package/src/linebreaking.js

@@ -1,4 +1,4 @@
-import mathMLTree from "./mathMLTree"
+import * as mathMLTree from "./mathMLTree"
 import { DocumentFragment } from "./tree"
 
 /*

package/src/mathMLTree.js

@@ -5,7 +5,7 @@
  * HTML text markup respectively.
  */
 
-import utils from "./utils";
+import * as utils from "./utils";
 import { DocumentFragment } from "./tree";
 import { createClass } from "./domTree";
 
@@ -172,9 +172,3 @@ export const wrapWithMstyle = expression => {
   }
   return node
 }
-
-export default {
-  MathNode,
-  TextNode,
-  newDocumentFragment
-};

package/src/postProcess.js

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

package/src/stretchy.js

@@ -2,7 +2,7 @@
  * This file provides support for building horizontal stretchy elements.
  */
 
-import mathMLTree from "./mathMLTree"
+import * as mathMLTree from "./mathMLTree"
 
 // TODO: Remove when Chromium stretches \widetilde & \widehat
 const estimatedWidth = node => {
@@ -89,7 +89,7 @@ const stretchyCodePoint = {
   chemequilibrium: "\u21cc"
 }
 
-const mathMLnode = function(label) {
+export const mathMLnode = function(label) {
   const child = new mathMLTree.TextNode(stretchyCodePoint[label.slice(1)])
   const node = new mathMLTree.MathNode("mo", [child])
   node.setAttribute("stretchy", "true")
@@ -99,7 +99,7 @@ const mathMLnode = function(label) {
 const crookedWides = ["\\widetilde", "\\widehat", "\\widecheck", "\\utilde"]
 
 // TODO: Remove when Chromium stretches \widetilde & \widehat
-const accentNode = (group) => {
+export const accentNode = (group) => {
   const mo = mathMLnode(group.label)
   if (crookedWides.includes(group.label)) {
     const width = estimatedWidth(group.base)
@@ -113,8 +113,3 @@ const accentNode = (group) => {
   }
   return mo
 }
-
-export default {
-  mathMLnode,
-  accentNode
-}

package/src/units.js

@@ -4,7 +4,7 @@
  */
 
 import ParseError from "./ParseError"
-import utils from "./utils"
+import * as utils from "./utils"
 
 const ptPerUnit = {
   // Convert to CSS (Postscipt) points, not TeX points

package/src/utils.js

@@ -7,14 +7,14 @@
 /**
  * Provide a default value if a setting is undefined
  */
-const deflt = function(setting, defaultIfUndefined) {
+export const deflt = function(setting, defaultIfUndefined) {
   return setting === undefined ? defaultIfUndefined : setting;
 };
 
 // hyphenate and escape adapted from Facebook's React under Apache 2 license
 
 const uppercase = /([A-Z])/g;
-const hyphenate = function(str) {
+export const hyphenate = function(str) {
   return str.replace(uppercase, "-$1").toLowerCase();
 };
 
@@ -31,7 +31,7 @@ const ESCAPE_REGEX = /[&><"']/g;
 /**
  * Escapes text to prevent scripting attacks.
  */
-function escape(text) {
+export function escape(text) {
   return String(text).replace(ESCAPE_REGEX, (match) => ESCAPE_LOOKUP[match]);
 }
 
@@ -40,7 +40,7 @@ function escape(text) {
  * cases, this will just be the group itself, but when ordgroups and colors have
  * a single element, we want to pull that out.
  */
-const getBaseElem = function(group) {
+export const getBaseElem = function(group) {
   if (group.type === "ordgroup") {
     if (group.body.length === 1) {
       return getBaseElem(group.body[0]);
@@ -65,7 +65,7 @@ const getBaseElem = function(group) {
  * with a single character in them. To decide if something is a character box,
  * we find its innermost group, and see if it is a single character.
  */
-const isCharacterBox = function(group) {
+export const isCharacterBox = function(group) {
   const baseElem = getBaseElem(group);
 
   // These are all the types of groups which hold single characters
@@ -112,16 +112,6 @@ export const protocolFromUrl = function(url) {
  * 1/6551.6em with our ptPerEm = 10):
  * http://www.ctex.org/documents/shredder/src/texbook.pdf#page=69
  */
-const round = function(n) {
+export const round = function(n) {
   return +n.toFixed(4);
 };
-
-export default {
-  deflt,
-  escape,
-  hyphenate,
-  getBaseElem,
-  isCharacterBox,
-  protocolFromUrl,
-  round
-};