katex 0.13.2 → 0.13.3

package/dist/katex.mjs

@@ -4321,13 +4321,11 @@ defineSymbol(math, main, rel, "\u2192", "\\to");
 defineSymbol(math, ams, rel, "\u2271", "\\ngeq", true);
 defineSymbol(math, ams, rel, "\u2270", "\\nleq", true);
 defineSymbol(math, main, spacing, "\u00a0", "\\ ");
-defineSymbol(math, main, spacing, "\u00a0", "~");
 defineSymbol(math, main, spacing, "\u00a0", "\\space"); // Ref: LaTeX Source 2e: \DeclareRobustCommand{\nobreakspace}{%
 
 defineSymbol(math, main, spacing, "\u00a0", "\\nobreakspace");
 defineSymbol(text$1, main, spacing, "\u00a0", "\\ ");
 defineSymbol(text$1, main, spacing, "\u00a0", " ");
-defineSymbol(text$1, main, spacing, "\u00a0", "~");
 defineSymbol(text$1, main, spacing, "\u00a0", "\\space");
 defineSymbol(text$1, main, spacing, "\u00a0", "\\nobreakspace");
 defineSymbol(math, main, spacing, null, "\\nobreak");
@@ -9866,6 +9864,7 @@ function parseArray(parser, _ref, style) {
     colSeparationType,
     addEqnNum,
     singleRow,
+    emptySingleRow,
     maxNumCols,
     leqno
   } = _ref;
@@ -9940,9 +9939,10 @@ function parseArray(parser, _ref, style) {
       parser.consume();
     } else if (next === "\\end") {
       // Arrays terminate newlines with `\crcr` which consumes a `\cr` if
-      // the last line is empty.
+      // the last line is empty.  However, AMS environments keep the
+      // empty row if it's the only one.
       // NOTE: Currently, `cell` is the last item added into `row`.
-      if (row.length === 1 && cell.type === "styling" && cell.body[0].body.length === 0) {
+      if (row.length === 1 && cell.type === "styling" && cell.body[0].body.length === 0 && (body.length > 1 || !emptySingleRow)) {
         body.pop();
       }
 
@@ -10439,6 +10439,7 @@ var alignedHandler = function alignedHandler(context, args) {
     cols,
     addJot: true,
     addEqnNum: context.envName === "align" || context.envName === "alignat",
+    emptySingleRow: true,
     colSeparationType: separationType,
     maxNumCols: context.envName === "split" ? 2 : undefined,
     leqno: context.parser.settings.leqno
@@ -10800,6 +10801,7 @@ defineEnvironment({
       addJot: true,
       colSeparationType: "gather",
       addEqnNum: context.envName === "gather",
+      emptySingleRow: true,
       leqno: context.parser.settings.leqno
     };
     return parseArray(context.parser, res, "display");
@@ -10832,6 +10834,7 @@ defineEnvironment({
     validateAmsEnvironmentContext(context);
     var res = {
       addEqnNum: context.envName === "equation",
+      emptySingleRow: true,
       singleRow: true,
       maxNumCols: 1,
       leqno: context.parser.settings.leqno
@@ -14472,7 +14475,8 @@ combiningDiacriticalMarkString + "*") + // ...plus accents
 /** Main Lexer class */
 
 class Lexer {
-  // category codes, only supports comment characters (14) for now
+  // Category codes. The lexer only supports comment characters (14) for now.
+  // MacroExpander additionally distinguishes active (13).
   constructor(input, settings) {
     this.input = void 0;
     this.settings = void 0;
@@ -14483,7 +14487,9 @@ class Lexer {
     this.settings = settings;
     this.tokenRegex = new RegExp(tokenRegexString, 'g');
     this.catcodes = {
-      "%": 14 // comment character
+      "%": 14,
+      // comment character
+      "~": 13 // active character
 
     };
   }
@@ -14924,11 +14930,13 @@ defineMacro("\\show", context => {
 
 defineMacro("\\bgroup", "{");
 defineMacro("\\egroup", "}"); // Symbols from latex.ltx:
+// \def~{\nobreakspace{}}
 // \def\lq{`}
 // \def\rq{'}
 // \def \aa {\r a}
 // \def \AA {\r A}
 
+defineMacro("~", "\\nobreakspace");
 defineMacro("\\lq", "`");
 defineMacro("\\rq", "'");
 defineMacro("\\aa", "\\r a");
@@ -16001,6 +16009,16 @@ class MacroExpander {
     if (definition == null) {
       // mainly checking for undefined here
       return definition;
+    } // If a single character has an associated catcode other than 13
+    // (active character), then don't expand it.
+
+
+    if (name.length === 1) {
+      var catcode = this.lexer.catcodes[name];
+
+      if (catcode != null && catcode !== 13) {
+        return;
+      }
     }
 
     var expansion = typeof definition === "function" ? definition(this) : definition;
@@ -17146,9 +17164,13 @@ class Parser {
   parseUrlGroup(optional) {
     this.gullet.lexer.setCatcode("%", 13); // active character
 
+    this.gullet.lexer.setCatcode("~", 12); // other character
+
     var res = this.parseStringGroup("url", optional);
     this.gullet.lexer.setCatcode("%", 14); // comment character
 
+    this.gullet.lexer.setCatcode("~", 13); // active character
+
     if (res == null) {
       return null;
     } // hyperref package allows backslashes alone in href, but doesn't
@@ -17594,7 +17616,7 @@ var katex = {
   /**
    * Current KaTeX version
    */
-  version: "0.13.2",
+  version: "0.13.3",
 
   /**
    * Renders the given LaTeX into an HTML+MathML combination, and adds

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "katex",
-  "version": "0.13.2",
+  "version": "0.13.3",
   "description": "Fast math typesetting for the web.",
   "main": "dist/katex.js",
   "homepage": "https://katex.org",

package/src/Lexer.js

@@ -60,7 +60,8 @@ export default class Lexer implements LexerInterface {
     input: string;
     settings: Settings;
     tokenRegex: RegExp;
-    // category codes, only supports comment characters (14) for now
+    // Category codes. The lexer only supports comment characters (14) for now.
+    // MacroExpander additionally distinguishes active (13).
     catcodes: {[string]: number};
 
     constructor(input: string, settings: Settings) {
@@ -70,6 +71,7 @@ export default class Lexer implements LexerInterface {
         this.tokenRegex = new RegExp(tokenRegexString, 'g');
         this.catcodes = {
             "%": 14, // comment character
+            "~": 13, // active character
         };
     }
 

package/src/MacroExpander.js

@@ -395,6 +395,14 @@ export default class MacroExpander implements MacroContextInterface {
         if (definition == null) { // mainly checking for undefined here
             return definition;
         }
+        // If a single character has an associated catcode other than 13
+        // (active character), then don't expand it.
+        if (name.length === 1) {
+            const catcode = this.lexer.catcodes[name];
+            if (catcode != null && catcode !== 13) {
+                return;
+            }
+        }
         const expansion =
             typeof definition === "function" ? definition(this) : definition;
         if (typeof expansion === "string") {

package/src/Parser.js

@@ -682,8 +682,10 @@ export default class Parser {
      */
     parseUrlGroup(optional: boolean): ?ParseNode<"url"> {
         this.gullet.lexer.setCatcode("%", 13); // active character
+        this.gullet.lexer.setCatcode("~", 12); // other character
         const res = this.parseStringGroup("url", optional);
         this.gullet.lexer.setCatcode("%", 14); // comment character
+        this.gullet.lexer.setCatcode("~", 13); // active character
         if (res == null) {
             return null;
         }

package/src/environments/array.js

@@ -70,6 +70,7 @@ function parseArray(
         colSeparationType,
         addEqnNum,
         singleRow,
+        emptySingleRow,
         maxNumCols,
         leqno,
     }: {|
@@ -80,6 +81,7 @@ function parseArray(
         colSeparationType?: ColSeparationType,
         addEqnNum?: boolean,
         singleRow?: boolean,
+        emptySingleRow?: boolean,
         maxNumCols?: number,
         leqno?: boolean,
     |},
@@ -153,10 +155,12 @@ function parseArray(
             parser.consume();
         } else if (next === "\\end") {
             // Arrays terminate newlines with `\crcr` which consumes a `\cr` if
-            // the last line is empty.
+            // the last line is empty.  However, AMS environments keep the
+            // empty row if it's the only one.
             // NOTE: Currently, `cell` is the last item added into `row`.
             if (row.length === 1 && cell.type === "styling" &&
-                cell.body[0].body.length === 0) {
+                cell.body[0].body.length === 0 &&
+                (body.length > 1 || !emptySingleRow)) {
                 body.pop();
             }
             if (hLinesBeforeRow.length < body.length + 1) {
@@ -630,6 +634,7 @@ const alignedHandler = function(context, args) {
             cols,
             addJot: true,
             addEqnNum: context.envName === "align" || context.envName === "alignat",
+            emptySingleRow: true,
             colSeparationType: separationType,
             maxNumCols: context.envName === "split" ? 2 : undefined,
             leqno: context.parser.settings.leqno,
@@ -977,6 +982,7 @@ defineEnvironment({
             addJot: true,
             colSeparationType: "gather",
             addEqnNum: context.envName === "gather",
+            emptySingleRow: true,
             leqno: context.parser.settings.leqno,
         };
         return parseArray(context.parser, res, "display");
@@ -1009,6 +1015,7 @@ defineEnvironment({
         validateAmsEnvironmentContext(context);
         const res = {
             addEqnNum: context.envName === "equation",
+            emptySingleRow: true,
             singleRow: true,
             maxNumCols: 1,
             leqno: context.parser.settings.leqno,

package/src/macros.js

@@ -327,10 +327,12 @@ defineMacro("\\bgroup", "{");
 defineMacro("\\egroup", "}");
 
 // Symbols from latex.ltx:
+// \def~{\nobreakspace{}}
 // \def\lq{`}
 // \def\rq{'}
 // \def \aa {\r a}
 // \def \AA {\r A}
+defineMacro("~", "\\nobreakspace");
 defineMacro("\\lq", "`");
 defineMacro("\\rq", "'");
 defineMacro("\\aa", "\\r a");

package/src/symbols.js

@@ -582,13 +582,11 @@ defineSymbol(math, main, rel, "\u2192", "\\to");
 defineSymbol(math, ams, rel, "\u2271", "\\ngeq", true);
 defineSymbol(math, ams, rel, "\u2270", "\\nleq", true);
 defineSymbol(math, main, spacing, "\u00a0", "\\ ");
-defineSymbol(math, main, spacing, "\u00a0", "~");
 defineSymbol(math, main, spacing, "\u00a0", "\\space");
 // Ref: LaTeX Source 2e: \DeclareRobustCommand{\nobreakspace}{%
 defineSymbol(math, main, spacing, "\u00a0", "\\nobreakspace");
 defineSymbol(text, main, spacing, "\u00a0", "\\ ");
 defineSymbol(text, main, spacing, "\u00a0", " ");
-defineSymbol(text, main, spacing, "\u00a0", "~");
 defineSymbol(text, main, spacing, "\u00a0", "\\space");
 defineSymbol(text, main, spacing, "\u00a0", "\\nobreakspace");
 defineSymbol(math, main, spacing, null, "\\nobreak");