katex 0.10.0-rc → 0.10.2

package/katex.js

@@ -22,7 +22,6 @@ import {
     PathNode,
     LineNode,
 } from "./src/domTree";
-import utils from "./src/utils";
 
 import type {SettingsOptions} from "./src/Settings";
 import type {AnyParseNode} from "./src/parseNode";
@@ -42,7 +41,7 @@ let render = function(
     baseNode: Node,
     options: SettingsOptions,
 ) {
-    utils.clearNode(baseNode);
+    baseNode.textContent = "";
     const node = renderToDomTree(expression, options).toNode();
     baseNode.appendChild(node);
 };

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "katex",
-  "version": "0.10.0-rc",
+  "version": "0.10.2",
   "description": "Fast math typesetting for the web.",
-  "main": "dist/katex",
-  "module": "dist/katex.mjs",
+  "main": "dist/katex.js",
+  "homepage": "https://katex.org",
   "repository": {
     "type": "git",
-    "url": "git://github.com/Khan/KaTeX.git"
+    "url": "git://github.com/KaTeX/KaTeX.git"
   },
   "files": [
     "katex.js",
@@ -17,54 +17,60 @@
   ],
   "license": "MIT",
   "devDependencies": {
-    "babel-core": "^6.26.3",
-    "babel-eslint": "^8.1.2",
-    "babel-jest": "^23.0.1",
-    "babel-loader": "^7.1.4",
-    "babel-plugin-transform-class-properties": "^6.23.0",
-    "babel-plugin-transform-runtime": "^6.15.0",
+    "@babel/core": "^7.3.3",
+    "@babel/plugin-proposal-class-properties": "^7.3.3",
+    "@babel/plugin-transform-runtime": "^7.2.0",
+    "@babel/preset-env": "^7.3.1",
+    "@babel/preset-flow": "^7.0.0",
+    "@babel/register": "^7.0.0",
+    "@babel/runtime": "^7.3.1",
+    "babel-eslint": "^10.0.1",
+    "babel-jest": "^24.1.0",
+    "babel-loader": "^8.0.5",
+    "babel-plugin-istanbul": "^5.1.1",
     "babel-plugin-version-inline": "^1.0.0",
-    "babel-preset-es2015": "^6.18.0",
-    "babel-preset-flow": "^6.23.0",
-    "babel-register": "^6.26.0",
     "benchmark": "^2.1.4",
-    "codecov": "^3.0.4",
-    "css-loader": "^1.0.0",
-    "cssnano": "^4.0.1",
-    "eslint": "^5.0.0",
-    "eslint-plugin-flowtype": "^2.40.1",
-    "eslint-plugin-react": "^7.10.0",
-    "eslint-plugin-transform-runtime-aliasing": "^1.0.0",
-    "file-loader": "^1.1.11",
-    "flow-bin": "^0.79.0",
-    "fs-extra": "^7.0.0",
-    "greenkeeper-lockfile": "^1.15.1",
-    "husky": "^1.0.0-rc.8",
-    "jest": "^23.0.1",
-    "jest-serializer-html": "^5.0.0",
-    "js-yaml": "^3.10.0",
+    "browserslist": "^4.4.1",
+    "caniuse-lite": "^1.0.30000938",
+    "codecov": "^3.2.0",
+    "css-loader": "^2.1.0",
+    "cssnano": "^4.1.10",
+    "eslint": "^5.14.1",
+    "eslint-plugin-flowtype": "^3.4.2",
+    "eslint-plugin-react": "^7.12.4",
+    "eslint-plugin-transform-runtime-aliasing": "^2.0.0",
+    "file-loader": "^3.0.1",
+    "flow-bin": "^0.93.0",
+    "fs-extra": "^7.0.1",
+    "husky": "^1.3.1",
+    "istanbul-api": "^2.1.1",
+    "istanbul-lib-coverage": "^2.0.3",
+    "jest": "^24.1.0",
+    "jest-serializer-html": "^6.0.0",
+    "js-yaml": "^3.12.1",
     "json-stable-stringify": "^1.0.1",
     "jspngopt": "^0.2.0",
-    "less": "^3.0.4",
+    "less": "^3.9.0",
     "less-loader": "^4.1.0",
-    "mini-css-extract-plugin": "^0.4.0",
+    "mini-css-extract-plugin": "^0.5.0",
     "mkdirp": "^0.5.1",
-    "pako": "1.0.6",
+    "pako": "^1.0.8",
     "postcss-loader": "^3.0.0",
-    "query-string": "^5.1.1",
-    "rimraf": "^2.6.2",
-    "rollup": "^0.63.4",
-    "rollup-plugin-babel": "^3.0.7",
+    "query-string": "^6.2.0",
+    "rimraf": "^2.6.3",
+    "rollup": "^1.2.2",
+    "rollup-plugin-alias": "^1.5.1",
+    "rollup-plugin-babel": "^4.3.2",
     "selenium-webdriver": "^3.6.0",
     "sri-toolbox": "^0.2.0",
-    "style-loader": "^0.22.0",
-    "stylelint": "^9.2.1",
-    "stylelint-config-standard": "^18.0.0",
-    "uglifyjs-webpack-plugin": "^1.2.5",
-    "webpack": "^4.9.1",
-    "webpack-bundle-analyzer": "^2.13.0",
-    "webpack-cli": "^3.0.1",
-    "webpack-dev-server": "^3.1.4"
+    "style-loader": "^0.23.1",
+    "stylelint": "^9.10.1",
+    "stylelint-config-standard": "^18.2.0",
+    "terser-webpack-plugin": "^1.2.2",
+    "webpack": "^4.29.5",
+    "webpack-bundle-analyzer": "^3.0.4",
+    "webpack-cli": "^3.2.3",
+    "webpack-dev-server": "^3.2.0"
   },
   "bin": "cli.js",
   "scripts": {
@@ -82,16 +88,16 @@
     "test:perf": "yarn prestart && NODE_ENV=test node test/perf-test.js",
     "clean": "rm -rf dist/ node_modules/",
     "clean-install": "yarn clean && yarn",
-    "prestart": "node check-node-version.js && yarn check && node src/unicodeMake.js",
+    "prestart": "node src/unicodeMake.js",
     "start": "webpack-dev-server --hot --config webpack.dev.js",
     "analyze": "webpack --config webpack.analyze.js",
     "build": "yarn prestart && rimraf dist/ && mkdirp dist && cp README.md dist && rollup -c && webpack",
     "watch": "yarn build --watch",
     "dist": "yarn test && yarn build && yarn dist:zip",
-    "dist:zip": "cd dist && tar czf ../katex.tar.gz * && zip -rq ../katex.zip *"
+    "dist:zip": "rimraf katex/ katex.tar.gz katex.zip && cp -R dist katex && tar czf katex.tar.gz katex && zip -rq katex.zip katex && rimraf katex/"
   },
   "dependencies": {
-    "commander": "^2.16.0"
+    "commander": "^2.19.0"
   },
   "husky": {
     "hooks": {
@@ -104,9 +110,12 @@
     "collectCoverageFrom": [
       "src/**/*.js",
       "contrib/**/*.js",
-      "!src/unicodeMake.js"
+      "!src/unicodeMake.js",
+      "!contrib/mhchem/**"
+    ],
+    "setupFilesAfterEnv": [
+      "<rootDir>/test/setup.js"
     ],
-    "setupTestFrameworkScriptFile": "<rootDir>/test/setup.js",
     "snapshotSerializers": [
       "jest-serializer-html"
     ],
@@ -116,6 +125,9 @@
     "testURL": "http://localhost/",
     "transform": {
       "^.+\\.js$": "babel-jest"
+    },
+    "moduleNameMapper": {
+      "^katex$": "<rootDir>/katex.js"
     }
   }
 }

package/src/Lexer.js

@@ -21,7 +21,6 @@ import type Settings from "./Settings";
 
 /* The following tokenRegex
  * - matches typical whitespace (but not NBSP etc.) using its first group
- * - matches comments (must have trailing newlines)
  * - does not match any control character \x00-\x1f except whitespace
  * - does not match a bare backslash
  * - matches any ASCII character except those just mentioned
@@ -36,7 +35,6 @@ import type Settings from "./Settings";
  * still reject the input.
  */
 const spaceRegexString = "[ \r\n\t]";
-const commentRegexString = "%[^\n]*(?:\n|$)";
 const controlWordRegexString = "\\\\[a-zA-Z@]+";
 const controlSymbolRegexString = "\\\\[^\uD800-\uDFFF]";
 const controlWordWhitespaceRegexString =
@@ -46,38 +44,36 @@ const controlWordWhitespaceRegex = new RegExp(
 const combiningDiacriticalMarkString = "[\u0300-\u036f]";
 export const combiningDiacriticalMarksEndRegex =
     new RegExp(`${combiningDiacriticalMarkString}+$`);
-const urlFunctionRegexString = "(\\\\href|\\\\url)" +
-    `(?:${spaceRegexString}*\\{((?:[^{}\\\\]|\\\\[^]|{[^{}]*})*)\\}` +
-    `|${spaceRegexString}+([^{}])` +
-    `|${spaceRegexString}*([^{}a-zA-Z]))`;
 const tokenRegexString = `(${spaceRegexString}+)|` +  // whitespace
-    `(${commentRegexString}` +                        // comments
-    "|[!-\\[\\]-\u2027\u202A-\uD7FF\uF900-\uFFFF]" +  // single codepoint
+    "([!-\\[\\]-\u2027\u202A-\uD7FF\uF900-\uFFFF]" +  // single codepoint
     `${combiningDiacriticalMarkString}*` +            // ...plus accents
     "|[\uD800-\uDBFF][\uDC00-\uDFFF]" +               // surrogate pair
     `${combiningDiacriticalMarkString}*` +            // ...plus accents
     "|\\\\verb\\*([^]).*?\\3" +                       // \verb*
     "|\\\\verb([^*a-zA-Z]).*?\\4" +                   // \verb unstarred
-    `|${urlFunctionRegexString}` +                    // URL arguments
     `|${controlWordWhitespaceRegexString}` +          // \macroName + spaces
     `|${controlSymbolRegexString})`;                  // \\, \', etc.
 
-// These regexs are for matching results from tokenRegex,
-// so they do have ^ markers.
-export const controlWordRegex = new RegExp(`^${controlWordRegexString}`);
-export const urlFunctionRegex = new RegExp(`^${urlFunctionRegexString}`);
-
 /** Main Lexer class */
 export default class Lexer implements LexerInterface {
     input: string;
     settings: Settings;
     tokenRegex: RegExp;
+    // category codes, only supports comment characters (14) for now
+    catcodes: {[string]: number};
 
     constructor(input: string, settings: Settings) {
         // Separate accents from characters
         this.input = input;
         this.settings = settings;
         this.tokenRegex = new RegExp(tokenRegexString, 'g');
+        this.catcodes = {
+            "%": 14, // comment character
+        };
+    }
+
+    setCatcode(char: string, code: number) {
+        this.catcodes[char] = code;
     }
 
     /**
@@ -97,22 +93,26 @@ export default class Lexer implements LexerInterface {
         }
         let text = match[2] || " ";
 
-        // Trim any trailing whitespace from control word match
-        const controlMatch = text.match(controlWordWhitespaceRegex);
-        if (controlMatch) {
-            text = controlMatch[1] + text.slice(controlMatch[0].length);
-        }
-
-        if (text[0] === "%") {
-            if (text[text.length - 1] !== "\n") {
+        if (this.catcodes[text] === 14) { // comment character
+            const nlIndex = input.indexOf('\n', this.tokenRegex.lastIndex);
+            if (nlIndex === -1) {
+                this.tokenRegex.lastIndex = input.length; // EOF
                 this.settings.reportNonstrict("commentAtEnd",
                     "% comment has no terminating newline; LaTeX would " +
                     "fail because of commenting the end of math mode (e.g. $)");
+            } else {
+                this.tokenRegex.lastIndex = nlIndex + 1;
             }
             return this.lex();
-        } else {
-            return new Token(text, new SourceLocation(this, pos,
-                this.tokenRegex.lastIndex));
         }
+
+        // Trim any trailing whitespace from control word match
+        const controlMatch = text.match(controlWordWhitespaceRegex);
+        if (controlMatch) {
+            text = controlMatch[1];
+        }
+
+        return new Token(text, new SourceLocation(this, pos,
+            this.tokenRegex.lastIndex));
     }
 }

package/src/MacroExpander.js

@@ -343,4 +343,3 @@ export default class MacroExpander implements MacroContextInterface {
             implicitCommands.hasOwnProperty(name);
     }
 }
-

package/src/Options.js

@@ -36,6 +36,10 @@ const sizeAtStyle = function(size: number, style: StyleInterface): number {
     return style.size < 2 ? size : sizeStyleMap[size - 1][style.size - 1];
 };
 
+// In these types, "" (empty string) means "no change".
+export type FontWeight = "textbf" | "textmd" | "";
+export type FontShape = "textit" | "textup" | "";
+
 export type OptionsData = {
     style: StyleInterface;
     color?: string | void;
@@ -44,8 +48,8 @@ export type OptionsData = {
     phantom?: boolean;
     font?: string;
     fontFamily?: string;
-    fontWeight?: string;
-    fontShape?: string;
+    fontWeight?: FontWeight;
+    fontShape?: FontShape;
     sizeMultiplier?: number;
     maxSize: number;
 };
@@ -68,8 +72,8 @@ class Options {
     // See: https://tex.stackexchange.com/questions/22350/difference-between-textrm-and-mathrm
     font: string;
     fontFamily: string;
-    fontWeight: string;
-    fontShape: string;
+    fontWeight: FontWeight;
+    fontShape: FontShape;
     sizeMultiplier: number;
     maxSize: number;
     _fontMetrics: FontMetrics | void;
@@ -244,7 +248,7 @@ class Options {
     /**
      * Creates a new options object with the given font weight
      */
-    withTextFontWeight(fontWeight: string): Options {
+    withTextFontWeight(fontWeight: FontWeight): Options {
         return this.extend({
             fontWeight,
             font: "",
@@ -254,7 +258,7 @@ class Options {
     /**
      * Creates a new options object with the given font weight
      */
-    withTextFontShape(fontShape: string): Options {
+    withTextFontShape(fontShape: FontShape): Options {
         return this.extend({
             fontShape,
             font: "",
@@ -295,81 +299,13 @@ class Options {
         return this._fontMetrics;
     }
 
-    /**
-     * A map of color names to CSS colors.
-     * TODO(emily): Remove this when we have real macros
-     */
-    static colorMap = {
-        "katex-blue": "#6495ed",
-        "katex-orange": "#ffa500",
-        "katex-pink": "#ff00af",
-        "katex-red": "#df0030",
-        "katex-green": "#28ae7b",
-        "katex-gray": "gray",
-        "katex-purple": "#9d38bd",
-        "katex-blueA": "#ccfaff",
-        "katex-blueB": "#80f6ff",
-        "katex-blueC": "#63d9ea",
-        "katex-blueD": "#11accd",
-        "katex-blueE": "#0c7f99",
-        "katex-tealA": "#94fff5",
-        "katex-tealB": "#26edd5",
-        "katex-tealC": "#01d1c1",
-        "katex-tealD": "#01a995",
-        "katex-tealE": "#208170",
-        "katex-greenA": "#b6ffb0",
-        "katex-greenB": "#8af281",
-        "katex-greenC": "#74cf70",
-        "katex-greenD": "#1fab54",
-        "katex-greenE": "#0d923f",
-        "katex-goldA": "#ffd0a9",
-        "katex-goldB": "#ffbb71",
-        "katex-goldC": "#ff9c39",
-        "katex-goldD": "#e07d10",
-        "katex-goldE": "#a75a05",
-        "katex-redA": "#fca9a9",
-        "katex-redB": "#ff8482",
-        "katex-redC": "#f9685d",
-        "katex-redD": "#e84d39",
-        "katex-redE": "#bc2612",
-        "katex-maroonA": "#ffbde0",
-        "katex-maroonB": "#ff92c6",
-        "katex-maroonC": "#ed5fa6",
-        "katex-maroonD": "#ca337c",
-        "katex-maroonE": "#9e034e",
-        "katex-purpleA": "#ddd7ff",
-        "katex-purpleB": "#c6b9fc",
-        "katex-purpleC": "#aa87ff",
-        "katex-purpleD": "#7854ab",
-        "katex-purpleE": "#543b78",
-        "katex-mintA": "#f5f9e8",
-        "katex-mintB": "#edf2df",
-        "katex-mintC": "#e0e5cc",
-        "katex-grayA": "#f6f7f7",
-        "katex-grayB": "#f0f1f2",
-        "katex-grayC": "#e3e5e6",
-        "katex-grayD": "#d6d8da",
-        "katex-grayE": "#babec2",
-        "katex-grayF": "#888d93",
-        "katex-grayG": "#626569",
-        "katex-grayH": "#3b3e40",
-        "katex-grayI": "#21242c",
-        "katex-kaBlue": "#314453",
-        "katex-kaGreen": "#71B307",
-    };
 
     /**
-     * Gets the CSS color of the current options object, accounting for the
-     * `colorMap`.
+     * Gets the CSS color of the current options object
      */
     getColor(): string | void {
         if (this.phantom) {
             return "transparent";
-        } else if (
-            this.color != null &&
-            Options.colorMap.hasOwnProperty(this.color)
-        ) {
-            return Options.colorMap[this.color];
         } else {
             return this.color;
         }