katex 0.13.23 → 0.15.0

package/src/functions/cr.js

@@ -4,7 +4,7 @@
 import defineFunction from "../defineFunction";
 import buildCommon from "../buildCommon";
 import mathMLTree from "../mathMLTree";
-import {calculateSize} from "../units";
+import {calculateSize, makeEm} from "../units";
 import {assertNodeType} from "../parseNode";
 
 // \DeclareRobustCommand\\{...\@xnewline}
@@ -41,7 +41,7 @@ defineFunction({
             span.classes.push("newline");
             if (group.size) {
                 span.style.marginTop =
-                    calculateSize(group.size, options) + "em";
+                    makeEm(calculateSize(group.size, options));
             }
         }
         return span;
@@ -53,7 +53,7 @@ defineFunction({
             node.setAttribute("linebreak", "newline");
             if (group.size) {
                 node.setAttribute("height",
-                    calculateSize(group.size, options) + "em");
+                    makeEm(calculateSize(group.size, options)));
             }
         }
         return node;

package/src/functions/delimsizing.js

@@ -6,6 +6,7 @@ import mathMLTree from "../mathMLTree";
 import ParseError from "../ParseError";
 import utils from "../utils";
 import {assertNodeType, checkSymbolNodeType} from "../parseNode";
+import {makeEm} from "../units";
 
 import * as html from "../buildHTML";
 import * as mml from "../buildMathML";
@@ -126,8 +127,9 @@ defineFunction({
         }
 
         node.setAttribute("stretchy", "true");
-        node.setAttribute("minsize", delimiter.sizeToMaxHeight[group.size] + "em");
-        node.setAttribute("maxsize", delimiter.sizeToMaxHeight[group.size] + "em");
+        const size = makeEm(delimiter.sizeToMaxHeight[group.size]);
+        node.setAttribute("minsize", size);
+        node.setAttribute("maxsize", size);
 
         return node;
     },

package/src/functions/enclose.js

@@ -6,7 +6,7 @@ import utils from "../utils";
 import stretchy from "../stretchy";
 import {phasePath} from "../svgGeometry";
 import {PathNode, SvgNode} from "../domTree";
-import {calculateSize} from "../units";
+import {calculateSize, makeEm} from "../units";
 import {assertNodeType} from "../parseNode";
 
 import * as html from "../buildHTML";
@@ -48,20 +48,20 @@ const htmlBuilder = (group, options) => {
 
         const angleHeight = inner.height + inner.depth + lineWeight + clearance;
         // Reserve a left pad for the angle.
-        inner.style.paddingLeft = (angleHeight / 2 + lineWeight) + "em";
+        inner.style.paddingLeft = makeEm(angleHeight / 2 + lineWeight);
 
         // Create an SVG
         const viewBoxHeight = Math.floor(1000 * angleHeight * scale);
         const path = phasePath(viewBoxHeight);
         const svgNode = new SvgNode([new PathNode("phase", path)], {
             "width": "400em",
-            "height": `${viewBoxHeight / 1000}em`,
+            "height": makeEm(viewBoxHeight / 1000),
             "viewBox": `0 0 400000 ${viewBoxHeight}`,
             "preserveAspectRatio": "xMinYMin slice",
         });
         // Wrap it in a span with overflow: hidden.
         img = buildCommon.makeSvgSpan(["hide-tail"], [svgNode], options);
-        img.style.height = angleHeight + "em";
+        img.style.height = makeEm(angleHeight);
         imgShift = inner.depth + lineWeight + clearance;
 
     } else {
@@ -104,10 +104,10 @@ const htmlBuilder = (group, options) => {
         img = stretchy.encloseSpan(inner, label, topPad, bottomPad, options);
         if (/fbox|boxed|fcolorbox/.test(label)) {
             img.style.borderStyle = "solid";
-            img.style.borderWidth = `${ruleThickness}em`;
+            img.style.borderWidth = makeEm(ruleThickness);
         } else if (label === "angl" && ruleThickness !== 0.049) {
-            img.style.borderTopWidth = `${ruleThickness}em`;
-            img.style.borderRightWidth = `${ruleThickness}em`;
+            img.style.borderTopWidth = makeEm(ruleThickness);
+            img.style.borderRightWidth = makeEm(ruleThickness);
         }
         imgShift = inner.depth + bottomPad;
 

package/src/functions/genfrac.js

@@ -9,7 +9,7 @@ import {assert} from "../utils";
 
 import * as html from "../buildHTML";
 import * as mml from "../buildMathML";
-import {calculateSize} from "../units";
+import {calculateSize, makeEm} from "../units";
 
 const adjustStyle = (size, originalStyle) => {
     // Figure out what style this fraction should be in based on the
@@ -196,7 +196,7 @@ const mathmlBuilder = (group, options) => {
         node.setAttribute("linethickness", "0px");
     } else if (group.barSize) {
         const ruleWidth = calculateSize(group.barSize, options);
-        node.setAttribute("linethickness", ruleWidth + "em");
+        node.setAttribute("linethickness", makeEm(ruleWidth));
     }
 
     const style = adjustStyle(group.size, options.style);

package/src/functions/includegraphics.js

@@ -1,7 +1,7 @@
 // @flow
 import defineFunction from "../defineFunction";
 import type {Measurement} from "../units";
-import {calculateSize, validUnit} from "../units";
+import {calculateSize, validUnit, makeEm} from "../units";
 import ParseError from "../ParseError";
 import {Img} from "../domTree";
 import mathMLTree from "../mathMLTree";
@@ -108,7 +108,6 @@ defineFunction({
 
         if (group.totalheight.number > 0) {
             depth = calculateSize(group.totalheight, options) - height;
-            depth = Number(depth.toFixed(2));
         }
 
         let width = 0;
@@ -116,12 +115,12 @@ defineFunction({
             width = calculateSize(group.width, options);
         }
 
-        const style: CssStyle = {height: height + depth + "em"};
+        const style: CssStyle = {height: makeEm(height + depth)};
         if (width > 0) {
-            style.width = width + "em";
+            style.width = makeEm(width);
         }
         if (depth > 0) {
-            style.verticalAlign = -depth + "em";
+            style.verticalAlign = makeEm(-depth);
         }
 
         const node = new Img(group.src, group.alt, style);
@@ -138,14 +137,13 @@ defineFunction({
         let depth = 0;
         if (group.totalheight.number > 0) {
             depth = calculateSize(group.totalheight, options) - height;
-            depth = depth.toFixed(2);
-            node.setAttribute("valign", "-" + depth + "em");
+            node.setAttribute("valign", makeEm(-depth));
         }
-        node.setAttribute("height", height + depth + "em");
+        node.setAttribute("height", makeEm(height + depth));
 
         if (group.width.number > 0) {
             const width = calculateSize(group.width, options);
-            node.setAttribute("width", width + "em");
+            node.setAttribute("width", makeEm(width));
         }
         node.setAttribute("src", group.src);
         return node;

package/src/functions/lap.js

@@ -3,6 +3,7 @@
 import defineFunction from "../defineFunction";
 import buildCommon from "../buildCommon";
 import mathMLTree from "../mathMLTree";
+import {makeEm} from "../units";
 
 import * as html from "../buildHTML";
 import * as mml from "../buildMathML";
@@ -46,9 +47,9 @@ defineFunction({
         // Otherwise, a tall argument may be misplaced.
         // This code resolved issue #1153
         const strut = buildCommon.makeSpan(["strut"]);
-        strut.style.height = (node.height + node.depth) + "em";
+        strut.style.height = makeEm(node.height + node.depth);
         if (node.depth) {
-            strut.style.verticalAlign = -node.depth + "em";
+            strut.style.verticalAlign = makeEm(-node.depth);
         }
         node.children.unshift(strut);
 

package/src/functions/op.js

@@ -8,6 +8,7 @@ import utils from "../utils";
 import Style from "../Style";
 import {assembleSupSub} from "./utils/assembleSupSub";
 import {assertNodeType} from "../parseNode";
+import {makeEm} from "../units";
 
 import * as html from "../buildHTML";
 import * as mml from "../buildMathML";
@@ -132,7 +133,7 @@ export const htmlBuilder: HtmlBuilderSupSub<"op"> = (grp, options) => {
     } else {
         if (baseShift) {
             base.style.position = "relative";
-            base.style.top = baseShift + "em";
+            base.style.top = makeEm(baseShift);
         }
 
         return base;

package/src/functions/relax.js

@@ -0,0 +1,17 @@
+//@flow
+import defineFunction from "../defineFunction";
+
+defineFunction({
+    type: "internal",
+    names: ["\\relax"],
+    props: {
+        numArgs: 0,
+        allowedInText: true,
+    },
+    handler({parser}) {
+        return {
+            type: "internal",
+            mode: parser.mode,
+        };
+    },
+});

package/src/functions/rule.js

@@ -3,7 +3,7 @@ import buildCommon from "../buildCommon";
 import defineFunction from "../defineFunction";
 import mathMLTree from "../mathMLTree";
 import {assertNodeType} from "../parseNode";
-import {calculateSize} from "../units";
+import {calculateSize, makeEm} from "../units";
 
 defineFunction({
     type: "rule",
@@ -35,9 +35,9 @@ defineFunction({
         const shift = (group.shift) ? calculateSize(group.shift, options) : 0;
 
         // Style the rule to the right size
-        rule.style.borderRightWidth = width + "em";
-        rule.style.borderTopWidth = height + "em";
-        rule.style.bottom = shift + "em";
+        rule.style.borderRightWidth = makeEm(width);
+        rule.style.borderTopWidth = makeEm(height);
+        rule.style.bottom = makeEm(shift);
 
         // Record the height and width
         rule.width = width;
@@ -58,17 +58,17 @@ defineFunction({
 
         const rule = new mathMLTree.MathNode("mspace");
         rule.setAttribute("mathbackground", color);
-        rule.setAttribute("width", width + "em");
-        rule.setAttribute("height", height + "em");
+        rule.setAttribute("width", makeEm(width));
+        rule.setAttribute("height", makeEm(height));
 
         const wrapper = new mathMLTree.MathNode("mpadded", [rule]);
         if (shift >= 0) {
-            wrapper.setAttribute("height", "+" + shift + "em");
+            wrapper.setAttribute("height", makeEm(shift));
         } else {
-            wrapper.setAttribute("height", shift + "em");
-            wrapper.setAttribute("depth", "+" + (-shift) + "em");
+            wrapper.setAttribute("height", makeEm(shift));
+            wrapper.setAttribute("depth", makeEm(-shift));
         }
-        wrapper.setAttribute("voffset", shift + "em");
+        wrapper.setAttribute("voffset", makeEm(shift));
 
         return wrapper;
     },

package/src/functions/sizing.js

@@ -2,6 +2,7 @@
 import buildCommon from "../buildCommon";
 import defineFunction from "../defineFunction";
 import mathMLTree from "../mathMLTree";
+import {makeEm} from "../units";
 
 import * as html from "../buildHTML";
 import * as mml from "../buildMathML";
@@ -83,7 +84,7 @@ defineFunction({
         // in, so we can't reset the size to normal before changing it.  Now
         // that we're passing an options parameter we should be able to fix
         // this.
-        node.setAttribute("mathsize", newOptions.sizeMultiplier + "em");
+        node.setAttribute("mathsize", makeEm(newOptions.sizeMultiplier));
 
         return node;
     },

package/src/functions/sqrt.js

@@ -4,6 +4,7 @@ import buildCommon from "../buildCommon";
 import mathMLTree from "../mathMLTree";
 import delimiter from "../delimiter";
 import Style from "../Style";
+import {makeEm} from "../units";
 
 import * as html from "../buildHTML";
 import * as mml from "../buildMathML";
@@ -70,7 +71,7 @@ defineFunction({
         // Shift the sqrt image
         const imgShift = img.height - inner.height - lineClearance - ruleWidth;
 
-        inner.style.paddingLeft = advanceWidth + "em";
+        inner.style.paddingLeft = makeEm(advanceWidth);
 
         // Overlay the image and the argument.
         const body = buildCommon.makeVList({

package/src/functions/supsub.js

@@ -4,6 +4,7 @@ import buildCommon from "../buildCommon";
 import {SymbolNode} from "../domTree";
 import mathMLTree from "../mathMLTree";
 import utils from "../utils";
+import {makeEm} from "../units";
 import Style from "../Style";
 
 import * as html from "../buildHTML";
@@ -111,7 +112,7 @@ defineFunctionBuilders({
         // scriptspace is a font-size-independent size, so scale it
         // appropriately for use as the marginRight.
         const multiplier = options.sizeMultiplier;
-        const marginRight = (0.5 / metrics.ptPerEm) / multiplier + "em";
+        const marginRight = makeEm((0.5 / metrics.ptPerEm) / multiplier);
 
         let marginLeft = null;
         if (subm) {
@@ -123,7 +124,7 @@ defineFunctionBuilders({
                 (group.base.name === "\\oiint" || group.base.name === "\\oiiint");
             if (base instanceof SymbolNode || isOiint) {
                 // $FlowFixMe
-                marginLeft = -base.italic + "em";
+                marginLeft = makeEm(-base.italic);
             }
         }
 

package/src/functions/utils/assembleSupSub.js

@@ -6,6 +6,7 @@ import type {StyleInterface} from "../../Style";
 import type Options from "../../Options";
 import type {DomSpan, SymbolNode} from "../../domTree";
 import type {AnyParseNode} from "../../parseNode";
+import {makeEm} from "../../units";
 
 // For an operator with limits, assemble the base, sup, and sub into a span.
 
@@ -62,11 +63,11 @@ export const assembleSupSub = (
             positionData: bottom,
             children: [
                 {type: "kern", size: options.fontMetrics().bigOpSpacing5},
-                {type: "elem", elem: sub.elem, marginLeft: -slant + "em"},
+                {type: "elem", elem: sub.elem, marginLeft: makeEm(-slant)},
                 {type: "kern", size: sub.kern},
                 {type: "elem", elem: base},
                 {type: "kern", size: sup.kern},
-                {type: "elem", elem: sup.elem, marginLeft: slant + "em"},
+                {type: "elem", elem: sup.elem, marginLeft: makeEm(slant)},
                 {type: "kern", size: options.fontMetrics().bigOpSpacing5},
             ],
         }, options);
@@ -82,7 +83,7 @@ export const assembleSupSub = (
             positionData: top,
             children: [
                 {type: "kern", size: options.fontMetrics().bigOpSpacing5},
-                {type: "elem", elem: sub.elem, marginLeft: -slant + "em"},
+                {type: "elem", elem: sub.elem, marginLeft: makeEm(-slant)},
                 {type: "kern", size: sub.kern},
                 {type: "elem", elem: base},
             ],
@@ -96,7 +97,7 @@ export const assembleSupSub = (
             children: [
                 {type: "elem", elem: base},
                 {type: "kern", size: sup.kern},
-                {type: "elem", elem: sup.elem, marginLeft: slant + "em"},
+                {type: "elem", elem: sup.elem, marginLeft: makeEm(slant)},
                 {type: "kern", size: options.fontMetrics().bigOpSpacing5},
             ],
         }, options);
@@ -112,7 +113,7 @@ export const assembleSupSub = (
         // A negative margin-left was applied to the lower limit.
         // Avoid an overlap by placing a spacer on the left on the group.
         const spacer = buildCommon.makeSpan(["mspace"], [], options);
-        spacer.style.marginRight = `${slant}em`;
+        spacer.style.marginRight = makeEm(slant);
         parts.unshift(spacer);
     }
     return buildCommon.makeSpan(["mop", "op-limits"], parts, options);

package/src/functions.js

@@ -37,6 +37,7 @@ import "./functions/ordgroup";
 import "./functions/overline";
 import "./functions/phantom";
 import "./functions/raisebox";
+import "./functions/relax";
 import "./functions/rule";
 import "./functions/sizing";
 import "./functions/smash";

package/src/macros.js

@@ -13,6 +13,7 @@ import fontMetricsData from "./fontMetricsData";
 import functions from "./functions";
 import symbols from "./symbols";
 import utils from "./utils";
+import {makeEm} from "./units";
 import ParseError from "./ParseError";
 
 
@@ -367,7 +368,7 @@ defineMacro("\\substack", "\\begin{subarray}{c}#1\\end{subarray}");
 // \renewcommand{\colon}{\nobreak\mskip2mu\mathpunct{}\nonscript
 // \mkern-\thinmuskip{:}\mskip6muplus1mu\relax}
 defineMacro("\\colon", "\\nobreak\\mskip2mu\\mathpunct{}" +
-    "\\mathchoice{\\mkern-3mu}{\\mkern-3mu}{}{}{:}\\mskip6mu");
+    "\\mathchoice{\\mkern-3mu}{\\mkern-3mu}{}{}{:}\\mskip6mu\\relax");
 
 // \newcommand{\boxed}[1]{\fbox{\m@th$\displaystyle#1$}}
 defineMacro("\\boxed", "\\fbox{$\\displaystyle{#1}$}");
@@ -634,8 +635,8 @@ defineMacro("\\TeX", "\\textrm{\\html@mathml{" +
 // boxes, though visually the A appears to extend above slightly).
 // We compute the corresponding \raisebox when A is rendered in \normalsize
 // \scriptstyle, which has a scale factor of 0.7 (see Options.js).
-const latexRaiseA = fontMetricsData['Main-Regular']["T".charCodeAt(0)][1] -
-    0.7 * fontMetricsData['Main-Regular']["A".charCodeAt(0)][1] + "em";
+const latexRaiseA = makeEm(fontMetricsData['Main-Regular']["T".charCodeAt(0)][1] -
+    0.7 * fontMetricsData['Main-Regular']["A".charCodeAt(0)][1]);
 defineMacro("\\LaTeX", "\\textrm{\\html@mathml{" +
     `L\\kern-.36em\\raisebox{${latexRaiseA}}{\\scriptstyle A}` +
     "\\kern-.15em\\TeX}{LaTeX}}");

package/src/mathMLTree.js

@@ -12,6 +12,7 @@
 import utils from "./utils";
 import {DocumentFragment} from "./tree";
 import {createClass} from "./domTree";
+import {makeEm} from "./units";
 
 import type {VirtualNode} from "./tree";
 
@@ -219,7 +220,7 @@ class SpaceNode implements MathDomNode {
         } else {
             const node = document.createElementNS(
                 "http://www.w3.org/1998/Math/MathML", "mspace");
-            node.setAttribute("width", this.width + "em");
+            node.setAttribute("width", makeEm(this.width));
             return node;
         }
     }
@@ -231,7 +232,7 @@ class SpaceNode implements MathDomNode {
         if (this.character) {
             return `<mtext>${this.character}</mtext>`;
         } else {
-            return `<mspace width="${this.width}em"/>`;
+            return `<mspace width="${makeEm(this.width)}"/>`;
         }
     }
 

package/src/stretchy.js

@@ -9,6 +9,7 @@ import {LineNode, PathNode, SvgNode} from "./domTree";
 import buildCommon from "./buildCommon";
 import mathMLTree from "./mathMLTree";
 import utils from "./utils";
+import {makeEm} from "./units";
 
 import type Options from "./Options";
 import type {ParseNode, AnyParseNode} from "./parseNode";
@@ -233,7 +234,7 @@ const svgSpan = function(
             const path = new PathNode(pathName);
             const svgNode = new SvgNode([path], {
                 "width": "100%",
-                "height": height + "em",
+                "height": makeEm(height),
                 "viewBox": `0 0 ${viewBoxWidth} ${viewBoxHeight}`,
                 "preserveAspectRatio": "none",
             });
@@ -274,7 +275,7 @@ const svgSpan = function(
 
                 const svgNode = new SvgNode([path], {
                     "width": "400em",
-                    "height": height + "em",
+                    "height": makeEm(height),
                     "viewBox": `0 0 ${viewBoxWidth} ${viewBoxHeight}`,
                     "preserveAspectRatio": aligns[i] + " slice",
                 });
@@ -284,7 +285,7 @@ const svgSpan = function(
                 if (numSvgChildren === 1) {
                     return {span, minWidth, height};
                 } else {
-                    span.style.height = height + "em";
+                    span.style.height = makeEm(height);
                     spans.push(span);
                 }
             }
@@ -301,9 +302,9 @@ const svgSpan = function(
     // Note that we are returning span.depth = 0.
     // Any adjustments relative to the baseline must be done in buildHTML.
     span.height = height;
-    span.style.height = height + "em";
+    span.style.height = makeEm(height);
     if (minWidth > 0) {
-        span.style.minWidth = minWidth + "em";
+        span.style.minWidth = makeEm(minWidth);
     }
 
     return span;
@@ -358,14 +359,14 @@ const encloseSpan = function(
 
         const svgNode = new SvgNode(lines, {
             "width": "100%",
-            "height": totalHeight + "em",
+            "height": makeEm(totalHeight),
         });
 
         img = buildCommon.makeSvgSpan([], [svgNode], options);
     }
 
     img.height = totalHeight;
-    img.style.height = totalHeight + "em";
+    img.style.height = makeEm(totalHeight);
 
     return img;
 };

package/src/units.js

@@ -96,3 +96,11 @@ export const calculateSize = function(
     }
     return Math.min(sizeValue.number * scale, options.maxSize);
 };
+
+/**
+ * Round `n` to 4 decimal places, or to the nearest 1/10,000th em. See
+ * https://github.com/KaTeX/KaTeX/pull/2460.
+ */
+export const makeEm = function(n: number): string {
+    return +n.toFixed(4) + "em";
+};