katex 0.15.4 → 0.16.0

package/dist/katex.mjs

@@ -15789,7 +15789,67 @@ defineMacro("\\bra", "\\mathinner{\\langle{#1}|}");
 defineMacro("\\ket", "\\mathinner{|{#1}\\rangle}");
 defineMacro("\\braket", "\\mathinner{\\langle{#1}\\rangle}");
 defineMacro("\\Bra", "\\left\\langle#1\\right|");
-defineMacro("\\Ket", "\\left|#1\\right\\rangle"); //////////////////////////////////////////////////////////////////////
+defineMacro("\\Ket", "\\left|#1\\right\\rangle");
+
+var braketHelper = one => context => {
+  var left = context.consumeArg().tokens;
+  var middle = context.consumeArg().tokens;
+  var middleDouble = context.consumeArg().tokens;
+  var right = context.consumeArg().tokens;
+  var oldMiddle = context.macros.get("|");
+  var oldMiddleDouble = context.macros.get("\\|");
+  context.macros.beginGroup();
+
+  var midMacro = double => context => {
+    if (one) {
+      // Only modify the first instance of | or \|
+      context.macros.set("|", oldMiddle);
+
+      if (middleDouble.length) {
+        context.macros.set("\\|", oldMiddleDouble);
+      }
+    }
+
+    var doubled = double;
+
+    if (!double && middleDouble.length) {
+      // Mimic \@ifnextchar
+      var nextToken = context.future();
+
+      if (nextToken.text === "|") {
+        context.popToken();
+        doubled = true;
+      }
+    }
+
+    return {
+      tokens: doubled ? middleDouble : middle,
+      numArgs: 0
+    };
+  };
+
+  context.macros.set("|", midMacro(false));
+
+  if (middleDouble.length) {
+    context.macros.set("\\|", midMacro(true));
+  }
+
+  var arg = context.consumeArg().tokens;
+  var expanded = context.expandTokens([...right, ...arg, ...left // reversed
+  ]);
+  context.macros.endGroup();
+  return {
+    tokens: expanded.reverse(),
+    numArgs: 0
+  };
+};
+
+defineMacro("\\bra@ket", braketHelper(false));
+defineMacro("\\bra@set", braketHelper(true));
+defineMacro("\\Braket", "\\bra@ket{\\left\\langle}" + "{\\,\\middle\\vert\\,}{\\,\\middle\\vert\\,}{\\right\\rangle}");
+defineMacro("\\Set", "\\bra@set{\\left\\{\\:}" + "{\\;\\middle\\vert\\;}{\\;\\middle\\Vert\\;}{\\:\\right\\}}");
+defineMacro("\\set", "\\bra@set{\\{\\,}{\\mid}{}{\\,\\}}"); // has no support for special || or \|
+//////////////////////////////////////////////////////////////////////
 // actuarialangle.dtx
 
 defineMacro("\\angln", "{\\angl n}"); // Custom Khan Academy colors, should be moved to an optional package
@@ -16245,7 +16305,9 @@ class MacroExpander {
     return this.macros.has(name) ? this.expandTokens([new Token(name)]) : undefined;
   }
   /**
-   * Fully expand the given token stream and return the resulting list of tokens
+   * Fully expand the given token stream and return the resulting list of
+   * tokens.  Note that the input tokens are in reverse order, but the
+   * output tokens are in forward order.
    */
 
 
@@ -18106,7 +18168,7 @@ var katex = {
   /**
    * Current KaTeX version
    */
-  version: "0.15.4",
+  version: "0.16.0",
 
   /**
    * Renders the given LaTeX into an HTML+MathML combination, and adds

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "katex",
-  "version": "0.15.4",
+  "version": "0.16.0",
   "description": "Fast math typesetting for the web.",
   "main": "dist/katex.js",
   "exports": {
@@ -127,7 +127,7 @@
     "test": "yarn test:lint && yarn test:flow && yarn test:jest",
     "test:lint": "yarn test:lint:js && yarn test:lint:css",
     "test:lint:js": "eslint .",
-    "test:lint:css": "stylelint src/katex.less static/main.css contrib/**/*.css website/static/**/*.css",
+    "test:lint:css": "stylelint src/katex.less static/main.css website/static/**/*.css",
     "test:flow": "flow",
     "test:jest": "jest",
     "test:jest:watch": "jest --watch",

package/src/MacroExpander.js

@@ -356,7 +356,9 @@ export default class MacroExpander implements MacroContextInterface {
     }
 
     /**
-     * Fully expand the given token stream and return the resulting list of tokens
+     * Fully expand the given token stream and return the resulting list of
+     * tokens.  Note that the input tokens are in reverse order, but the
+     * output tokens are in forward order.
      */
     expandTokens(tokens: Token[]): Token[] {
         const output = [];

package/src/defineMacro.js

@@ -61,6 +61,13 @@ export interface MacroContextInterface {
      */
     expandMacroAsText(name: string): string | void;
 
+    /**
+     * Fully expand the given token stream and return the resulting list of
+     * tokens.  Note that the input tokens are in reverse order, but the
+     * output tokens are in forward order.
+     */
+    expandTokens(tokens: Token[]): Token[];
+
     /**
      * Consume an argument from the token stream, and return the resulting array
      * of tokens and start/end token.

package/src/macros.js

@@ -912,6 +912,58 @@ defineMacro("\\ket", "\\mathinner{|{#1}\\rangle}");
 defineMacro("\\braket", "\\mathinner{\\langle{#1}\\rangle}");
 defineMacro("\\Bra", "\\left\\langle#1\\right|");
 defineMacro("\\Ket", "\\left|#1\\right\\rangle");
+const braketHelper = (one) => (context) => {
+    const left = context.consumeArg().tokens;
+    const middle = context.consumeArg().tokens;
+    const middleDouble = context.consumeArg().tokens;
+    const right = context.consumeArg().tokens;
+    const oldMiddle = context.macros.get("|");
+    const oldMiddleDouble = context.macros.get("\\|");
+    context.macros.beginGroup();
+    const midMacro = (double) => (context) => {
+        if (one) {
+            // Only modify the first instance of | or \|
+            context.macros.set("|", oldMiddle);
+            if (middleDouble.length) {
+                context.macros.set("\\|", oldMiddleDouble);
+            }
+        }
+        let doubled = double;
+        if (!double && middleDouble.length) {
+            // Mimic \@ifnextchar
+            const nextToken = context.future();
+            if (nextToken.text === "|") {
+                context.popToken();
+                doubled = true;
+            }
+        }
+        return {
+            tokens: doubled ? middleDouble : middle,
+            numArgs: 0,
+        };
+    };
+    context.macros.set("|", midMacro(false));
+    if (middleDouble.length) {
+        context.macros.set("\\|", midMacro(true));
+    }
+    const arg = context.consumeArg().tokens;
+    const expanded = context.expandTokens([
+        ...right, ...arg, ...left,  // reversed
+    ]);
+    context.macros.endGroup();
+    return {
+        tokens: expanded.reverse(),
+        numArgs: 0,
+    };
+};
+defineMacro("\\bra@ket", braketHelper(false));
+defineMacro("\\bra@set", braketHelper(true));
+defineMacro("\\Braket", "\\bra@ket{\\left\\langle}" +
+    "{\\,\\middle\\vert\\,}{\\,\\middle\\vert\\,}{\\right\\rangle}");
+defineMacro("\\Set", "\\bra@set{\\left\\{\\:}" +
+    "{\\;\\middle\\vert\\;}{\\;\\middle\\Vert\\;}{\\:\\right\\}}");
+defineMacro("\\set", "\\bra@set{\\{\\,}{\\mid}{}{\\,\\}}");
+    // has no support for special || or \|
 
 //////////////////////////////////////////////////////////////////////
 // actuarialangle.dtx

package/contrib/copy-tex/copy-tex.css

@@ -1,10 +0,0 @@
-/* Force selection of entire .katex/.katex-display blocks, so that we can
- * copy/paste the entire source code.  If you omit this CSS, partial
- * selections of a formula will work, but will copy the ugly HTML
- * representation instead of the LaTeX source code.  (Full selections will
- * still produce the LaTeX source code.)
- */
-.katex,
-.katex-display {
-    user-select: all;
-}

package/contrib/copy-tex/copy-tex.webpack.js

@@ -1,6 +0,0 @@
-/**
- * This is the webpack entry point for KaTeX. As ECMAScript doesn't support
- * CSS modules natively, a separate entry point is used.
- */
-import './copy-tex.css';
-import './copy-tex.js';

package/contrib/mhchem/mhchem.patch

@@ -1,235 +0,0 @@
-0a1
-> /* eslint-disable */
-5a7,22
->  *  KaTeX mhchem.js
->  *
->  *  This file implements a KaTeX version of mhchem version 3.3.0.
->  *  It is adapted from MathJax/extensions/TeX/mhchem.js
->  *  It differs from the MathJax version as follows:
->  *    1. The interface is changed so that it can be called from KaTeX, not MathJax.
->  *    2. \rlap and \llap are replaced with \mathrlap and \mathllap.
->  *    3. Four lines of code are edited in order to use \raisebox instead of \raise.
->  *    4. The reaction arrow code is simplified. All reaction arrows are rendered
->  *       using KaTeX extensible arrows instead of building non-extensible arrows.
->  *    5. \tripledash vertical alignment is slightly adjusted.
->  *
->  *    This code, as other KaTeX code, is released under the MIT license.
->  * 
->  * /*************************************************************
->  *
-33a51
-> // version: "3.3.0" for MathJax and KaTeX
-35,37d52
-< MathJax.Extension["TeX/mhchem"] = {
-<   version: "3.3.0"
-< };
-39c54
-< MathJax.Hub.Register.StartupHook("TeX Jax Ready", function () {
----
-> // Add \ce, \pu, and \tripledash to the KaTeX macros.
-41c56,58
-<   var TEX = MathJax.InputJax.TeX;
----
-> katex.__defineMacro("\\ce", function(context) {
->   return chemParse(context.consumeArgs(1)[0], "ce")
-> });
-43,47c60,62
-<   //
-<   //  This is the main class for handing the \ce and related commands.
-<   //  Its main method is Parse() which takes the argument to \ce and
-<   //  returns the corresponding TeX string.
-<   //
----
-> katex.__defineMacro("\\pu", function(context) {
->   return chemParse(context.consumeArgs(1)[0], "pu");
-> });
-49,50c64,68
-<   var CE = MathJax.Object.Subclass({
-<     string: "",   // the \ce string being parsed
----
-> //  Needed for \bond for the ~ forms
-> //  Raise by 2.56mu, not 2mu. We're raising a hyphen-minus, U+002D, not 
-> //  a mathematical minus, U+2212. So we need that extra 0.56.
-> katex.__defineMacro("\\tripledash", "{\\vphantom{-}\\raisebox{2.56mu}{$\\mkern2mu"
-> + "\\tiny\\text{-}\\mkern1mu\\text{-}\\mkern1mu\\text{-}\\mkern2mu$}}");
-52,55c70
-<     //
-<     //  Store the string when a CE object is created
-<     //
-<     Init: function (string) { this.string = string; },
----
-> import katex from "katex";
-57,64c72,85
-<     //
-<     //  This converts the CE string to a TeX string.
-<     //
-<     Parse: function (stateMachine) {
-<       try {
-<         return texify.go(mhchemParser.go(this.string, stateMachine));
-<       } catch (ex) {
-<         TEX.Error(ex);
----
->   //
->   //  This is the main function for handing the \ce and \pu commands.
->   //  It takes the argument to \ce or \pu and returns the corresponding TeX string.
->   //
-> 
->   var chemParse = function (tokens, stateMachine) {
->     // Recreate the argument string from KaTeX's array of tokens.
->     var str = "";
->     var expectedLoc = tokens[tokens.length - 1].loc.start
->     for (var i = tokens.length - 1; i >= 0; i--) {
->       if(tokens[i].loc.start > expectedLoc) {
->         // context.consumeArgs has eaten a space.
->         str += " ";
->         expectedLoc = tokens[i].loc.start;
-65a87,88
->       str += tokens[i].text;
->       expectedLoc += tokens[i].text.length;
-67c90,92
-<   });
----
->     var tex = texify.go(mhchemParser.go(str, stateMachine));
->     return tex;
->   };
-1405,1406c1430,1431
-<             res += "^{\\smash[t]{\\vphantom{2}}\\llap{"+(b5.b||"")+"}}";
-<             res += "_{\\vphantom{2}\\llap{\\smash[t]{"+(b5.p||"")+"}}}";
----
->             res += "^{\\smash[t]{\\vphantom{2}}\\mathllap{"+(b5.b||"")+"}}";
->             res += "_{\\vphantom{2}\\mathllap{\\smash[t]{"+(b5.p||"")+"}}}";
-1508,1520c1533,1536
-<           var arrow = texify._getArrow(buf.r);
-<           if (b6.rd || b6.rq) {
-<             if (buf.r === "<=>"  ||  buf.r === "<=>>"  ||  buf.r === "<<=>"  ||  buf.r === "<-->") {
-<               // arrows that cannot stretch correctly yet, https://github.com/mathjax/MathJax/issues/1491
-<               arrow = "\\long"+arrow;
-<               if (b6.rd) { arrow = "\\overset{"+b6.rd+"}{"+arrow+"}"; }
-<               if (b6.rq) { arrow = "\\underset{\\lower7mu{"+b6.rq+"}}{"+arrow+"}"; }
-<               arrow = " {}\\mathrel{"+arrow+"}{} ";
-<             } else {
-<               if (b6.rq) { arrow += "[{"+b6.rq+"}]"; }
-<               arrow += "{"+b6.rd+"}";
-<               arrow = " {}\\mathrel{\\x"+arrow+"}{} ";
-<             }
----
->           var arrow = "\\x" + texify._getArrow(buf.r);
->           if (b6.rq) { arrow += "[{" + b6.rq + "}]"; }
->           if (b6.rd) {
->             arrow += "{" + b6.rd + "}";
-1522c1538
-<             arrow = " {}\\mathrel{\\long"+arrow+"}{} ";
----
->             arrow += "{}";
-1615c1631
-<         case "<-->": return "leftrightarrows";
----
->         case "<-->": return "rightleftarrows";
-1618,1619c1634,1635
-<         case "<=>>": return "Rightleftharpoons";
-<         case "<<=>": return "Leftrightharpoons";
----
->         case "<=>>": return "rightequilibrium";
->         case "<<=>": return "leftequilibrium";
-1634,1637c1650,1653
-<         case "~-": return "{\\rlap{\\lower.1em{-}}\\raise.1em{\\tripledash}}";
-<         case "~=": return "{\\rlap{\\lower.2em{-}}\\rlap{\\raise.2em{\\tripledash}}-}";
-<         case "~--": return "{\\rlap{\\lower.2em{-}}\\rlap{\\raise.2em{\\tripledash}}-}";
-<         case "-~-": return "{\\rlap{\\lower.2em{-}}\\rlap{\\raise.2em{-}}\\tripledash}";
----
->         case "~-": return "{\\mathrlap{\\raisebox{-.1em}{$-$}}\\raisebox{.1em}{$\\tripledash$}}";
->         case "~=": return "{\\mathrlap{\\raisebox{-.2em}{$-$}}\\mathrlap{\\raisebox{.2em}{$\\tripledash$}}-}";
->         case "~--": return "{\\mathrlap{\\raisebox{-.2em}{$-$}}\\mathrlap{\\raisebox{.2em}{$\\tripledash$}}-}";
->         case "-~-": return "{\\mathrlap{\\raisebox{-.2em}{$-$}}\\mathrlap{\\raisebox{.2em}{$-$}}\\tripledash}";
-1680,1770d1695
-< 
-<   //
-<   // MathJax definitions
-<   //
-<   MathJax.Extension["TeX/mhchem"].CE = CE;
-< 
-<   /***************************************************************************/
-< 
-<   TEX.Definitions.Add({
-<     macros: {
-<       //
-<       //  Set up the macros for chemistry
-<       //
-<       ce: "CE",
-<       pu: "PU",
-< 
-<       //
-<       //  Make these load AMSmath package (redefined below when loaded)
-<       //
-<       xleftrightarrow:    ["Extension", "AMSmath"],
-<       xrightleftharpoons: ["Extension", "AMSmath"],
-<       xRightleftharpoons: ["Extension", "AMSmath"],
-<       xLeftrightharpoons: ["Extension", "AMSmath"],
-< 
-<       //  FIXME:  These don't work well in FF NativeMML mode
-<       longrightleftharpoons: ["Macro", "\\stackrel{\\textstyle{-}\\!\\!{\\rightharpoonup}}{\\smash{{\\leftharpoondown}\\!\\!{-}}}"],
-<       longRightleftharpoons: ["Macro", "\\stackrel{\\textstyle{-}\\!\\!{\\rightharpoonup}}{\\smash{\\leftharpoondown}}"],
-<       longLeftrightharpoons: ["Macro", "\\stackrel{\\textstyle\\vphantom{{-}}{\\rightharpoonup}}{\\smash{{\\leftharpoondown}\\!\\!{-}}}"],
-<       longleftrightarrows:   ["Macro", "\\stackrel{\\longrightarrow}{\\smash{\\longleftarrow}\\Rule{0px}{.25em}{0px}}"],
-< 
-<       //
-<       //  Needed for \bond for the ~ forms
-<       //  Not perfectly aligned when zoomed in, but on 100%
-<       //
-<       tripledash: ["Macro", "\\vphantom{-}\\raise2mu{\\kern2mu\\tiny\\text{-}\\kern1mu\\text{-}\\kern1mu\\text{-}\\kern2mu}"]
-<     },
-<   }, null, true);
-< 
-<   if (!MathJax.Extension["TeX/AMSmath"]) {
-<     TEX.Definitions.Add({
-<       macros: {
-<         xrightarrow: ["Extension", "AMSmath"],
-<         xleftarrow:  ["Extension", "AMSmath"]
-<       }
-<     }, null, true);
-<   }
-< 
-<   //
-<   //  These arrows need to wait until AMSmath is loaded
-<   //
-<   MathJax.Hub.Register.StartupHook("TeX AMSmath Ready", function () {
-<     TEX.Definitions.Add({
-<       macros: {
-<         //
-<         //  Some of these are hacks for now
-<         //
-<         xleftrightarrow:    ["xArrow", 0x2194, 6, 6],
-<         xrightleftharpoons: ["xArrow", 0x21CC, 5, 7],  // FIXME:  doesn't stretch in HTML-CSS output
-<         xRightleftharpoons: ["xArrow", 0x21CC, 5, 7],  // FIXME:  how should this be handled?
-<         xLeftrightharpoons: ["xArrow", 0x21CC, 5, 7]
-<       }
-<     }, null, true);
-<   });
-< 
-<   TEX.Parse.Augment({
-< 
-<     //
-<     //  Implements \ce and friends
-<     //
-<     CE: function (name) {
-<       var arg = this.GetArgument(name);
-<       var tex = CE(arg).Parse();
-<       this.string = tex + this.string.substr(this.i); this.i = 0;
-<     },
-< 
-<     PU: function (name) {
-<       var arg = this.GetArgument(name);
-<       var tex = CE(arg).Parse('pu');
-<       this.string = tex + this.string.substr(this.i); this.i = 0;
-<     }
-< 
-<   });
-< 
-<   //
-<   //  Indicate that the extension is ready
-<   //
-<   MathJax.Hub.Startup.signal.Post("TeX mhchem Ready");
-< 
-< });
-< 
-< MathJax.Ajax.loadComplete("[mhchem]/unpacked/mhchem.js");

package/dist/contrib/copy-tex.css

@@ -1,13 +0,0 @@
-/* Force selection of entire .katex/.katex-display blocks, so that we can
- * copy/paste the entire source code.  If you omit this CSS, partial
- * selections of a formula will work, but will copy the ugly HTML
- * representation instead of the LaTeX source code.  (Full selections will
- * still produce the LaTeX source code.)
- */
-.katex,
-.katex-display {
-    -webkit-user-select: all;
-       -moz-user-select: all;
-            user-select: all;
-}
-

package/dist/contrib/copy-tex.min.css

@@ -1 +0,0 @@
-.katex,.katex-display{-webkit-user-select:all;-moz-user-select:all;user-select:all}