katex 0.16.30 → 0.16.32

package/dist/katex.mjs

@@ -5523,11 +5523,12 @@ var makeOrd = function makeOrd(group, options, type) {
 };
 /**
  * Returns true if subsequent symbolNodes have the same classes, skew, maxFont,
- * and styles.
+ * and styles. For mathnormal text, the left node must also have zero italic
+ * correction so we don't lose spacing between combined glyphs.
  */
 
 var canCombine = (prev, next) => {
-  if (createClass(prev.classes) !== createClass(next.classes) || prev.skew !== next.skew || prev.maxFontSize !== next.maxFontSize) {
+  if (createClass(prev.classes) !== createClass(next.classes) || prev.skew !== next.skew || prev.maxFontSize !== next.maxFontSize || prev.italic !== 0 && prev.hasClass("mathnormal")) {
     return false;
   } // If prev and next both are just "mbin"s or "mord"s we don't combine them
   // so that the proper spacing can be preserved.
@@ -11601,30 +11602,9 @@ defineFunction({
   mathmlBuilder: mathmlBuilder$4
 });
 
-var adjustStyle = (size, originalStyle) => {
-  // Figure out what style this fraction should be in based on the
-  // function used
-  var style = originalStyle;
-
-  if (size === "display") {
-    // Get display style as a default.
-    // If incoming style is sub/sup, use style.text() to get correct size.
-    style = style.id >= Style$1.SCRIPT.id ? style.text() : Style$1.DISPLAY;
-  } else if (size === "text" && style.size === Style$1.DISPLAY.size) {
-    // We're in a \tfrac but incoming style is displaystyle, so:
-    style = Style$1.TEXT;
-  } else if (size === "script") {
-    style = Style$1.SCRIPT;
-  } else if (size === "scriptscript") {
-    style = Style$1.SCRIPTSCRIPT;
-  }
-
-  return style;
-};
-
 var htmlBuilder$4 = (group, options) => {
   // Fractions are handled in the TeXbook on pages 444-445, rules 15(a-e).
-  var style = adjustStyle(group.size, options.style);
+  var style = options.style;
   var nstyle = style.fracNum();
   var dstyle = style.fracDen();
   var newOptions;
@@ -11667,7 +11647,7 @@ var htmlBuilder$4 = (group, options) => {
   var clearance;
   var denomShift;
 
-  if (style.size === Style$1.DISPLAY.size || group.size === "display") {
+  if (style.size === Style$1.DISPLAY.size) {
     numShift = options.fontMetrics().num1;
 
     if (ruleWidth > 0) {
@@ -11789,15 +11769,6 @@ var mathmlBuilder$3 = (group, options) => {
     node.setAttribute("linethickness", makeEm(ruleWidth));
   }
 
-  var style = adjustStyle(group.size, options.style);
-
-  if (style.size !== options.style.size) {
-    node = new MathNode("mstyle", [node]);
-    var isDisplay = style.size === Style$1.DISPLAY.size ? "true" : "false";
-    node.setAttribute("displaystyle", isDisplay);
-    node.setAttribute("scriptlevel", "0");
-  }
-
   if (group.leftDelim != null || group.rightDelim != null) {
     var withDelims = [];
 
@@ -11821,9 +11792,24 @@ var mathmlBuilder$3 = (group, options) => {
   return node;
 };
 
+var wrapWithStyle = (frac, style) => {
+  if (!style) {
+    return frac;
+  }
+
+  var wrapper = {
+    type: "styling",
+    mode: frac.mode,
+    style,
+    body: [frac]
+  }; // $FlowFixMe: defineFunction handler needs to return ParseNode<"genfrac">
+
+  return wrapper;
+};
+
 defineFunction({
   type: "genfrac",
-  names: ["\\dfrac", "\\frac", "\\tfrac", "\\dbinom", "\\binom", "\\tbinom", "\\\\atopfrac", // can’t be entered directly
+  names: ["\\cfrac", "\\dfrac", "\\frac", "\\tfrac", "\\dbinom", "\\binom", "\\tbinom", "\\\\atopfrac", // can’t be entered directly
   "\\\\bracefrac", "\\\\brackfrac" // ditto
   ],
   props: {
@@ -11840,9 +11826,9 @@ defineFunction({
     var hasBarLine;
     var leftDelim = null;
     var rightDelim = null;
-    var size = "auto";
 
     switch (funcName) {
+      case "\\cfrac":
       case "\\dfrac":
       case "\\frac":
       case "\\tfrac":
@@ -11877,60 +11863,29 @@ defineFunction({
         throw new Error("Unrecognized genfrac command");
     }
 
-    switch (funcName) {
-      case "\\dfrac":
-      case "\\dbinom":
-        size = "display";
-        break;
+    var continued = funcName === "\\cfrac";
+    var style = null;
 
-      case "\\tfrac":
-      case "\\tbinom":
-        size = "text";
-        break;
+    if (continued || funcName.startsWith("\\d")) {
+      style = "display";
+    } else if (funcName.startsWith("\\t")) {
+      style = "text";
     }
 
-    return {
+    return wrapWithStyle({
       type: "genfrac",
       mode: parser.mode,
-      continued: false,
       numer,
       denom,
+      continued,
       hasBarLine,
       leftDelim,
       rightDelim,
-      size,
       barSize: null
-    };
+    }, style);
   },
   htmlBuilder: htmlBuilder$4,
   mathmlBuilder: mathmlBuilder$3
-});
-defineFunction({
-  type: "genfrac",
-  names: ["\\cfrac"],
-  props: {
-    numArgs: 2
-  },
-  handler: (_ref2, args) => {
-    var {
-      parser,
-      funcName
-    } = _ref2;
-    var numer = args[0];
-    var denom = args[1];
-    return {
-      type: "genfrac",
-      mode: parser.mode,
-      continued: true,
-      numer,
-      denom,
-      hasBarLine: true,
-      leftDelim: null,
-      rightDelim: null,
-      size: "display",
-      barSize: null
-    };
-  }
 }); // Infix generalized fractions -- these are not rendered directly, but replaced
 // immediately by one of the variants above.
 
@@ -11942,12 +11897,12 @@ defineFunction({
     infix: true
   },
 
-  handler(_ref3) {
+  handler(_ref2) {
     var {
       parser,
       funcName,
       token
-    } = _ref3;
+    } = _ref2;
     var replaceWith;
 
     switch (funcName) {
@@ -12006,10 +11961,10 @@ defineFunction({
     argTypes: ["math", "math", "size", "text", "math", "math"]
   },
 
-  handler(_ref4, args) {
+  handler(_ref3, args) {
     var {
       parser
-    } = _ref4;
+    } = _ref3;
     var numer = args[4];
     var denom = args[5]; // Look into the parse nodes to get the desired delimiters.
 
@@ -12032,7 +11987,7 @@ defineFunction({
     } // Find out if we want displaystyle, textstyle, etc.
 
 
-    var size = "auto";
+    var size = null;
     var styl = args[3];
 
     if (styl.type === "ordgroup") {
@@ -12045,7 +12000,7 @@ defineFunction({
       size = stylArray[Number(styl.text)];
     }
 
-    return {
+    return wrapWithStyle({
       type: "genfrac",
       mode: parser.mode,
       numer,
@@ -12054,13 +12009,10 @@ defineFunction({
       hasBarLine,
       barSize,
       leftDelim,
-      rightDelim,
-      size
-    };
-  },
+      rightDelim
+    }, size);
+  }
 
-  htmlBuilder: htmlBuilder$4,
-  mathmlBuilder: mathmlBuilder$3
 }); // \above is an infix fraction that also defines a fraction bar size.
 
 defineFunction({
@@ -12072,12 +12024,12 @@ defineFunction({
     infix: true
   },
 
-  handler(_ref5, args) {
+  handler(_ref4, args) {
     var {
       parser,
       funcName,
       token
-    } = _ref5;
+    } = _ref4;
     return {
       type: "infix",
       mode: parser.mode,
@@ -12095,11 +12047,11 @@ defineFunction({
     numArgs: 3,
     argTypes: ["math", "size", "math"]
   },
-  handler: (_ref6, args) => {
+  handler: (_ref5, args) => {
     var {
       parser,
       funcName
-    } = _ref6;
+    } = _ref5;
     var numer = args[0];
     var barSize = assertNodeType(args[1], "infix").size;
 
@@ -12118,12 +12070,9 @@ defineFunction({
       hasBarLine,
       barSize,
       leftDelim: null,
-      rightDelim: null,
-      size: "auto"
+      rightDelim: null
     };
-  },
-  htmlBuilder: htmlBuilder$4,
-  mathmlBuilder: mathmlBuilder$3
+  }
 });
 
 // NOTE: Unlike most `htmlBuilder`s, this one handles not only "horizBrace", but
@@ -18350,7 +18299,7 @@ var renderToHTMLTree = function renderToHTMLTree(expression, options) {
   }
 };
 
-var version = "0.16.30";
+var version = "0.16.32";
 var __domTree = {
   Span,
   Anchor,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "katex",
-  "version": "0.16.30",
+  "version": "0.16.32",
   "description": "Fast math typesetting for the web.",
   "main": "dist/katex.js",
   "types": "types/katex.d.ts",

package/src/buildCommon.js

@@ -238,12 +238,14 @@ export const makeOrd = function<NODETYPE: "spacing" | "mathord" | "textord">(
 
 /**
  * Returns true if subsequent symbolNodes have the same classes, skew, maxFont,
- * and styles.
+ * and styles. For mathnormal text, the left node must also have zero italic
+ * correction so we don't lose spacing between combined glyphs.
  */
 const canCombine = (prev: SymbolNode, next: SymbolNode) => {
     if (createClass(prev.classes) !== createClass(next.classes)
         || prev.skew !== next.skew
-        || prev.maxFontSize !== next.maxFontSize) {
+        || prev.maxFontSize !== next.maxFontSize
+        || (prev.italic !== 0 && prev.hasClass("mathnormal"))) {
         return false;
     }
 

package/src/functions/genfrac.js

@@ -3,36 +3,18 @@ import defineFunction, {normalizeArgument} from "../defineFunction";
 import {makeLineSpan, makeSpan, makeVList} from "../buildCommon";
 import {makeCustomSizedDelim} from "../delimiter";
 import {MathNode, TextNode} from "../mathMLTree";
+import type {ParseNode} from "../parseNode";
 import Style from "../Style";
 import {assertNodeType} from "../parseNode";
+import type {StyleStr} from "../types";
 
 import * as html from "../buildHTML";
 import * as mml from "../buildMathML";
 import {calculateSize, makeEm} from "../units";
 
-const adjustStyle = (size, originalStyle) => {
-    // Figure out what style this fraction should be in based on the
-    // function used
-    let style = originalStyle;
-    if (size === "display") {
-        // Get display style as a default.
-        // If incoming style is sub/sup, use style.text() to get correct size.
-        style = style.id >= Style.SCRIPT.id ? style.text() : Style.DISPLAY;
-    } else if (size === "text" &&
-        style.size === Style.DISPLAY.size) {
-        // We're in a \tfrac but incoming style is displaystyle, so:
-        style = Style.TEXT;
-    } else if (size === "script") {
-        style = Style.SCRIPT;
-    } else if (size === "scriptscript") {
-        style = Style.SCRIPTSCRIPT;
-    }
-    return style;
-};
-
 const htmlBuilder = (group, options) => {
     // Fractions are handled in the TeXbook on pages 444-445, rules 15(a-e).
-    const style = adjustStyle(group.size, options.style);
+    const style = options.style;
 
     const nstyle = style.fracNum();
     const dstyle = style.fracDen();
@@ -75,7 +57,7 @@ const htmlBuilder = (group, options) => {
     let numShift;
     let clearance;
     let denomShift;
-    if (style.size === Style.DISPLAY.size || group.size === "display") {
+    if (style.size === Style.DISPLAY.size) {
         numShift = options.fontMetrics().num1;
         if (ruleWidth > 0) {
             clearance = 3 * ruleSpacing;
@@ -184,7 +166,7 @@ const htmlBuilder = (group, options) => {
 };
 
 const mathmlBuilder = (group, options) => {
-    let node = new MathNode(
+    const node = new MathNode(
         "mfrac",
         [
             mml.buildGroup(group.numer, options),
@@ -198,14 +180,6 @@ const mathmlBuilder = (group, options) => {
         node.setAttribute("linethickness", makeEm(ruleWidth));
     }
 
-    const style = adjustStyle(group.size, options.style);
-    if (style.size !== options.style.size) {
-        node = new MathNode("mstyle", [node]);
-        const isDisplay = (style.size === Style.DISPLAY.size) ? "true" : "false";
-        node.setAttribute("displaystyle", isDisplay);
-        node.setAttribute("scriptlevel", "0");
-    }
-
     if (group.leftDelim != null || group.rightDelim != null) {
         const withDelims = [];
 
@@ -239,10 +213,29 @@ const mathmlBuilder = (group, options) => {
     return node;
 };
 
+const wrapWithStyle = (
+    frac: ParseNode<"genfrac">,
+    style?: StyleStr | null,
+): ParseNode<"genfrac"> => {
+    if (!style) {
+        return frac;
+    }
+
+    const wrapper: ParseNode<"styling"> = {
+        type: "styling",
+        mode: frac.mode,
+        style,
+        body: [frac],
+    };
+
+    // $FlowFixMe: defineFunction handler needs to return ParseNode<"genfrac">
+    return wrapper;
+};
+
 defineFunction({
     type: "genfrac",
     names: [
-        "\\dfrac", "\\frac", "\\tfrac",
+        "\\cfrac", "\\dfrac", "\\frac", "\\tfrac",
         "\\dbinom", "\\binom", "\\tbinom",
         "\\\\atopfrac", // can’t be entered directly
         "\\\\bracefrac", "\\\\brackfrac",   // ditto
@@ -257,9 +250,9 @@ defineFunction({
         let hasBarLine;
         let leftDelim = null;
         let rightDelim = null;
-        let size = "auto";
 
         switch (funcName) {
+            case "\\cfrac":
             case "\\dfrac":
             case "\\frac":
             case "\\tfrac":
@@ -289,60 +282,31 @@ defineFunction({
                 throw new Error("Unrecognized genfrac command");
         }
 
-        switch (funcName) {
-            case "\\dfrac":
-            case "\\dbinom":
-                size = "display";
-                break;
-            case "\\tfrac":
-            case "\\tbinom":
-                size = "text";
-                break;
+        const continued = funcName === "\\cfrac";
+        let style = null;
+        if (continued || funcName.startsWith("\\d")) {
+            style = "display";
+        } else if (funcName.startsWith("\\t")) {
+            style = "text";
         }
 
-        return {
+        return wrapWithStyle({
             type: "genfrac",
             mode: parser.mode,
-            continued: false,
             numer,
             denom,
+            continued,
             hasBarLine,
             leftDelim,
             rightDelim,
-            size,
             barSize: null,
-        };
+        }, style);
     },
 
     htmlBuilder,
     mathmlBuilder,
 });
 
-defineFunction({
-    type: "genfrac",
-    names: ["\\cfrac"],
-    props: {
-        numArgs: 2,
-    },
-    handler: ({parser, funcName}, args) => {
-        const numer = args[0];
-        const denom = args[1];
-
-        return {
-            type: "genfrac",
-            mode: parser.mode,
-            continued: true,
-            numer,
-            denom,
-            hasBarLine: true,
-            leftDelim: null,
-            rightDelim: null,
-            size: "display",
-            barSize: null,
-        };
-    },
-});
-
 // Infix generalized fractions -- these are not rendered directly, but replaced
 // immediately by one of the variants above.
 defineFunction({
@@ -427,7 +391,7 @@ defineFunction({
         }
 
         // Find out if we want displaystyle, textstyle, etc.
-        let size = "auto";
+        let size = null;
         let styl = args[3];
         if (styl.type === "ordgroup") {
             if (styl.body.length > 0) {
@@ -439,7 +403,7 @@ defineFunction({
             size = stylArray[Number(styl.text)];
         }
 
-        return {
+        return wrapWithStyle({
             type: "genfrac",
             mode: parser.mode,
             numer,
@@ -449,12 +413,8 @@ defineFunction({
             barSize,
             leftDelim,
             rightDelim,
-            size,
-        };
+        }, size);
     },
-
-    htmlBuilder,
-    mathmlBuilder,
 });
 
 // \above is an infix fraction that also defines a fraction bar size.
@@ -506,10 +466,6 @@ defineFunction({
             barSize,
             leftDelim: null,
             rightDelim: null,
-            size: "auto",
         };
     },
-
-    htmlBuilder,
-    mathmlBuilder,
 });

package/src/parseNode.js

@@ -268,7 +268,6 @@ type ParseNodeTypes = {
         hasBarLine: boolean,
         leftDelim: ?string,
         rightDelim: ?string,
-        size: StyleStr | "auto",
         barSize: Measurement | null,
     |},
     "hbox": {|