katex 0.13.13 → 0.13.18

package/katex.js

@@ -28,7 +28,7 @@ import type {AnyParseNode} from "./src/parseNode";
 import type {DomSpan} from "./src/domTree";
 
 import {defineSymbol} from './src/symbols';
-import {defineMacro} from './src/macros';
+import defineMacro from './src/defineMacro';
 import {setFontMetrics} from './src/fontMetrics';
 
 declare var __VERSION__: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "katex",
-  "version": "0.13.13",
+  "version": "0.13.18",
   "description": "Fast math typesetting for the web.",
   "main": "dist/katex.js",
   "homepage": "https://katex.org",
@@ -16,20 +16,22 @@
     "dist/"
   ],
   "license": "MIT",
+  "packageManager": "yarn@3.0.1",
   "devDependencies": {
     "@babel/core": "^7.10.4",
+    "@babel/eslint-parser": "^7.15.0",
     "@babel/plugin-proposal-class-properties": "^7.10.4",
     "@babel/plugin-transform-runtime": "^7.10.4",
     "@babel/preset-env": "^7.10.4",
     "@babel/preset-flow": "^7.10.4",
+    "@babel/preset-react": "^7.14.5",
     "@babel/register": "^7.10.4",
     "@babel/runtime": "^7.10.4",
     "@rollup/plugin-alias": "^3.1.1",
     "@rollup/plugin-babel": "^5.0.4",
     "@semantic-release/changelog": "^5.0.1",
     "@semantic-release/git": "^9.0.0",
-    "babel-eslint": "^10.1.0",
-    "babel-jest": "^26.1.0",
+    "babel-jest": "^27.0.0",
     "babel-loader": "^8.0.5",
     "babel-plugin-istanbul": "^6.0.0",
     "babel-plugin-preval": "^5.0.0",
@@ -38,13 +40,12 @@
     "browserslist": "^4.13.0",
     "browserstack-local": "^1.4.5",
     "caniuse-lite": "^1.0.30001102",
-    "css-loader": "^5.1.2",
+    "css-loader": "^6.0.0",
     "cssnano": "^5.0.0-rc.1",
     "eslint": "^7.4.0",
     "eslint-plugin-actions": "^1.0.1",
     "eslint-plugin-flowtype": "^5.2.0",
     "eslint-plugin-react": "^7.20.3",
-    "file-loader": "^6.0.0",
     "flow-bin": "^0.135.0",
     "fs-extra": "^10.0.0",
     "got": "^11.8.0",
@@ -52,37 +53,38 @@
     "istanbul-lib-coverage": "^3.0.0",
     "istanbul-lib-report": "^3.0.0",
     "istanbul-reports": "^3.0.2",
-    "jest": "^26.1.0",
-    "jest-diff": "^26.1.0",
-    "jest-matcher-utils": "^26.1.0",
-    "jest-message-util": "^26.1.0",
+    "jest": "^27.0.0",
+    "jest-diff": "^27.0.0",
+    "jest-matcher-utils": "^27.0.0",
+    "jest-message-util": "^27.0.0",
     "jest-serializer-html": "^7.0.0",
     "js-yaml": "^4.0.0",
     "json-stable-stringify": "^1.0.1",
     "jspngopt": "^0.2.0",
     "less": "^4.0.0",
-    "less-loader": "^9.0.0",
-    "mini-css-extract-plugin": "^1.0.0",
+    "less-loader": "^10.0.0",
+    "mini-css-extract-plugin": "^2.0.0",
     "mkdirp": "^1.0.4",
+    "p-retry": "^4.6.1",
     "pako": "^2.0.0",
     "postcss": "^8.0.0",
-    "postcss-loader": "^5.2.0",
+    "postcss-loader": "^6.0.0",
     "postcss-preset-env": "^6.7.0",
     "prettier": "^2.0.5",
     "query-string": "^7.0.0",
     "rimraf": "^3.0.2",
     "rollup": "^2.21.0",
-    "selenium-webdriver": "^3.6.0",
+    "selenium-webdriver": "^4.0.0-beta.4",
     "semantic-release": "^17.4.1",
     "sri-toolbox": "^0.2.0",
-    "style-loader": "^2.0.0",
+    "style-loader": "^3.0.0",
     "stylelint": "^13.6.1",
     "stylelint-config-standard": "^22.0.0",
     "terser-webpack-plugin": "^5.0.3",
-    "webpack": "^5.8.0",
+    "webpack": "^5.51.1",
     "webpack-bundle-analyzer": "^4.0.0",
-    "webpack-cli": "^4.2.0",
-    "webpack-dev-server": "^4.0.0-beta.0"
+    "webpack-cli": "^4.8.0",
+    "webpack-dev-server": "^4.0.0"
   },
   "bin": "cli.js",
   "scripts": {
@@ -102,7 +104,9 @@
     "clean-install": "yarn clean && yarn",
     "start": "webpack serve --config webpack.dev.js",
     "analyze": "webpack --config webpack.analyze.js",
-    "build": "rimraf dist/ && mkdirp dist && cp README.md dist && rollup -c && webpack && node update-sri.js package dist/README.md",
+    "build": "rimraf dist/ && mkdirp dist && cp README.md dist && rollup -c --failAfterWarnings && webpack && node update-sri.js package dist/README.md",
+    "build:fonts": "dockers/fonts/buildFonts.sh",
+    "build:metrics": "dockers/fonts/buildMetrics.sh",
     "watch": "yarn build --watch",
     "postversion": "yarn dist && node update-sri.js package README.md contrib/*/README.md docs/*.md website/pages/index.html",
     "semantic-release": "semantic-release",

package/src/MacroExpander.js

@@ -11,10 +11,10 @@ import {Token} from "./Token";
 import type {Mode} from "./types";
 import ParseError from "./ParseError";
 import Namespace from "./Namespace";
-import builtinMacros from "./macros";
+import macros from "./macros";
 
 import type {MacroContextInterface, MacroDefinition, MacroExpansion, MacroArg}
-    from "./macros";
+    from "./defineMacro";
 import type Settings from "./Settings";
 
 // List of commands that act like macros but aren't defined as a macro,
@@ -40,7 +40,7 @@ export default class MacroExpander implements MacroContextInterface {
         this.expansionCount = 0;
         this.feed(input);
         // Make new global namespace
-        this.macros = new Namespace(builtinMacros, settings.macros);
+        this.macros = new Namespace(macros, settings.macros);
         this.mode = mode;
         this.stack = []; // contains tokens in REVERSE order
     }
@@ -74,6 +74,14 @@ export default class MacroExpander implements MacroContextInterface {
         this.macros.endGroup();
     }
 
+    /**
+     * Ends all currently nested groups (if any), restoring values before the
+     * groups began.  Useful in case of an error in the middle of parsing.
+     */
+    endGroups() {
+        this.macros.endGroups();
+    }
+
     /**
      * Returns the topmost token on the stack, without expanding it.
      * Similar in behavior to TeX's `\futurelet`.

package/src/Namespace.js

@@ -57,6 +57,16 @@ export default class Namespace<Value> {
         }
     }
 
+    /**
+     * Ends all currently nested groups (if any), restoring values before the
+     * groups began.  Useful in case of an error in the middle of parsing.
+     */
+    endGroups() {
+        while (this.undefStack.length > 0) {
+            this.endGroup();
+        }
+    }
+
     /**
      * Detect whether `name` has a definition.  Equivalent to
      * `get(name) != null`.

package/src/Parser.js

@@ -130,17 +130,24 @@ export default class Parser {
             this.gullet.macros.set("\\color", "\\textcolor");
         }
 
-        // Try to parse the input
-        const parse = this.parseExpression(false);
+        try {
+            // Try to parse the input
+            const parse = this.parseExpression(false);
 
-        // If we succeeded, make sure there's an EOF at the end
-        this.expect("EOF");
+            // If we succeeded, make sure there's an EOF at the end
+            this.expect("EOF");
 
-        // End the group namespace for the expression
-        if (!this.settings.globalGroup) {
-            this.gullet.endGroup();
+            // End the group namespace for the expression
+            if (!this.settings.globalGroup) {
+                this.gullet.endGroup();
+            }
+
+            return parse;
+
+        // Close any leftover groups in case of a parse error.
+        } finally {
+            this.gullet.endGroups();
         }
-        return parse;
     }
 
     static endOfExpression: string[] = ["}", "\\endgroup", "\\end", "\\right", "&"];
@@ -951,7 +958,8 @@ export default class Parser {
                 if (!unicodeAccents[accent]) {
                     throw new ParseError(`Unknown accent ' ${accent}'`, nucleus);
                 }
-                const command = unicodeAccents[accent][this.mode];
+                const command = unicodeAccents[accent][this.mode] ||
+                    unicodeAccents[accent].text;
                 if (!command) {
                     throw new ParseError(
                         `Accent ${accent} unsupported in ${this.mode} mode`,

package/src/Settings.js

@@ -10,7 +10,7 @@ import ParseError from "./ParseError";
 import {Token} from "./Token";
 
 import type {AnyParseNode} from "./parseNode";
-import type {MacroMap} from "./macros";
+import type {MacroMap} from "./defineMacro";
 
 export type StrictFunction =
     (errorCode: string, errorMsg: string, token?: Token | AnyParseNode) =>

package/src/defineMacro.js

@@ -0,0 +1,118 @@
+// @flow
+
+import {Token} from "./Token";
+import type Namespace from "./Namespace";
+import type {Mode} from "./types";
+
+/**
+ * Provides context to macros defined by functions. Implemented by
+ * MacroExpander.
+ */
+export interface MacroContextInterface {
+    mode: Mode;
+
+    /**
+     * Object mapping macros to their expansions.
+     */
+    macros: Namespace<MacroDefinition>;
+
+    /**
+     * Returns the topmost token on the stack, without expanding it.
+     * Similar in behavior to TeX's `\futurelet`.
+     */
+    future(): Token;
+
+    /**
+     * Remove and return the next unexpanded token.
+     */
+    popToken(): Token;
+
+    /**
+     * Consume all following space tokens, without expansion.
+     */
+    consumeSpaces(): void;
+
+    /**
+     * Expand the next token only once if possible.
+     */
+    expandOnce(expandableOnly?: boolean): Token | Token[];
+
+    /**
+     * Expand the next token only once (if possible), and return the resulting
+     * top token on the stack (without removing anything from the stack).
+     * Similar in behavior to TeX's `\expandafter\futurelet`.
+     */
+    expandAfterFuture(): Token;
+
+    /**
+     * Recursively expand first token, then return first non-expandable token.
+     */
+    expandNextToken(): Token;
+
+    /**
+     * Fully expand the given macro name and return the resulting list of
+     * tokens, or return `undefined` if no such macro is defined.
+     */
+    expandMacro(name: string): Token[] | void;
+
+    /**
+     * Fully expand the given macro name and return the result as a string,
+     * or return `undefined` if no such macro is defined.
+     */
+    expandMacroAsText(name: string): string | void;
+
+    /**
+     * Consume an argument from the token stream, and return the resulting array
+     * of tokens and start/end token.
+     */
+    consumeArg(delims?: ?string[]): MacroArg;
+
+    /**
+     * Consume the specified number of arguments from the token stream,
+     * and return the resulting array of arguments.
+     */
+    consumeArgs(numArgs: number): Token[][];
+
+    /**
+     * Determine whether a command is currently "defined" (has some
+     * functionality), meaning that it's a macro (in the current group),
+     * a function, a symbol, or one of the special commands listed in
+     * `implicitCommands`.
+     */
+    isDefined(name: string): boolean;
+
+    /**
+     * Determine whether a command is expandable.
+     */
+    isExpandable(name: string): boolean;
+}
+
+export type MacroArg = {
+    tokens: Token[],
+    start: Token,
+    end: Token
+};
+
+/** Macro tokens (in reverse order). */
+export type MacroExpansion = {
+    tokens: Token[],
+    numArgs: number,
+    delimiters?: string[][],
+    unexpandable?: boolean, // used in \let
+};
+
+export type MacroDefinition = string | MacroExpansion |
+    (MacroContextInterface => (string | MacroExpansion));
+export type MacroMap = {[string]: MacroDefinition};
+
+/**
+ * All registered global/built-in macros.
+ * `macros.js` exports this same dictionary again and makes it public.
+ * `Parser.js` requires this dictionary via `macros.js`.
+ */
+export const _macros: MacroMap = {};
+
+// This function might one day accept an additional argument and do more things.
+export default function defineMacro(name: string, body: MacroDefinition) {
+    _macros[name] = body;
+}

package/src/fontMetrics.js

@@ -108,11 +108,9 @@ import metricMap from "./fontMetricsData";
 const extraCharacterMap = {
     // Latin-1
     'Å': 'A',
-    'Ç': 'C',
     'Ð': 'D',
     'Þ': 'o',
     'å': 'a',
-    'ç': 'c',
     'ð': 'd',
     'þ': 'o',
 

package/src/fontMetricsData.js

@@ -1038,7 +1038,7 @@ export default {
         "8221": [0, 0.69444, 0, 0, 0.5],
         "8224": [0.19444, 0.69444, 0, 0, 0.44445],
         "8225": [0.19444, 0.69444, 0, 0, 0.44445],
-        "8230": [0, 0.12, 0, 0, 1.172],
+        "8230": [0, 0.123, 0, 0, 1.172],
         "8242": [0, 0.55556, 0, 0, 0.275],
         "8407": [0, 0.71444, 0.15382, 0, 0.5],
         "8463": [0, 0.68889, 0, 0, 0.54028],
@@ -1102,7 +1102,7 @@ export default {
         "8773": [-0.022, 0.589, 0, 0, 1.0],
         "8776": [-0.01688, 0.48312, 0, 0, 0.77778],
         "8781": [-0.03625, 0.46375, 0, 0, 0.77778],
-        "8784": [-0.133, 0.67, 0, 0, 0.778],
+        "8784": [-0.133, 0.673, 0, 0, 0.778],
         "8801": [-0.03625, 0.46375, 0, 0, 0.77778],
         "8804": [0.13597, 0.63597, 0, 0, 0.77778],
         "8805": [0.13597, 0.63597, 0, 0, 0.77778],
@@ -1133,9 +1133,9 @@ export default {
         "8901": [-0.05555, 0.44445, 0, 0, 0.27778],
         "8902": [-0.03472, 0.46528, 0, 0, 0.5],
         "8904": [0.005, 0.505, 0, 0, 0.9],
-        "8942": [0.03, 0.9, 0, 0, 0.278],
-        "8943": [-0.19, 0.31, 0, 0, 1.172],
-        "8945": [-0.1, 0.82, 0, 0, 1.282],
+        "8942": [0.03, 0.903, 0, 0, 0.278],
+        "8943": [-0.19, 0.313, 0, 0, 1.172],
+        "8945": [-0.1, 0.823, 0, 0, 1.282],
         "8968": [0.25, 0.75, 0, 0, 0.44445],
         "8969": [0.25, 0.75, 0, 0, 0.44445],
         "8970": [0.25, 0.75, 0, 0, 0.44445],
@@ -1143,7 +1143,7 @@ export default {
         "8994": [-0.14236, 0.35764, 0, 0, 1.0],
         "8995": [-0.14236, 0.35764, 0, 0, 1.0],
         "9136": [0.244, 0.744, 0, 0, 0.412],
-        "9137": [0.244, 0.744, 0, 0, 0.412],
+        "9137": [0.244, 0.745, 0, 0, 0.412],
         "9651": [0.19444, 0.69444, 0, 0, 0.88889],
         "9657": [-0.03472, 0.46528, 0, 0, 0.5],
         "9661": [0.19444, 0.69444, 0, 0, 0.88889],
@@ -1159,7 +1159,7 @@ export default {
         "10216": [0.25, 0.75, 0, 0, 0.38889],
         "10217": [0.25, 0.75, 0, 0, 0.38889],
         "10222": [0.244, 0.744, 0, 0, 0.412],
-        "10223": [0.244, 0.744, 0, 0, 0.412],
+        "10223": [0.244, 0.745, 0, 0, 0.412],
         "10229": [0.011, 0.511, 0, 0, 1.609],
         "10230": [0.011, 0.511, 0, 0, 1.638],
         "10231": [0.011, 0.511, 0, 0, 1.859],

package/src/fonts/Makefile

@@ -42,7 +42,7 @@ config: $(CUSTOM).pl
 
 blacker: $(MFTRACE_MODIFIED)
 $(MFTRACE_MODIFIED):
-	$(PERL) makeBlacker 15 # values between 10 and 30 seem best
+	$(PERL) -I. makeBlacker 15 # values between 10 and 30 seem best
 
 pfa: $(MFTRACE_MODIFIED)
 	@echo "cmr10"
@@ -109,7 +109,7 @@ pfa: $(MFTRACE_MODIFIED)
 ff: pfa
 	mkdir -p ff otf
 	rm -f ff/* otf/*
-	$(PERL) makeFF
+	$(PERL) -I. makeFF
 
 .PHONY: fonts
 fonts: ff
@@ -123,9 +123,9 @@ fonts: ff
 		\
 		echo "Hinting $$file"; \
 		if echo "$$file" | $(GREP) -q -e "Size[1-4]" -e "Typewriter"; then \
-			$(TTFAUTOHINT) --windows-compatibility --symbol ttf/$$file.ttf ttf/$$file.ttf.hinted; \
+			$(TTFAUTOHINT) -f none -S --windows-compatibility --symbol ttf/$$file.ttf ttf/$$file.ttf.hinted; \
 		else \
-			$(TTFAUTOHINT) --windows-compatibility ttf/$$file.ttf ttf/$$file.ttf.hinted; \
+			$(TTFAUTOHINT) -f none -S --windows-compatibility ttf/$$file.ttf ttf/$$file.ttf.hinted; \
 		fi; \
 		mv ttf/$$file.ttf.hinted ttf/$$file.ttf; \
 		\

package/src/fonts/default.cfg

@@ -3,7 +3,7 @@
 ##### Standard programs #####
 GREP=grep
 PERL=perl
-PYTHON=python
+PYTHON=python3
 SED=sed
 WHICH=which
 KPSEWHICH=kpsewhich

package/src/fonts/generate_fonts.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 
 import sys
 import os
@@ -9,7 +9,7 @@ from fontTools.misc.timeTools import timestampNow
 sfnt.USE_ZOPFLI = True
 
 if len(sys.argv) < 2:
-    print "Usage: %s <font file>" % sys.argv[0]
+    print("Usage: %s <font file>" % sys.argv[0])
     sys.exit(1)
 
 font_file = sys.argv[1]
@@ -36,7 +36,7 @@ if 'GDEF' in font:
 font['name'].names = [record for record in font['name'].names if record.platformID != 1]
 font['cmap'].tables = [table for table in font['cmap'].tables if table.platformID != 1]
 
-font['name'].setName(unicode('Version ' + str(timestamp)), 5, 3, 1, 1033)
+font['name'].setName('Version ' + str(timestamp), 5, 3, 1, 1033)
 
 # fix OS/2 and hhea metrics
 glyf = font['glyf']

package/src/functions/accent.js

@@ -74,10 +74,14 @@ export const htmlBuilder: HtmlBuilderSupSub<"accent"> = (grp, options) => {
         // TODO(emily): Find a better way to get the skew
     }
 
+    const accentBelow = group.label === "\\c";
+
     // calculate the amount of space between the body and the accent
-    let clearance = Math.min(
-        body.height,
-        options.fontMetrics().xHeight);
+    let clearance = accentBelow
+        ? body.height + body.depth
+        : Math.min(
+            body.height,
+            options.fontMetrics().xHeight);
 
     // Build the accent
     let accentBody;
@@ -100,6 +104,9 @@ export const htmlBuilder: HtmlBuilderSupSub<"accent"> = (grp, options) => {
             // shift the accent over to a place we don't want.
             accent.italic = 0;
             width = accent.width;
+            if (accentBelow) {
+                clearance += accent.depth;
+            }
         }
 
         accentBody = buildCommon.makeSpan(["accent-body"], [accent]);
@@ -244,7 +251,7 @@ defineFunction({
     type: "accent",
     names: [
         "\\'", "\\`", "\\^", "\\~", "\\=", "\\u", "\\.", '\\"',
-        "\\r", "\\H", "\\v", "\\textcircled",
+        "\\c", "\\r", "\\H", "\\v", "\\textcircled",
     ],
     props: {
         numArgs: 1,

package/src/functions/char.js

@@ -21,14 +21,25 @@ defineFunction({
             const node = assertNodeType(group[i], "textord");
             number += node.text;
         }
-        const code = parseInt(number);
+        let code = parseInt(number);
+        let text;
         if (isNaN(code)) {
             throw new ParseError(`\\@char has non-numeric argument ${number}`);
+        // If we drop IE support, the following code could be replaced with
+        // text = String.fromCodePoint(code)
+        } else if (code < 0 || code >= 0x10ffff) {
+            throw new ParseError(`\\@char with invalid code point ${number}`);
+        } else if (code <= 0xffff) {
+            text = String.fromCharCode(code);
+        } else { // Astral code point; split into surrogate halves
+            code -= 0x10000;
+            text = String.fromCharCode((code >> 10) + 0xd800,
+                                       (code & 0x3ff) + 0xdc00);
         }
         return {
             type: "textord",
             mode: parser.mode,
-            text: String.fromCharCode(code),
+            text: text,
         };
     },
 });

package/src/functions/operatorname.js

@@ -1,6 +1,6 @@
 // @flow
 import defineFunction, {ordargument} from "../defineFunction";
-import {defineMacro} from "../macros";
+import defineMacro from "../defineMacro";
 import buildCommon from "../buildCommon";
 import mathMLTree from "../mathMLTree";
 import {SymbolNode} from "../domTree";

package/src/macros.js

@@ -4,124 +4,17 @@
  * This can be used to define some commands in terms of others.
  */
 
+// Export global macros object from defineMacro
+import defineMacro, {_macros} from "./defineMacro";
+const macros = _macros;
+export default macros;
+
 import fontMetricsData from "./fontMetricsData";
 import functions from "./functions";
 import symbols from "./symbols";
 import utils from "./utils";
-import {Token} from "./Token";
 import ParseError from "./ParseError";
-import type Namespace from "./Namespace";
-
-import type {Mode} from "./types";
-
-/**
- * Provides context to macros defined by functions. Implemented by
- * MacroExpander.
- */
-export interface MacroContextInterface {
-    mode: Mode;
-
-    /**
-     * Object mapping macros to their expansions.
-     */
-    macros: Namespace<MacroDefinition>;
-
-    /**
-     * Returns the topmost token on the stack, without expanding it.
-     * Similar in behavior to TeX's `\futurelet`.
-     */
-    future(): Token;
-
-    /**
-     * Remove and return the next unexpanded token.
-     */
-    popToken(): Token;
-
-    /**
-     * Consume all following space tokens, without expansion.
-     */
-    consumeSpaces(): void;
-
-    /**
-     * Expand the next token only once if possible.
-     */
-    expandOnce(expandableOnly?: boolean): Token | Token[];
-
-    /**
-     * Expand the next token only once (if possible), and return the resulting
-     * top token on the stack (without removing anything from the stack).
-     * Similar in behavior to TeX's `\expandafter\futurelet`.
-     */
-    expandAfterFuture(): Token;
-
-    /**
-     * Recursively expand first token, then return first non-expandable token.
-     */
-    expandNextToken(): Token;
-
-    /**
-     * Fully expand the given macro name and return the resulting list of
-     * tokens, or return `undefined` if no such macro is defined.
-     */
-    expandMacro(name: string): Token[] | void;
-
-    /**
-     * Fully expand the given macro name and return the result as a string,
-     * or return `undefined` if no such macro is defined.
-     */
-    expandMacroAsText(name: string): string | void;
-
-    /**
-     * Consume an argument from the token stream, and return the resulting array
-     * of tokens and start/end token.
-     */
-    consumeArg(delims?: ?string[]): MacroArg;
-
-    /**
-     * Consume the specified number of arguments from the token stream,
-     * and return the resulting array of arguments.
-     */
-    consumeArgs(numArgs: number): Token[][];
-
-    /**
-     * Determine whether a command is currently "defined" (has some
-     * functionality), meaning that it's a macro (in the current group),
-     * a function, a symbol, or one of the special commands listed in
-     * `implicitCommands`.
-     */
-    isDefined(name: string): boolean;
-
-    /**
-     * Determine whether a command is expandable.
-     */
-    isExpandable(name: string): boolean;
-}
-
-export type MacroArg = {
-    tokens: Token[],
-    start: Token,
-    end: Token
-};
-
-/** Macro tokens (in reverse order). */
-export type MacroExpansion = {
-    tokens: Token[],
-    numArgs: number,
-    delimiters?: string[][],
-    unexpandable?: boolean, // used in \let
-};
-
-export type MacroDefinition = string | MacroExpansion |
-    (MacroContextInterface => (string | MacroExpansion));
-export type MacroMap = {[string]: MacroDefinition};
-
-const builtinMacros: MacroMap = {};
-export default builtinMacros;
 
-// This function might one day accept an additional argument and do more things.
-export function defineMacro(name: string, body: MacroDefinition) {
-    builtinMacros[name] = body;
-}
 
 //////////////////////////////////////////////////////////////////////
 // macro tools