katex 0.13.20 → 0.13.24

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/katex.less

@@ -568,7 +568,7 @@
     }
 
     .boxpad {
-        padding: 0 0.3em 0 0.3em;      // \fboxsep = 3pt
+        padding: 0 0.3em;              // \fboxsep = 3pt
     }
 
     .fbox,
@@ -578,7 +578,7 @@
     }
 
     .cancel-pad {
-        padding: 0 0.2em 0 0.2em;    // ref: cancel package  \advance\dimen@ 2\p@ %  "+2"
+        padding: 0 0.2em;            // ref: cancel package  \advance\dimen@ 2\p@ %  "+2"
     }
 
     .cancel-lap {
@@ -600,7 +600,7 @@
     }
 
     .anglpad {
-        padding: 0 0.03889em 0 0.03889em; // pad 1mu left and right (in scriptstyle)
+        padding: 0 0.03889em;             // pad 1mu left and right (in scriptstyle)
     }
 
     .eqn-num::before {

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";
 
 
@@ -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/metrics/extract_ttfs.py

@@ -44,6 +44,9 @@ metrics_to_extract = {
         u"\u21aa": None,  # \hookrightarrow
         u"\u21cc": None,  # \rightleftharpoons
     },
+    "Main-Bold": {
+        u"\u2245": None,  # \cong
+    },
     "Size1-Regular": {
         u"\u222c": u"\u222b",  # \iint, based on \int
         u"\u222d": u"\u222b",  # \iiint, based on \int

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";
+};