katex 0.16.28 → 0.16.30

package/katex.js

@@ -13,7 +13,7 @@ import Settings, {SETTINGS_SCHEMA} from "./src/Settings";
 
 import {buildTree, buildHTMLTree} from "./src/buildTree";
 import parseTree from "./src/parseTree";
-import buildCommon from "./src/buildCommon";
+import {makeSpan} from "./src/buildCommon";
 import {
     Span,
     Anchor,
@@ -97,7 +97,7 @@ const renderError = function(
     if (options.throwOnError || !(error instanceof ParseError)) {
         throw error;
     }
-    const node = buildCommon.makeSpan(["katex-error"],
+    const node = makeSpan(["katex-error"],
         [new SymbolNode(expression)]);
     node.setAttribute("title", error.toString());
     node.setAttribute("style", `color:${options.errorColor}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "katex",
-  "version": "0.16.28",
+  "version": "0.16.30",
   "description": "Fast math typesetting for the web.",
   "main": "dist/katex.js",
   "types": "types/katex.d.ts",
@@ -114,11 +114,10 @@
     "postcss-preset-env": "^7.8.0",
     "postcss-scss": "^4.0.9",
     "prettier": "^2.7.1",
-    "query-string": "^7.1.1",
     "rimraf": "^3.0.2",
     "rollup": "^2.79.2",
-    "sass": "^1.75.6",
-    "sass-loader": "^14.2.1",
+    "sass": "^1.94.2",
+    "sass-loader": "^16.0.6",
     "selenium-webdriver": "^4.4.0",
     "semantic-release": "^19.0.5",
     "sri-toolbox": "^0.2.0",

package/src/MacroExpander.js

@@ -424,9 +424,9 @@ export default class MacroExpander implements MacroContextInterface {
             typeof definition === "function" ? definition(this) : definition;
         if (typeof expansion === "string") {
             let numArgs = 0;
-            if (expansion.indexOf("#") !== -1) {
+            if (expansion.includes("#")) {
                 const stripped = expansion.replace(/##/g, "");
-                while (stripped.indexOf("#" + (numArgs + 1)) !== -1) {
+                while (stripped.includes("#" + (numArgs + 1))) {
                     ++numArgs;
                 }
             }

package/src/Parser.js

@@ -172,7 +172,8 @@ export default class Parser {
         return parse;
     }
 
-    static endOfExpression: string[] = ["}", "\\endgroup", "\\end", "\\right", "&"];
+    static endOfExpression: Set<string> =
+        new Set(["}", "\\endgroup", "\\end", "\\right", "&"]);
 
     /**
      * Parses an "expression", which is a list of atoms.
@@ -198,7 +199,7 @@ export default class Parser {
                 this.consumeSpaces();
             }
             const lex = this.fetch();
-            if (Parser.endOfExpression.indexOf(lex.text) !== -1) {
+            if (Parser.endOfExpression.has(lex.text)) {
                 break;
             }
             if (breakOnTokenText && lex.text === breakOnTokenText) {
@@ -953,7 +954,7 @@ export default class Parser {
         let symbol: AnyParseNode;
         if (symbols[this.mode][text]) {
             if (this.settings.strict && this.mode === 'math' &&
-                extraLatin.indexOf(text) >= 0) {
+                extraLatin.includes(text)) {
                 this.settings.reportNonstrict("unicodeTextInMathMode",
                     `Latin-1/Unicode text character "${text[0]}" used in ` +
                     `math mode`, nucleus);

package/src/Settings.js

@@ -5,7 +5,7 @@
  * default settings.
  */
 
-import utils from "./utils";
+import {protocolFromUrl} from "./utils";
 import ParseError from "./ParseError";
 import {Token} from "./Token";
 
@@ -346,7 +346,7 @@ export default class Settings {
      */
     isTrusted(context: AnyTrustContext): boolean {
         if (context.url && !context.protocol) {
-            const protocol = utils.protocolFromUrl(context.url);
+            const protocol = protocolFromUrl(context.url);
             if (protocol == null) {
                 return false;
             }

package/src/buildCommon.js

@@ -50,7 +50,7 @@ const lookupSymbol = function(
  * should if present come first in `classes`.
  * TODO(#953): Make `options` mandatory and always pass it in.
  */
-const makeSymbol = function(
+export const makeSymbol = function(
     value: string,
     fontName: string,
     mode: Mode,
@@ -95,7 +95,7 @@ const makeSymbol = function(
  * Makes a symbol in Main-Regular or AMS-Regular.
  * Used for rel, bin, open, close, inner, and punct.
  */
-const mathsym = function(
+export const mathsym = function(
     value: string,
     mode: Mode,
     options: Options,
@@ -152,7 +152,7 @@ const boldsymbol = function(
 /**
  * Makes either a mathord or textord in the correct font and color.
  */
-const makeOrd = function<NODETYPE: "spacing" | "mathord" | "textord">(
+export const makeOrd = function<NODETYPE: "spacing" | "mathord" | "textord">(
     group: ParseNode<NODETYPE>,
     options: Options,
     type: "mathord" | "textord",
@@ -277,7 +277,7 @@ const canCombine = (prev: SymbolNode, next: SymbolNode) => {
  * Combine consecutive domTree.symbolNodes into a single symbolNode.
  * Note: this function mutates the argument.
  */
-const tryCombineChars = (chars: HtmlDomNode[]): HtmlDomNode[] => {
+export const tryCombineChars = (chars: HtmlDomNode[]): HtmlDomNode[] => {
     for (let i = 0; i < chars.length - 1; i++) {
         const prev = chars[i];
         const next = chars[i + 1];
@@ -336,7 +336,7 @@ const sizeElementFromChildren = function(
  * TODO: add a separate argument for math class (e.g. `mop`, `mbin`), which
  * should if present come first in `classes`.
  */
-const makeSpan = function(
+export const makeSpan = function(
     classes?: string[],
     children?: HtmlDomNode[],
     options?: Options,
@@ -351,14 +351,14 @@ const makeSpan = function(
 
 // SVG one is simpler -- doesn't require height, depth, max-font setting.
 // This is also a separate method for typesafety.
-const makeSvgSpan = (
+export const makeSvgSpan = (
     classes?: string[],
     children?: SvgNode[],
     options?: Options,
     style?: CssStyle,
 ): SvgSpan => new Span(classes, children, options, style);
 
-const makeLineSpan = function(
+export const makeLineSpan = function(
     className: string,
     options: Options,
     thickness?: number,
@@ -377,7 +377,7 @@ const makeLineSpan = function(
  * Makes an anchor with the given href, list of classes, list of children,
  * and options.
  */
-const makeAnchor = function(
+export const makeAnchor = function(
     href: string,
     classes: string[],
     children: HtmlDomNode[],
@@ -393,7 +393,7 @@ const makeAnchor = function(
 /**
  * Makes a document fragment with the given list of children.
  */
-const makeFragment = function(
+export const makeFragment = function(
     children: HtmlDomNode[],
 ): HtmlDocumentFragment {
     const fragment = new DocumentFragment(children);
@@ -407,7 +407,7 @@ const makeFragment = function(
  * Wraps group in a span if it's a document fragment, allowing to apply classes
  * and styles
  */
-const wrapFragment = function(
+export const wrapFragment = function(
     group: HtmlDomNode,
     options: Options,
 ): HtmlDomNode {
@@ -534,7 +534,7 @@ const getVListChildrenAndDepth = function(params: VListParam): {
  *
  * See VListParam documentation above.
  */
-const makeVList = function(params: VListParam, options: Options): DomSpan {
+export const makeVList = function(params: VListParam, options: Options): DomSpan {
     const {children, depth} = getVListChildrenAndDepth(params);
 
     // Create a strut that is taller than any list item. The strut is added to
@@ -626,7 +626,7 @@ const makeVList = function(params: VListParam, options: Options): DomSpan {
 // Glue is a concept from TeX which is a flexible space between elements in
 // either a vertical or horizontal list. In KaTeX, at least for now, it's
 // static space between elements in a horizontal layout.
-const makeGlue = (measurement: Measurement, options: Options): DomSpan => {
+export const makeGlue = (measurement: Measurement, options: Options): DomSpan => {
     // Make an empty span for the space
     const rule = makeSpan(["mspace"], [], options);
     const size = calculateSize(measurement, options);
@@ -678,7 +678,7 @@ const retrieveTextFontName = function(
  * - fontName: the "style" parameter to fontMetrics.getCharacterMetrics
  */
 // A map between tex font commands an MathML mathvariant attribute values
-const fontMap: {[string]: {| variant: FontVariant, fontName: string |}} = {
+export const fontMap: {[string]: {| variant: FontVariant, fontName: string |}} = {
     // styles
     "mathbf": {
         variant: "bold",
@@ -735,7 +735,7 @@ const fontMap: {[string]: {| variant: FontVariant, fontName: string |}} = {
     },
 };
 
-const svgData: {
+export const svgData: {
     [string]: ([string, number, number])
 } = {
      //   path, width, height
@@ -746,7 +746,7 @@ const svgData: {
     oiiintSize2: ["oiiintSize2", 1.98, 0.659],
 };
 
-const staticSvg = function(value: string, options: Options): SvgSpan {
+export const staticSvg = function(value: string, options: Options): SvgSpan {
     // Create a span with inline SVG for the element.
     const [pathName, width, height] = svgData[value];
     const path = new PathNode(pathName);
@@ -764,21 +764,3 @@ const staticSvg = function(value: string, options: Options): SvgSpan {
     span.style.width = makeEm(width);
     return span;
 };
-
-export default {
-    fontMap,
-    makeSymbol,
-    mathsym,
-    makeSpan,
-    makeSvgSpan,
-    makeLineSpan,
-    makeAnchor,
-    makeFragment,
-    wrapFragment,
-    makeVList,
-    makeOrd,
-    makeGlue,
-    staticSvg,
-    svgData,
-    tryCombineChars,
-};

package/src/buildHTML.js

@@ -8,7 +8,7 @@
 
 import ParseError from "./ParseError";
 import Style from "./Style";
-import buildCommon from "./buildCommon";
+import {makeGlue, makeSpan, tryCombineChars} from "./buildCommon";
 import {Span, Anchor} from "./domTree";
 import {makeEm} from "./units";
 import {spacings, tightSpacings} from "./spacingData";
@@ -19,13 +19,15 @@ import type Options from "./Options";
 import type {AnyParseNode} from "./parseNode";
 import type {HtmlDomNode, DomSpan} from "./domTree";
 
-const makeSpan = buildCommon.makeSpan;
-
 // Binary atoms (first class `mbin`) change into ordinary atoms (`mord`)
 // depending on their surroundings. See TeXbook pg. 442-446, Rules 5 and 6,
 // and the text before Rule 19.
-const binLeftCanceller = ["leftmost", "mbin", "mopen", "mrel", "mop", "mpunct"];
-const binRightCanceller = ["rightmost", "mrel", "mclose", "mpunct"];
+const binLeftCanceller = new Set([
+    "leftmost", "mbin", "mopen", "mrel", "mop", "mpunct",
+]);
+const binRightCanceller = new Set([
+    "rightmost", "mrel", "mclose", "mpunct",
+]);
 
 const styleMap = {
     "display": Style.DISPLAY,
@@ -75,7 +77,7 @@ export const buildExpression = function(
     }
 
     // Combine consecutive domTree.symbolNodes into a single symbolNode.
-    buildCommon.tryCombineChars(groups);
+    tryCombineChars(groups);
 
     // If `expression` is a partial group, let the parent handle spacings
     // to avoid processing groups multiple times.
@@ -109,9 +111,9 @@ export const buildExpression = function(
     traverseNonSpaceNodes(groups, (node, prev) => {
         const prevType = prev.classes[0];
         const type = node.classes[0];
-        if (prevType === "mbin" && binRightCanceller.includes(type)) {
+        if (prevType === "mbin" && binRightCanceller.has(type)) {
             prev.classes[0] = "mord";
-        } else if (type === "mbin" && binLeftCanceller.includes(prevType)) {
+        } else if (type === "mbin" && binLeftCanceller.has(prevType)) {
             node.classes[0] = "mord";
         }
     }, {node: dummyPrev}, dummyNext, isRoot);
@@ -125,7 +127,7 @@ export const buildExpression = function(
             ? tightSpacings[prevType][type]
             : spacings[prevType][type]) : null;
         if (space) { // Insert glue (spacing) after the `prev`.
-            return buildCommon.makeGlue(space, glueOptions);
+            return makeGlue(space, glueOptions);
         }
     }, {node: dummyPrev}, dummyNext, isRoot);
 

package/src/buildMathML.js

@@ -5,9 +5,8 @@
  * parser.
  */
 
-import buildCommon from "./buildCommon";
+import {fontMap, makeSpan} from "./buildCommon";
 import {getCharacterMetrics} from "./fontMetrics";
-import mathMLTree from "./mathMLTree";
 import ParseError from "./ParseError";
 import symbols, {ligatures} from "./symbols";
 import {_mathmlGroupBuilders as groupBuilders} from "./defineFunction";
@@ -19,6 +18,9 @@ import type {DomSpan} from "./domTree";
 import type {MathDomNode} from "./mathMLTree";
 import type {FontVariant, Mode} from "./types";
 
+const noVariantSymbols = new Set(["\\imath", "\\jmath"]);
+const rowLikeTypes = new Set(["mrow", "mtable"]);
+
 /**
  * Takes a symbol and converts it into a MathML text node after performing
  * optional replacement from symbols.js.
@@ -36,7 +38,7 @@ export const makeText = function(
         text = symbols[mode][text].replace;
     }
 
-    return new mathMLTree.TextNode(text);
+    return new TextNode(text);
 };
 
 /**
@@ -47,7 +49,7 @@ export const makeRow = function(body: $ReadOnlyArray<MathDomNode>): MathDomNode
     if (body.length === 1) {
         return body[0];
     } else {
-        return new mathMLTree.MathNode("mrow", body);
+        return new MathNode("mrow", body);
     }
 };
 
@@ -111,7 +113,7 @@ export const getVariant = function(
     }
 
     let text = group.text;
-    if (["\\imath", "\\jmath"].includes(text)) {
+    if (noVariantSymbols.has(text)) {
         return null;
     }
 
@@ -119,9 +121,9 @@ export const getVariant = function(
         text = symbols[mode][text].replace;
     }
 
-    const fontName = buildCommon.fontMap[font].fontName;
+    const fontName = fontMap[font].fontName;
     if (getCharacterMetrics(text, fontName, mode)) {
-        return buildCommon.fontMap[font].variant;
+        return fontMap[font].variant;
     }
 
     return null;
@@ -249,7 +251,7 @@ export const buildGroup = function(
     options: Options,
 ): MathNode {
     if (!group) {
-        return new mathMLTree.MathNode("mrow");
+        return new MathNode("mrow");
     }
 
     if (groupBuilders[group.type]) {
@@ -290,22 +292,22 @@ export default function buildMathML(
     // tag correctly, unless it's a single <mrow> or <mtable>.
     let wrapper;
     if (expression.length === 1 && expression[0] instanceof MathNode &&
-        ["mrow", "mtable"].includes(expression[0].type)) {
+        rowLikeTypes.has(expression[0].type)) {
         wrapper = expression[0];
     } else {
-        wrapper = new mathMLTree.MathNode("mrow", expression);
+        wrapper = new MathNode("mrow", expression);
     }
 
     // Build a TeX annotation of the source
-    const annotation = new mathMLTree.MathNode(
-        "annotation", [new mathMLTree.TextNode(texExpression)]);
+    const annotation = new MathNode(
+        "annotation", [new TextNode(texExpression)]);
 
     annotation.setAttribute("encoding", "application/x-tex");
 
-    const semantics = new mathMLTree.MathNode(
+    const semantics = new MathNode(
         "semantics", [wrapper, annotation]);
 
-    const math = new mathMLTree.MathNode("math", [semantics]);
+    const math = new MathNode("math", [semantics]);
     math.setAttribute("xmlns", "http://www.w3.org/1998/Math/MathML");
     if (isDisplayMode) {
         math.setAttribute("display", "block");
@@ -317,5 +319,5 @@ export default function buildMathML(
     // of span are expected to have more fields in `buildHtml` contexts.
     const wrapperClass = forMathmlOnly ? "katex" : "katex-mathml";
     // $FlowFixMe
-    return buildCommon.makeSpan([wrapperClass], [math]);
+    return makeSpan([wrapperClass], [math]);
 }

package/src/buildTree.js

@@ -1,7 +1,7 @@
 // @flow
 import buildHTML from "./buildHTML";
 import buildMathML from "./buildMathML";
-import buildCommon from "./buildCommon";
+import {makeSpan} from "./buildCommon";
 import Options from "./Options";
 import Settings from "./Settings";
 import Style from "./Style";
@@ -26,7 +26,7 @@ const displayWrap = function(node: DomSpan, settings: Settings): DomSpan {
         if (settings.fleqn) {
             classes.push("fleqn");
         }
-        node = buildCommon.makeSpan(classes, [node]);
+        node = makeSpan(classes, [node]);
     }
     return node;
 };
@@ -42,12 +42,12 @@ export const buildTree = function(
         return  buildMathML(tree, expression, options, settings.displayMode, true);
     } else if (settings.output === "html") {
         const htmlNode = buildHTML(tree, options);
-        katexNode = buildCommon.makeSpan(["katex"], [htmlNode]);
+        katexNode = makeSpan(["katex"], [htmlNode]);
     } else {
         const mathMLNode = buildMathML(tree, expression, options,
             settings.displayMode, false);
         const htmlNode = buildHTML(tree, options);
-        katexNode = buildCommon.makeSpan(["katex"], [mathMLNode, htmlNode]);
+        katexNode = makeSpan(["katex"], [mathMLNode, htmlNode]);
     }
 
     return displayWrap(katexNode, settings);
@@ -60,7 +60,7 @@ export const buildHTMLTree = function(
 ): DomSpan {
     const options = optionsFromSettings(settings);
     const htmlNode = buildHTML(tree, options);
-    const katexNode = buildCommon.makeSpan(["katex"], [htmlNode]);
+    const katexNode = makeSpan(["katex"], [htmlNode]);
     return displayWrap(katexNode, settings);
 };