- import { onMount } from "svelte";
+ import { onMount, createEventDispatcher } from "svelte";
import { onMobile, activeMathField } from "./stores";
import { renderMathInElement } from "mathlive";
import type { Button } from "./keyboard/Keyboard";
+ import type { MathField } from "./cells/MathField";
export let button: Button
let buttonElement: HTMLButtonElement;
+ const dispatchCustomMatrix = createEventDispatcher<{customMatrix: {targetMathField: MathField}}>();
+
onMount(() => {
renderMathInElement(buttonElement);
});
+
+ function handleButtonClick() {
+ const event = button.click($activeMathField);
+ if (event === "customMatrix") {
+ dispatchCustomMatrix("customMatrix", {targetMathField: $activeMathField});
+ }
+ }
+
+August 19, 2023
+Matrices and Python Code Generation Features
+
+ This release adds matrix and vector support. Just like all of the capabilities in EngineeringPaper.xyz,
+ matrix and vector support is designed to be intuitive and easy to use and you'll get a long way by exploring
+ the new "Matrices" tab on the onscreen keyboard. You can also check out the new
+ Matrices and Vectors Tutorial
+ to see all of the details. And, of course, all of the matrix and vector functionally has full units support.
+
+
+ If you're finding the need to do more in depth numerical analysis with your EngineeringPaper.xyz calculations,
+ the new automatic Python code generation feature is for you! Check out the details in the new
+ Python Code Generation Tutorial .
+ And, you guessed it, the Python code generation is units aware and will use whatever units you specify in your
+ EngineeringPaper.xyz sheet!
+
+
+July 2, 2023
Minor Updates
diff --git a/src/VirtualKeyboard.svelte b/src/VirtualKeyboard.svelte
index 594ee4fc..de99abf4 100644
--- a/src/VirtualKeyboard.svelte
+++ b/src/VirtualKeyboard.svelte
@@ -118,7 +118,10 @@
>
{#each buttonRow as button (button.id)}
{#if "click" in button}
-
+
{/if}
diff --git a/src/cells/MathField.ts b/src/cells/MathField.ts
index d74f8466..d40a726c 100644
--- a/src/cells/MathField.ts
+++ b/src/cells/MathField.ts
@@ -4,7 +4,8 @@ import { CharStream, CommonTokenStream } from "antlr4";
import LatexLexer from "../parser/LatexLexer.js";
import LatexParser from "../parser/LatexParser.js";
import { LatexToSympy, LatexErrorListener } from "../parser/LatexToSympy";
-import type { Statement, FieldTypes } from "../parser/types";
+import { type Statement, type FieldTypes, type Insertion, type Replacement,
+ isInsertion, isReplacement } from "../parser/types";
export class MathField {
@@ -17,7 +18,7 @@ export class MathField {
statement: Statement | null = null;
element: SvelteComponent | null = null;
pendingNewLatex = false;
- newLatex = [];
+ newLatex:string;
constructor (latex = "", type: FieldTypes ="math") {
this.latex = latex;
@@ -70,23 +71,86 @@ export class MathField {
this.parsingErrorMessage = visitor.parsingErrorMessage;
}
- if (visitor.insertions.length > 0) {
- visitor.insertions.sort((a,b) => a.location - b.location);
- const segments = [];
- let previousInsertLocation = 0;
- visitor.insertions.forEach( (insert) => {
- segments.push(latex.slice(previousInsertLocation, insert.location) + insert.text);
- previousInsertLocation = insert.location;
- });
- segments.push(latex.slice(previousInsertLocation));
- const newLatex = segments.reduce( (accum, current) => accum+current, '');
- this.pendingNewLatex = true;
- this.newLatex = newLatex;
+ if (visitor.pendingEdits.length > 0) {
+ try {
+ this.newLatex = applyEdits(latex, visitor.pendingEdits);
+ this.pendingNewLatex = true;
+ } catch (e) {
+ console.error(`Error auto updating latex: ${e}`);
+ this.pendingNewLatex = false; // safe fallback
+ }
}
+
+ if (this.statement.type === "immediateUpdate") {
+ this.statement = null;
+ this.parsingError = true; // we're in an intermediate state, can't send to sympy just yet
+ }
+
} else {
this.statement = null;
this.parsingError = true;
this.parsingErrorMessage = "Invalid Syntax";
}
- };
+ }
+}
+
+
+function applyEdits(source: string, pendingEdits: (Insertion | Replacement)[]): string {
+ let newString: string = source;
+
+ const insertions = pendingEdits.filter(isInsertion)
+ .sort((a,b) => a.location - b.location);
+
+ // check for insertion collisions
+ const insertionLocations = new Set(insertions.map( (insertion) => insertion.location));
+ if (insertionLocations.size < insertions.length) {
+ throw new Error("Insertion collision");
+ }
+
+ const replacements = pendingEdits.filter(isReplacement)
+ .sort((a,b) => a.location - b.location);
+
+ // Perform replacements first, update insertion locations as necessary
+ // Also, check for overlapping replacements and replacement insertion collisions
+ let insertionCursor = 0;
+ for (const [index, replacement] of replacements.entries()) {
+ if (replacements[index+1]) {
+ const nextLocation = replacements[index+1].location;
+ if (nextLocation >= replacement.location && nextLocation < replacement.location + replacement.deletionLength) {
+ throw new Error("Overlapping replacements");
+ }
+ }
+
+ newString = newString.slice(0, replacement.location) + replacement.text +
+ newString.slice(replacement.location + replacement.deletionLength);
+
+ let cursorMoved = false;
+ for (const [insertionIndex, insertion] of insertions.slice(insertionCursor).entries()) {
+ if (insertion.location >= replacement.location && insertion.location < replacement.location + replacement.deletionLength) {
+ throw new Error("Replacement/Insertion collision");
+ }
+
+ if (insertion.location >= replacement.location) {
+ if (!cursorMoved) {
+ insertionCursor = insertionIndex;
+ cursorMoved = true;
+ }
+ insertion.location += replacement.text.length - replacement.deletionLength;
+ }
+ }
+ }
+
+ // finally, perform insertions in order
+ const segments = [];
+ let previousInsertLocation = 0;
+ for (const insert of insertions) {
+ segments.push(newString.slice(previousInsertLocation, insert.location) + insert.text);
+ previousInsertLocation = insert.location;
+ }
+
+ segments.push(newString.slice(previousInsertLocation));
+
+ newString = segments.reduce( (accum, current) => accum+current, '');
+
+ return newString;
}
\ No newline at end of file
diff --git a/src/keyboard/Keyboard.ts b/src/keyboard/Keyboard.ts
index 53830d0a..7d92eada 100644
--- a/src/keyboard/Keyboard.ts
+++ b/src/keyboard/Keyboard.ts
@@ -20,7 +20,7 @@ type Keyboard = {
};
type Commands = "insert" | "moveToNextChar" | "moveToPreviousChar" | "deleteBackward" |
- "toggleMode" | "typedText";
+ "toggleMode" | "typedText" | "customMatrix";
export class Button {
static nextId = 0;
@@ -51,7 +51,7 @@ export class Button {
this.rawText = rawText;
}
- click(activeMathField: MathField) {
+ click(activeMathField: MathField): string | undefined {
if (activeMathField && activeMathField.element) {
if (get(onMobile) && navigator.vibrate) {
navigator.vibrate(1);
@@ -69,6 +69,8 @@ export class Button {
} else {
mathLiveField.executeCommand(['switchMode', 'text', '', '']);
}
+ } else if (this.command === "customMatrix") {
+ return("customMatrix");
} else {
mathLiveField.executeCommand([this.command]);
}
@@ -445,7 +447,7 @@ export const keyboards: Keyboards = {
new Button({ buttonText: '4', content: '4', command: "typedText" }),
new Button({ buttonText: '5', content: '5', command: "typedText" }),
new Button({ buttonText: '6', content: '6', command: "typedText" }),
- new Button({ buttonText: '\\times', content: '\\cdot' }),
+ new Button({ buttonText: '\\ast', content: '\\cdot' }),
new Blank('0.25fr'),
new Button({ buttonText: '\\pi', content: '\\pi' }),
new Button({ buttonText: 'e', content: 'e', command: "typedText" }),
@@ -533,6 +535,64 @@ export const keyboards: Keyboards = {
]]
}
},
+ {
+ tabText: "Matrices",
+ content: {
+ type: "Buttons",
+ buttons: [[
+ new Button({ buttonText: '\\leftarrow', command: "moveToPreviousChar" }),
+ new Button({ buttonText: '\\rightarrow', command: "moveToNextChar" }),
+ new Blank('.25fr'),
+ new Button({ buttonText: 'M \\times N', command: "customMatrix", fontSize: '11px'}),
+ new Button({ buttonText: '1 \\times 2', content: String.raw`\begin{bmatrix} \placeholder{} & \placeholder{} \end{bmatrix}`, fontSize: '12px'}),
+ new Button({ buttonText: '1 \\times 3', content: String.raw`\begin{bmatrix} \placeholder{} & \placeholder{} & \placeholder{} \end{bmatrix}`, fontSize: '12px'}),
+ new Button({ buttonText: '1 \\times 4', content: String.raw`\begin{bmatrix} \placeholder{} & \placeholder{} & \placeholder{} & \placeholder{} \end{bmatrix}`, fontSize: '12px'}),
+ new Blank('0.25fr'),
+ new Button({ buttonText: '\\ast', content: '\\cdot' }),
+ new Button({ buttonText: 'A_{m,n}', content: '_{#?,#?}' }),
+ new Button({ buttonText: '⌫', command: 'deleteBackward' }),
+ ],
+ [
+ new Button({ buttonText: '(', content: '(', command: "typedText" }),
+ new Button({ buttonText: ')', content: ')', command: "typedText" }),
+ new Blank('0.25fr'),
+ new Button({ buttonText: '2 \\times 1', content: String.raw`\begin{bmatrix} \placeholder{} \\ \placeholder{} \end{bmatrix}`, fontSize: '12px'}),
+ new Button({ buttonText: '2 \\times 2', content: String.raw`\begin{bmatrix} \placeholder{} & \placeholder{} \\ \placeholder{} & \placeholder{} \end{bmatrix}`, fontSize: '12px'}),
+ new Button({ buttonText: '2 \\times 3', content: String.raw`\begin{bmatrix} \placeholder{} & \placeholder{} & \placeholder{} \\ \placeholder{} & \placeholder{} & \placeholder{} \end{bmatrix}`, fontSize: '12px'}),
+ new Button({ buttonText: '2 \\times 4', content: String.raw`\begin{bmatrix} \placeholder{} & \placeholder{} & \placeholder{} & \placeholder{} \\ \placeholder{} & \placeholder{} & \placeholder{} & \placeholder{} \end{bmatrix}`, fontSize: '12px'}),
+ new Blank('0.25fr'),
+ new Button({ buttonText: '\\times', content: '\\times' }),
+ new Button({ buttonText: '\\mathrm{dot}', content: '\\mathrm{dot}\\left(#0\\right)', command: "insert"}),
+ new Button({ buttonText: 'A^{-1}', content: '^{-1}' }),
+ ],
+ [
+ new Button({ buttonText: 'A', content: 'A', command: "typedText"}),
+ new Button({ buttonText: 'B', content: 'B', command: "typedText" }),
+ new Blank('0.25fr'),
+ new Button({ buttonText: '3 \\times 1', content: String.raw`\begin{bmatrix} \placeholder{} \\ \placeholder{} \\ \placeholder{} \end{bmatrix}`, fontSize: '12px'}),
+ new Button({ buttonText: '3 \\times 2', content: String.raw`\begin{bmatrix} \placeholder{} & \placeholder{} \\ \placeholder{} & \placeholder{} \\ \placeholder{} & \placeholder{} \end{bmatrix}`, fontSize: '12px'}),
+ new Button({ buttonText: '3 \\times 3', content: String.raw`\begin{bmatrix} \placeholder{} & \placeholder{} & \placeholder{} \\ \placeholder{} & \placeholder{} & \placeholder{} \\ \placeholder{} & \placeholder{} & \placeholder{} \end{bmatrix}`, fontSize: '12px'}),
+ new Button({ buttonText: '3 \\times 4', content: String.raw`\begin{bmatrix} \placeholder{} & \placeholder{} & \placeholder{} & \placeholder{} \\ \placeholder{} & \placeholder{} & \placeholder{} & \placeholder{} \\ \placeholder{} & \placeholder{} & \placeholder{} & \placeholder{} \end{bmatrix}`, fontSize: '12px'}),
+ new Blank('0.25fr'),
+ new Button({ buttonText: '-', content: '-' }),
+ new Button({ buttonText: '\\left\\Vert v \\right\\Vert', content: '\\left\\Vert#0\\right\\Vert', command: "insert" }),
+ new Button({ buttonText: 'A^{\\mathrm{T}}', content: '^{\\mathrm{T}}'}),
+ ],
+ [
+ new Button({ buttonText: 'C', content: 'C', command: "typedText"}),
+ new Button({ buttonText: 'D', content: 'D', command: "typedText" }),
+ new Blank('0.25fr'),
+ new Button({ buttonText: '4 \\times 1', content: String.raw`\begin{bmatrix} \placeholder{} \\ \placeholder{} \\ \placeholder{} \\ \placeholder{} \end{bmatrix}`, fontSize: '12px'}),
+ new Button({ buttonText: '4 \\times 2', content: String.raw`\begin{bmatrix} \placeholder{} & \placeholder{} \\ \placeholder{} & \placeholder{} \\ \placeholder{} & \placeholder{} \\ \placeholder{} & \placeholder{} \end{bmatrix}`, fontSize: '12px'}),
+ new Button({ buttonText: '4 \\times 3', content: String.raw`\begin{bmatrix} \placeholder{} & \placeholder{} & \placeholder{} \\ \placeholder{} & \placeholder{} & \placeholder{} \\ \placeholder{} & \placeholder{} & \placeholder{} \\ \placeholder{} & \placeholder{} & \placeholder{} \end{bmatrix}`, fontSize: '12px'}),
+ new Button({ buttonText: '4 \\times 4', content: String.raw`\begin{bmatrix} \placeholder{} & \placeholder{} & \placeholder{} & \placeholder{} \\ \placeholder{} & \placeholder{} & \placeholder{} & \placeholder{} \\ \placeholder{} & \placeholder{} & \placeholder{} & \placeholder{} \\ \placeholder{} & \placeholder{} & \placeholder{} & \placeholder{} \end{bmatrix}`, fontSize: '12px'}),
+ new Blank('0.25fr'),
+ new Button({ buttonText: '+', content: '+', command: "typedText" }),
+ new Button({ buttonText: '=', content: '=', command: "typedText" }),
+ new Button({ buttonText: '\\mathrm{det}', content: '\\mathrm{det}\\left(#0\\right)', command: "insert"}),
+ ]]
+ }
+ },
{
tabText: "ABC",
content: {
@@ -698,7 +758,3 @@ export const keyboards: Keyboards = {
}
]
};
-
-
-
-
diff --git a/src/parser/LatexLexer.g4 b/src/parser/LatexLexer.g4
index 999ead54..b5992585 100644
--- a/src/parser/LatexLexer.g4
+++ b/src/parser/LatexLexer.g4
@@ -12,6 +12,7 @@ L_PAREN: '(' ;
R_PAREN: ')' ;
VBAR: '|' ;
+DOUBLE_VBAR: '||' | '\\Vert' ;
UNDERSCORE: '_' ;
@@ -27,13 +28,16 @@ CMD_MATHRM: '\\mathrm' ;
CMD_FRAC: '\\frac' ;
CMD_FRAC_INTS: '\\frac' [ ]* [0-9][0-9];
CMD_CDOT: '\\cdot' ;
+CMD_TIMES: '\\times' ;
CMD_SQRT: '\\sqrt' ;
CMD_SQRT_INT: '\\sqrt' [ ]* [0-9] ;
CMD_SIM: '\\sim' ;
CMD_APPROX: '\\approx' ;
-BACK_SLASH: '\\' ;
+TRANSPOSE: '^{\\mathrm{T}}' ;
+
+BACKSLASH: '\\' ;
CMD_SIN: 'sin' ;
CMD_COS: 'cos' ;
@@ -98,6 +102,12 @@ GREEK_CHAR: '\\' ('alpha' | 'beta' | 'gamma' | 'delta' | 'epsilon' | 'zeta' |
'psi' | 'omega' | 'Gamma' | 'Delta' | 'Theta' | 'Lambda' |
'Xi' | 'Pi' | 'Sigma' | 'Upsilon' | 'Phi' | 'Psi' | 'Omega');
+BEGIN_MATRIX: '\\begin{bmatrix}';
+END_MATRIX: '\\end{bmatrix}';
+AMPERSAND: '&';
+DOUBLE_BACKSLASH: '\\\\';
+
+
UNDERSCORE_SUBSCRIPT: (([ ]* '_{' [a-zA-Z0-9]+ '}') | ([ ]* '_' [a-zA-Z0-9]));
CARET_SINGLE_CHAR_ID_UNDERSCORE_SUBSCRIPT: '^'[a-zA-Z] UNDERSCORE_SUBSCRIPT;
@@ -118,7 +128,9 @@ ALT_R_BRACKET: '\\rbrack' -> mode(DEFAULT_MODE) ;
U_CMD_FRAC: '\\frac' ;
U_CMD_FRAC_INTS: '\\frac' [ ]* [0-9][0-9];
U_CMD_CDOT: '\\cdot' ;
+U_CMD_TIMES: '\\times' ;
U_CMD_SQRT: '\\sqrt' ;
+U_COMMA: ',';
U_CARET: '^' ;
U_NAME: [a-zA-Z] [a-zA-Z0-9]* ;
U_L_PAREN: '(' ;
diff --git a/src/parser/LatexLexer.ts b/src/parser/LatexLexer.ts
index a7ba34e9..9d0f897f 100644
--- a/src/parser/LatexLexer.ts
+++ b/src/parser/LatexLexer.ts
@@ -20,92 +20,102 @@ export default class LatexLexer extends Lexer {
public static readonly L_PAREN = 6;
public static readonly R_PAREN = 7;
public static readonly VBAR = 8;
- public static readonly UNDERSCORE = 9;
- public static readonly PI = 10;
- public static readonly CMD_INT = 11;
- public static readonly CMD_INT_UNDERSCORE = 12;
- public static readonly CMD_INT_UNDERSCORE_SINGLE_CHAR_NUMBER = 13;
- public static readonly CMD_INT_UNDERSCORE_SINGLE_CHAR_ID = 14;
- public static readonly CMD_MATHRM = 15;
- public static readonly CMD_FRAC = 16;
- public static readonly CMD_FRAC_INTS = 17;
- public static readonly CMD_CDOT = 18;
- public static readonly CMD_SQRT = 19;
- public static readonly CMD_SQRT_INT = 20;
- public static readonly CMD_SIM = 21;
- public static readonly CMD_APPROX = 22;
- public static readonly BACK_SLASH = 23;
- public static readonly CMD_SIN = 24;
- public static readonly CMD_COS = 25;
- public static readonly CMD_TAN = 26;
- public static readonly CMD_COT = 27;
- public static readonly CMD_SEC = 28;
- public static readonly CMD_CSC = 29;
- public static readonly CMD_ARCSIN = 30;
- public static readonly CMD_ARCCOS = 31;
- public static readonly CMD_ARCTAN = 32;
- public static readonly CMD_SINH = 33;
- public static readonly CMD_COSH = 34;
- public static readonly CMD_TANH = 35;
- public static readonly CMD_COTH = 36;
- public static readonly CMD_LN = 37;
- public static readonly CMD_LOG = 38;
- public static readonly CMD_SLASH_LOG_UNDERSCORE = 39;
- public static readonly CMD_SLASH_LOG_UNDERSCORE_SINGLE_CHAR_NUMBER = 40;
- public static readonly CMD_SLASH_LOG_UNDERSCORE_SINGLE_CHAR_ID = 41;
- public static readonly COMMENT = 42;
- public static readonly CMD_LEFT = 43;
- public static readonly CMD_RIGHT = 44;
- public static readonly DOUBLE_DOLLAR_SIGN = 45;
- public static readonly ADD = 46;
- public static readonly SUB = 47;
- public static readonly CARET = 48;
- public static readonly EQ = 49;
- public static readonly LT = 50;
- public static readonly GT = 51;
- public static readonly LTE = 52;
- public static readonly GTE = 53;
- public static readonly COMMA = 54;
- public static readonly CARET_SINGLE_CHAR_NUMBER = 55;
- public static readonly CARET_SINGLE_CHAR_ID = 56;
- public static readonly NUMBER = 57;
- public static readonly UNDERSCORE_SUBSCRIPT = 58;
- public static readonly CARET_SINGLE_CHAR_ID_UNDERSCORE_SUBSCRIPT = 59;
- public static readonly ID = 60;
- public static readonly WS = 61;
- public static readonly SLASH_SPACE = 62;
- public static readonly SLASH_COLON = 63;
- public static readonly ERROR_CHAR = 64;
- public static readonly R_BRACKET = 65;
- public static readonly ALT_R_BRACKET = 66;
- public static readonly U_CMD_FRAC = 67;
- public static readonly U_CMD_FRAC_INTS = 68;
- public static readonly U_CMD_CDOT = 69;
- public static readonly U_CMD_SQRT = 70;
- public static readonly U_CARET = 71;
- public static readonly U_NAME = 72;
- public static readonly U_L_PAREN = 73;
- public static readonly U_R_PAREN = 74;
- public static readonly U_L_BRACE = 75;
- public static readonly U_R_BRACE = 76;
- public static readonly U_ONE = 77;
- public static readonly U_NUMBER = 78;
- public static readonly U_CMD_LEFT = 79;
- public static readonly U_CMD_RIGHT = 80;
- public static readonly U_WS = 81;
- public static readonly U_SLASH_SPACE = 82;
- public static readonly U_ERROR_CHAR = 83;
+ public static readonly DOUBLE_VBAR = 9;
+ public static readonly UNDERSCORE = 10;
+ public static readonly PI = 11;
+ public static readonly CMD_INT = 12;
+ public static readonly CMD_INT_UNDERSCORE = 13;
+ public static readonly CMD_INT_UNDERSCORE_SINGLE_CHAR_NUMBER = 14;
+ public static readonly CMD_INT_UNDERSCORE_SINGLE_CHAR_ID = 15;
+ public static readonly CMD_MATHRM = 16;
+ public static readonly CMD_FRAC = 17;
+ public static readonly CMD_FRAC_INTS = 18;
+ public static readonly CMD_CDOT = 19;
+ public static readonly CMD_TIMES = 20;
+ public static readonly CMD_SQRT = 21;
+ public static readonly CMD_SQRT_INT = 22;
+ public static readonly CMD_SIM = 23;
+ public static readonly CMD_APPROX = 24;
+ public static readonly TRANSPOSE = 25;
+ public static readonly BACKSLASH = 26;
+ public static readonly CMD_SIN = 27;
+ public static readonly CMD_COS = 28;
+ public static readonly CMD_TAN = 29;
+ public static readonly CMD_COT = 30;
+ public static readonly CMD_SEC = 31;
+ public static readonly CMD_CSC = 32;
+ public static readonly CMD_ARCSIN = 33;
+ public static readonly CMD_ARCCOS = 34;
+ public static readonly CMD_ARCTAN = 35;
+ public static readonly CMD_SINH = 36;
+ public static readonly CMD_COSH = 37;
+ public static readonly CMD_TANH = 38;
+ public static readonly CMD_COTH = 39;
+ public static readonly CMD_LN = 40;
+ public static readonly CMD_LOG = 41;
+ public static readonly CMD_SLASH_LOG_UNDERSCORE = 42;
+ public static readonly CMD_SLASH_LOG_UNDERSCORE_SINGLE_CHAR_NUMBER = 43;
+ public static readonly CMD_SLASH_LOG_UNDERSCORE_SINGLE_CHAR_ID = 44;
+ public static readonly COMMENT = 45;
+ public static readonly CMD_LEFT = 46;
+ public static readonly CMD_RIGHT = 47;
+ public static readonly DOUBLE_DOLLAR_SIGN = 48;
+ public static readonly ADD = 49;
+ public static readonly SUB = 50;
+ public static readonly CARET = 51;
+ public static readonly EQ = 52;
+ public static readonly LT = 53;
+ public static readonly GT = 54;
+ public static readonly LTE = 55;
+ public static readonly GTE = 56;
+ public static readonly COMMA = 57;
+ public static readonly CARET_SINGLE_CHAR_NUMBER = 58;
+ public static readonly CARET_SINGLE_CHAR_ID = 59;
+ public static readonly NUMBER = 60;
+ public static readonly BEGIN_MATRIX = 61;
+ public static readonly END_MATRIX = 62;
+ public static readonly AMPERSAND = 63;
+ public static readonly DOUBLE_BACKSLASH = 64;
+ public static readonly UNDERSCORE_SUBSCRIPT = 65;
+ public static readonly CARET_SINGLE_CHAR_ID_UNDERSCORE_SUBSCRIPT = 66;
+ public static readonly ID = 67;
+ public static readonly WS = 68;
+ public static readonly SLASH_SPACE = 69;
+ public static readonly SLASH_COLON = 70;
+ public static readonly ERROR_CHAR = 71;
+ public static readonly R_BRACKET = 72;
+ public static readonly ALT_R_BRACKET = 73;
+ public static readonly U_CMD_FRAC = 74;
+ public static readonly U_CMD_FRAC_INTS = 75;
+ public static readonly U_CMD_CDOT = 76;
+ public static readonly U_CMD_TIMES = 77;
+ public static readonly U_CMD_SQRT = 78;
+ public static readonly U_COMMA = 79;
+ public static readonly U_CARET = 80;
+ public static readonly U_NAME = 81;
+ public static readonly U_L_PAREN = 82;
+ public static readonly U_R_PAREN = 83;
+ public static readonly U_L_BRACE = 84;
+ public static readonly U_R_BRACE = 85;
+ public static readonly U_ONE = 86;
+ public static readonly U_NUMBER = 87;
+ public static readonly U_CMD_LEFT = 88;
+ public static readonly U_CMD_RIGHT = 89;
+ public static readonly U_WS = 90;
+ public static readonly U_SLASH_SPACE = 91;
+ public static readonly U_ERROR_CHAR = 92;
public static readonly EOF = Token.EOF;
public static readonly UNITS = 1;
public static readonly channelNames: string[] = [ "DEFAULT_TOKEN_CHANNEL", "HIDDEN" ];
public static readonly literalNames: string[] = [ null, "'['", "'\\lbrack'",
"';'", null, null, null,
- null, "'|'", "'_'", "'\\pi'",
- "'\\int'", null, null,
- null, "'\\mathrm'", null,
+ null, "'|'", null, "'_'",
+ "'\\pi'", "'\\int'",
+ null, null, null, "'\\mathrm'",
null, null, null, null,
- "'\\sim'", "'\\approx'",
+ null, null, "'\\sim'",
+ "'\\approx'", "'^{\\mathrm{T}}'",
"'\\'", "'sin'", "'cos'",
"'tan'", "'cot'", "'sec'",
"'csc'", "'arcsin'",
@@ -116,25 +126,30 @@ export default class LatexLexer extends Lexer {
null, null, "'$$'", "'+'",
"'-'", null, "'='", "'<'",
"'>'", "'\\le'", "'\\ge'",
- "','", null, null, null,
null, null, null, null,
- null, "'\\:'", null,
- "']'", "'\\rbrack'",
+ "'\\begin{bmatrix}'",
+ "'\\end{bmatrix}'", "'&'",
+ "'\\\\'", null, null,
+ null, null, null, "'\\:'",
+ null, "']'", "'\\rbrack'",
null, null, null, null,
null, null, null, null,
- null, null, "'1'" ];
+ null, null, null, null,
+ "'1'" ];
public static readonly symbolicNames: string[] = [ null, "L_BRACKET", "ALT_L_BRACKET",
"SEMICOLON", "L_BRACE",
"R_BRACE", "L_PAREN",
- "R_PAREN", "VBAR", "UNDERSCORE",
- "PI", "CMD_INT", "CMD_INT_UNDERSCORE",
+ "R_PAREN", "VBAR", "DOUBLE_VBAR",
+ "UNDERSCORE", "PI",
+ "CMD_INT", "CMD_INT_UNDERSCORE",
"CMD_INT_UNDERSCORE_SINGLE_CHAR_NUMBER",
"CMD_INT_UNDERSCORE_SINGLE_CHAR_ID",
"CMD_MATHRM", "CMD_FRAC",
"CMD_FRAC_INTS", "CMD_CDOT",
- "CMD_SQRT", "CMD_SQRT_INT",
- "CMD_SIM", "CMD_APPROX",
- "BACK_SLASH", "CMD_SIN",
+ "CMD_TIMES", "CMD_SQRT",
+ "CMD_SQRT_INT", "CMD_SIM",
+ "CMD_APPROX", "TRANSPOSE",
+ "BACKSLASH", "CMD_SIN",
"CMD_COS", "CMD_TAN",
"CMD_COT", "CMD_SEC",
"CMD_CSC", "CMD_ARCSIN",
@@ -151,13 +166,17 @@ export default class LatexLexer extends Lexer {
"EQ", "LT", "GT", "LTE",
"GTE", "COMMA", "CARET_SINGLE_CHAR_NUMBER",
"CARET_SINGLE_CHAR_ID",
- "NUMBER", "UNDERSCORE_SUBSCRIPT",
+ "NUMBER", "BEGIN_MATRIX",
+ "END_MATRIX", "AMPERSAND",
+ "DOUBLE_BACKSLASH",
+ "UNDERSCORE_SUBSCRIPT",
"CARET_SINGLE_CHAR_ID_UNDERSCORE_SUBSCRIPT",
"ID", "WS", "SLASH_SPACE",
"SLASH_COLON", "ERROR_CHAR",
"R_BRACKET", "ALT_R_BRACKET",
"U_CMD_FRAC", "U_CMD_FRAC_INTS",
- "U_CMD_CDOT", "U_CMD_SQRT",
+ "U_CMD_CDOT", "U_CMD_TIMES",
+ "U_CMD_SQRT", "U_COMMA",
"U_CARET", "U_NAME",
"U_L_PAREN", "U_R_PAREN",
"U_L_BRACE", "U_R_BRACE",
@@ -169,22 +188,23 @@ export default class LatexLexer extends Lexer {
public static readonly ruleNames: string[] = [
"L_BRACKET", "ALT_L_BRACKET", "SEMICOLON", "L_BRACE", "R_BRACE", "L_PAREN",
- "R_PAREN", "VBAR", "UNDERSCORE", "PI", "CMD_INT", "CMD_INT_UNDERSCORE",
+ "R_PAREN", "VBAR", "DOUBLE_VBAR", "UNDERSCORE", "PI", "CMD_INT", "CMD_INT_UNDERSCORE",
"CMD_INT_UNDERSCORE_SINGLE_CHAR_NUMBER", "CMD_INT_UNDERSCORE_SINGLE_CHAR_ID",
- "CMD_MATHRM", "CMD_FRAC", "CMD_FRAC_INTS", "CMD_CDOT", "CMD_SQRT", "CMD_SQRT_INT",
- "CMD_SIM", "CMD_APPROX", "BACK_SLASH", "CMD_SIN", "CMD_COS", "CMD_TAN",
- "CMD_COT", "CMD_SEC", "CMD_CSC", "CMD_ARCSIN", "CMD_ARCCOS", "CMD_ARCTAN",
- "CMD_SINH", "CMD_COSH", "CMD_TANH", "CMD_COTH", "CMD_LN", "CMD_LOG", "CMD_SLASH_LOG_UNDERSCORE",
- "CMD_SLASH_LOG_UNDERSCORE_SINGLE_CHAR_NUMBER", "CMD_SLASH_LOG_UNDERSCORE_SINGLE_CHAR_ID",
- "COMMENT", "CMD_LEFT", "CMD_RIGHT", "DOUBLE_DOLLAR_SIGN", "ADD", "SUB",
- "CARET", "EQ", "LT", "GT", "LTE", "GTE", "COMMA", "CARET_SINGLE_CHAR_NUMBER",
- "CARET_SINGLE_CHAR_ID", "NUMBER", "DIGIT", "IDENTIFIER", "EXP", "GREEK_CHAR",
- "UNDERSCORE_SUBSCRIPT", "CARET_SINGLE_CHAR_ID_UNDERSCORE_SUBSCRIPT", "ID",
- "WS", "SLASH_SPACE", "SLASH_COLON", "ERROR_CHAR", "R_BRACKET", "ALT_R_BRACKET",
- "U_CMD_FRAC", "U_CMD_FRAC_INTS", "U_CMD_CDOT", "U_CMD_SQRT", "U_CARET",
- "U_NAME", "U_L_PAREN", "U_R_PAREN", "U_L_BRACE", "U_R_BRACE", "U_ONE",
- "U_NUMBER", "U_DIGIT", "U_CMD_LEFT", "U_CMD_RIGHT", "U_WS", "U_SLASH_SPACE",
- "U_ERROR_CHAR",
+ "CMD_MATHRM", "CMD_FRAC", "CMD_FRAC_INTS", "CMD_CDOT", "CMD_TIMES", "CMD_SQRT",
+ "CMD_SQRT_INT", "CMD_SIM", "CMD_APPROX", "TRANSPOSE", "BACKSLASH", "CMD_SIN",
+ "CMD_COS", "CMD_TAN", "CMD_COT", "CMD_SEC", "CMD_CSC", "CMD_ARCSIN", "CMD_ARCCOS",
+ "CMD_ARCTAN", "CMD_SINH", "CMD_COSH", "CMD_TANH", "CMD_COTH", "CMD_LN",
+ "CMD_LOG", "CMD_SLASH_LOG_UNDERSCORE", "CMD_SLASH_LOG_UNDERSCORE_SINGLE_CHAR_NUMBER",
+ "CMD_SLASH_LOG_UNDERSCORE_SINGLE_CHAR_ID", "COMMENT", "CMD_LEFT", "CMD_RIGHT",
+ "DOUBLE_DOLLAR_SIGN", "ADD", "SUB", "CARET", "EQ", "LT", "GT", "LTE",
+ "GTE", "COMMA", "CARET_SINGLE_CHAR_NUMBER", "CARET_SINGLE_CHAR_ID", "NUMBER",
+ "DIGIT", "IDENTIFIER", "EXP", "GREEK_CHAR", "BEGIN_MATRIX", "END_MATRIX",
+ "AMPERSAND", "DOUBLE_BACKSLASH", "UNDERSCORE_SUBSCRIPT", "CARET_SINGLE_CHAR_ID_UNDERSCORE_SUBSCRIPT",
+ "ID", "WS", "SLASH_SPACE", "SLASH_COLON", "ERROR_CHAR", "R_BRACKET", "ALT_R_BRACKET",
+ "U_CMD_FRAC", "U_CMD_FRAC_INTS", "U_CMD_CDOT", "U_CMD_TIMES", "U_CMD_SQRT",
+ "U_COMMA", "U_CARET", "U_NAME", "U_L_PAREN", "U_R_PAREN", "U_L_BRACE",
+ "U_R_BRACE", "U_ONE", "U_NUMBER", "U_DIGIT", "U_CMD_LEFT", "U_CMD_RIGHT",
+ "U_WS", "U_SLASH_SPACE", "U_ERROR_CHAR",
];
@@ -205,7 +225,7 @@ export default class LatexLexer extends Lexer {
public get modeNames(): string[] { return LatexLexer.modeNames; }
- public static readonly _serializedATN: number[] = [4,0,83,888,6,-1,6,-1,
+ public static readonly _serializedATN: number[] = [4,0,92,980,6,-1,6,-1,
2,0,7,0,2,1,7,1,2,2,7,2,2,3,7,3,2,4,7,4,2,5,7,5,2,6,7,6,2,7,7,7,2,8,7,8,
2,9,7,9,2,10,7,10,2,11,7,11,2,12,7,12,2,13,7,13,2,14,7,14,2,15,7,15,2,16,
7,16,2,17,7,17,2,18,7,18,2,19,7,19,2,20,7,20,2,21,7,21,2,22,7,22,2,23,7,
@@ -217,289 +237,318 @@ export default class LatexLexer extends Lexer {
2,60,7,60,2,61,7,61,2,62,7,62,2,63,7,63,2,64,7,64,2,65,7,65,2,66,7,66,2,
67,7,67,2,68,7,68,2,69,7,69,2,70,7,70,2,71,7,71,2,72,7,72,2,73,7,73,2,74,
7,74,2,75,7,75,2,76,7,76,2,77,7,77,2,78,7,78,2,79,7,79,2,80,7,80,2,81,7,
- 81,2,82,7,82,2,83,7,83,2,84,7,84,2,85,7,85,2,86,7,86,2,87,7,87,1,0,1,0,
- 1,0,1,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,2,1,2,1,3,1,3,1,4,1,4,
- 1,5,1,5,1,6,1,6,1,7,1,7,1,8,1,8,1,9,1,9,1,9,1,9,1,10,1,10,1,10,1,10,1,10,
- 1,11,1,11,1,11,1,11,1,11,1,11,5,11,222,8,11,10,11,12,11,225,9,11,1,11,1,
- 11,1,12,1,12,1,12,1,12,1,12,1,12,5,12,235,8,12,10,12,12,12,238,9,12,1,12,
- 1,12,1,12,1,13,1,13,1,13,1,13,1,13,1,13,5,13,249,8,13,10,13,12,13,252,9,
- 13,1,13,1,13,1,13,1,14,1,14,1,14,1,14,1,14,1,14,1,14,1,14,1,15,1,15,1,15,
- 1,15,1,15,1,15,1,16,1,16,1,16,1,16,1,16,1,16,1,16,5,16,278,8,16,10,16,12,
- 16,281,9,16,1,16,1,16,1,16,1,17,1,17,1,17,1,17,1,17,1,17,1,18,1,18,1,18,
- 1,18,1,18,1,18,1,19,1,19,1,19,1,19,1,19,1,19,1,19,5,19,305,8,19,10,19,12,
- 19,308,9,19,1,19,1,19,1,20,1,20,1,20,1,20,1,20,1,21,1,21,1,21,1,21,1,21,
- 1,21,1,21,1,21,1,22,1,22,1,23,1,23,1,23,1,23,1,24,1,24,1,24,1,24,1,25,1,
- 25,1,25,1,25,1,26,1,26,1,26,1,26,1,27,1,27,1,27,1,27,1,28,1,28,1,28,1,28,
- 1,29,1,29,1,29,1,29,1,29,1,29,1,29,1,30,1,30,1,30,1,30,1,30,1,30,1,30,1,
- 31,1,31,1,31,1,31,1,31,1,31,1,31,1,32,1,32,1,32,1,32,1,32,1,33,1,33,1,33,
- 1,33,1,33,1,34,1,34,1,34,1,34,1,34,1,35,1,35,1,35,1,35,1,35,1,36,1,36,1,
- 36,1,37,1,37,1,37,1,37,1,38,1,38,1,38,1,38,1,38,1,38,5,38,405,8,38,10,38,
- 12,38,408,9,38,1,38,1,38,1,39,1,39,1,39,1,39,1,39,1,39,5,39,418,8,39,10,
- 39,12,39,421,9,39,1,39,1,39,1,39,1,40,1,40,1,40,1,40,1,40,1,40,5,40,432,
- 8,40,10,40,12,40,435,9,40,1,40,1,40,1,40,1,41,1,41,1,41,1,41,1,41,1,41,
- 1,41,1,41,5,41,448,8,41,10,41,12,41,451,9,41,1,41,1,41,1,41,1,41,1,42,1,
- 42,1,42,1,42,1,42,1,42,1,42,1,42,1,43,1,43,1,43,1,43,1,43,1,43,1,43,1,43,
- 1,43,1,44,1,44,1,44,1,44,1,44,1,45,1,45,1,46,1,46,1,47,1,47,1,48,1,48,1,
- 49,1,49,1,50,1,50,1,51,1,51,1,51,1,51,1,52,1,52,1,52,1,52,1,53,1,53,1,54,
- 1,54,1,54,1,55,1,55,1,55,1,56,4,56,508,8,56,11,56,12,56,509,1,56,1,56,5,
- 56,514,8,56,10,56,12,56,517,9,56,1,56,3,56,520,8,56,1,56,1,56,4,56,524,
- 8,56,11,56,12,56,525,1,56,3,56,529,8,56,1,56,4,56,532,8,56,11,56,12,56,
- 533,1,56,3,56,537,8,56,3,56,539,8,56,1,57,1,57,1,58,1,58,5,58,545,8,58,
- 10,58,12,58,548,9,58,1,59,1,59,3,59,552,8,59,1,59,4,59,555,8,59,11,59,12,
- 59,556,1,60,1,60,1,60,1,60,1,60,1,60,1,60,1,60,1,60,1,60,1,60,1,60,1,60,
- 1,60,1,60,1,60,1,60,1,60,1,60,1,60,1,60,1,60,1,60,1,60,1,60,1,60,1,60,1,
- 60,1,60,1,60,1,60,1,60,1,60,1,60,1,60,1,60,1,60,1,60,1,60,1,60,1,60,1,60,
- 1,60,1,60,1,60,1,60,1,60,1,60,1,60,1,60,1,60,1,60,1,60,1,60,1,60,1,60,1,
- 60,1,60,1,60,1,60,1,60,1,60,1,60,1,60,1,60,1,60,1,60,1,60,1,60,1,60,1,60,
- 1,60,1,60,1,60,1,60,1,60,1,60,1,60,1,60,1,60,1,60,1,60,1,60,1,60,1,60,1,
- 60,1,60,1,60,1,60,1,60,1,60,1,60,1,60,1,60,1,60,1,60,1,60,1,60,1,60,1,60,
- 1,60,1,60,1,60,1,60,1,60,1,60,1,60,1,60,1,60,1,60,1,60,1,60,1,60,1,60,1,
- 60,1,60,1,60,1,60,1,60,1,60,1,60,1,60,1,60,1,60,1,60,1,60,1,60,1,60,1,60,
- 1,60,1,60,1,60,1,60,1,60,1,60,1,60,1,60,1,60,1,60,1,60,3,60,699,8,60,1,
- 61,5,61,702,8,61,10,61,12,61,705,9,61,1,61,1,61,1,61,1,61,4,61,711,8,61,
- 11,61,12,61,712,1,61,1,61,5,61,717,8,61,10,61,12,61,720,9,61,1,61,1,61,
- 3,61,724,8,61,1,62,1,62,1,62,1,62,1,63,1,63,3,63,732,8,63,1,63,3,63,735,
- 8,63,1,64,4,64,738,8,64,11,64,12,64,739,1,64,1,64,1,65,1,65,1,65,1,65,1,
- 65,1,66,1,66,1,66,1,66,1,66,1,67,1,67,1,68,1,68,1,68,1,68,1,69,1,69,1,69,
- 1,69,1,69,1,69,1,69,1,69,1,69,1,69,1,70,1,70,1,70,1,70,1,70,1,70,1,71,1,
- 71,1,71,1,71,1,71,1,71,1,71,5,71,783,8,71,10,71,12,71,786,9,71,1,71,1,71,
- 1,71,1,72,1,72,1,72,1,72,1,72,1,72,1,73,1,73,1,73,1,73,1,73,1,73,1,74,1,
- 74,1,75,1,75,5,75,807,8,75,10,75,12,75,810,9,75,1,76,1,76,1,77,1,77,1,78,
- 1,78,1,79,1,79,1,80,1,80,1,81,3,81,823,8,81,1,81,4,81,826,8,81,11,81,12,
- 81,827,1,81,1,81,5,81,832,8,81,10,81,12,81,835,9,81,1,81,3,81,838,8,81,
- 1,81,1,81,4,81,842,8,81,11,81,12,81,843,1,81,3,81,847,8,81,1,81,4,81,850,
- 8,81,11,81,12,81,851,3,81,854,8,81,1,82,1,82,1,83,1,83,1,83,1,83,1,83,1,
- 83,1,83,1,83,1,84,1,84,1,84,1,84,1,84,1,84,1,84,1,84,1,84,1,85,4,85,876,
- 8,85,11,85,12,85,877,1,85,1,85,1,86,1,86,1,86,1,86,1,86,1,87,1,87,1,449,
- 0,88,2,1,4,2,6,3,8,4,10,5,12,6,14,7,16,8,18,9,20,10,22,11,24,12,26,13,28,
- 14,30,15,32,16,34,17,36,18,38,19,40,20,42,21,44,22,46,23,48,24,50,25,52,
- 26,54,27,56,28,58,29,60,30,62,31,64,32,66,33,68,34,70,35,72,36,74,37,76,
- 38,78,39,80,40,82,41,84,42,86,43,88,44,90,45,92,46,94,47,96,48,98,49,100,
- 50,102,51,104,52,106,53,108,54,110,55,112,56,114,57,116,0,118,0,120,0,122,
- 0,124,58,126,59,128,60,130,61,132,62,134,63,136,64,138,65,140,66,142,67,
- 144,68,146,69,148,70,150,71,152,72,154,73,156,74,158,75,160,76,162,77,164,
- 78,166,0,168,79,170,80,172,81,174,82,176,83,2,0,1,7,1,0,32,32,1,0,48,57,
- 2,0,65,90,97,122,3,0,48,57,65,90,97,122,2,0,69,69,101,101,2,0,43,43,45,
- 45,3,0,9,10,13,13,32,32,953,0,2,1,0,0,0,0,4,1,0,0,0,0,6,1,0,0,0,0,8,1,0,
- 0,0,0,10,1,0,0,0,0,12,1,0,0,0,0,14,1,0,0,0,0,16,1,0,0,0,0,18,1,0,0,0,0,
- 20,1,0,0,0,0,22,1,0,0,0,0,24,1,0,0,0,0,26,1,0,0,0,0,28,1,0,0,0,0,30,1,0,
- 0,0,0,32,1,0,0,0,0,34,1,0,0,0,0,36,1,0,0,0,0,38,1,0,0,0,0,40,1,0,0,0,0,
- 42,1,0,0,0,0,44,1,0,0,0,0,46,1,0,0,0,0,48,1,0,0,0,0,50,1,0,0,0,0,52,1,0,
- 0,0,0,54,1,0,0,0,0,56,1,0,0,0,0,58,1,0,0,0,0,60,1,0,0,0,0,62,1,0,0,0,0,
- 64,1,0,0,0,0,66,1,0,0,0,0,68,1,0,0,0,0,70,1,0,0,0,0,72,1,0,0,0,0,74,1,0,
- 0,0,0,76,1,0,0,0,0,78,1,0,0,0,0,80,1,0,0,0,0,82,1,0,0,0,0,84,1,0,0,0,0,
- 86,1,0,0,0,0,88,1,0,0,0,0,90,1,0,0,0,0,92,1,0,0,0,0,94,1,0,0,0,0,96,1,0,
- 0,0,0,98,1,0,0,0,0,100,1,0,0,0,0,102,1,0,0,0,0,104,1,0,0,0,0,106,1,0,0,
- 0,0,108,1,0,0,0,0,110,1,0,0,0,0,112,1,0,0,0,0,114,1,0,0,0,0,124,1,0,0,0,
- 0,126,1,0,0,0,0,128,1,0,0,0,0,130,1,0,0,0,0,132,1,0,0,0,0,134,1,0,0,0,0,
- 136,1,0,0,0,1,138,1,0,0,0,1,140,1,0,0,0,1,142,1,0,0,0,1,144,1,0,0,0,1,146,
- 1,0,0,0,1,148,1,0,0,0,1,150,1,0,0,0,1,152,1,0,0,0,1,154,1,0,0,0,1,156,1,
- 0,0,0,1,158,1,0,0,0,1,160,1,0,0,0,1,162,1,0,0,0,1,164,1,0,0,0,1,168,1,0,
- 0,0,1,170,1,0,0,0,1,172,1,0,0,0,1,174,1,0,0,0,1,176,1,0,0,0,2,178,1,0,0,
- 0,4,182,1,0,0,0,6,192,1,0,0,0,8,194,1,0,0,0,10,196,1,0,0,0,12,198,1,0,0,
- 0,14,200,1,0,0,0,16,202,1,0,0,0,18,204,1,0,0,0,20,206,1,0,0,0,22,210,1,
- 0,0,0,24,215,1,0,0,0,26,228,1,0,0,0,28,242,1,0,0,0,30,256,1,0,0,0,32,264,
- 1,0,0,0,34,270,1,0,0,0,36,285,1,0,0,0,38,291,1,0,0,0,40,297,1,0,0,0,42,
- 311,1,0,0,0,44,316,1,0,0,0,46,324,1,0,0,0,48,326,1,0,0,0,50,330,1,0,0,0,
- 52,334,1,0,0,0,54,338,1,0,0,0,56,342,1,0,0,0,58,346,1,0,0,0,60,350,1,0,
- 0,0,62,357,1,0,0,0,64,364,1,0,0,0,66,371,1,0,0,0,68,376,1,0,0,0,70,381,
- 1,0,0,0,72,386,1,0,0,0,74,391,1,0,0,0,76,394,1,0,0,0,78,398,1,0,0,0,80,
- 411,1,0,0,0,82,425,1,0,0,0,84,439,1,0,0,0,86,456,1,0,0,0,88,464,1,0,0,0,
- 90,473,1,0,0,0,92,478,1,0,0,0,94,480,1,0,0,0,96,482,1,0,0,0,98,484,1,0,
- 0,0,100,486,1,0,0,0,102,488,1,0,0,0,104,490,1,0,0,0,106,494,1,0,0,0,108,
- 498,1,0,0,0,110,500,1,0,0,0,112,503,1,0,0,0,114,538,1,0,0,0,116,540,1,0,
- 0,0,118,542,1,0,0,0,120,549,1,0,0,0,122,558,1,0,0,0,124,723,1,0,0,0,126,
- 725,1,0,0,0,128,731,1,0,0,0,130,737,1,0,0,0,132,743,1,0,0,0,134,748,1,0,
- 0,0,136,753,1,0,0,0,138,755,1,0,0,0,140,759,1,0,0,0,142,769,1,0,0,0,144,
- 775,1,0,0,0,146,790,1,0,0,0,148,796,1,0,0,0,150,802,1,0,0,0,152,804,1,0,
- 0,0,154,811,1,0,0,0,156,813,1,0,0,0,158,815,1,0,0,0,160,817,1,0,0,0,162,
- 819,1,0,0,0,164,853,1,0,0,0,166,855,1,0,0,0,168,857,1,0,0,0,170,865,1,0,
- 0,0,172,875,1,0,0,0,174,881,1,0,0,0,176,886,1,0,0,0,178,179,5,91,0,0,179,
- 180,1,0,0,0,180,181,6,0,0,0,181,3,1,0,0,0,182,183,5,92,0,0,183,184,5,108,
- 0,0,184,185,5,98,0,0,185,186,5,114,0,0,186,187,5,97,0,0,187,188,5,99,0,
- 0,188,189,5,107,0,0,189,190,1,0,0,0,190,191,6,1,0,0,191,5,1,0,0,0,192,193,
- 5,59,0,0,193,7,1,0,0,0,194,195,5,123,0,0,195,9,1,0,0,0,196,197,5,125,0,
- 0,197,11,1,0,0,0,198,199,5,40,0,0,199,13,1,0,0,0,200,201,5,41,0,0,201,15,
- 1,0,0,0,202,203,5,124,0,0,203,17,1,0,0,0,204,205,5,95,0,0,205,19,1,0,0,
- 0,206,207,5,92,0,0,207,208,5,112,0,0,208,209,5,105,0,0,209,21,1,0,0,0,210,
- 211,5,92,0,0,211,212,5,105,0,0,212,213,5,110,0,0,213,214,5,116,0,0,214,
- 23,1,0,0,0,215,216,5,92,0,0,216,217,5,105,0,0,217,218,5,110,0,0,218,219,
- 5,116,0,0,219,223,1,0,0,0,220,222,7,0,0,0,221,220,1,0,0,0,222,225,1,0,0,
- 0,223,221,1,0,0,0,223,224,1,0,0,0,224,226,1,0,0,0,225,223,1,0,0,0,226,227,
- 5,95,0,0,227,25,1,0,0,0,228,229,5,92,0,0,229,230,5,105,0,0,230,231,5,110,
- 0,0,231,232,5,116,0,0,232,236,1,0,0,0,233,235,7,0,0,0,234,233,1,0,0,0,235,
- 238,1,0,0,0,236,234,1,0,0,0,236,237,1,0,0,0,237,239,1,0,0,0,238,236,1,0,
- 0,0,239,240,5,95,0,0,240,241,7,1,0,0,241,27,1,0,0,0,242,243,5,92,0,0,243,
- 244,5,105,0,0,244,245,5,110,0,0,245,246,5,116,0,0,246,250,1,0,0,0,247,249,
- 7,0,0,0,248,247,1,0,0,0,249,252,1,0,0,0,250,248,1,0,0,0,250,251,1,0,0,0,
- 251,253,1,0,0,0,252,250,1,0,0,0,253,254,5,95,0,0,254,255,7,2,0,0,255,29,
- 1,0,0,0,256,257,5,92,0,0,257,258,5,109,0,0,258,259,5,97,0,0,259,260,5,116,
- 0,0,260,261,5,104,0,0,261,262,5,114,0,0,262,263,5,109,0,0,263,31,1,0,0,
- 0,264,265,5,92,0,0,265,266,5,102,0,0,266,267,5,114,0,0,267,268,5,97,0,0,
- 268,269,5,99,0,0,269,33,1,0,0,0,270,271,5,92,0,0,271,272,5,102,0,0,272,
- 273,5,114,0,0,273,274,5,97,0,0,274,275,5,99,0,0,275,279,1,0,0,0,276,278,
- 7,0,0,0,277,276,1,0,0,0,278,281,1,0,0,0,279,277,1,0,0,0,279,280,1,0,0,0,
- 280,282,1,0,0,0,281,279,1,0,0,0,282,283,7,1,0,0,283,284,7,1,0,0,284,35,
- 1,0,0,0,285,286,5,92,0,0,286,287,5,99,0,0,287,288,5,100,0,0,288,289,5,111,
- 0,0,289,290,5,116,0,0,290,37,1,0,0,0,291,292,5,92,0,0,292,293,5,115,0,0,
- 293,294,5,113,0,0,294,295,5,114,0,0,295,296,5,116,0,0,296,39,1,0,0,0,297,
- 298,5,92,0,0,298,299,5,115,0,0,299,300,5,113,0,0,300,301,5,114,0,0,301,
- 302,5,116,0,0,302,306,1,0,0,0,303,305,7,0,0,0,304,303,1,0,0,0,305,308,1,
- 0,0,0,306,304,1,0,0,0,306,307,1,0,0,0,307,309,1,0,0,0,308,306,1,0,0,0,309,
- 310,7,1,0,0,310,41,1,0,0,0,311,312,5,92,0,0,312,313,5,115,0,0,313,314,5,
- 105,0,0,314,315,5,109,0,0,315,43,1,0,0,0,316,317,5,92,0,0,317,318,5,97,
- 0,0,318,319,5,112,0,0,319,320,5,112,0,0,320,321,5,114,0,0,321,322,5,111,
- 0,0,322,323,5,120,0,0,323,45,1,0,0,0,324,325,5,92,0,0,325,47,1,0,0,0,326,
- 327,5,115,0,0,327,328,5,105,0,0,328,329,5,110,0,0,329,49,1,0,0,0,330,331,
- 5,99,0,0,331,332,5,111,0,0,332,333,5,115,0,0,333,51,1,0,0,0,334,335,5,116,
- 0,0,335,336,5,97,0,0,336,337,5,110,0,0,337,53,1,0,0,0,338,339,5,99,0,0,
- 339,340,5,111,0,0,340,341,5,116,0,0,341,55,1,0,0,0,342,343,5,115,0,0,343,
- 344,5,101,0,0,344,345,5,99,0,0,345,57,1,0,0,0,346,347,5,99,0,0,347,348,
- 5,115,0,0,348,349,5,99,0,0,349,59,1,0,0,0,350,351,5,97,0,0,351,352,5,114,
- 0,0,352,353,5,99,0,0,353,354,5,115,0,0,354,355,5,105,0,0,355,356,5,110,
- 0,0,356,61,1,0,0,0,357,358,5,97,0,0,358,359,5,114,0,0,359,360,5,99,0,0,
- 360,361,5,99,0,0,361,362,5,111,0,0,362,363,5,115,0,0,363,63,1,0,0,0,364,
- 365,5,97,0,0,365,366,5,114,0,0,366,367,5,99,0,0,367,368,5,116,0,0,368,369,
- 5,97,0,0,369,370,5,110,0,0,370,65,1,0,0,0,371,372,5,115,0,0,372,373,5,105,
- 0,0,373,374,5,110,0,0,374,375,5,104,0,0,375,67,1,0,0,0,376,377,5,99,0,0,
- 377,378,5,111,0,0,378,379,5,115,0,0,379,380,5,104,0,0,380,69,1,0,0,0,381,
- 382,5,116,0,0,382,383,5,97,0,0,383,384,5,110,0,0,384,385,5,104,0,0,385,
- 71,1,0,0,0,386,387,5,99,0,0,387,388,5,111,0,0,388,389,5,116,0,0,389,390,
- 5,104,0,0,390,73,1,0,0,0,391,392,5,108,0,0,392,393,5,110,0,0,393,75,1,0,
- 0,0,394,395,5,108,0,0,395,396,5,111,0,0,396,397,5,103,0,0,397,77,1,0,0,
- 0,398,399,5,92,0,0,399,400,5,108,0,0,400,401,5,111,0,0,401,402,5,103,0,
- 0,402,406,1,0,0,0,403,405,7,0,0,0,404,403,1,0,0,0,405,408,1,0,0,0,406,404,
- 1,0,0,0,406,407,1,0,0,0,407,409,1,0,0,0,408,406,1,0,0,0,409,410,5,95,0,
- 0,410,79,1,0,0,0,411,412,5,92,0,0,412,413,5,108,0,0,413,414,5,111,0,0,414,
- 415,5,103,0,0,415,419,1,0,0,0,416,418,7,0,0,0,417,416,1,0,0,0,418,421,1,
- 0,0,0,419,417,1,0,0,0,419,420,1,0,0,0,420,422,1,0,0,0,421,419,1,0,0,0,422,
- 423,5,95,0,0,423,424,7,1,0,0,424,81,1,0,0,0,425,426,5,92,0,0,426,427,5,
- 108,0,0,427,428,5,111,0,0,428,429,5,103,0,0,429,433,1,0,0,0,430,432,7,0,
- 0,0,431,430,1,0,0,0,432,435,1,0,0,0,433,431,1,0,0,0,433,434,1,0,0,0,434,
- 436,1,0,0,0,435,433,1,0,0,0,436,437,5,95,0,0,437,438,7,2,0,0,438,83,1,0,
- 0,0,439,440,5,92,0,0,440,441,5,116,0,0,441,442,5,101,0,0,442,443,5,120,
- 0,0,443,444,5,116,0,0,444,445,5,123,0,0,445,449,1,0,0,0,446,448,9,0,0,0,
- 447,446,1,0,0,0,448,451,1,0,0,0,449,450,1,0,0,0,449,447,1,0,0,0,450,452,
- 1,0,0,0,451,449,1,0,0,0,452,453,5,125,0,0,453,454,1,0,0,0,454,455,6,41,
- 1,0,455,85,1,0,0,0,456,457,5,92,0,0,457,458,5,108,0,0,458,459,5,101,0,0,
- 459,460,5,102,0,0,460,461,5,116,0,0,461,462,1,0,0,0,462,463,6,42,1,0,463,
- 87,1,0,0,0,464,465,5,92,0,0,465,466,5,114,0,0,466,467,5,105,0,0,467,468,
- 5,103,0,0,468,469,5,104,0,0,469,470,5,116,0,0,470,471,1,0,0,0,471,472,6,
- 43,1,0,472,89,1,0,0,0,473,474,5,36,0,0,474,475,5,36,0,0,475,476,1,0,0,0,
- 476,477,6,44,1,0,477,91,1,0,0,0,478,479,5,43,0,0,479,93,1,0,0,0,480,481,
- 5,45,0,0,481,95,1,0,0,0,482,483,5,94,0,0,483,97,1,0,0,0,484,485,5,61,0,
- 0,485,99,1,0,0,0,486,487,5,60,0,0,487,101,1,0,0,0,488,489,5,62,0,0,489,
- 103,1,0,0,0,490,491,5,92,0,0,491,492,5,108,0,0,492,493,5,101,0,0,493,105,
- 1,0,0,0,494,495,5,92,0,0,495,496,5,103,0,0,496,497,5,101,0,0,497,107,1,
- 0,0,0,498,499,5,44,0,0,499,109,1,0,0,0,500,501,5,94,0,0,501,502,7,1,0,0,
- 502,111,1,0,0,0,503,504,5,94,0,0,504,505,7,2,0,0,505,113,1,0,0,0,506,508,
- 3,116,57,0,507,506,1,0,0,0,508,509,1,0,0,0,509,507,1,0,0,0,509,510,1,0,
- 0,0,510,511,1,0,0,0,511,515,5,46,0,0,512,514,3,116,57,0,513,512,1,0,0,0,
- 514,517,1,0,0,0,515,513,1,0,0,0,515,516,1,0,0,0,516,519,1,0,0,0,517,515,
- 1,0,0,0,518,520,3,120,59,0,519,518,1,0,0,0,519,520,1,0,0,0,520,539,1,0,
- 0,0,521,523,5,46,0,0,522,524,3,116,57,0,523,522,1,0,0,0,524,525,1,0,0,0,
- 525,523,1,0,0,0,525,526,1,0,0,0,526,528,1,0,0,0,527,529,3,120,59,0,528,
- 527,1,0,0,0,528,529,1,0,0,0,529,539,1,0,0,0,530,532,3,116,57,0,531,530,
- 1,0,0,0,532,533,1,0,0,0,533,531,1,0,0,0,533,534,1,0,0,0,534,536,1,0,0,0,
- 535,537,3,120,59,0,536,535,1,0,0,0,536,537,1,0,0,0,537,539,1,0,0,0,538,
- 507,1,0,0,0,538,521,1,0,0,0,538,531,1,0,0,0,539,115,1,0,0,0,540,541,7,1,
- 0,0,541,117,1,0,0,0,542,546,7,2,0,0,543,545,7,3,0,0,544,543,1,0,0,0,545,
- 548,1,0,0,0,546,544,1,0,0,0,546,547,1,0,0,0,547,119,1,0,0,0,548,546,1,0,
- 0,0,549,551,7,4,0,0,550,552,7,5,0,0,551,550,1,0,0,0,551,552,1,0,0,0,552,
- 554,1,0,0,0,553,555,3,116,57,0,554,553,1,0,0,0,555,556,1,0,0,0,556,554,
- 1,0,0,0,556,557,1,0,0,0,557,121,1,0,0,0,558,698,5,92,0,0,559,560,5,97,0,
- 0,560,561,5,108,0,0,561,562,5,112,0,0,562,563,5,104,0,0,563,699,5,97,0,
- 0,564,565,5,98,0,0,565,566,5,101,0,0,566,567,5,116,0,0,567,699,5,97,0,0,
- 568,569,5,103,0,0,569,570,5,97,0,0,570,571,5,109,0,0,571,572,5,109,0,0,
- 572,699,5,97,0,0,573,574,5,100,0,0,574,575,5,101,0,0,575,576,5,108,0,0,
- 576,577,5,116,0,0,577,699,5,97,0,0,578,579,5,101,0,0,579,580,5,112,0,0,
- 580,581,5,115,0,0,581,582,5,105,0,0,582,583,5,108,0,0,583,584,5,111,0,0,
- 584,699,5,110,0,0,585,586,5,122,0,0,586,587,5,101,0,0,587,588,5,116,0,0,
- 588,699,5,97,0,0,589,590,5,101,0,0,590,591,5,116,0,0,591,699,5,97,0,0,592,
- 593,5,116,0,0,593,594,5,104,0,0,594,595,5,101,0,0,595,596,5,116,0,0,596,
- 699,5,97,0,0,597,598,5,105,0,0,598,599,5,111,0,0,599,600,5,116,0,0,600,
- 699,5,97,0,0,601,602,5,107,0,0,602,603,5,97,0,0,603,604,5,112,0,0,604,605,
- 5,112,0,0,605,699,5,97,0,0,606,607,5,108,0,0,607,608,5,97,0,0,608,609,5,
- 109,0,0,609,610,5,98,0,0,610,611,5,100,0,0,611,699,5,97,0,0,612,613,5,109,
- 0,0,613,699,5,117,0,0,614,615,5,110,0,0,615,699,5,117,0,0,616,617,5,120,
- 0,0,617,699,5,105,0,0,618,619,5,114,0,0,619,620,5,104,0,0,620,699,5,111,
- 0,0,621,622,5,115,0,0,622,623,5,105,0,0,623,624,5,103,0,0,624,625,5,109,
- 0,0,625,699,5,97,0,0,626,627,5,116,0,0,627,628,5,97,0,0,628,699,5,117,0,
- 0,629,630,5,117,0,0,630,631,5,112,0,0,631,632,5,115,0,0,632,633,5,105,0,
- 0,633,634,5,108,0,0,634,635,5,111,0,0,635,699,5,110,0,0,636,637,5,112,0,
- 0,637,638,5,104,0,0,638,699,5,105,0,0,639,640,5,99,0,0,640,641,5,104,0,
- 0,641,699,5,105,0,0,642,643,5,112,0,0,643,644,5,115,0,0,644,699,5,105,0,
- 0,645,646,5,111,0,0,646,647,5,109,0,0,647,648,5,101,0,0,648,649,5,103,0,
- 0,649,699,5,97,0,0,650,651,5,71,0,0,651,652,5,97,0,0,652,653,5,109,0,0,
- 653,654,5,109,0,0,654,699,5,97,0,0,655,656,5,68,0,0,656,657,5,101,0,0,657,
- 658,5,108,0,0,658,659,5,116,0,0,659,699,5,97,0,0,660,661,5,84,0,0,661,662,
- 5,104,0,0,662,663,5,101,0,0,663,664,5,116,0,0,664,699,5,97,0,0,665,666,
- 5,76,0,0,666,667,5,97,0,0,667,668,5,109,0,0,668,669,5,98,0,0,669,670,5,
- 100,0,0,670,699,5,97,0,0,671,672,5,88,0,0,672,699,5,105,0,0,673,674,5,80,
- 0,0,674,699,5,105,0,0,675,676,5,83,0,0,676,677,5,105,0,0,677,678,5,103,
- 0,0,678,679,5,109,0,0,679,699,5,97,0,0,680,681,5,85,0,0,681,682,5,112,0,
- 0,682,683,5,115,0,0,683,684,5,105,0,0,684,685,5,108,0,0,685,686,5,111,0,
- 0,686,699,5,110,0,0,687,688,5,80,0,0,688,689,5,104,0,0,689,699,5,105,0,
- 0,690,691,5,80,0,0,691,692,5,115,0,0,692,699,5,105,0,0,693,694,5,79,0,0,
- 694,695,5,109,0,0,695,696,5,101,0,0,696,697,5,103,0,0,697,699,5,97,0,0,
- 698,559,1,0,0,0,698,564,1,0,0,0,698,568,1,0,0,0,698,573,1,0,0,0,698,578,
- 1,0,0,0,698,585,1,0,0,0,698,589,1,0,0,0,698,592,1,0,0,0,698,597,1,0,0,0,
- 698,601,1,0,0,0,698,606,1,0,0,0,698,612,1,0,0,0,698,614,1,0,0,0,698,616,
- 1,0,0,0,698,618,1,0,0,0,698,621,1,0,0,0,698,626,1,0,0,0,698,629,1,0,0,0,
- 698,636,1,0,0,0,698,639,1,0,0,0,698,642,1,0,0,0,698,645,1,0,0,0,698,650,
- 1,0,0,0,698,655,1,0,0,0,698,660,1,0,0,0,698,665,1,0,0,0,698,671,1,0,0,0,
- 698,673,1,0,0,0,698,675,1,0,0,0,698,680,1,0,0,0,698,687,1,0,0,0,698,690,
- 1,0,0,0,698,693,1,0,0,0,699,123,1,0,0,0,700,702,7,0,0,0,701,700,1,0,0,0,
- 702,705,1,0,0,0,703,701,1,0,0,0,703,704,1,0,0,0,704,706,1,0,0,0,705,703,
- 1,0,0,0,706,707,5,95,0,0,707,708,5,123,0,0,708,710,1,0,0,0,709,711,7,3,
- 0,0,710,709,1,0,0,0,711,712,1,0,0,0,712,710,1,0,0,0,712,713,1,0,0,0,713,
- 714,1,0,0,0,714,724,5,125,0,0,715,717,7,0,0,0,716,715,1,0,0,0,717,720,1,
- 0,0,0,718,716,1,0,0,0,718,719,1,0,0,0,719,721,1,0,0,0,720,718,1,0,0,0,721,
- 722,5,95,0,0,722,724,7,3,0,0,723,703,1,0,0,0,723,718,1,0,0,0,724,125,1,
- 0,0,0,725,726,5,94,0,0,726,727,7,2,0,0,727,728,3,124,61,0,728,127,1,0,0,
- 0,729,732,3,118,58,0,730,732,3,122,60,0,731,729,1,0,0,0,731,730,1,0,0,0,
- 732,734,1,0,0,0,733,735,3,124,61,0,734,733,1,0,0,0,734,735,1,0,0,0,735,
- 129,1,0,0,0,736,738,7,6,0,0,737,736,1,0,0,0,738,739,1,0,0,0,739,737,1,0,
- 0,0,739,740,1,0,0,0,740,741,1,0,0,0,741,742,6,64,1,0,742,131,1,0,0,0,743,
- 744,5,92,0,0,744,745,5,32,0,0,745,746,1,0,0,0,746,747,6,65,1,0,747,133,
- 1,0,0,0,748,749,5,92,0,0,749,750,5,58,0,0,750,751,1,0,0,0,751,752,6,66,
- 1,0,752,135,1,0,0,0,753,754,9,0,0,0,754,137,1,0,0,0,755,756,5,93,0,0,756,
- 757,1,0,0,0,757,758,6,68,2,0,758,139,1,0,0,0,759,760,5,92,0,0,760,761,5,
- 114,0,0,761,762,5,98,0,0,762,763,5,114,0,0,763,764,5,97,0,0,764,765,5,99,
- 0,0,765,766,5,107,0,0,766,767,1,0,0,0,767,768,6,69,2,0,768,141,1,0,0,0,
- 769,770,5,92,0,0,770,771,5,102,0,0,771,772,5,114,0,0,772,773,5,97,0,0,773,
- 774,5,99,0,0,774,143,1,0,0,0,775,776,5,92,0,0,776,777,5,102,0,0,777,778,
- 5,114,0,0,778,779,5,97,0,0,779,780,5,99,0,0,780,784,1,0,0,0,781,783,7,0,
- 0,0,782,781,1,0,0,0,783,786,1,0,0,0,784,782,1,0,0,0,784,785,1,0,0,0,785,
- 787,1,0,0,0,786,784,1,0,0,0,787,788,7,1,0,0,788,789,7,1,0,0,789,145,1,0,
- 0,0,790,791,5,92,0,0,791,792,5,99,0,0,792,793,5,100,0,0,793,794,5,111,0,
- 0,794,795,5,116,0,0,795,147,1,0,0,0,796,797,5,92,0,0,797,798,5,115,0,0,
- 798,799,5,113,0,0,799,800,5,114,0,0,800,801,5,116,0,0,801,149,1,0,0,0,802,
- 803,5,94,0,0,803,151,1,0,0,0,804,808,7,2,0,0,805,807,7,3,0,0,806,805,1,
- 0,0,0,807,810,1,0,0,0,808,806,1,0,0,0,808,809,1,0,0,0,809,153,1,0,0,0,810,
- 808,1,0,0,0,811,812,5,40,0,0,812,155,1,0,0,0,813,814,5,41,0,0,814,157,1,
- 0,0,0,815,816,5,123,0,0,816,159,1,0,0,0,817,818,5,125,0,0,818,161,1,0,0,
- 0,819,820,5,49,0,0,820,163,1,0,0,0,821,823,5,45,0,0,822,821,1,0,0,0,822,
- 823,1,0,0,0,823,825,1,0,0,0,824,826,3,166,82,0,825,824,1,0,0,0,826,827,
- 1,0,0,0,827,825,1,0,0,0,827,828,1,0,0,0,828,829,1,0,0,0,829,833,5,46,0,
- 0,830,832,3,166,82,0,831,830,1,0,0,0,832,835,1,0,0,0,833,831,1,0,0,0,833,
- 834,1,0,0,0,834,854,1,0,0,0,835,833,1,0,0,0,836,838,5,45,0,0,837,836,1,
- 0,0,0,837,838,1,0,0,0,838,839,1,0,0,0,839,841,5,46,0,0,840,842,3,166,82,
- 0,841,840,1,0,0,0,842,843,1,0,0,0,843,841,1,0,0,0,843,844,1,0,0,0,844,854,
- 1,0,0,0,845,847,5,45,0,0,846,845,1,0,0,0,846,847,1,0,0,0,847,849,1,0,0,
- 0,848,850,3,166,82,0,849,848,1,0,0,0,850,851,1,0,0,0,851,849,1,0,0,0,851,
- 852,1,0,0,0,852,854,1,0,0,0,853,822,1,0,0,0,853,837,1,0,0,0,853,846,1,0,
- 0,0,854,165,1,0,0,0,855,856,7,1,0,0,856,167,1,0,0,0,857,858,5,92,0,0,858,
- 859,5,108,0,0,859,860,5,101,0,0,860,861,5,102,0,0,861,862,5,116,0,0,862,
- 863,1,0,0,0,863,864,6,83,1,0,864,169,1,0,0,0,865,866,5,92,0,0,866,867,5,
- 114,0,0,867,868,5,105,0,0,868,869,5,103,0,0,869,870,5,104,0,0,870,871,5,
- 116,0,0,871,872,1,0,0,0,872,873,6,84,1,0,873,171,1,0,0,0,874,876,7,6,0,
- 0,875,874,1,0,0,0,876,877,1,0,0,0,877,875,1,0,0,0,877,878,1,0,0,0,878,879,
- 1,0,0,0,879,880,6,85,1,0,880,173,1,0,0,0,881,882,5,92,0,0,882,883,5,32,
- 0,0,883,884,1,0,0,0,884,885,6,86,1,0,885,175,1,0,0,0,886,887,9,0,0,0,887,
- 177,1,0,0,0,41,0,1,223,236,250,279,306,406,419,433,449,509,515,519,525,
- 528,533,536,538,546,551,556,698,703,712,718,723,731,734,739,784,808,822,
- 827,833,837,843,846,851,853,877,3,2,1,0,6,0,0,2,0,0];
+ 81,2,82,7,82,2,83,7,83,2,84,7,84,2,85,7,85,2,86,7,86,2,87,7,87,2,88,7,88,
+ 2,89,7,89,2,90,7,90,2,91,7,91,2,92,7,92,2,93,7,93,2,94,7,94,2,95,7,95,2,
+ 96,7,96,1,0,1,0,1,0,1,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,2,1,2,
+ 1,3,1,3,1,4,1,4,1,5,1,5,1,6,1,6,1,7,1,7,1,8,1,8,1,8,1,8,1,8,1,8,1,8,3,8,
+ 230,8,8,1,9,1,9,1,10,1,10,1,10,1,10,1,11,1,11,1,11,1,11,1,11,1,12,1,12,
+ 1,12,1,12,1,12,1,12,5,12,249,8,12,10,12,12,12,252,9,12,1,12,1,12,1,13,1,
+ 13,1,13,1,13,1,13,1,13,5,13,262,8,13,10,13,12,13,265,9,13,1,13,1,13,1,13,
+ 1,14,1,14,1,14,1,14,1,14,1,14,5,14,276,8,14,10,14,12,14,279,9,14,1,14,1,
+ 14,1,14,1,15,1,15,1,15,1,15,1,15,1,15,1,15,1,15,1,16,1,16,1,16,1,16,1,16,
+ 1,16,1,17,1,17,1,17,1,17,1,17,1,17,1,17,5,17,305,8,17,10,17,12,17,308,9,
+ 17,1,17,1,17,1,17,1,18,1,18,1,18,1,18,1,18,1,18,1,19,1,19,1,19,1,19,1,19,
+ 1,19,1,19,1,20,1,20,1,20,1,20,1,20,1,20,1,21,1,21,1,21,1,21,1,21,1,21,1,
+ 21,5,21,339,8,21,10,21,12,21,342,9,21,1,21,1,21,1,22,1,22,1,22,1,22,1,22,
+ 1,23,1,23,1,23,1,23,1,23,1,23,1,23,1,23,1,24,1,24,1,24,1,24,1,24,1,24,1,
+ 24,1,24,1,24,1,24,1,24,1,24,1,24,1,24,1,25,1,25,1,26,1,26,1,26,1,26,1,27,
+ 1,27,1,27,1,27,1,28,1,28,1,28,1,28,1,29,1,29,1,29,1,29,1,30,1,30,1,30,1,
+ 30,1,31,1,31,1,31,1,31,1,32,1,32,1,32,1,32,1,32,1,32,1,32,1,33,1,33,1,33,
+ 1,33,1,33,1,33,1,33,1,34,1,34,1,34,1,34,1,34,1,34,1,34,1,35,1,35,1,35,1,
+ 35,1,35,1,36,1,36,1,36,1,36,1,36,1,37,1,37,1,37,1,37,1,37,1,38,1,38,1,38,
+ 1,38,1,38,1,39,1,39,1,39,1,40,1,40,1,40,1,40,1,41,1,41,1,41,1,41,1,41,1,
+ 41,5,41,453,8,41,10,41,12,41,456,9,41,1,41,1,41,1,42,1,42,1,42,1,42,1,42,
+ 1,42,5,42,466,8,42,10,42,12,42,469,9,42,1,42,1,42,1,42,1,43,1,43,1,43,1,
+ 43,1,43,1,43,5,43,480,8,43,10,43,12,43,483,9,43,1,43,1,43,1,43,1,44,1,44,
+ 1,44,1,44,1,44,1,44,1,44,1,44,5,44,496,8,44,10,44,12,44,499,9,44,1,44,1,
+ 44,1,44,1,44,1,45,1,45,1,45,1,45,1,45,1,45,1,45,1,45,1,46,1,46,1,46,1,46,
+ 1,46,1,46,1,46,1,46,1,46,1,47,1,47,1,47,1,47,1,47,1,48,1,48,1,49,1,49,1,
+ 50,1,50,1,51,1,51,1,52,1,52,1,53,1,53,1,54,1,54,1,54,1,54,1,55,1,55,1,55,
+ 1,55,1,56,1,56,1,57,1,57,1,57,1,58,1,58,1,58,1,59,4,59,556,8,59,11,59,12,
+ 59,557,1,59,1,59,5,59,562,8,59,10,59,12,59,565,9,59,1,59,3,59,568,8,59,
+ 1,59,1,59,4,59,572,8,59,11,59,12,59,573,1,59,3,59,577,8,59,1,59,4,59,580,
+ 8,59,11,59,12,59,581,1,59,3,59,585,8,59,3,59,587,8,59,1,60,1,60,1,61,1,
+ 61,5,61,593,8,61,10,61,12,61,596,9,61,1,62,1,62,3,62,600,8,62,1,62,4,62,
+ 603,8,62,11,62,12,62,604,1,63,1,63,1,63,1,63,1,63,1,63,1,63,1,63,1,63,1,
+ 63,1,63,1,63,1,63,1,63,1,63,1,63,1,63,1,63,1,63,1,63,1,63,1,63,1,63,1,63,
+ 1,63,1,63,1,63,1,63,1,63,1,63,1,63,1,63,1,63,1,63,1,63,1,63,1,63,1,63,1,
+ 63,1,63,1,63,1,63,1,63,1,63,1,63,1,63,1,63,1,63,1,63,1,63,1,63,1,63,1,63,
+ 1,63,1,63,1,63,1,63,1,63,1,63,1,63,1,63,1,63,1,63,1,63,1,63,1,63,1,63,1,
+ 63,1,63,1,63,1,63,1,63,1,63,1,63,1,63,1,63,1,63,1,63,1,63,1,63,1,63,1,63,
+ 1,63,1,63,1,63,1,63,1,63,1,63,1,63,1,63,1,63,1,63,1,63,1,63,1,63,1,63,1,
+ 63,1,63,1,63,1,63,1,63,1,63,1,63,1,63,1,63,1,63,1,63,1,63,1,63,1,63,1,63,
+ 1,63,1,63,1,63,1,63,1,63,1,63,1,63,1,63,1,63,1,63,1,63,1,63,1,63,1,63,1,
+ 63,1,63,1,63,1,63,1,63,1,63,1,63,1,63,1,63,1,63,1,63,1,63,1,63,1,63,1,63,
+ 3,63,747,8,63,1,64,1,64,1,64,1,64,1,64,1,64,1,64,1,64,1,64,1,64,1,64,1,
+ 64,1,64,1,64,1,64,1,64,1,65,1,65,1,65,1,65,1,65,1,65,1,65,1,65,1,65,1,65,
+ 1,65,1,65,1,65,1,65,1,66,1,66,1,67,1,67,1,67,1,68,5,68,785,8,68,10,68,12,
+ 68,788,9,68,1,68,1,68,1,68,1,68,4,68,794,8,68,11,68,12,68,795,1,68,1,68,
+ 5,68,800,8,68,10,68,12,68,803,9,68,1,68,1,68,3,68,807,8,68,1,69,1,69,1,
+ 69,1,69,1,70,1,70,3,70,815,8,70,1,70,3,70,818,8,70,1,71,4,71,821,8,71,11,
+ 71,12,71,822,1,71,1,71,1,72,1,72,1,72,1,72,1,72,1,73,1,73,1,73,1,73,1,73,
+ 1,74,1,74,1,75,1,75,1,75,1,75,1,76,1,76,1,76,1,76,1,76,1,76,1,76,1,76,1,
+ 76,1,76,1,77,1,77,1,77,1,77,1,77,1,77,1,78,1,78,1,78,1,78,1,78,1,78,1,78,
+ 5,78,866,8,78,10,78,12,78,869,9,78,1,78,1,78,1,78,1,79,1,79,1,79,1,79,1,
+ 79,1,79,1,80,1,80,1,80,1,80,1,80,1,80,1,80,1,81,1,81,1,81,1,81,1,81,1,81,
+ 1,82,1,82,1,83,1,83,1,84,1,84,5,84,899,8,84,10,84,12,84,902,9,84,1,85,1,
+ 85,1,86,1,86,1,87,1,87,1,88,1,88,1,89,1,89,1,90,3,90,915,8,90,1,90,4,90,
+ 918,8,90,11,90,12,90,919,1,90,1,90,5,90,924,8,90,10,90,12,90,927,9,90,1,
+ 90,3,90,930,8,90,1,90,1,90,4,90,934,8,90,11,90,12,90,935,1,90,3,90,939,
+ 8,90,1,90,4,90,942,8,90,11,90,12,90,943,3,90,946,8,90,1,91,1,91,1,92,1,
+ 92,1,92,1,92,1,92,1,92,1,92,1,92,1,93,1,93,1,93,1,93,1,93,1,93,1,93,1,93,
+ 1,93,1,94,4,94,968,8,94,11,94,12,94,969,1,94,1,94,1,95,1,95,1,95,1,95,1,
+ 95,1,96,1,96,1,497,0,97,2,1,4,2,6,3,8,4,10,5,12,6,14,7,16,8,18,9,20,10,
+ 22,11,24,12,26,13,28,14,30,15,32,16,34,17,36,18,38,19,40,20,42,21,44,22,
+ 46,23,48,24,50,25,52,26,54,27,56,28,58,29,60,30,62,31,64,32,66,33,68,34,
+ 70,35,72,36,74,37,76,38,78,39,80,40,82,41,84,42,86,43,88,44,90,45,92,46,
+ 94,47,96,48,98,49,100,50,102,51,104,52,106,53,108,54,110,55,112,56,114,
+ 57,116,58,118,59,120,60,122,0,124,0,126,0,128,0,130,61,132,62,134,63,136,
+ 64,138,65,140,66,142,67,144,68,146,69,148,70,150,71,152,72,154,73,156,74,
+ 158,75,160,76,162,77,164,78,166,79,168,80,170,81,172,82,174,83,176,84,178,
+ 85,180,86,182,87,184,0,186,88,188,89,190,90,192,91,194,92,2,0,1,7,1,0,32,
+ 32,1,0,48,57,2,0,65,90,97,122,3,0,48,57,65,90,97,122,2,0,69,69,101,101,
+ 2,0,43,43,45,45,3,0,9,10,13,13,32,32,1046,0,2,1,0,0,0,0,4,1,0,0,0,0,6,1,
+ 0,0,0,0,8,1,0,0,0,0,10,1,0,0,0,0,12,1,0,0,0,0,14,1,0,0,0,0,16,1,0,0,0,0,
+ 18,1,0,0,0,0,20,1,0,0,0,0,22,1,0,0,0,0,24,1,0,0,0,0,26,1,0,0,0,0,28,1,0,
+ 0,0,0,30,1,0,0,0,0,32,1,0,0,0,0,34,1,0,0,0,0,36,1,0,0,0,0,38,1,0,0,0,0,
+ 40,1,0,0,0,0,42,1,0,0,0,0,44,1,0,0,0,0,46,1,0,0,0,0,48,1,0,0,0,0,50,1,0,
+ 0,0,0,52,1,0,0,0,0,54,1,0,0,0,0,56,1,0,0,0,0,58,1,0,0,0,0,60,1,0,0,0,0,
+ 62,1,0,0,0,0,64,1,0,0,0,0,66,1,0,0,0,0,68,1,0,0,0,0,70,1,0,0,0,0,72,1,0,
+ 0,0,0,74,1,0,0,0,0,76,1,0,0,0,0,78,1,0,0,0,0,80,1,0,0,0,0,82,1,0,0,0,0,
+ 84,1,0,0,0,0,86,1,0,0,0,0,88,1,0,0,0,0,90,1,0,0,0,0,92,1,0,0,0,0,94,1,0,
+ 0,0,0,96,1,0,0,0,0,98,1,0,0,0,0,100,1,0,0,0,0,102,1,0,0,0,0,104,1,0,0,0,
+ 0,106,1,0,0,0,0,108,1,0,0,0,0,110,1,0,0,0,0,112,1,0,0,0,0,114,1,0,0,0,0,
+ 116,1,0,0,0,0,118,1,0,0,0,0,120,1,0,0,0,0,130,1,0,0,0,0,132,1,0,0,0,0,134,
+ 1,0,0,0,0,136,1,0,0,0,0,138,1,0,0,0,0,140,1,0,0,0,0,142,1,0,0,0,0,144,1,
+ 0,0,0,0,146,1,0,0,0,0,148,1,0,0,0,0,150,1,0,0,0,1,152,1,0,0,0,1,154,1,0,
+ 0,0,1,156,1,0,0,0,1,158,1,0,0,0,1,160,1,0,0,0,1,162,1,0,0,0,1,164,1,0,0,
+ 0,1,166,1,0,0,0,1,168,1,0,0,0,1,170,1,0,0,0,1,172,1,0,0,0,1,174,1,0,0,0,
+ 1,176,1,0,0,0,1,178,1,0,0,0,1,180,1,0,0,0,1,182,1,0,0,0,1,186,1,0,0,0,1,
+ 188,1,0,0,0,1,190,1,0,0,0,1,192,1,0,0,0,1,194,1,0,0,0,2,196,1,0,0,0,4,200,
+ 1,0,0,0,6,210,1,0,0,0,8,212,1,0,0,0,10,214,1,0,0,0,12,216,1,0,0,0,14,218,
+ 1,0,0,0,16,220,1,0,0,0,18,229,1,0,0,0,20,231,1,0,0,0,22,233,1,0,0,0,24,
+ 237,1,0,0,0,26,242,1,0,0,0,28,255,1,0,0,0,30,269,1,0,0,0,32,283,1,0,0,0,
+ 34,291,1,0,0,0,36,297,1,0,0,0,38,312,1,0,0,0,40,318,1,0,0,0,42,325,1,0,
+ 0,0,44,331,1,0,0,0,46,345,1,0,0,0,48,350,1,0,0,0,50,358,1,0,0,0,52,372,
+ 1,0,0,0,54,374,1,0,0,0,56,378,1,0,0,0,58,382,1,0,0,0,60,386,1,0,0,0,62,
+ 390,1,0,0,0,64,394,1,0,0,0,66,398,1,0,0,0,68,405,1,0,0,0,70,412,1,0,0,0,
+ 72,419,1,0,0,0,74,424,1,0,0,0,76,429,1,0,0,0,78,434,1,0,0,0,80,439,1,0,
+ 0,0,82,442,1,0,0,0,84,446,1,0,0,0,86,459,1,0,0,0,88,473,1,0,0,0,90,487,
+ 1,0,0,0,92,504,1,0,0,0,94,512,1,0,0,0,96,521,1,0,0,0,98,526,1,0,0,0,100,
+ 528,1,0,0,0,102,530,1,0,0,0,104,532,1,0,0,0,106,534,1,0,0,0,108,536,1,0,
+ 0,0,110,538,1,0,0,0,112,542,1,0,0,0,114,546,1,0,0,0,116,548,1,0,0,0,118,
+ 551,1,0,0,0,120,586,1,0,0,0,122,588,1,0,0,0,124,590,1,0,0,0,126,597,1,0,
+ 0,0,128,606,1,0,0,0,130,748,1,0,0,0,132,764,1,0,0,0,134,778,1,0,0,0,136,
+ 780,1,0,0,0,138,806,1,0,0,0,140,808,1,0,0,0,142,814,1,0,0,0,144,820,1,0,
+ 0,0,146,826,1,0,0,0,148,831,1,0,0,0,150,836,1,0,0,0,152,838,1,0,0,0,154,
+ 842,1,0,0,0,156,852,1,0,0,0,158,858,1,0,0,0,160,873,1,0,0,0,162,879,1,0,
+ 0,0,164,886,1,0,0,0,166,892,1,0,0,0,168,894,1,0,0,0,170,896,1,0,0,0,172,
+ 903,1,0,0,0,174,905,1,0,0,0,176,907,1,0,0,0,178,909,1,0,0,0,180,911,1,0,
+ 0,0,182,945,1,0,0,0,184,947,1,0,0,0,186,949,1,0,0,0,188,957,1,0,0,0,190,
+ 967,1,0,0,0,192,973,1,0,0,0,194,978,1,0,0,0,196,197,5,91,0,0,197,198,1,
+ 0,0,0,198,199,6,0,0,0,199,3,1,0,0,0,200,201,5,92,0,0,201,202,5,108,0,0,
+ 202,203,5,98,0,0,203,204,5,114,0,0,204,205,5,97,0,0,205,206,5,99,0,0,206,
+ 207,5,107,0,0,207,208,1,0,0,0,208,209,6,1,0,0,209,5,1,0,0,0,210,211,5,59,
+ 0,0,211,7,1,0,0,0,212,213,5,123,0,0,213,9,1,0,0,0,214,215,5,125,0,0,215,
+ 11,1,0,0,0,216,217,5,40,0,0,217,13,1,0,0,0,218,219,5,41,0,0,219,15,1,0,
+ 0,0,220,221,5,124,0,0,221,17,1,0,0,0,222,223,5,124,0,0,223,230,5,124,0,
+ 0,224,225,5,92,0,0,225,226,5,86,0,0,226,227,5,101,0,0,227,228,5,114,0,0,
+ 228,230,5,116,0,0,229,222,1,0,0,0,229,224,1,0,0,0,230,19,1,0,0,0,231,232,
+ 5,95,0,0,232,21,1,0,0,0,233,234,5,92,0,0,234,235,5,112,0,0,235,236,5,105,
+ 0,0,236,23,1,0,0,0,237,238,5,92,0,0,238,239,5,105,0,0,239,240,5,110,0,0,
+ 240,241,5,116,0,0,241,25,1,0,0,0,242,243,5,92,0,0,243,244,5,105,0,0,244,
+ 245,5,110,0,0,245,246,5,116,0,0,246,250,1,0,0,0,247,249,7,0,0,0,248,247,
+ 1,0,0,0,249,252,1,0,0,0,250,248,1,0,0,0,250,251,1,0,0,0,251,253,1,0,0,0,
+ 252,250,1,0,0,0,253,254,5,95,0,0,254,27,1,0,0,0,255,256,5,92,0,0,256,257,
+ 5,105,0,0,257,258,5,110,0,0,258,259,5,116,0,0,259,263,1,0,0,0,260,262,7,
+ 0,0,0,261,260,1,0,0,0,262,265,1,0,0,0,263,261,1,0,0,0,263,264,1,0,0,0,264,
+ 266,1,0,0,0,265,263,1,0,0,0,266,267,5,95,0,0,267,268,7,1,0,0,268,29,1,0,
+ 0,0,269,270,5,92,0,0,270,271,5,105,0,0,271,272,5,110,0,0,272,273,5,116,
+ 0,0,273,277,1,0,0,0,274,276,7,0,0,0,275,274,1,0,0,0,276,279,1,0,0,0,277,
+ 275,1,0,0,0,277,278,1,0,0,0,278,280,1,0,0,0,279,277,1,0,0,0,280,281,5,95,
+ 0,0,281,282,7,2,0,0,282,31,1,0,0,0,283,284,5,92,0,0,284,285,5,109,0,0,285,
+ 286,5,97,0,0,286,287,5,116,0,0,287,288,5,104,0,0,288,289,5,114,0,0,289,
+ 290,5,109,0,0,290,33,1,0,0,0,291,292,5,92,0,0,292,293,5,102,0,0,293,294,
+ 5,114,0,0,294,295,5,97,0,0,295,296,5,99,0,0,296,35,1,0,0,0,297,298,5,92,
+ 0,0,298,299,5,102,0,0,299,300,5,114,0,0,300,301,5,97,0,0,301,302,5,99,0,
+ 0,302,306,1,0,0,0,303,305,7,0,0,0,304,303,1,0,0,0,305,308,1,0,0,0,306,304,
+ 1,0,0,0,306,307,1,0,0,0,307,309,1,0,0,0,308,306,1,0,0,0,309,310,7,1,0,0,
+ 310,311,7,1,0,0,311,37,1,0,0,0,312,313,5,92,0,0,313,314,5,99,0,0,314,315,
+ 5,100,0,0,315,316,5,111,0,0,316,317,5,116,0,0,317,39,1,0,0,0,318,319,5,
+ 92,0,0,319,320,5,116,0,0,320,321,5,105,0,0,321,322,5,109,0,0,322,323,5,
+ 101,0,0,323,324,5,115,0,0,324,41,1,0,0,0,325,326,5,92,0,0,326,327,5,115,
+ 0,0,327,328,5,113,0,0,328,329,5,114,0,0,329,330,5,116,0,0,330,43,1,0,0,
+ 0,331,332,5,92,0,0,332,333,5,115,0,0,333,334,5,113,0,0,334,335,5,114,0,
+ 0,335,336,5,116,0,0,336,340,1,0,0,0,337,339,7,0,0,0,338,337,1,0,0,0,339,
+ 342,1,0,0,0,340,338,1,0,0,0,340,341,1,0,0,0,341,343,1,0,0,0,342,340,1,0,
+ 0,0,343,344,7,1,0,0,344,45,1,0,0,0,345,346,5,92,0,0,346,347,5,115,0,0,347,
+ 348,5,105,0,0,348,349,5,109,0,0,349,47,1,0,0,0,350,351,5,92,0,0,351,352,
+ 5,97,0,0,352,353,5,112,0,0,353,354,5,112,0,0,354,355,5,114,0,0,355,356,
+ 5,111,0,0,356,357,5,120,0,0,357,49,1,0,0,0,358,359,5,94,0,0,359,360,5,123,
+ 0,0,360,361,5,92,0,0,361,362,5,109,0,0,362,363,5,97,0,0,363,364,5,116,0,
+ 0,364,365,5,104,0,0,365,366,5,114,0,0,366,367,5,109,0,0,367,368,5,123,0,
+ 0,368,369,5,84,0,0,369,370,5,125,0,0,370,371,5,125,0,0,371,51,1,0,0,0,372,
+ 373,5,92,0,0,373,53,1,0,0,0,374,375,5,115,0,0,375,376,5,105,0,0,376,377,
+ 5,110,0,0,377,55,1,0,0,0,378,379,5,99,0,0,379,380,5,111,0,0,380,381,5,115,
+ 0,0,381,57,1,0,0,0,382,383,5,116,0,0,383,384,5,97,0,0,384,385,5,110,0,0,
+ 385,59,1,0,0,0,386,387,5,99,0,0,387,388,5,111,0,0,388,389,5,116,0,0,389,
+ 61,1,0,0,0,390,391,5,115,0,0,391,392,5,101,0,0,392,393,5,99,0,0,393,63,
+ 1,0,0,0,394,395,5,99,0,0,395,396,5,115,0,0,396,397,5,99,0,0,397,65,1,0,
+ 0,0,398,399,5,97,0,0,399,400,5,114,0,0,400,401,5,99,0,0,401,402,5,115,0,
+ 0,402,403,5,105,0,0,403,404,5,110,0,0,404,67,1,0,0,0,405,406,5,97,0,0,406,
+ 407,5,114,0,0,407,408,5,99,0,0,408,409,5,99,0,0,409,410,5,111,0,0,410,411,
+ 5,115,0,0,411,69,1,0,0,0,412,413,5,97,0,0,413,414,5,114,0,0,414,415,5,99,
+ 0,0,415,416,5,116,0,0,416,417,5,97,0,0,417,418,5,110,0,0,418,71,1,0,0,0,
+ 419,420,5,115,0,0,420,421,5,105,0,0,421,422,5,110,0,0,422,423,5,104,0,0,
+ 423,73,1,0,0,0,424,425,5,99,0,0,425,426,5,111,0,0,426,427,5,115,0,0,427,
+ 428,5,104,0,0,428,75,1,0,0,0,429,430,5,116,0,0,430,431,5,97,0,0,431,432,
+ 5,110,0,0,432,433,5,104,0,0,433,77,1,0,0,0,434,435,5,99,0,0,435,436,5,111,
+ 0,0,436,437,5,116,0,0,437,438,5,104,0,0,438,79,1,0,0,0,439,440,5,108,0,
+ 0,440,441,5,110,0,0,441,81,1,0,0,0,442,443,5,108,0,0,443,444,5,111,0,0,
+ 444,445,5,103,0,0,445,83,1,0,0,0,446,447,5,92,0,0,447,448,5,108,0,0,448,
+ 449,5,111,0,0,449,450,5,103,0,0,450,454,1,0,0,0,451,453,7,0,0,0,452,451,
+ 1,0,0,0,453,456,1,0,0,0,454,452,1,0,0,0,454,455,1,0,0,0,455,457,1,0,0,0,
+ 456,454,1,0,0,0,457,458,5,95,0,0,458,85,1,0,0,0,459,460,5,92,0,0,460,461,
+ 5,108,0,0,461,462,5,111,0,0,462,463,5,103,0,0,463,467,1,0,0,0,464,466,7,
+ 0,0,0,465,464,1,0,0,0,466,469,1,0,0,0,467,465,1,0,0,0,467,468,1,0,0,0,468,
+ 470,1,0,0,0,469,467,1,0,0,0,470,471,5,95,0,0,471,472,7,1,0,0,472,87,1,0,
+ 0,0,473,474,5,92,0,0,474,475,5,108,0,0,475,476,5,111,0,0,476,477,5,103,
+ 0,0,477,481,1,0,0,0,478,480,7,0,0,0,479,478,1,0,0,0,480,483,1,0,0,0,481,
+ 479,1,0,0,0,481,482,1,0,0,0,482,484,1,0,0,0,483,481,1,0,0,0,484,485,5,95,
+ 0,0,485,486,7,2,0,0,486,89,1,0,0,0,487,488,5,92,0,0,488,489,5,116,0,0,489,
+ 490,5,101,0,0,490,491,5,120,0,0,491,492,5,116,0,0,492,493,5,123,0,0,493,
+ 497,1,0,0,0,494,496,9,0,0,0,495,494,1,0,0,0,496,499,1,0,0,0,497,498,1,0,
+ 0,0,497,495,1,0,0,0,498,500,1,0,0,0,499,497,1,0,0,0,500,501,5,125,0,0,501,
+ 502,1,0,0,0,502,503,6,44,1,0,503,91,1,0,0,0,504,505,5,92,0,0,505,506,5,
+ 108,0,0,506,507,5,101,0,0,507,508,5,102,0,0,508,509,5,116,0,0,509,510,1,
+ 0,0,0,510,511,6,45,1,0,511,93,1,0,0,0,512,513,5,92,0,0,513,514,5,114,0,
+ 0,514,515,5,105,0,0,515,516,5,103,0,0,516,517,5,104,0,0,517,518,5,116,0,
+ 0,518,519,1,0,0,0,519,520,6,46,1,0,520,95,1,0,0,0,521,522,5,36,0,0,522,
+ 523,5,36,0,0,523,524,1,0,0,0,524,525,6,47,1,0,525,97,1,0,0,0,526,527,5,
+ 43,0,0,527,99,1,0,0,0,528,529,5,45,0,0,529,101,1,0,0,0,530,531,5,94,0,0,
+ 531,103,1,0,0,0,532,533,5,61,0,0,533,105,1,0,0,0,534,535,5,60,0,0,535,107,
+ 1,0,0,0,536,537,5,62,0,0,537,109,1,0,0,0,538,539,5,92,0,0,539,540,5,108,
+ 0,0,540,541,5,101,0,0,541,111,1,0,0,0,542,543,5,92,0,0,543,544,5,103,0,
+ 0,544,545,5,101,0,0,545,113,1,0,0,0,546,547,5,44,0,0,547,115,1,0,0,0,548,
+ 549,5,94,0,0,549,550,7,1,0,0,550,117,1,0,0,0,551,552,5,94,0,0,552,553,7,
+ 2,0,0,553,119,1,0,0,0,554,556,3,122,60,0,555,554,1,0,0,0,556,557,1,0,0,
+ 0,557,555,1,0,0,0,557,558,1,0,0,0,558,559,1,0,0,0,559,563,5,46,0,0,560,
+ 562,3,122,60,0,561,560,1,0,0,0,562,565,1,0,0,0,563,561,1,0,0,0,563,564,
+ 1,0,0,0,564,567,1,0,0,0,565,563,1,0,0,0,566,568,3,126,62,0,567,566,1,0,
+ 0,0,567,568,1,0,0,0,568,587,1,0,0,0,569,571,5,46,0,0,570,572,3,122,60,0,
+ 571,570,1,0,0,0,572,573,1,0,0,0,573,571,1,0,0,0,573,574,1,0,0,0,574,576,
+ 1,0,0,0,575,577,3,126,62,0,576,575,1,0,0,0,576,577,1,0,0,0,577,587,1,0,
+ 0,0,578,580,3,122,60,0,579,578,1,0,0,0,580,581,1,0,0,0,581,579,1,0,0,0,
+ 581,582,1,0,0,0,582,584,1,0,0,0,583,585,3,126,62,0,584,583,1,0,0,0,584,
+ 585,1,0,0,0,585,587,1,0,0,0,586,555,1,0,0,0,586,569,1,0,0,0,586,579,1,0,
+ 0,0,587,121,1,0,0,0,588,589,7,1,0,0,589,123,1,0,0,0,590,594,7,2,0,0,591,
+ 593,7,3,0,0,592,591,1,0,0,0,593,596,1,0,0,0,594,592,1,0,0,0,594,595,1,0,
+ 0,0,595,125,1,0,0,0,596,594,1,0,0,0,597,599,7,4,0,0,598,600,7,5,0,0,599,
+ 598,1,0,0,0,599,600,1,0,0,0,600,602,1,0,0,0,601,603,3,122,60,0,602,601,
+ 1,0,0,0,603,604,1,0,0,0,604,602,1,0,0,0,604,605,1,0,0,0,605,127,1,0,0,0,
+ 606,746,5,92,0,0,607,608,5,97,0,0,608,609,5,108,0,0,609,610,5,112,0,0,610,
+ 611,5,104,0,0,611,747,5,97,0,0,612,613,5,98,0,0,613,614,5,101,0,0,614,615,
+ 5,116,0,0,615,747,5,97,0,0,616,617,5,103,0,0,617,618,5,97,0,0,618,619,5,
+ 109,0,0,619,620,5,109,0,0,620,747,5,97,0,0,621,622,5,100,0,0,622,623,5,
+ 101,0,0,623,624,5,108,0,0,624,625,5,116,0,0,625,747,5,97,0,0,626,627,5,
+ 101,0,0,627,628,5,112,0,0,628,629,5,115,0,0,629,630,5,105,0,0,630,631,5,
+ 108,0,0,631,632,5,111,0,0,632,747,5,110,0,0,633,634,5,122,0,0,634,635,5,
+ 101,0,0,635,636,5,116,0,0,636,747,5,97,0,0,637,638,5,101,0,0,638,639,5,
+ 116,0,0,639,747,5,97,0,0,640,641,5,116,0,0,641,642,5,104,0,0,642,643,5,
+ 101,0,0,643,644,5,116,0,0,644,747,5,97,0,0,645,646,5,105,0,0,646,647,5,
+ 111,0,0,647,648,5,116,0,0,648,747,5,97,0,0,649,650,5,107,0,0,650,651,5,
+ 97,0,0,651,652,5,112,0,0,652,653,5,112,0,0,653,747,5,97,0,0,654,655,5,108,
+ 0,0,655,656,5,97,0,0,656,657,5,109,0,0,657,658,5,98,0,0,658,659,5,100,0,
+ 0,659,747,5,97,0,0,660,661,5,109,0,0,661,747,5,117,0,0,662,663,5,110,0,
+ 0,663,747,5,117,0,0,664,665,5,120,0,0,665,747,5,105,0,0,666,667,5,114,0,
+ 0,667,668,5,104,0,0,668,747,5,111,0,0,669,670,5,115,0,0,670,671,5,105,0,
+ 0,671,672,5,103,0,0,672,673,5,109,0,0,673,747,5,97,0,0,674,675,5,116,0,
+ 0,675,676,5,97,0,0,676,747,5,117,0,0,677,678,5,117,0,0,678,679,5,112,0,
+ 0,679,680,5,115,0,0,680,681,5,105,0,0,681,682,5,108,0,0,682,683,5,111,0,
+ 0,683,747,5,110,0,0,684,685,5,112,0,0,685,686,5,104,0,0,686,747,5,105,0,
+ 0,687,688,5,99,0,0,688,689,5,104,0,0,689,747,5,105,0,0,690,691,5,112,0,
+ 0,691,692,5,115,0,0,692,747,5,105,0,0,693,694,5,111,0,0,694,695,5,109,0,
+ 0,695,696,5,101,0,0,696,697,5,103,0,0,697,747,5,97,0,0,698,699,5,71,0,0,
+ 699,700,5,97,0,0,700,701,5,109,0,0,701,702,5,109,0,0,702,747,5,97,0,0,703,
+ 704,5,68,0,0,704,705,5,101,0,0,705,706,5,108,0,0,706,707,5,116,0,0,707,
+ 747,5,97,0,0,708,709,5,84,0,0,709,710,5,104,0,0,710,711,5,101,0,0,711,712,
+ 5,116,0,0,712,747,5,97,0,0,713,714,5,76,0,0,714,715,5,97,0,0,715,716,5,
+ 109,0,0,716,717,5,98,0,0,717,718,5,100,0,0,718,747,5,97,0,0,719,720,5,88,
+ 0,0,720,747,5,105,0,0,721,722,5,80,0,0,722,747,5,105,0,0,723,724,5,83,0,
+ 0,724,725,5,105,0,0,725,726,5,103,0,0,726,727,5,109,0,0,727,747,5,97,0,
+ 0,728,729,5,85,0,0,729,730,5,112,0,0,730,731,5,115,0,0,731,732,5,105,0,
+ 0,732,733,5,108,0,0,733,734,5,111,0,0,734,747,5,110,0,0,735,736,5,80,0,
+ 0,736,737,5,104,0,0,737,747,5,105,0,0,738,739,5,80,0,0,739,740,5,115,0,
+ 0,740,747,5,105,0,0,741,742,5,79,0,0,742,743,5,109,0,0,743,744,5,101,0,
+ 0,744,745,5,103,0,0,745,747,5,97,0,0,746,607,1,0,0,0,746,612,1,0,0,0,746,
+ 616,1,0,0,0,746,621,1,0,0,0,746,626,1,0,0,0,746,633,1,0,0,0,746,637,1,0,
+ 0,0,746,640,1,0,0,0,746,645,1,0,0,0,746,649,1,0,0,0,746,654,1,0,0,0,746,
+ 660,1,0,0,0,746,662,1,0,0,0,746,664,1,0,0,0,746,666,1,0,0,0,746,669,1,0,
+ 0,0,746,674,1,0,0,0,746,677,1,0,0,0,746,684,1,0,0,0,746,687,1,0,0,0,746,
+ 690,1,0,0,0,746,693,1,0,0,0,746,698,1,0,0,0,746,703,1,0,0,0,746,708,1,0,
+ 0,0,746,713,1,0,0,0,746,719,1,0,0,0,746,721,1,0,0,0,746,723,1,0,0,0,746,
+ 728,1,0,0,0,746,735,1,0,0,0,746,738,1,0,0,0,746,741,1,0,0,0,747,129,1,0,
+ 0,0,748,749,5,92,0,0,749,750,5,98,0,0,750,751,5,101,0,0,751,752,5,103,0,
+ 0,752,753,5,105,0,0,753,754,5,110,0,0,754,755,5,123,0,0,755,756,5,98,0,
+ 0,756,757,5,109,0,0,757,758,5,97,0,0,758,759,5,116,0,0,759,760,5,114,0,
+ 0,760,761,5,105,0,0,761,762,5,120,0,0,762,763,5,125,0,0,763,131,1,0,0,0,
+ 764,765,5,92,0,0,765,766,5,101,0,0,766,767,5,110,0,0,767,768,5,100,0,0,
+ 768,769,5,123,0,0,769,770,5,98,0,0,770,771,5,109,0,0,771,772,5,97,0,0,772,
+ 773,5,116,0,0,773,774,5,114,0,0,774,775,5,105,0,0,775,776,5,120,0,0,776,
+ 777,5,125,0,0,777,133,1,0,0,0,778,779,5,38,0,0,779,135,1,0,0,0,780,781,
+ 5,92,0,0,781,782,5,92,0,0,782,137,1,0,0,0,783,785,7,0,0,0,784,783,1,0,0,
+ 0,785,788,1,0,0,0,786,784,1,0,0,0,786,787,1,0,0,0,787,789,1,0,0,0,788,786,
+ 1,0,0,0,789,790,5,95,0,0,790,791,5,123,0,0,791,793,1,0,0,0,792,794,7,3,
+ 0,0,793,792,1,0,0,0,794,795,1,0,0,0,795,793,1,0,0,0,795,796,1,0,0,0,796,
+ 797,1,0,0,0,797,807,5,125,0,0,798,800,7,0,0,0,799,798,1,0,0,0,800,803,1,
+ 0,0,0,801,799,1,0,0,0,801,802,1,0,0,0,802,804,1,0,0,0,803,801,1,0,0,0,804,
+ 805,5,95,0,0,805,807,7,3,0,0,806,786,1,0,0,0,806,801,1,0,0,0,807,139,1,
+ 0,0,0,808,809,5,94,0,0,809,810,7,2,0,0,810,811,3,138,68,0,811,141,1,0,0,
+ 0,812,815,3,124,61,0,813,815,3,128,63,0,814,812,1,0,0,0,814,813,1,0,0,0,
+ 815,817,1,0,0,0,816,818,3,138,68,0,817,816,1,0,0,0,817,818,1,0,0,0,818,
+ 143,1,0,0,0,819,821,7,6,0,0,820,819,1,0,0,0,821,822,1,0,0,0,822,820,1,0,
+ 0,0,822,823,1,0,0,0,823,824,1,0,0,0,824,825,6,71,1,0,825,145,1,0,0,0,826,
+ 827,5,92,0,0,827,828,5,32,0,0,828,829,1,0,0,0,829,830,6,72,1,0,830,147,
+ 1,0,0,0,831,832,5,92,0,0,832,833,5,58,0,0,833,834,1,0,0,0,834,835,6,73,
+ 1,0,835,149,1,0,0,0,836,837,9,0,0,0,837,151,1,0,0,0,838,839,5,93,0,0,839,
+ 840,1,0,0,0,840,841,6,75,2,0,841,153,1,0,0,0,842,843,5,92,0,0,843,844,5,
+ 114,0,0,844,845,5,98,0,0,845,846,5,114,0,0,846,847,5,97,0,0,847,848,5,99,
+ 0,0,848,849,5,107,0,0,849,850,1,0,0,0,850,851,6,76,2,0,851,155,1,0,0,0,
+ 852,853,5,92,0,0,853,854,5,102,0,0,854,855,5,114,0,0,855,856,5,97,0,0,856,
+ 857,5,99,0,0,857,157,1,0,0,0,858,859,5,92,0,0,859,860,5,102,0,0,860,861,
+ 5,114,0,0,861,862,5,97,0,0,862,863,5,99,0,0,863,867,1,0,0,0,864,866,7,0,
+ 0,0,865,864,1,0,0,0,866,869,1,0,0,0,867,865,1,0,0,0,867,868,1,0,0,0,868,
+ 870,1,0,0,0,869,867,1,0,0,0,870,871,7,1,0,0,871,872,7,1,0,0,872,159,1,0,
+ 0,0,873,874,5,92,0,0,874,875,5,99,0,0,875,876,5,100,0,0,876,877,5,111,0,
+ 0,877,878,5,116,0,0,878,161,1,0,0,0,879,880,5,92,0,0,880,881,5,116,0,0,
+ 881,882,5,105,0,0,882,883,5,109,0,0,883,884,5,101,0,0,884,885,5,115,0,0,
+ 885,163,1,0,0,0,886,887,5,92,0,0,887,888,5,115,0,0,888,889,5,113,0,0,889,
+ 890,5,114,0,0,890,891,5,116,0,0,891,165,1,0,0,0,892,893,5,44,0,0,893,167,
+ 1,0,0,0,894,895,5,94,0,0,895,169,1,0,0,0,896,900,7,2,0,0,897,899,7,3,0,
+ 0,898,897,1,0,0,0,899,902,1,0,0,0,900,898,1,0,0,0,900,901,1,0,0,0,901,171,
+ 1,0,0,0,902,900,1,0,0,0,903,904,5,40,0,0,904,173,1,0,0,0,905,906,5,41,0,
+ 0,906,175,1,0,0,0,907,908,5,123,0,0,908,177,1,0,0,0,909,910,5,125,0,0,910,
+ 179,1,0,0,0,911,912,5,49,0,0,912,181,1,0,0,0,913,915,5,45,0,0,914,913,1,
+ 0,0,0,914,915,1,0,0,0,915,917,1,0,0,0,916,918,3,184,91,0,917,916,1,0,0,
+ 0,918,919,1,0,0,0,919,917,1,0,0,0,919,920,1,0,0,0,920,921,1,0,0,0,921,925,
+ 5,46,0,0,922,924,3,184,91,0,923,922,1,0,0,0,924,927,1,0,0,0,925,923,1,0,
+ 0,0,925,926,1,0,0,0,926,946,1,0,0,0,927,925,1,0,0,0,928,930,5,45,0,0,929,
+ 928,1,0,0,0,929,930,1,0,0,0,930,931,1,0,0,0,931,933,5,46,0,0,932,934,3,
+ 184,91,0,933,932,1,0,0,0,934,935,1,0,0,0,935,933,1,0,0,0,935,936,1,0,0,
+ 0,936,946,1,0,0,0,937,939,5,45,0,0,938,937,1,0,0,0,938,939,1,0,0,0,939,
+ 941,1,0,0,0,940,942,3,184,91,0,941,940,1,0,0,0,942,943,1,0,0,0,943,941,
+ 1,0,0,0,943,944,1,0,0,0,944,946,1,0,0,0,945,914,1,0,0,0,945,929,1,0,0,0,
+ 945,938,1,0,0,0,946,183,1,0,0,0,947,948,7,1,0,0,948,185,1,0,0,0,949,950,
+ 5,92,0,0,950,951,5,108,0,0,951,952,5,101,0,0,952,953,5,102,0,0,953,954,
+ 5,116,0,0,954,955,1,0,0,0,955,956,6,92,1,0,956,187,1,0,0,0,957,958,5,92,
+ 0,0,958,959,5,114,0,0,959,960,5,105,0,0,960,961,5,103,0,0,961,962,5,104,
+ 0,0,962,963,5,116,0,0,963,964,1,0,0,0,964,965,6,93,1,0,965,189,1,0,0,0,
+ 966,968,7,6,0,0,967,966,1,0,0,0,968,969,1,0,0,0,969,967,1,0,0,0,969,970,
+ 1,0,0,0,970,971,1,0,0,0,971,972,6,94,1,0,972,191,1,0,0,0,973,974,5,92,0,
+ 0,974,975,5,32,0,0,975,976,1,0,0,0,976,977,6,95,1,0,977,193,1,0,0,0,978,
+ 979,9,0,0,0,979,195,1,0,0,0,42,0,1,229,250,263,277,306,340,454,467,481,
+ 497,557,563,567,573,576,581,584,586,594,599,604,746,786,795,801,806,814,
+ 817,822,867,900,914,919,925,929,935,938,943,945,969,3,2,1,0,6,0,0,2,0,0];
private static __ATN: ATN;
public static get _ATN(): ATN {
diff --git a/src/parser/LatexParser.g4 b/src/parser/LatexParser.g4
index 29c9d52f..e97d85c9 100644
--- a/src/parser/LatexParser.g4
+++ b/src/parser/LatexParser.g4
@@ -2,7 +2,11 @@ parser grammar LatexParser;
options { tokenVocab=LatexLexer; }
-statement: (assign | assign_list | assign_plus_query | query | equality | u_block | number | id | id_list | guess | guess_list | expr | condition | piecewise_assign)? EOF;
+statement: (assign | assign_list | assign_plus_query | query | equality |
+ u_block | number | id | id_list | guess | guess_list | expr |
+ condition | piecewise_assign | insert_matrix)? EOF;
+
+insert_matrix: .*? u_insert_matrix .*?;
id: ID ;
@@ -24,7 +28,7 @@ piecewise_assign: (id | PI) EQ id L_PAREN ( piecewise_arg (COMMA piecewise_arg)*
piecewise_arg: L_PAREN expr COMMA condition R_PAREN;
-trig_function: BACK_SLASH? (CMD_SIN | CMD_COS | CMD_TAN | CMD_COT | CMD_SEC | CMD_CSC
+trig_function: BACKSLASH? (CMD_SIN | CMD_COS | CMD_TAN | CMD_COT | CMD_SEC | CMD_CSC
| CMD_ARCSIN | CMD_ARCCOS | CMD_ARCTAN | CMD_SINH | CMD_COSH
| CMD_TANH | CMD_COTH)
;
@@ -59,31 +63,38 @@ condition_single: expr operator=(LT | LTE | GT | GTE ) expr;
condition_chain: expr lower=(LT | LTE | GT | GTE ) expr upper=(LT | LTE | GT | GTE ) expr;
+matrix_row: expr (AMPERSAND expr)*;
+
expr: id CARET_SINGLE_CHAR_ID_UNDERSCORE_SUBSCRIPT #exponent
| id (CARET_SINGLE_CHAR_ID | CARET_SINGLE_CHAR_NUMBER) UNDERSCORE_SUBSCRIPT #exponent
| id CARET L_BRACE expr R_BRACE UNDERSCORE_SUBSCRIPT #exponent
| expr (CARET_SINGLE_CHAR_ID | CARET_SINGLE_CHAR_NUMBER) #exponent
| expr CARET L_BRACE expr R_BRACE #exponent
+ | expr UNDERSCORE L_BRACE expr COMMA expr R_BRACE #index
+ | expr TRANSPOSE #transpose
| CMD_SQRT_INT #singleIntSqrt
| CMD_SQRT L_BRACE expr R_BRACE #sqrt
+ | BEGIN_MATRIX matrix_row (DOUBLE_BACKSLASH matrix_row)* END_MATRIX #matrix
| trig_function L_PAREN expr R_PAREN #trig
| indefinite_integral_cmd #indefiniteIntegral
| integral_cmd #integral
| derivative_cmd #derivative
| n_derivative_cmd #nDerivative
- | BACK_SLASH? CMD_LN L_PAREN expr R_PAREN #ln
- | BACK_SLASH? CMD_LOG L_PAREN expr R_PAREN #log
+ | BACKSLASH? CMD_LN L_PAREN expr R_PAREN #ln
+ | BACKSLASH? CMD_LOG L_PAREN expr R_PAREN #log
| CMD_SLASH_LOG_UNDERSCORE L_BRACE expr R_BRACE L_PAREN expr R_PAREN #baseLog
| (CMD_SLASH_LOG_UNDERSCORE_SINGLE_CHAR_ID | CMD_SLASH_LOG_UNDERSCORE_SINGLE_CHAR_NUMBER) L_PAREN expr R_PAREN #baseLogSingleChar
+ | DOUBLE_VBAR expr DOUBLE_VBAR #norm
| VBAR expr VBAR #abs
| number_with_units #numberWithUnitsExpr
| number #numberExpr
| SUB expr #unaryMinus
+ | expr CMD_TIMES expr #matrixMultiply
| expr CMD_CDOT expr #multiply
| CMD_FRAC L_BRACE expr R_BRACE L_BRACE expr R_BRACE #divide
| CMD_FRAC_INTS #divideInts
+ | expr SUB expr #subtract
| expr ADD expr #add
- | expr SUB expr #subtract
| id #variable
| id L_PAREN (argument (COMMA argument)*) R_PAREN (points_id_0=ID num_points=number points_id_1=ID)? #function
| (CMD_MATHRM L_BRACE id R_BRACE | id) L_PAREN (expr (COMMA expr)*) R_PAREN #builtinFunction
@@ -94,6 +105,8 @@ expr: id CARET_SINGLE_CHAR_ID_UNDERSCORE_SUBSCRIPT #exp
u_block: (L_BRACKET | ALT_L_BRACKET) u_expr (R_BRACKET | ALT_R_BRACKET);
+u_insert_matrix: (L_BRACKET | ALT_L_BRACKET) numRows=(U_NUMBER | U_ONE) (U_COMMA | U_CMD_TIMES) numColumns=(U_NUMBER | U_ONE) (R_BRACKET | ALT_R_BRACKET) ;
+
u_fraction: U_CMD_FRAC U_L_BRACE (U_NUMBER | U_ONE) U_R_BRACE U_L_BRACE U_NUMBER U_R_BRACE
| U_CMD_FRAC_INTS;
diff --git a/src/parser/LatexParser.ts b/src/parser/LatexParser.ts
index fff90900..e573dc7c 100644
--- a/src/parser/LatexParser.ts
+++ b/src/parser/LatexParser.ts
@@ -27,122 +27,135 @@ export default class LatexParser extends Parser {
public static readonly L_PAREN = 6;
public static readonly R_PAREN = 7;
public static readonly VBAR = 8;
- public static readonly UNDERSCORE = 9;
- public static readonly PI = 10;
- public static readonly CMD_INT = 11;
- public static readonly CMD_INT_UNDERSCORE = 12;
- public static readonly CMD_INT_UNDERSCORE_SINGLE_CHAR_NUMBER = 13;
- public static readonly CMD_INT_UNDERSCORE_SINGLE_CHAR_ID = 14;
- public static readonly CMD_MATHRM = 15;
- public static readonly CMD_FRAC = 16;
- public static readonly CMD_FRAC_INTS = 17;
- public static readonly CMD_CDOT = 18;
- public static readonly CMD_SQRT = 19;
- public static readonly CMD_SQRT_INT = 20;
- public static readonly CMD_SIM = 21;
- public static readonly CMD_APPROX = 22;
- public static readonly BACK_SLASH = 23;
- public static readonly CMD_SIN = 24;
- public static readonly CMD_COS = 25;
- public static readonly CMD_TAN = 26;
- public static readonly CMD_COT = 27;
- public static readonly CMD_SEC = 28;
- public static readonly CMD_CSC = 29;
- public static readonly CMD_ARCSIN = 30;
- public static readonly CMD_ARCCOS = 31;
- public static readonly CMD_ARCTAN = 32;
- public static readonly CMD_SINH = 33;
- public static readonly CMD_COSH = 34;
- public static readonly CMD_TANH = 35;
- public static readonly CMD_COTH = 36;
- public static readonly CMD_LN = 37;
- public static readonly CMD_LOG = 38;
- public static readonly CMD_SLASH_LOG_UNDERSCORE = 39;
- public static readonly CMD_SLASH_LOG_UNDERSCORE_SINGLE_CHAR_NUMBER = 40;
- public static readonly CMD_SLASH_LOG_UNDERSCORE_SINGLE_CHAR_ID = 41;
- public static readonly COMMENT = 42;
- public static readonly CMD_LEFT = 43;
- public static readonly CMD_RIGHT = 44;
- public static readonly DOUBLE_DOLLAR_SIGN = 45;
- public static readonly ADD = 46;
- public static readonly SUB = 47;
- public static readonly CARET = 48;
- public static readonly EQ = 49;
- public static readonly LT = 50;
- public static readonly GT = 51;
- public static readonly LTE = 52;
- public static readonly GTE = 53;
- public static readonly COMMA = 54;
- public static readonly CARET_SINGLE_CHAR_NUMBER = 55;
- public static readonly CARET_SINGLE_CHAR_ID = 56;
- public static readonly NUMBER = 57;
- public static readonly UNDERSCORE_SUBSCRIPT = 58;
- public static readonly CARET_SINGLE_CHAR_ID_UNDERSCORE_SUBSCRIPT = 59;
- public static readonly ID = 60;
- public static readonly WS = 61;
- public static readonly SLASH_SPACE = 62;
- public static readonly SLASH_COLON = 63;
- public static readonly ERROR_CHAR = 64;
- public static readonly R_BRACKET = 65;
- public static readonly ALT_R_BRACKET = 66;
- public static readonly U_CMD_FRAC = 67;
- public static readonly U_CMD_FRAC_INTS = 68;
- public static readonly U_CMD_CDOT = 69;
- public static readonly U_CMD_SQRT = 70;
- public static readonly U_CARET = 71;
- public static readonly U_NAME = 72;
- public static readonly U_L_PAREN = 73;
- public static readonly U_R_PAREN = 74;
- public static readonly U_L_BRACE = 75;
- public static readonly U_R_BRACE = 76;
- public static readonly U_ONE = 77;
- public static readonly U_NUMBER = 78;
- public static readonly U_CMD_LEFT = 79;
- public static readonly U_CMD_RIGHT = 80;
- public static readonly U_WS = 81;
- public static readonly U_SLASH_SPACE = 82;
- public static readonly U_ERROR_CHAR = 83;
+ public static readonly DOUBLE_VBAR = 9;
+ public static readonly UNDERSCORE = 10;
+ public static readonly PI = 11;
+ public static readonly CMD_INT = 12;
+ public static readonly CMD_INT_UNDERSCORE = 13;
+ public static readonly CMD_INT_UNDERSCORE_SINGLE_CHAR_NUMBER = 14;
+ public static readonly CMD_INT_UNDERSCORE_SINGLE_CHAR_ID = 15;
+ public static readonly CMD_MATHRM = 16;
+ public static readonly CMD_FRAC = 17;
+ public static readonly CMD_FRAC_INTS = 18;
+ public static readonly CMD_CDOT = 19;
+ public static readonly CMD_TIMES = 20;
+ public static readonly CMD_SQRT = 21;
+ public static readonly CMD_SQRT_INT = 22;
+ public static readonly CMD_SIM = 23;
+ public static readonly CMD_APPROX = 24;
+ public static readonly TRANSPOSE = 25;
+ public static readonly BACKSLASH = 26;
+ public static readonly CMD_SIN = 27;
+ public static readonly CMD_COS = 28;
+ public static readonly CMD_TAN = 29;
+ public static readonly CMD_COT = 30;
+ public static readonly CMD_SEC = 31;
+ public static readonly CMD_CSC = 32;
+ public static readonly CMD_ARCSIN = 33;
+ public static readonly CMD_ARCCOS = 34;
+ public static readonly CMD_ARCTAN = 35;
+ public static readonly CMD_SINH = 36;
+ public static readonly CMD_COSH = 37;
+ public static readonly CMD_TANH = 38;
+ public static readonly CMD_COTH = 39;
+ public static readonly CMD_LN = 40;
+ public static readonly CMD_LOG = 41;
+ public static readonly CMD_SLASH_LOG_UNDERSCORE = 42;
+ public static readonly CMD_SLASH_LOG_UNDERSCORE_SINGLE_CHAR_NUMBER = 43;
+ public static readonly CMD_SLASH_LOG_UNDERSCORE_SINGLE_CHAR_ID = 44;
+ public static readonly COMMENT = 45;
+ public static readonly CMD_LEFT = 46;
+ public static readonly CMD_RIGHT = 47;
+ public static readonly DOUBLE_DOLLAR_SIGN = 48;
+ public static readonly ADD = 49;
+ public static readonly SUB = 50;
+ public static readonly CARET = 51;
+ public static readonly EQ = 52;
+ public static readonly LT = 53;
+ public static readonly GT = 54;
+ public static readonly LTE = 55;
+ public static readonly GTE = 56;
+ public static readonly COMMA = 57;
+ public static readonly CARET_SINGLE_CHAR_NUMBER = 58;
+ public static readonly CARET_SINGLE_CHAR_ID = 59;
+ public static readonly NUMBER = 60;
+ public static readonly BEGIN_MATRIX = 61;
+ public static readonly END_MATRIX = 62;
+ public static readonly AMPERSAND = 63;
+ public static readonly DOUBLE_BACKSLASH = 64;
+ public static readonly UNDERSCORE_SUBSCRIPT = 65;
+ public static readonly CARET_SINGLE_CHAR_ID_UNDERSCORE_SUBSCRIPT = 66;
+ public static readonly ID = 67;
+ public static readonly WS = 68;
+ public static readonly SLASH_SPACE = 69;
+ public static readonly SLASH_COLON = 70;
+ public static readonly ERROR_CHAR = 71;
+ public static readonly R_BRACKET = 72;
+ public static readonly ALT_R_BRACKET = 73;
+ public static readonly U_CMD_FRAC = 74;
+ public static readonly U_CMD_FRAC_INTS = 75;
+ public static readonly U_CMD_CDOT = 76;
+ public static readonly U_CMD_TIMES = 77;
+ public static readonly U_CMD_SQRT = 78;
+ public static readonly U_COMMA = 79;
+ public static readonly U_CARET = 80;
+ public static readonly U_NAME = 81;
+ public static readonly U_L_PAREN = 82;
+ public static readonly U_R_PAREN = 83;
+ public static readonly U_L_BRACE = 84;
+ public static readonly U_R_BRACE = 85;
+ public static readonly U_ONE = 86;
+ public static readonly U_NUMBER = 87;
+ public static readonly U_CMD_LEFT = 88;
+ public static readonly U_CMD_RIGHT = 89;
+ public static readonly U_WS = 90;
+ public static readonly U_SLASH_SPACE = 91;
+ public static readonly U_ERROR_CHAR = 92;
public static readonly EOF = Token.EOF;
public static readonly RULE_statement = 0;
- public static readonly RULE_id = 1;
- public static readonly RULE_number = 2;
- public static readonly RULE_number_with_units = 3;
- public static readonly RULE_assign = 4;
- public static readonly RULE_assign_list = 5;
- public static readonly RULE_assign_plus_query = 6;
- public static readonly RULE_query = 7;
- public static readonly RULE_equality = 8;
- public static readonly RULE_piecewise_assign = 9;
- public static readonly RULE_piecewise_arg = 10;
- public static readonly RULE_trig_function = 11;
- public static readonly RULE_indefinite_integral_cmd = 12;
- public static readonly RULE_integral_cmd = 13;
- public static readonly RULE_derivative_cmd = 14;
- public static readonly RULE_n_derivative_cmd = 15;
- public static readonly RULE_argument = 16;
- public static readonly RULE_condition = 17;
- public static readonly RULE_id_list = 18;
- public static readonly RULE_guess = 19;
- public static readonly RULE_guess_list = 20;
- public static readonly RULE_condition_single = 21;
- public static readonly RULE_condition_chain = 22;
- public static readonly RULE_expr = 23;
- public static readonly RULE_u_block = 24;
- public static readonly RULE_u_fraction = 25;
- public static readonly RULE_u_expr = 26;
+ public static readonly RULE_insert_matrix = 1;
+ public static readonly RULE_id = 2;
+ public static readonly RULE_number = 3;
+ public static readonly RULE_number_with_units = 4;
+ public static readonly RULE_assign = 5;
+ public static readonly RULE_assign_list = 6;
+ public static readonly RULE_assign_plus_query = 7;
+ public static readonly RULE_query = 8;
+ public static readonly RULE_equality = 9;
+ public static readonly RULE_piecewise_assign = 10;
+ public static readonly RULE_piecewise_arg = 11;
+ public static readonly RULE_trig_function = 12;
+ public static readonly RULE_indefinite_integral_cmd = 13;
+ public static readonly RULE_integral_cmd = 14;
+ public static readonly RULE_derivative_cmd = 15;
+ public static readonly RULE_n_derivative_cmd = 16;
+ public static readonly RULE_argument = 17;
+ public static readonly RULE_condition = 18;
+ public static readonly RULE_id_list = 19;
+ public static readonly RULE_guess = 20;
+ public static readonly RULE_guess_list = 21;
+ public static readonly RULE_condition_single = 22;
+ public static readonly RULE_condition_chain = 23;
+ public static readonly RULE_matrix_row = 24;
+ public static readonly RULE_expr = 25;
+ public static readonly RULE_u_block = 26;
+ public static readonly RULE_u_insert_matrix = 27;
+ public static readonly RULE_u_fraction = 28;
+ public static readonly RULE_u_expr = 29;
public static readonly literalNames: (string | null)[] = [ null, "'['",
"'\\lbrack'",
"';'", null,
null, null,
null, "'|'",
- "'_'", "'\\pi'",
- "'\\int'", null,
+ null, "'_'",
+ "'\\pi'", "'\\int'",
null, null,
- "'\\mathrm'",
+ null, "'\\mathrm'",
null, null,
null, null,
- null, "'\\sim'",
- "'\\approx'",
+ null, null,
+ "'\\sim'", "'\\approx'",
+ "'^{\\mathrm{T}}'",
"'\\'", "'sin'",
"'cos'", "'tan'",
"'cot'", "'sec'",
@@ -159,13 +172,17 @@ export default class LatexParser extends Parser {
"'-'", null,
"'='", "'<'",
"'>'", "'\\le'",
- "'\\ge'", "','",
+ "'\\ge'", null,
null, null,
+ null, "'\\begin{bmatrix}'",
+ "'\\end{bmatrix}'",
+ "'&'", "'\\\\'",
null, null,
null, null,
+ null, "'\\:'",
+ null, "']'",
+ "'\\rbrack'",
null, null,
- "'\\:'", null,
- "']'", "'\\rbrack'",
null, null,
null, null,
null, null,
@@ -179,7 +196,8 @@ export default class LatexParser extends Parser {
"R_BRACE",
"L_PAREN",
"R_PAREN",
- "VBAR", "UNDERSCORE",
+ "VBAR", "DOUBLE_VBAR",
+ "UNDERSCORE",
"PI", "CMD_INT",
"CMD_INT_UNDERSCORE",
"CMD_INT_UNDERSCORE_SINGLE_CHAR_NUMBER",
@@ -188,11 +206,13 @@ export default class LatexParser extends Parser {
"CMD_FRAC",
"CMD_FRAC_INTS",
"CMD_CDOT",
+ "CMD_TIMES",
"CMD_SQRT",
"CMD_SQRT_INT",
"CMD_SIM",
"CMD_APPROX",
- "BACK_SLASH",
+ "TRANSPOSE",
+ "BACKSLASH",
"CMD_SIN",
"CMD_COS",
"CMD_TAN",
@@ -220,7 +240,11 @@ export default class LatexParser extends Parser {
"LTE", "GTE",
"COMMA", "CARET_SINGLE_CHAR_NUMBER",
"CARET_SINGLE_CHAR_ID",
- "NUMBER", "UNDERSCORE_SUBSCRIPT",
+ "NUMBER", "BEGIN_MATRIX",
+ "END_MATRIX",
+ "AMPERSAND",
+ "DOUBLE_BACKSLASH",
+ "UNDERSCORE_SUBSCRIPT",
"CARET_SINGLE_CHAR_ID_UNDERSCORE_SUBSCRIPT",
"ID", "WS",
"SLASH_SPACE",
@@ -231,7 +255,9 @@ export default class LatexParser extends Parser {
"U_CMD_FRAC",
"U_CMD_FRAC_INTS",
"U_CMD_CDOT",
+ "U_CMD_TIMES",
"U_CMD_SQRT",
+ "U_COMMA",
"U_CARET",
"U_NAME", "U_L_PAREN",
"U_R_PAREN",
@@ -244,12 +270,12 @@ export default class LatexParser extends Parser {
"U_ERROR_CHAR" ];
// tslint:disable:no-trailing-whitespace
public static readonly ruleNames: string[] = [
- "statement", "id", "number", "number_with_units", "assign", "assign_list",
- "assign_plus_query", "query", "equality", "piecewise_assign", "piecewise_arg",
- "trig_function", "indefinite_integral_cmd", "integral_cmd", "derivative_cmd",
- "n_derivative_cmd", "argument", "condition", "id_list", "guess", "guess_list",
- "condition_single", "condition_chain", "expr", "u_block", "u_fraction",
- "u_expr",
+ "statement", "insert_matrix", "id", "number", "number_with_units", "assign",
+ "assign_list", "assign_plus_query", "query", "equality", "piecewise_assign",
+ "piecewise_arg", "trig_function", "indefinite_integral_cmd", "integral_cmd",
+ "derivative_cmd", "n_derivative_cmd", "argument", "condition", "id_list",
+ "guess", "guess_list", "condition_single", "condition_chain", "matrix_row",
+ "expr", "u_block", "u_insert_matrix", "u_fraction", "u_expr",
];
public get grammarFileName(): string { return "LatexParser.g4"; }
public get literalNames(): (string | null)[] { return LatexParser.literalNames; }
@@ -272,95 +298,101 @@ export default class LatexParser extends Parser {
try {
this.enterOuterAlt(localctx, 1);
{
- this.state = 68;
+ this.state = 75;
this._errHandler.sync(this);
switch ( this._interp.adaptivePredict(this._input, 0, this._ctx) ) {
case 1:
{
- this.state = 54;
+ this.state = 60;
this.assign();
}
break;
case 2:
{
- this.state = 55;
+ this.state = 61;
this.assign_list();
}
break;
case 3:
{
- this.state = 56;
+ this.state = 62;
this.assign_plus_query();
}
break;
case 4:
{
- this.state = 57;
+ this.state = 63;
this.query();
}
break;
case 5:
{
- this.state = 58;
+ this.state = 64;
this.equality();
}
break;
case 6:
{
- this.state = 59;
+ this.state = 65;
this.u_block();
}
break;
case 7:
{
- this.state = 60;
+ this.state = 66;
this.number_();
}
break;
case 8:
{
- this.state = 61;
+ this.state = 67;
this.id();
}
break;
case 9:
{
- this.state = 62;
+ this.state = 68;
this.id_list();
}
break;
case 10:
{
- this.state = 63;
+ this.state = 69;
this.guess();
}
break;
case 11:
{
- this.state = 64;
+ this.state = 70;
this.guess_list();
}
break;
case 12:
{
- this.state = 65;
+ this.state = 71;
this.expr(0);
}
break;
case 13:
{
- this.state = 66;
+ this.state = 72;
this.condition();
}
break;
case 14:
{
- this.state = 67;
+ this.state = 73;
this.piecewise_assign();
}
break;
+ case 15:
+ {
+ this.state = 74;
+ this.insert_matrix();
+ }
+ break;
}
- this.state = 70;
+ this.state = 77;
this.match(LatexParser.EOF);
}
}
@@ -379,13 +411,71 @@ export default class LatexParser extends Parser {
return localctx;
}
// @RuleVersion(0)
+ public insert_matrix(): Insert_matrixContext {
+ let localctx: Insert_matrixContext = new Insert_matrixContext(this, this._ctx, this.state);
+ this.enterRule(localctx, 2, LatexParser.RULE_insert_matrix);
+ try {
+ let _alt: number;
+ this.enterOuterAlt(localctx, 1);
+ {
+ this.state = 82;
+ this._errHandler.sync(this);
+ _alt = this._interp.adaptivePredict(this._input, 1, this._ctx);
+ while (_alt !== 1 && _alt !== ATN.INVALID_ALT_NUMBER) {
+ if (_alt === 1 + 1) {
+ {
+ {
+ this.state = 79;
+ this.matchWildcard();
+ }
+ }
+ }
+ this.state = 84;
+ this._errHandler.sync(this);
+ _alt = this._interp.adaptivePredict(this._input, 1, this._ctx);
+ }
+ this.state = 85;
+ this.u_insert_matrix();
+ this.state = 89;
+ this._errHandler.sync(this);
+ _alt = this._interp.adaptivePredict(this._input, 2, this._ctx);
+ while (_alt !== 1 && _alt !== ATN.INVALID_ALT_NUMBER) {
+ if (_alt === 1 + 1) {
+ {
+ {
+ this.state = 86;
+ this.matchWildcard();
+ }
+ }
+ }
+ this.state = 91;
+ this._errHandler.sync(this);
+ _alt = this._interp.adaptivePredict(this._input, 2, this._ctx);
+ }
+ }
+ }
+ catch (re) {
+ if (re instanceof RecognitionException) {
+ localctx.exception = re;
+ this._errHandler.reportError(this, re);
+ this._errHandler.recover(this, re);
+ } else {
+ throw re;
+ }
+ }
+ finally {
+ this.exitRule();
+ }
+ return localctx;
+ }
+ // @RuleVersion(0)
public id(): IdContext {
let localctx: IdContext = new IdContext(this, this._ctx, this.state);
- this.enterRule(localctx, 2, LatexParser.RULE_id);
+ this.enterRule(localctx, 4, LatexParser.RULE_id);
try {
this.enterOuterAlt(localctx, 1);
{
- this.state = 72;
+ this.state = 92;
this.match(LatexParser.ID);
}
}
@@ -406,22 +496,22 @@ export default class LatexParser extends Parser {
// @RuleVersion(0)
public number_(): NumberContext {
let localctx: NumberContext = new NumberContext(this, this._ctx, this.state);
- this.enterRule(localctx, 4, LatexParser.RULE_number);
+ this.enterRule(localctx, 6, LatexParser.RULE_number);
let _la: number;
try {
this.enterOuterAlt(localctx, 1);
{
- this.state = 75;
+ this.state = 95;
this._errHandler.sync(this);
_la = this._input.LA(1);
- if (_la===47) {
+ if (_la===50) {
{
- this.state = 74;
+ this.state = 94;
this.match(LatexParser.SUB);
}
}
- this.state = 77;
+ this.state = 97;
this.match(LatexParser.NUMBER);
}
}
@@ -442,13 +532,13 @@ export default class LatexParser extends Parser {
// @RuleVersion(0)
public number_with_units(): Number_with_unitsContext {
let localctx: Number_with_unitsContext = new Number_with_unitsContext(this, this._ctx, this.state);
- this.enterRule(localctx, 6, LatexParser.RULE_number_with_units);
+ this.enterRule(localctx, 8, LatexParser.RULE_number_with_units);
try {
this.enterOuterAlt(localctx, 1);
{
- this.state = 79;
+ this.state = 99;
this.number_();
- this.state = 80;
+ this.state = 100;
this.u_block();
}
}
@@ -469,31 +559,31 @@ export default class LatexParser extends Parser {
// @RuleVersion(0)
public assign(): AssignContext {
let localctx: AssignContext = new AssignContext(this, this._ctx, this.state);
- this.enterRule(localctx, 8, LatexParser.RULE_assign);
+ this.enterRule(localctx, 10, LatexParser.RULE_assign);
try {
this.enterOuterAlt(localctx, 1);
{
- this.state = 84;
+ this.state = 104;
this._errHandler.sync(this);
switch (this._input.LA(1)) {
- case 60:
+ case 67:
{
- this.state = 82;
+ this.state = 102;
this.id();
}
break;
- case 10:
+ case 11:
{
- this.state = 83;
+ this.state = 103;
this.match(LatexParser.PI);
}
break;
default:
throw new NoViableAltException(this);
}
- this.state = 86;
+ this.state = 106;
this.match(LatexParser.EQ);
- this.state = 87;
+ this.state = 107;
this.expr(0);
}
}
@@ -514,29 +604,29 @@ export default class LatexParser extends Parser {
// @RuleVersion(0)
public assign_list(): Assign_listContext {
let localctx: Assign_listContext = new Assign_listContext(this, this._ctx, this.state);
- this.enterRule(localctx, 10, LatexParser.RULE_assign_list);
+ this.enterRule(localctx, 12, LatexParser.RULE_assign_list);
let _la: number;
try {
this.enterOuterAlt(localctx, 1);
{
- this.state = 89;
+ this.state = 109;
this.assign();
- this.state = 92;
+ this.state = 112;
this._errHandler.sync(this);
_la = this._input.LA(1);
do {
{
{
- this.state = 90;
+ this.state = 110;
this.match(LatexParser.COMMA);
- this.state = 91;
+ this.state = 111;
this.assign();
}
}
- this.state = 94;
+ this.state = 114;
this._errHandler.sync(this);
_la = this._input.LA(1);
- } while (_la===54);
+ } while (_la===57);
}
}
catch (re) {
@@ -556,21 +646,21 @@ export default class LatexParser extends Parser {
// @RuleVersion(0)
public assign_plus_query(): Assign_plus_queryContext {
let localctx: Assign_plus_queryContext = new Assign_plus_queryContext(this, this._ctx, this.state);
- this.enterRule(localctx, 12, LatexParser.RULE_assign_plus_query);
+ this.enterRule(localctx, 14, LatexParser.RULE_assign_plus_query);
let _la: number;
try {
this.enterOuterAlt(localctx, 1);
{
- this.state = 96;
+ this.state = 116;
this.assign();
- this.state = 97;
+ this.state = 117;
this.match(LatexParser.EQ);
- this.state = 99;
+ this.state = 119;
this._errHandler.sync(this);
_la = this._input.LA(1);
if (_la===1 || _la===2) {
{
- this.state = 98;
+ this.state = 118;
this.u_block();
}
}
@@ -594,21 +684,21 @@ export default class LatexParser extends Parser {
// @RuleVersion(0)
public query(): QueryContext {
let localctx: QueryContext = new QueryContext(this, this._ctx, this.state);
- this.enterRule(localctx, 14, LatexParser.RULE_query);
+ this.enterRule(localctx, 16, LatexParser.RULE_query);
let _la: number;
try {
this.enterOuterAlt(localctx, 1);
{
- this.state = 101;
+ this.state = 121;
this.expr(0);
- this.state = 102;
+ this.state = 122;
this.match(LatexParser.EQ);
- this.state = 104;
+ this.state = 124;
this._errHandler.sync(this);
_la = this._input.LA(1);
if (_la===1 || _la===2) {
{
- this.state = 103;
+ this.state = 123;
this.u_block();
}
}
@@ -632,15 +722,15 @@ export default class LatexParser extends Parser {
// @RuleVersion(0)
public equality(): EqualityContext {
let localctx: EqualityContext = new EqualityContext(this, this._ctx, this.state);
- this.enterRule(localctx, 16, LatexParser.RULE_equality);
+ this.enterRule(localctx, 18, LatexParser.RULE_equality);
try {
this.enterOuterAlt(localctx, 1);
{
- this.state = 106;
+ this.state = 126;
this.expr(0);
- this.state = 107;
+ this.state = 127;
this.match(LatexParser.EQ);
- this.state = 108;
+ this.state = 128;
this.expr(0);
}
}
@@ -661,56 +751,56 @@ export default class LatexParser extends Parser {
// @RuleVersion(0)
public piecewise_assign(): Piecewise_assignContext {
let localctx: Piecewise_assignContext = new Piecewise_assignContext(this, this._ctx, this.state);
- this.enterRule(localctx, 18, LatexParser.RULE_piecewise_assign);
+ this.enterRule(localctx, 20, LatexParser.RULE_piecewise_assign);
let _la: number;
try {
this.enterOuterAlt(localctx, 1);
{
- this.state = 112;
+ this.state = 132;
this._errHandler.sync(this);
switch (this._input.LA(1)) {
- case 60:
+ case 67:
{
- this.state = 110;
+ this.state = 130;
this.id();
}
break;
- case 10:
+ case 11:
{
- this.state = 111;
+ this.state = 131;
this.match(LatexParser.PI);
}
break;
default:
throw new NoViableAltException(this);
}
- this.state = 114;
+ this.state = 134;
this.match(LatexParser.EQ);
- this.state = 115;
+ this.state = 135;
this.id();
- this.state = 116;
+ this.state = 136;
this.match(LatexParser.L_PAREN);
{
- this.state = 117;
+ this.state = 137;
this.piecewise_arg();
- this.state = 122;
+ this.state = 142;
this._errHandler.sync(this);
_la = this._input.LA(1);
- while (_la===54) {
+ while (_la===57) {
{
{
- this.state = 118;
+ this.state = 138;
this.match(LatexParser.COMMA);
- this.state = 119;
+ this.state = 139;
this.piecewise_arg();
}
}
- this.state = 124;
+ this.state = 144;
this._errHandler.sync(this);
_la = this._input.LA(1);
}
}
- this.state = 125;
+ this.state = 145;
this.match(LatexParser.R_PAREN);
}
}
@@ -731,19 +821,19 @@ export default class LatexParser extends Parser {
// @RuleVersion(0)
public piecewise_arg(): Piecewise_argContext {
let localctx: Piecewise_argContext = new Piecewise_argContext(this, this._ctx, this.state);
- this.enterRule(localctx, 20, LatexParser.RULE_piecewise_arg);
+ this.enterRule(localctx, 22, LatexParser.RULE_piecewise_arg);
try {
this.enterOuterAlt(localctx, 1);
{
- this.state = 127;
+ this.state = 147;
this.match(LatexParser.L_PAREN);
- this.state = 128;
+ this.state = 148;
this.expr(0);
- this.state = 129;
+ this.state = 149;
this.match(LatexParser.COMMA);
- this.state = 130;
+ this.state = 150;
this.condition();
- this.state = 131;
+ this.state = 151;
this.match(LatexParser.R_PAREN);
}
}
@@ -764,24 +854,24 @@ export default class LatexParser extends Parser {
// @RuleVersion(0)
public trig_function(): Trig_functionContext {
let localctx: Trig_functionContext = new Trig_functionContext(this, this._ctx, this.state);
- this.enterRule(localctx, 22, LatexParser.RULE_trig_function);
+ this.enterRule(localctx, 24, LatexParser.RULE_trig_function);
let _la: number;
try {
this.enterOuterAlt(localctx, 1);
{
- this.state = 134;
+ this.state = 154;
this._errHandler.sync(this);
_la = this._input.LA(1);
- if (_la===23) {
+ if (_la===26) {
{
- this.state = 133;
- this.match(LatexParser.BACK_SLASH);
+ this.state = 153;
+ this.match(LatexParser.BACKSLASH);
}
}
- this.state = 136;
+ this.state = 156;
_la = this._input.LA(1);
- if(!(((((_la - 24)) & ~0x1F) === 0 && ((1 << (_la - 24)) & 8191) !== 0))) {
+ if(!(((((_la - 27)) & ~0x1F) === 0 && ((1 << (_la - 27)) & 8191) !== 0))) {
this._errHandler.recoverInline(this);
}
else {
@@ -807,33 +897,33 @@ export default class LatexParser extends Parser {
// @RuleVersion(0)
public indefinite_integral_cmd(): Indefinite_integral_cmdContext {
let localctx: Indefinite_integral_cmdContext = new Indefinite_integral_cmdContext(this, this._ctx, this.state);
- this.enterRule(localctx, 24, LatexParser.RULE_indefinite_integral_cmd);
+ this.enterRule(localctx, 26, LatexParser.RULE_indefinite_integral_cmd);
try {
this.enterOuterAlt(localctx, 1);
{
- this.state = 145;
+ this.state = 165;
this._errHandler.sync(this);
switch (this._input.LA(1)) {
- case 11:
+ case 12:
{
- this.state = 138;
+ this.state = 158;
this.match(LatexParser.CMD_INT);
}
break;
- case 12:
+ case 13:
{
{
- this.state = 139;
+ this.state = 159;
this.match(LatexParser.CMD_INT_UNDERSCORE);
- this.state = 140;
+ this.state = 160;
this.match(LatexParser.L_BRACE);
- this.state = 141;
+ this.state = 161;
this.match(LatexParser.R_BRACE);
- this.state = 142;
+ this.state = 162;
this.match(LatexParser.CARET);
- this.state = 143;
+ this.state = 163;
this.match(LatexParser.L_BRACE);
- this.state = 144;
+ this.state = 164;
this.match(LatexParser.R_BRACE);
}
}
@@ -841,41 +931,41 @@ export default class LatexParser extends Parser {
default:
throw new NoViableAltException(this);
}
- this.state = 147;
+ this.state = 167;
this.match(LatexParser.L_PAREN);
- this.state = 148;
+ this.state = 168;
this.expr(0);
- this.state = 149;
+ this.state = 169;
this.match(LatexParser.R_PAREN);
- this.state = 156;
+ this.state = 176;
this._errHandler.sync(this);
switch (this._input.LA(1)) {
- case 15:
+ case 16:
{
- this.state = 150;
+ this.state = 170;
this.match(LatexParser.CMD_MATHRM);
- this.state = 151;
+ this.state = 171;
this.match(LatexParser.L_BRACE);
- this.state = 152;
+ this.state = 172;
this.id();
- this.state = 153;
+ this.state = 173;
this.match(LatexParser.R_BRACE);
}
break;
- case 60:
+ case 67:
{
- this.state = 155;
+ this.state = 175;
this.id();
}
break;
default:
throw new NoViableAltException(this);
}
- this.state = 158;
+ this.state = 178;
this.match(LatexParser.L_PAREN);
- this.state = 159;
+ this.state = 179;
this.id();
- this.state = 160;
+ this.state = 180;
this.match(LatexParser.R_PAREN);
}
}
@@ -896,34 +986,34 @@ export default class LatexParser extends Parser {
// @RuleVersion(0)
public integral_cmd(): Integral_cmdContext {
let localctx: Integral_cmdContext = new Integral_cmdContext(this, this._ctx, this.state);
- this.enterRule(localctx, 26, LatexParser.RULE_integral_cmd);
+ this.enterRule(localctx, 28, LatexParser.RULE_integral_cmd);
let _la: number;
try {
this.enterOuterAlt(localctx, 1);
{
- this.state = 168;
+ this.state = 188;
this._errHandler.sync(this);
switch (this._input.LA(1)) {
- case 12:
+ case 13:
{
{
- this.state = 162;
+ this.state = 182;
this.match(LatexParser.CMD_INT_UNDERSCORE);
- this.state = 163;
+ this.state = 183;
this.match(LatexParser.L_BRACE);
- this.state = 164;
+ this.state = 184;
localctx._lower_lim_expr = this.expr(0);
- this.state = 165;
+ this.state = 185;
this.match(LatexParser.R_BRACE);
}
}
break;
- case 13:
case 14:
+ case 15:
{
- this.state = 167;
+ this.state = 187;
_la = this._input.LA(1);
- if(!(_la===13 || _la===14)) {
+ if(!(_la===14 || _la===15)) {
this._errHandler.recoverInline(this);
}
else {
@@ -935,29 +1025,29 @@ export default class LatexParser extends Parser {
default:
throw new NoViableAltException(this);
}
- this.state = 176;
+ this.state = 196;
this._errHandler.sync(this);
switch (this._input.LA(1)) {
- case 48:
+ case 51:
{
{
- this.state = 170;
+ this.state = 190;
this.match(LatexParser.CARET);
- this.state = 171;
+ this.state = 191;
this.match(LatexParser.L_BRACE);
- this.state = 172;
+ this.state = 192;
localctx._upper_lim_expr = this.expr(0);
- this.state = 173;
+ this.state = 193;
this.match(LatexParser.R_BRACE);
}
}
break;
- case 55:
- case 56:
+ case 58:
+ case 59:
{
- this.state = 175;
+ this.state = 195;
_la = this._input.LA(1);
- if(!(_la===55 || _la===56)) {
+ if(!(_la===58 || _la===59)) {
this._errHandler.recoverInline(this);
}
else {
@@ -969,41 +1059,41 @@ export default class LatexParser extends Parser {
default:
throw new NoViableAltException(this);
}
- this.state = 178;
+ this.state = 198;
this.match(LatexParser.L_PAREN);
- this.state = 179;
+ this.state = 199;
localctx._integrand_expr = this.expr(0);
- this.state = 180;
+ this.state = 200;
this.match(LatexParser.R_PAREN);
- this.state = 187;
+ this.state = 207;
this._errHandler.sync(this);
switch (this._input.LA(1)) {
- case 15:
+ case 16:
{
- this.state = 181;
+ this.state = 201;
this.match(LatexParser.CMD_MATHRM);
- this.state = 182;
+ this.state = 202;
this.match(LatexParser.L_BRACE);
- this.state = 183;
+ this.state = 203;
this.id();
- this.state = 184;
+ this.state = 204;
this.match(LatexParser.R_BRACE);
}
break;
- case 60:
+ case 67:
{
- this.state = 186;
+ this.state = 206;
this.id();
}
break;
default:
throw new NoViableAltException(this);
}
- this.state = 189;
+ this.state = 209;
this.match(LatexParser.L_PAREN);
- this.state = 190;
+ this.state = 210;
this.id();
- this.state = 191;
+ this.state = 211;
this.match(LatexParser.R_PAREN);
}
}
@@ -1024,79 +1114,79 @@ export default class LatexParser extends Parser {
// @RuleVersion(0)
public derivative_cmd(): Derivative_cmdContext {
let localctx: Derivative_cmdContext = new Derivative_cmdContext(this, this._ctx, this.state);
- this.enterRule(localctx, 28, LatexParser.RULE_derivative_cmd);
+ this.enterRule(localctx, 30, LatexParser.RULE_derivative_cmd);
try {
this.enterOuterAlt(localctx, 1);
{
- this.state = 193;
+ this.state = 213;
this.match(LatexParser.CMD_FRAC);
- this.state = 194;
+ this.state = 214;
this.match(LatexParser.L_BRACE);
- this.state = 201;
+ this.state = 221;
this._errHandler.sync(this);
switch (this._input.LA(1)) {
- case 15:
+ case 16:
{
- this.state = 195;
+ this.state = 215;
localctx._MATHRM_0 = this.match(LatexParser.CMD_MATHRM);
- this.state = 196;
+ this.state = 216;
this.match(LatexParser.L_BRACE);
- this.state = 197;
+ this.state = 217;
this.id();
- this.state = 198;
+ this.state = 218;
this.match(LatexParser.R_BRACE);
}
break;
- case 60:
+ case 67:
{
- this.state = 200;
+ this.state = 220;
this.id();
}
break;
default:
throw new NoViableAltException(this);
}
- this.state = 203;
+ this.state = 223;
this.match(LatexParser.R_BRACE);
- this.state = 204;
+ this.state = 224;
this.match(LatexParser.L_BRACE);
- this.state = 211;
+ this.state = 231;
this._errHandler.sync(this);
switch (this._input.LA(1)) {
- case 15:
+ case 16:
{
- this.state = 205;
+ this.state = 225;
localctx._MATHRM_1 = this.match(LatexParser.CMD_MATHRM);
- this.state = 206;
+ this.state = 226;
this.match(LatexParser.L_BRACE);
- this.state = 207;
+ this.state = 227;
this.id();
- this.state = 208;
+ this.state = 228;
this.match(LatexParser.R_BRACE);
}
break;
- case 60:
+ case 67:
{
- this.state = 210;
+ this.state = 230;
this.id();
}
break;
default:
throw new NoViableAltException(this);
}
- this.state = 213;
+ this.state = 233;
this.match(LatexParser.L_PAREN);
- this.state = 214;
+ this.state = 234;
this.id();
- this.state = 215;
+ this.state = 235;
this.match(LatexParser.R_PAREN);
- this.state = 216;
+ this.state = 236;
this.match(LatexParser.R_BRACE);
- this.state = 217;
+ this.state = 237;
this.match(LatexParser.L_PAREN);
- this.state = 218;
+ this.state = 238;
this.expr(0);
- this.state = 219;
+ this.state = 239;
this.match(LatexParser.R_PAREN);
}
}
@@ -1117,131 +1207,131 @@ export default class LatexParser extends Parser {
// @RuleVersion(0)
public n_derivative_cmd(): N_derivative_cmdContext {
let localctx: N_derivative_cmdContext = new N_derivative_cmdContext(this, this._ctx, this.state);
- this.enterRule(localctx, 30, LatexParser.RULE_n_derivative_cmd);
+ this.enterRule(localctx, 32, LatexParser.RULE_n_derivative_cmd);
try {
this.enterOuterAlt(localctx, 1);
{
- this.state = 221;
+ this.state = 241;
this.match(LatexParser.CMD_FRAC);
- this.state = 222;
+ this.state = 242;
this.match(LatexParser.L_BRACE);
- this.state = 229;
+ this.state = 249;
this._errHandler.sync(this);
switch (this._input.LA(1)) {
- case 15:
+ case 16:
{
- this.state = 223;
+ this.state = 243;
localctx._MATHRM_0 = this.match(LatexParser.CMD_MATHRM);
- this.state = 224;
+ this.state = 244;
this.match(LatexParser.L_BRACE);
- this.state = 225;
+ this.state = 245;
this.id();
- this.state = 226;
+ this.state = 246;
this.match(LatexParser.R_BRACE);
}
break;
- case 60:
+ case 67:
{
- this.state = 228;
+ this.state = 248;
this.id();
}
break;
default:
throw new NoViableAltException(this);
}
- this.state = 237;
+ this.state = 257;
this._errHandler.sync(this);
switch (this._input.LA(1)) {
- case 48:
+ case 51:
{
{
- this.state = 231;
+ this.state = 251;
this.match(LatexParser.CARET);
- this.state = 232;
+ this.state = 252;
this.match(LatexParser.L_BRACE);
- this.state = 233;
+ this.state = 253;
this.number_();
- this.state = 234;
+ this.state = 254;
this.match(LatexParser.R_BRACE);
}
}
break;
- case 55:
+ case 58:
{
- this.state = 236;
+ this.state = 256;
localctx._single_char_exp1 = this.match(LatexParser.CARET_SINGLE_CHAR_NUMBER);
}
break;
default:
throw new NoViableAltException(this);
}
- this.state = 239;
+ this.state = 259;
this.match(LatexParser.R_BRACE);
- this.state = 240;
+ this.state = 260;
this.match(LatexParser.L_BRACE);
- this.state = 247;
+ this.state = 267;
this._errHandler.sync(this);
switch (this._input.LA(1)) {
- case 15:
+ case 16:
{
- this.state = 241;
+ this.state = 261;
localctx._MATHRM_1 = this.match(LatexParser.CMD_MATHRM);
- this.state = 242;
+ this.state = 262;
this.match(LatexParser.L_BRACE);
- this.state = 243;
+ this.state = 263;
this.id();
- this.state = 244;
+ this.state = 264;
this.match(LatexParser.R_BRACE);
}
break;
- case 60:
+ case 67:
{
- this.state = 246;
+ this.state = 266;
this.id();
}
break;
default:
throw new NoViableAltException(this);
}
- this.state = 249;
+ this.state = 269;
this.match(LatexParser.L_PAREN);
- this.state = 250;
+ this.state = 270;
this.id();
- this.state = 251;
+ this.state = 271;
this.match(LatexParser.R_PAREN);
- this.state = 258;
+ this.state = 278;
this._errHandler.sync(this);
switch (this._input.LA(1)) {
- case 48:
+ case 51:
{
{
- this.state = 252;
+ this.state = 272;
this.match(LatexParser.CARET);
- this.state = 253;
+ this.state = 273;
this.match(LatexParser.L_BRACE);
- this.state = 254;
+ this.state = 274;
this.number_();
- this.state = 255;
+ this.state = 275;
this.match(LatexParser.R_BRACE);
}
}
break;
- case 55:
+ case 58:
{
- this.state = 257;
+ this.state = 277;
localctx._single_char_exp2 = this.match(LatexParser.CARET_SINGLE_CHAR_NUMBER);
}
break;
default:
throw new NoViableAltException(this);
}
- this.state = 260;
+ this.state = 280;
this.match(LatexParser.R_BRACE);
- this.state = 261;
+ this.state = 281;
this.match(LatexParser.L_PAREN);
- this.state = 262;
+ this.state = 282;
this.expr(0);
- this.state = 263;
+ this.state = 283;
this.match(LatexParser.R_PAREN);
}
}
@@ -1262,21 +1352,21 @@ export default class LatexParser extends Parser {
// @RuleVersion(0)
public argument(): ArgumentContext {
let localctx: ArgumentContext = new ArgumentContext(this, this._ctx, this.state);
- this.enterRule(localctx, 32, LatexParser.RULE_argument);
+ this.enterRule(localctx, 34, LatexParser.RULE_argument);
let _la: number;
try {
- this.state = 275;
+ this.state = 295;
this._errHandler.sync(this);
- switch ( this._interp.adaptivePredict(this._input, 20, this._ctx) ) {
+ switch ( this._interp.adaptivePredict(this._input, 22, this._ctx) ) {
case 1:
this.enterOuterAlt(localctx, 1);
{
{
- this.state = 265;
+ this.state = 285;
this.id();
- this.state = 266;
+ this.state = 286;
this.match(LatexParser.EQ);
- this.state = 267;
+ this.state = 287;
this.expr(0);
}
}
@@ -1285,31 +1375,31 @@ export default class LatexParser extends Parser {
this.enterOuterAlt(localctx, 2);
{
{
- this.state = 269;
+ this.state = 289;
this.expr(0);
- this.state = 270;
+ this.state = 290;
localctx._lower = this._input.LT(1);
_la = this._input.LA(1);
- if(!(_la===50 || _la===52)) {
+ if(!(_la===53 || _la===55)) {
localctx._lower = this._errHandler.recoverInline(this);
}
else {
this._errHandler.reportMatch(this);
this.consume();
}
- this.state = 271;
+ this.state = 291;
this.id();
- this.state = 272;
+ this.state = 292;
localctx._upper = this._input.LT(1);
_la = this._input.LA(1);
- if(!(_la===50 || _la===52)) {
+ if(!(_la===53 || _la===55)) {
localctx._upper = this._errHandler.recoverInline(this);
}
else {
this._errHandler.reportMatch(this);
this.consume();
}
- this.state = 273;
+ this.state = 293;
this.expr(0);
}
}
@@ -1333,22 +1423,22 @@ export default class LatexParser extends Parser {
// @RuleVersion(0)
public condition(): ConditionContext {
let localctx: ConditionContext = new ConditionContext(this, this._ctx, this.state);
- this.enterRule(localctx, 34, LatexParser.RULE_condition);
+ this.enterRule(localctx, 36, LatexParser.RULE_condition);
try {
- this.state = 279;
+ this.state = 299;
this._errHandler.sync(this);
- switch ( this._interp.adaptivePredict(this._input, 21, this._ctx) ) {
+ switch ( this._interp.adaptivePredict(this._input, 23, this._ctx) ) {
case 1:
this.enterOuterAlt(localctx, 1);
{
- this.state = 277;
+ this.state = 297;
this.condition_single();
}
break;
case 2:
this.enterOuterAlt(localctx, 2);
{
- this.state = 278;
+ this.state = 298;
this.condition_chain();
}
break;
@@ -1371,29 +1461,29 @@ export default class LatexParser extends Parser {
// @RuleVersion(0)
public id_list(): Id_listContext {
let localctx: Id_listContext = new Id_listContext(this, this._ctx, this.state);
- this.enterRule(localctx, 36, LatexParser.RULE_id_list);
+ this.enterRule(localctx, 38, LatexParser.RULE_id_list);
let _la: number;
try {
this.enterOuterAlt(localctx, 1);
{
- this.state = 281;
+ this.state = 301;
this.id();
- this.state = 284;
+ this.state = 304;
this._errHandler.sync(this);
_la = this._input.LA(1);
do {
{
{
- this.state = 282;
+ this.state = 302;
this.match(LatexParser.COMMA);
- this.state = 283;
+ this.state = 303;
this.id();
}
}
- this.state = 286;
+ this.state = 306;
this._errHandler.sync(this);
_la = this._input.LA(1);
- } while (_la===54);
+ } while (_la===57);
}
}
catch (re) {
@@ -1413,34 +1503,34 @@ export default class LatexParser extends Parser {
// @RuleVersion(0)
public guess(): GuessContext {
let localctx: GuessContext = new GuessContext(this, this._ctx, this.state);
- this.enterRule(localctx, 38, LatexParser.RULE_guess);
+ this.enterRule(localctx, 40, LatexParser.RULE_guess);
let _la: number;
try {
this.enterOuterAlt(localctx, 1);
{
- this.state = 288;
+ this.state = 308;
this.id();
- this.state = 289;
+ this.state = 309;
_la = this._input.LA(1);
- if(!(_la===21 || _la===22)) {
+ if(!(_la===23 || _la===24)) {
this._errHandler.recoverInline(this);
}
else {
this._errHandler.reportMatch(this);
this.consume();
}
- this.state = 292;
+ this.state = 312;
this._errHandler.sync(this);
- switch ( this._interp.adaptivePredict(this._input, 23, this._ctx) ) {
+ switch ( this._interp.adaptivePredict(this._input, 25, this._ctx) ) {
case 1:
{
- this.state = 290;
+ this.state = 310;
this.number_();
}
break;
case 2:
{
- this.state = 291;
+ this.state = 311;
this.number_with_units();
}
break;
@@ -1464,29 +1554,29 @@ export default class LatexParser extends Parser {
// @RuleVersion(0)
public guess_list(): Guess_listContext {
let localctx: Guess_listContext = new Guess_listContext(this, this._ctx, this.state);
- this.enterRule(localctx, 40, LatexParser.RULE_guess_list);
+ this.enterRule(localctx, 42, LatexParser.RULE_guess_list);
let _la: number;
try {
this.enterOuterAlt(localctx, 1);
{
- this.state = 294;
+ this.state = 314;
this.guess();
- this.state = 297;
+ this.state = 317;
this._errHandler.sync(this);
_la = this._input.LA(1);
do {
{
{
- this.state = 295;
+ this.state = 315;
this.match(LatexParser.COMMA);
- this.state = 296;
+ this.state = 316;
this.guess();
}
}
- this.state = 299;
+ this.state = 319;
this._errHandler.sync(this);
_la = this._input.LA(1);
- } while (_la===54);
+ } while (_la===57);
}
}
catch (re) {
@@ -1506,24 +1596,24 @@ export default class LatexParser extends Parser {
// @RuleVersion(0)
public condition_single(): Condition_singleContext {
let localctx: Condition_singleContext = new Condition_singleContext(this, this._ctx, this.state);
- this.enterRule(localctx, 42, LatexParser.RULE_condition_single);
+ this.enterRule(localctx, 44, LatexParser.RULE_condition_single);
let _la: number;
try {
this.enterOuterAlt(localctx, 1);
{
- this.state = 301;
+ this.state = 321;
this.expr(0);
- this.state = 302;
+ this.state = 322;
localctx._operator = this._input.LT(1);
_la = this._input.LA(1);
- if(!(((((_la - 50)) & ~0x1F) === 0 && ((1 << (_la - 50)) & 15) !== 0))) {
+ if(!(((((_la - 53)) & ~0x1F) === 0 && ((1 << (_la - 53)) & 15) !== 0))) {
localctx._operator = this._errHandler.recoverInline(this);
}
else {
this._errHandler.reportMatch(this);
this.consume();
}
- this.state = 303;
+ this.state = 323;
this.expr(0);
}
}
@@ -1544,36 +1634,36 @@ export default class LatexParser extends Parser {
// @RuleVersion(0)
public condition_chain(): Condition_chainContext {
let localctx: Condition_chainContext = new Condition_chainContext(this, this._ctx, this.state);
- this.enterRule(localctx, 44, LatexParser.RULE_condition_chain);
+ this.enterRule(localctx, 46, LatexParser.RULE_condition_chain);
let _la: number;
try {
this.enterOuterAlt(localctx, 1);
{
- this.state = 305;
+ this.state = 325;
this.expr(0);
- this.state = 306;
+ this.state = 326;
localctx._lower = this._input.LT(1);
_la = this._input.LA(1);
- if(!(((((_la - 50)) & ~0x1F) === 0 && ((1 << (_la - 50)) & 15) !== 0))) {
+ if(!(((((_la - 53)) & ~0x1F) === 0 && ((1 << (_la - 53)) & 15) !== 0))) {
localctx._lower = this._errHandler.recoverInline(this);
}
else {
this._errHandler.reportMatch(this);
this.consume();
}
- this.state = 307;
+ this.state = 327;
this.expr(0);
- this.state = 308;
+ this.state = 328;
localctx._upper = this._input.LT(1);
_la = this._input.LA(1);
- if(!(((((_la - 50)) & ~0x1F) === 0 && ((1 << (_la - 50)) & 15) !== 0))) {
+ if(!(((((_la - 53)) & ~0x1F) === 0 && ((1 << (_la - 53)) & 15) !== 0))) {
localctx._upper = this._errHandler.recoverInline(this);
}
else {
this._errHandler.reportMatch(this);
this.consume();
}
- this.state = 309;
+ this.state = 329;
this.expr(0);
}
}
@@ -1591,6 +1681,48 @@ export default class LatexParser extends Parser {
}
return localctx;
}
+ // @RuleVersion(0)
+ public matrix_row(): Matrix_rowContext {
+ let localctx: Matrix_rowContext = new Matrix_rowContext(this, this._ctx, this.state);
+ this.enterRule(localctx, 48, LatexParser.RULE_matrix_row);
+ let _la: number;
+ try {
+ this.enterOuterAlt(localctx, 1);
+ {
+ this.state = 331;
+ this.expr(0);
+ this.state = 336;
+ this._errHandler.sync(this);
+ _la = this._input.LA(1);
+ while (_la===63) {
+ {
+ {
+ this.state = 332;
+ this.match(LatexParser.AMPERSAND);
+ this.state = 333;
+ this.expr(0);
+ }
+ }
+ this.state = 338;
+ this._errHandler.sync(this);
+ _la = this._input.LA(1);
+ }
+ }
+ }
+ catch (re) {
+ if (re instanceof RecognitionException) {
+ localctx.exception = re;
+ this._errHandler.reportError(this, re);
+ this._errHandler.recover(this, re);
+ } else {
+ throw re;
+ }
+ }
+ finally {
+ this.exitRule();
+ }
+ return localctx;
+ }
public expr(): ExprContext;
public expr(_p: number): ExprContext;
@@ -1604,25 +1736,25 @@ export default class LatexParser extends Parser {
let _parentState: number = this.state;
let localctx: ExprContext = new ExprContext(this, this._ctx, _parentState);
let _prevctx: ExprContext = localctx;
- let _startState: number = 46;
- this.enterRecursionRule(localctx, 46, LatexParser.RULE_expr, _p);
+ let _startState: number = 50;
+ this.enterRecursionRule(localctx, 50, LatexParser.RULE_expr, _p);
let _la: number;
try {
let _alt: number;
this.enterOuterAlt(localctx, 1);
{
- this.state = 429;
+ this.state = 472;
this._errHandler.sync(this);
- switch ( this._interp.adaptivePredict(this._input, 31, this._ctx) ) {
+ switch ( this._interp.adaptivePredict(this._input, 35, this._ctx) ) {
case 1:
{
localctx = new ExponentContext(this, localctx);
this._ctx = localctx;
_prevctx = localctx;
- this.state = 312;
+ this.state = 340;
this.id();
- this.state = 313;
+ this.state = 341;
this.match(LatexParser.CARET_SINGLE_CHAR_ID_UNDERSCORE_SUBSCRIPT);
}
break;
@@ -1631,18 +1763,18 @@ export default class LatexParser extends Parser {
localctx = new ExponentContext(this, localctx);
this._ctx = localctx;
_prevctx = localctx;
- this.state = 315;
+ this.state = 343;
this.id();
- this.state = 316;
+ this.state = 344;
_la = this._input.LA(1);
- if(!(_la===55 || _la===56)) {
+ if(!(_la===58 || _la===59)) {
this._errHandler.recoverInline(this);
}
else {
this._errHandler.reportMatch(this);
this.consume();
}
- this.state = 317;
+ this.state = 345;
this.match(LatexParser.UNDERSCORE_SUBSCRIPT);
}
break;
@@ -1651,17 +1783,17 @@ export default class LatexParser extends Parser {
localctx = new ExponentContext(this, localctx);
this._ctx = localctx;
_prevctx = localctx;
- this.state = 319;
+ this.state = 347;
this.id();
- this.state = 320;
+ this.state = 348;
this.match(LatexParser.CARET);
- this.state = 321;
+ this.state = 349;
this.match(LatexParser.L_BRACE);
- this.state = 322;
+ this.state = 350;
this.expr(0);
- this.state = 323;
+ this.state = 351;
this.match(LatexParser.R_BRACE);
- this.state = 324;
+ this.state = 352;
this.match(LatexParser.UNDERSCORE_SUBSCRIPT);
}
break;
@@ -1670,7 +1802,7 @@ export default class LatexParser extends Parser {
localctx = new SingleIntSqrtContext(this, localctx);
this._ctx = localctx;
_prevctx = localctx;
- this.state = 326;
+ this.state = 354;
this.match(LatexParser.CMD_SQRT_INT);
}
break;
@@ -1679,370 +1811,412 @@ export default class LatexParser extends Parser {
localctx = new SqrtContext(this, localctx);
this._ctx = localctx;
_prevctx = localctx;
- this.state = 327;
+ this.state = 355;
this.match(LatexParser.CMD_SQRT);
- this.state = 328;
+ this.state = 356;
this.match(LatexParser.L_BRACE);
- this.state = 329;
+ this.state = 357;
this.expr(0);
- this.state = 330;
+ this.state = 358;
this.match(LatexParser.R_BRACE);
}
break;
case 6:
+ {
+ localctx = new MatrixContext(this, localctx);
+ this._ctx = localctx;
+ _prevctx = localctx;
+ this.state = 360;
+ this.match(LatexParser.BEGIN_MATRIX);
+ this.state = 361;
+ this.matrix_row();
+ this.state = 366;
+ this._errHandler.sync(this);
+ _la = this._input.LA(1);
+ while (_la===64) {
+ {
+ {
+ this.state = 362;
+ this.match(LatexParser.DOUBLE_BACKSLASH);
+ this.state = 363;
+ this.matrix_row();
+ }
+ }
+ this.state = 368;
+ this._errHandler.sync(this);
+ _la = this._input.LA(1);
+ }
+ this.state = 369;
+ this.match(LatexParser.END_MATRIX);
+ }
+ break;
+ case 7:
{
localctx = new TrigContext(this, localctx);
this._ctx = localctx;
_prevctx = localctx;
- this.state = 332;
+ this.state = 371;
this.trig_function();
- this.state = 333;
+ this.state = 372;
this.match(LatexParser.L_PAREN);
- this.state = 334;
+ this.state = 373;
this.expr(0);
- this.state = 335;
+ this.state = 374;
this.match(LatexParser.R_PAREN);
}
break;
- case 7:
+ case 8:
{
localctx = new IndefiniteIntegralContext(this, localctx);
this._ctx = localctx;
_prevctx = localctx;
- this.state = 337;
+ this.state = 376;
this.indefinite_integral_cmd();
}
break;
- case 8:
+ case 9:
{
localctx = new IntegralContext(this, localctx);
this._ctx = localctx;
_prevctx = localctx;
- this.state = 338;
+ this.state = 377;
this.integral_cmd();
}
break;
- case 9:
+ case 10:
{
localctx = new DerivativeContext(this, localctx);
this._ctx = localctx;
_prevctx = localctx;
- this.state = 339;
+ this.state = 378;
this.derivative_cmd();
}
break;
- case 10:
+ case 11:
{
localctx = new NDerivativeContext(this, localctx);
this._ctx = localctx;
_prevctx = localctx;
- this.state = 340;
+ this.state = 379;
this.n_derivative_cmd();
}
break;
- case 11:
+ case 12:
{
localctx = new LnContext(this, localctx);
this._ctx = localctx;
_prevctx = localctx;
- this.state = 342;
+ this.state = 381;
this._errHandler.sync(this);
_la = this._input.LA(1);
- if (_la===23) {
+ if (_la===26) {
{
- this.state = 341;
- this.match(LatexParser.BACK_SLASH);
+ this.state = 380;
+ this.match(LatexParser.BACKSLASH);
}
}
- this.state = 344;
+ this.state = 383;
this.match(LatexParser.CMD_LN);
- this.state = 345;
+ this.state = 384;
this.match(LatexParser.L_PAREN);
- this.state = 346;
+ this.state = 385;
this.expr(0);
- this.state = 347;
+ this.state = 386;
this.match(LatexParser.R_PAREN);
}
break;
- case 12:
+ case 13:
{
localctx = new LogContext(this, localctx);
this._ctx = localctx;
_prevctx = localctx;
- this.state = 350;
+ this.state = 389;
this._errHandler.sync(this);
_la = this._input.LA(1);
- if (_la===23) {
+ if (_la===26) {
{
- this.state = 349;
- this.match(LatexParser.BACK_SLASH);
+ this.state = 388;
+ this.match(LatexParser.BACKSLASH);
}
}
- this.state = 352;
+ this.state = 391;
this.match(LatexParser.CMD_LOG);
- this.state = 353;
+ this.state = 392;
this.match(LatexParser.L_PAREN);
- this.state = 354;
+ this.state = 393;
this.expr(0);
- this.state = 355;
+ this.state = 394;
this.match(LatexParser.R_PAREN);
}
break;
- case 13:
+ case 14:
{
localctx = new BaseLogContext(this, localctx);
this._ctx = localctx;
_prevctx = localctx;
- this.state = 357;
+ this.state = 396;
this.match(LatexParser.CMD_SLASH_LOG_UNDERSCORE);
- this.state = 358;
+ this.state = 397;
this.match(LatexParser.L_BRACE);
- this.state = 359;
+ this.state = 398;
this.expr(0);
- this.state = 360;
+ this.state = 399;
this.match(LatexParser.R_BRACE);
- this.state = 361;
+ this.state = 400;
this.match(LatexParser.L_PAREN);
- this.state = 362;
+ this.state = 401;
this.expr(0);
- this.state = 363;
+ this.state = 402;
this.match(LatexParser.R_PAREN);
}
break;
- case 14:
+ case 15:
{
localctx = new BaseLogSingleCharContext(this, localctx);
this._ctx = localctx;
_prevctx = localctx;
- this.state = 365;
+ this.state = 404;
_la = this._input.LA(1);
- if(!(_la===40 || _la===41)) {
+ if(!(_la===43 || _la===44)) {
this._errHandler.recoverInline(this);
}
else {
this._errHandler.reportMatch(this);
this.consume();
}
- this.state = 366;
+ this.state = 405;
this.match(LatexParser.L_PAREN);
- this.state = 367;
+ this.state = 406;
this.expr(0);
- this.state = 368;
+ this.state = 407;
this.match(LatexParser.R_PAREN);
}
break;
- case 15:
+ case 16:
+ {
+ localctx = new NormContext(this, localctx);
+ this._ctx = localctx;
+ _prevctx = localctx;
+ this.state = 409;
+ this.match(LatexParser.DOUBLE_VBAR);
+ this.state = 410;
+ this.expr(0);
+ this.state = 411;
+ this.match(LatexParser.DOUBLE_VBAR);
+ }
+ break;
+ case 17:
{
localctx = new AbsContext(this, localctx);
this._ctx = localctx;
_prevctx = localctx;
- this.state = 370;
+ this.state = 413;
this.match(LatexParser.VBAR);
- this.state = 371;
+ this.state = 414;
this.expr(0);
- this.state = 372;
+ this.state = 415;
this.match(LatexParser.VBAR);
}
break;
- case 16:
+ case 18:
{
localctx = new NumberWithUnitsExprContext(this, localctx);
this._ctx = localctx;
_prevctx = localctx;
- this.state = 374;
+ this.state = 417;
this.number_with_units();
}
break;
- case 17:
+ case 19:
{
localctx = new NumberExprContext(this, localctx);
this._ctx = localctx;
_prevctx = localctx;
- this.state = 375;
+ this.state = 418;
this.number_();
}
break;
- case 18:
+ case 20:
{
localctx = new UnaryMinusContext(this, localctx);
this._ctx = localctx;
_prevctx = localctx;
- this.state = 376;
+ this.state = 419;
this.match(LatexParser.SUB);
- this.state = 377;
- this.expr(11);
+ this.state = 420;
+ this.expr(12);
}
break;
- case 19:
+ case 21:
{
localctx = new DivideContext(this, localctx);
this._ctx = localctx;
_prevctx = localctx;
- this.state = 378;
+ this.state = 421;
this.match(LatexParser.CMD_FRAC);
- this.state = 379;
+ this.state = 422;
this.match(LatexParser.L_BRACE);
- this.state = 380;
+ this.state = 423;
this.expr(0);
- this.state = 381;
+ this.state = 424;
this.match(LatexParser.R_BRACE);
- this.state = 382;
+ this.state = 425;
this.match(LatexParser.L_BRACE);
- this.state = 383;
+ this.state = 426;
this.expr(0);
- this.state = 384;
+ this.state = 427;
this.match(LatexParser.R_BRACE);
}
break;
- case 20:
+ case 22:
{
localctx = new DivideIntsContext(this, localctx);
this._ctx = localctx;
_prevctx = localctx;
- this.state = 386;
+ this.state = 429;
this.match(LatexParser.CMD_FRAC_INTS);
}
break;
- case 21:
+ case 23:
{
localctx = new VariableContext(this, localctx);
this._ctx = localctx;
_prevctx = localctx;
- this.state = 387;
+ this.state = 430;
this.id();
}
break;
- case 22:
+ case 24:
{
localctx = new FunctionContext(this, localctx);
this._ctx = localctx;
_prevctx = localctx;
- this.state = 388;
+ this.state = 431;
this.id();
- this.state = 389;
+ this.state = 432;
this.match(LatexParser.L_PAREN);
{
- this.state = 390;
+ this.state = 433;
this.argument();
- this.state = 395;
+ this.state = 438;
this._errHandler.sync(this);
_la = this._input.LA(1);
- while (_la===54) {
+ while (_la===57) {
{
{
- this.state = 391;
+ this.state = 434;
this.match(LatexParser.COMMA);
- this.state = 392;
+ this.state = 435;
this.argument();
}
}
- this.state = 397;
+ this.state = 440;
this._errHandler.sync(this);
_la = this._input.LA(1);
}
}
- this.state = 398;
+ this.state = 441;
this.match(LatexParser.R_PAREN);
- this.state = 403;
+ this.state = 446;
this._errHandler.sync(this);
- switch ( this._interp.adaptivePredict(this._input, 28, this._ctx) ) {
+ switch ( this._interp.adaptivePredict(this._input, 32, this._ctx) ) {
case 1:
{
- this.state = 399;
+ this.state = 442;
(localctx as FunctionContext)._points_id_0 = this.match(LatexParser.ID);
- this.state = 400;
+ this.state = 443;
(localctx as FunctionContext)._num_points = this.number_();
- this.state = 401;
+ this.state = 444;
(localctx as FunctionContext)._points_id_1 = this.match(LatexParser.ID);
}
break;
}
}
break;
- case 23:
+ case 25:
{
localctx = new BuiltinFunctionContext(this, localctx);
this._ctx = localctx;
_prevctx = localctx;
- this.state = 411;
+ this.state = 454;
this._errHandler.sync(this);
switch (this._input.LA(1)) {
- case 15:
+ case 16:
{
- this.state = 405;
+ this.state = 448;
this.match(LatexParser.CMD_MATHRM);
- this.state = 406;
+ this.state = 449;
this.match(LatexParser.L_BRACE);
- this.state = 407;
+ this.state = 450;
this.id();
- this.state = 408;
+ this.state = 451;
this.match(LatexParser.R_BRACE);
}
break;
- case 60:
+ case 67:
{
- this.state = 410;
+ this.state = 453;
this.id();
}
break;
default:
throw new NoViableAltException(this);
}
- this.state = 413;
+ this.state = 456;
this.match(LatexParser.L_PAREN);
{
- this.state = 414;
+ this.state = 457;
this.expr(0);
- this.state = 419;
+ this.state = 462;
this._errHandler.sync(this);
_la = this._input.LA(1);
- while (_la===54) {
+ while (_la===57) {
{
{
- this.state = 415;
+ this.state = 458;
this.match(LatexParser.COMMA);
- this.state = 416;
+ this.state = 459;
this.expr(0);
}
}
- this.state = 421;
+ this.state = 464;
this._errHandler.sync(this);
_la = this._input.LA(1);
}
}
- this.state = 422;
+ this.state = 465;
this.match(LatexParser.R_PAREN);
}
break;
- case 24:
+ case 26:
{
localctx = new PiExprContext(this, localctx);
this._ctx = localctx;
_prevctx = localctx;
- this.state = 424;
+ this.state = 467;
this.match(LatexParser.PI);
}
break;
- case 25:
+ case 27:
{
localctx = new SubExprContext(this, localctx);
this._ctx = localctx;
_prevctx = localctx;
- this.state = 425;
+ this.state = 468;
this.match(LatexParser.L_PAREN);
- this.state = 426;
+ this.state = 469;
this.expr(0);
- this.state = 427;
+ this.state = 470;
this.match(LatexParser.R_PAREN);
}
break;
}
this._ctx.stop = this._input.LT(-1);
- this.state = 450;
+ this.state = 506;
this._errHandler.sync(this);
- _alt = this._interp.adaptivePredict(this._input, 33, this._ctx);
+ _alt = this._interp.adaptivePredict(this._input, 37, this._ctx);
while (_alt !== 2 && _alt !== ATN.INVALID_ALT_NUMBER) {
if (_alt === 1) {
if (this._parseListeners != null) {
@@ -2050,62 +2224,76 @@ export default class LatexParser extends Parser {
}
_prevctx = localctx;
{
- this.state = 448;
+ this.state = 504;
this._errHandler.sync(this);
- switch ( this._interp.adaptivePredict(this._input, 32, this._ctx) ) {
+ switch ( this._interp.adaptivePredict(this._input, 36, this._ctx) ) {
case 1:
+ {
+ localctx = new MatrixMultiplyContext(this, new ExprContext(this, _parentctx, _parentState));
+ this.pushNewRecursionContext(localctx, _startState, LatexParser.RULE_expr);
+ this.state = 474;
+ if (!(this.precpred(this._ctx, 11))) {
+ throw this.createFailedPredicateException("this.precpred(this._ctx, 11)");
+ }
+ this.state = 475;
+ this.match(LatexParser.CMD_TIMES);
+ this.state = 476;
+ this.expr(12);
+ }
+ break;
+ case 2:
{
localctx = new MultiplyContext(this, new ExprContext(this, _parentctx, _parentState));
this.pushNewRecursionContext(localctx, _startState, LatexParser.RULE_expr);
- this.state = 431;
+ this.state = 477;
if (!(this.precpred(this._ctx, 10))) {
throw this.createFailedPredicateException("this.precpred(this._ctx, 10)");
}
- this.state = 432;
+ this.state = 478;
this.match(LatexParser.CMD_CDOT);
- this.state = 433;
+ this.state = 479;
this.expr(11);
}
break;
- case 2:
+ case 3:
{
- localctx = new AddContext(this, new ExprContext(this, _parentctx, _parentState));
+ localctx = new SubtractContext(this, new ExprContext(this, _parentctx, _parentState));
this.pushNewRecursionContext(localctx, _startState, LatexParser.RULE_expr);
- this.state = 434;
+ this.state = 480;
if (!(this.precpred(this._ctx, 7))) {
throw this.createFailedPredicateException("this.precpred(this._ctx, 7)");
}
- this.state = 435;
- this.match(LatexParser.ADD);
- this.state = 436;
+ this.state = 481;
+ this.match(LatexParser.SUB);
+ this.state = 482;
this.expr(8);
}
break;
- case 3:
+ case 4:
{
- localctx = new SubtractContext(this, new ExprContext(this, _parentctx, _parentState));
+ localctx = new AddContext(this, new ExprContext(this, _parentctx, _parentState));
this.pushNewRecursionContext(localctx, _startState, LatexParser.RULE_expr);
- this.state = 437;
+ this.state = 483;
if (!(this.precpred(this._ctx, 6))) {
throw this.createFailedPredicateException("this.precpred(this._ctx, 6)");
}
- this.state = 438;
- this.match(LatexParser.SUB);
- this.state = 439;
+ this.state = 484;
+ this.match(LatexParser.ADD);
+ this.state = 485;
this.expr(7);
}
break;
- case 4:
+ case 5:
{
localctx = new ExponentContext(this, new ExprContext(this, _parentctx, _parentState));
this.pushNewRecursionContext(localctx, _startState, LatexParser.RULE_expr);
- this.state = 440;
- if (!(this.precpred(this._ctx, 27))) {
- throw this.createFailedPredicateException("this.precpred(this._ctx, 27)");
+ this.state = 486;
+ if (!(this.precpred(this._ctx, 32))) {
+ throw this.createFailedPredicateException("this.precpred(this._ctx, 32)");
}
- this.state = 441;
+ this.state = 487;
_la = this._input.LA(1);
- if(!(_la===55 || _la===56)) {
+ if(!(_la===58 || _la===59)) {
this._errHandler.recoverInline(this);
}
else {
@@ -2114,30 +2302,108 @@ export default class LatexParser extends Parser {
}
}
break;
- case 5:
+ case 6:
{
localctx = new ExponentContext(this, new ExprContext(this, _parentctx, _parentState));
this.pushNewRecursionContext(localctx, _startState, LatexParser.RULE_expr);
- this.state = 442;
- if (!(this.precpred(this._ctx, 26))) {
- throw this.createFailedPredicateException("this.precpred(this._ctx, 26)");
+ this.state = 488;
+ if (!(this.precpred(this._ctx, 31))) {
+ throw this.createFailedPredicateException("this.precpred(this._ctx, 31)");
}
- this.state = 443;
+ this.state = 489;
this.match(LatexParser.CARET);
- this.state = 444;
+ this.state = 490;
this.match(LatexParser.L_BRACE);
- this.state = 445;
+ this.state = 491;
this.expr(0);
- this.state = 446;
+ this.state = 492;
this.match(LatexParser.R_BRACE);
}
break;
+ case 7:
+ {
+ localctx = new IndexContext(this, new ExprContext(this, _parentctx, _parentState));
+ this.pushNewRecursionContext(localctx, _startState, LatexParser.RULE_expr);
+ this.state = 494;
+ if (!(this.precpred(this._ctx, 30))) {
+ throw this.createFailedPredicateException("this.precpred(this._ctx, 30)");
+ }
+ this.state = 495;
+ this.match(LatexParser.UNDERSCORE);
+ this.state = 496;
+ this.match(LatexParser.L_BRACE);
+ this.state = 497;
+ this.expr(0);
+ this.state = 498;
+ this.match(LatexParser.COMMA);
+ this.state = 499;
+ this.expr(0);
+ this.state = 500;
+ this.match(LatexParser.R_BRACE);
+ }
+ break;
+ case 8:
+ {
+ localctx = new TransposeContext(this, new ExprContext(this, _parentctx, _parentState));
+ this.pushNewRecursionContext(localctx, _startState, LatexParser.RULE_expr);
+ this.state = 502;
+ if (!(this.precpred(this._ctx, 29))) {
+ throw this.createFailedPredicateException("this.precpred(this._ctx, 29)");
+ }
+ this.state = 503;
+ this.match(LatexParser.TRANSPOSE);
+ }
+ break;
}
}
}
- this.state = 452;
+ this.state = 508;
this._errHandler.sync(this);
- _alt = this._interp.adaptivePredict(this._input, 33, this._ctx);
+ _alt = this._interp.adaptivePredict(this._input, 37, this._ctx);
+ }
+ }
+ }
+ catch (re) {
+ if (re instanceof RecognitionException) {
+ localctx.exception = re;
+ this._errHandler.reportError(this, re);
+ this._errHandler.recover(this, re);
+ } else {
+ throw re;
+ }
+ }
+ finally {
+ this.unrollRecursionContexts(_parentctx);
+ }
+ return localctx;
+ }
+ // @RuleVersion(0)
+ public u_block(): U_blockContext {
+ let localctx: U_blockContext = new U_blockContext(this, this._ctx, this.state);
+ this.enterRule(localctx, 52, LatexParser.RULE_u_block);
+ let _la: number;
+ try {
+ this.enterOuterAlt(localctx, 1);
+ {
+ this.state = 509;
+ _la = this._input.LA(1);
+ if(!(_la===1 || _la===2)) {
+ this._errHandler.recoverInline(this);
+ }
+ else {
+ this._errHandler.reportMatch(this);
+ this.consume();
+ }
+ this.state = 510;
+ this.u_expr(0);
+ this.state = 511;
+ _la = this._input.LA(1);
+ if(!(_la===72 || _la===73)) {
+ this._errHandler.recoverInline(this);
+ }
+ else {
+ this._errHandler.reportMatch(this);
+ this.consume();
}
}
}
@@ -2151,19 +2417,19 @@ export default class LatexParser extends Parser {
}
}
finally {
- this.unrollRecursionContexts(_parentctx);
+ this.exitRule();
}
return localctx;
}
// @RuleVersion(0)
- public u_block(): U_blockContext {
- let localctx: U_blockContext = new U_blockContext(this, this._ctx, this.state);
- this.enterRule(localctx, 48, LatexParser.RULE_u_block);
+ public u_insert_matrix(): U_insert_matrixContext {
+ let localctx: U_insert_matrixContext = new U_insert_matrixContext(this, this._ctx, this.state);
+ this.enterRule(localctx, 54, LatexParser.RULE_u_insert_matrix);
let _la: number;
try {
this.enterOuterAlt(localctx, 1);
{
- this.state = 453;
+ this.state = 513;
_la = this._input.LA(1);
if(!(_la===1 || _la===2)) {
this._errHandler.recoverInline(this);
@@ -2172,11 +2438,38 @@ export default class LatexParser extends Parser {
this._errHandler.reportMatch(this);
this.consume();
}
- this.state = 454;
- this.u_expr(0);
- this.state = 455;
+ this.state = 514;
+ localctx._numRows = this._input.LT(1);
+ _la = this._input.LA(1);
+ if(!(_la===86 || _la===87)) {
+ localctx._numRows = this._errHandler.recoverInline(this);
+ }
+ else {
+ this._errHandler.reportMatch(this);
+ this.consume();
+ }
+ this.state = 515;
+ _la = this._input.LA(1);
+ if(!(_la===77 || _la===79)) {
+ this._errHandler.recoverInline(this);
+ }
+ else {
+ this._errHandler.reportMatch(this);
+ this.consume();
+ }
+ this.state = 516;
+ localctx._numColumns = this._input.LT(1);
+ _la = this._input.LA(1);
+ if(!(_la===86 || _la===87)) {
+ localctx._numColumns = this._errHandler.recoverInline(this);
+ }
+ else {
+ this._errHandler.reportMatch(this);
+ this.consume();
+ }
+ this.state = 517;
_la = this._input.LA(1);
- if(!(_la===65 || _la===66)) {
+ if(!(_la===72 || _la===73)) {
this._errHandler.recoverInline(this);
}
else {
@@ -2202,42 +2495,42 @@ export default class LatexParser extends Parser {
// @RuleVersion(0)
public u_fraction(): U_fractionContext {
let localctx: U_fractionContext = new U_fractionContext(this, this._ctx, this.state);
- this.enterRule(localctx, 50, LatexParser.RULE_u_fraction);
+ this.enterRule(localctx, 56, LatexParser.RULE_u_fraction);
let _la: number;
try {
- this.state = 465;
+ this.state = 527;
this._errHandler.sync(this);
switch (this._input.LA(1)) {
- case 67:
+ case 74:
this.enterOuterAlt(localctx, 1);
{
- this.state = 457;
+ this.state = 519;
this.match(LatexParser.U_CMD_FRAC);
- this.state = 458;
+ this.state = 520;
this.match(LatexParser.U_L_BRACE);
- this.state = 459;
+ this.state = 521;
_la = this._input.LA(1);
- if(!(_la===77 || _la===78)) {
+ if(!(_la===86 || _la===87)) {
this._errHandler.recoverInline(this);
}
else {
this._errHandler.reportMatch(this);
this.consume();
}
- this.state = 460;
+ this.state = 522;
this.match(LatexParser.U_R_BRACE);
- this.state = 461;
+ this.state = 523;
this.match(LatexParser.U_L_BRACE);
- this.state = 462;
+ this.state = 524;
this.match(LatexParser.U_NUMBER);
- this.state = 463;
+ this.state = 525;
this.match(LatexParser.U_R_BRACE);
}
break;
- case 68:
+ case 75:
this.enterOuterAlt(localctx, 2);
{
- this.state = 464;
+ this.state = 526;
this.match(LatexParser.U_CMD_FRAC_INTS);
}
break;
@@ -2272,90 +2565,90 @@ export default class LatexParser extends Parser {
let _parentState: number = this.state;
let localctx: U_exprContext = new U_exprContext(this, this._ctx, _parentState);
let _prevctx: U_exprContext = localctx;
- let _startState: number = 52;
- this.enterRecursionRule(localctx, 52, LatexParser.RULE_u_expr, _p);
+ let _startState: number = 58;
+ this.enterRecursionRule(localctx, 58, LatexParser.RULE_u_expr, _p);
try {
let _alt: number;
this.enterOuterAlt(localctx, 1);
{
- this.state = 489;
+ this.state = 551;
this._errHandler.sync(this);
switch (this._input.LA(1)) {
- case 70:
+ case 78:
{
localctx = new UnitSqrtContext(this, localctx);
this._ctx = localctx;
_prevctx = localctx;
- this.state = 468;
+ this.state = 530;
this.match(LatexParser.U_CMD_SQRT);
- this.state = 469;
+ this.state = 531;
this.match(LatexParser.U_L_BRACE);
- this.state = 470;
+ this.state = 532;
this.expr(0);
- this.state = 471;
+ this.state = 533;
this.match(LatexParser.U_R_BRACE);
}
break;
- case 67:
+ case 74:
{
localctx = new UnitDivideContext(this, localctx);
this._ctx = localctx;
_prevctx = localctx;
- this.state = 473;
+ this.state = 535;
this.match(LatexParser.U_CMD_FRAC);
- this.state = 474;
+ this.state = 536;
this.match(LatexParser.U_L_BRACE);
- this.state = 477;
+ this.state = 539;
this._errHandler.sync(this);
switch (this._input.LA(1)) {
- case 67:
- case 70:
- case 72:
- case 73:
+ case 74:
+ case 78:
+ case 81:
+ case 82:
{
- this.state = 475;
+ this.state = 537;
this.u_expr(0);
}
break;
- case 77:
+ case 86:
{
- this.state = 476;
+ this.state = 538;
this.match(LatexParser.U_ONE);
}
break;
default:
throw new NoViableAltException(this);
}
- this.state = 479;
+ this.state = 541;
this.match(LatexParser.U_R_BRACE);
- this.state = 480;
+ this.state = 542;
this.match(LatexParser.U_L_BRACE);
- this.state = 481;
+ this.state = 543;
this.u_expr(0);
- this.state = 482;
+ this.state = 544;
this.match(LatexParser.U_R_BRACE);
}
break;
- case 72:
+ case 81:
{
localctx = new UnitNameContext(this, localctx);
this._ctx = localctx;
_prevctx = localctx;
- this.state = 484;
+ this.state = 546;
this.match(LatexParser.U_NAME);
}
break;
- case 73:
+ case 82:
{
localctx = new UnitSubExprContext(this, localctx);
this._ctx = localctx;
_prevctx = localctx;
- this.state = 485;
+ this.state = 547;
this.match(LatexParser.U_L_PAREN);
- this.state = 486;
+ this.state = 548;
this.u_expr(0);
- this.state = 487;
+ this.state = 549;
this.match(LatexParser.U_R_PAREN);
}
break;
@@ -2363,9 +2656,9 @@ export default class LatexParser extends Parser {
throw new NoViableAltException(this);
}
this._ctx.stop = this._input.LT(-1);
- this.state = 513;
+ this.state = 575;
this._errHandler.sync(this);
- _alt = this._interp.adaptivePredict(this._input, 38, this._ctx);
+ _alt = this._interp.adaptivePredict(this._input, 42, this._ctx);
while (_alt !== 2 && _alt !== ATN.INVALID_ALT_NUMBER) {
if (_alt === 1) {
if (this._parseListeners != null) {
@@ -2373,20 +2666,20 @@ export default class LatexParser extends Parser {
}
_prevctx = localctx;
{
- this.state = 511;
+ this.state = 573;
this._errHandler.sync(this);
- switch ( this._interp.adaptivePredict(this._input, 37, this._ctx) ) {
+ switch ( this._interp.adaptivePredict(this._input, 41, this._ctx) ) {
case 1:
{
localctx = new UnitMultiplyContext(this, new U_exprContext(this, _parentctx, _parentState));
this.pushNewRecursionContext(localctx, _startState, LatexParser.RULE_u_expr);
- this.state = 491;
+ this.state = 553;
if (!(this.precpred(this._ctx, 4))) {
throw this.createFailedPredicateException("this.precpred(this._ctx, 4)");
}
- this.state = 492;
+ this.state = 554;
this.match(LatexParser.U_CMD_CDOT);
- this.state = 493;
+ this.state = 555;
this.u_expr(5);
}
break;
@@ -2394,13 +2687,13 @@ export default class LatexParser extends Parser {
{
localctx = new UnitExponentContext(this, new U_exprContext(this, _parentctx, _parentState));
this.pushNewRecursionContext(localctx, _startState, LatexParser.RULE_u_expr);
- this.state = 494;
+ this.state = 556;
if (!(this.precpred(this._ctx, 9))) {
throw this.createFailedPredicateException("this.precpred(this._ctx, 9)");
}
- this.state = 495;
+ this.state = 557;
this.match(LatexParser.U_CARET);
- this.state = 496;
+ this.state = 558;
this.match(LatexParser.U_NUMBER);
}
break;
@@ -2408,17 +2701,17 @@ export default class LatexParser extends Parser {
{
localctx = new UnitExponentContext(this, new U_exprContext(this, _parentctx, _parentState));
this.pushNewRecursionContext(localctx, _startState, LatexParser.RULE_u_expr);
- this.state = 497;
+ this.state = 559;
if (!(this.precpred(this._ctx, 8))) {
throw this.createFailedPredicateException("this.precpred(this._ctx, 8)");
}
- this.state = 498;
+ this.state = 560;
this.match(LatexParser.U_CARET);
- this.state = 499;
+ this.state = 561;
this.match(LatexParser.U_L_BRACE);
- this.state = 500;
+ this.state = 562;
this.match(LatexParser.U_NUMBER);
- this.state = 501;
+ this.state = 563;
this.match(LatexParser.U_R_BRACE);
}
break;
@@ -2426,13 +2719,13 @@ export default class LatexParser extends Parser {
{
localctx = new UnitFractionalExponentContext(this, new U_exprContext(this, _parentctx, _parentState));
this.pushNewRecursionContext(localctx, _startState, LatexParser.RULE_u_expr);
- this.state = 502;
+ this.state = 564;
if (!(this.precpred(this._ctx, 7))) {
throw this.createFailedPredicateException("this.precpred(this._ctx, 7)");
}
- this.state = 503;
+ this.state = 565;
this.match(LatexParser.U_CARET);
- this.state = 504;
+ this.state = 566;
this.u_fraction();
}
break;
@@ -2440,26 +2733,26 @@ export default class LatexParser extends Parser {
{
localctx = new UnitFractionalExponentContext(this, new U_exprContext(this, _parentctx, _parentState));
this.pushNewRecursionContext(localctx, _startState, LatexParser.RULE_u_expr);
- this.state = 505;
+ this.state = 567;
if (!(this.precpred(this._ctx, 6))) {
throw this.createFailedPredicateException("this.precpred(this._ctx, 6)");
}
- this.state = 506;
+ this.state = 568;
this.match(LatexParser.U_CARET);
- this.state = 507;
+ this.state = 569;
this.match(LatexParser.U_L_BRACE);
- this.state = 508;
+ this.state = 570;
this.u_fraction();
- this.state = 509;
+ this.state = 571;
this.match(LatexParser.U_R_BRACE);
}
break;
}
}
}
- this.state = 515;
+ this.state = 577;
this._errHandler.sync(this);
- _alt = this._interp.adaptivePredict(this._input, 38, this._ctx);
+ _alt = this._interp.adaptivePredict(this._input, 42, this._ctx);
}
}
}
@@ -2480,9 +2773,9 @@ export default class LatexParser extends Parser {
public sempred(localctx: RuleContext, ruleIndex: number, predIndex: number): boolean {
switch (ruleIndex) {
- case 23:
+ case 25:
return this.expr_sempred(localctx as ExprContext, predIndex);
- case 26:
+ case 29:
return this.u_expr_sempred(localctx as U_exprContext, predIndex);
}
return true;
@@ -2490,206 +2783,233 @@ export default class LatexParser extends Parser {
private expr_sempred(localctx: ExprContext, predIndex: number): boolean {
switch (predIndex) {
case 0:
- return this.precpred(this._ctx, 10);
+ return this.precpred(this._ctx, 11);
case 1:
- return this.precpred(this._ctx, 7);
+ return this.precpred(this._ctx, 10);
case 2:
- return this.precpred(this._ctx, 6);
+ return this.precpred(this._ctx, 7);
case 3:
- return this.precpred(this._ctx, 27);
+ return this.precpred(this._ctx, 6);
case 4:
- return this.precpred(this._ctx, 26);
+ return this.precpred(this._ctx, 32);
+ case 5:
+ return this.precpred(this._ctx, 31);
+ case 6:
+ return this.precpred(this._ctx, 30);
+ case 7:
+ return this.precpred(this._ctx, 29);
}
return true;
}
private u_expr_sempred(localctx: U_exprContext, predIndex: number): boolean {
switch (predIndex) {
- case 5:
+ case 8:
return this.precpred(this._ctx, 4);
- case 6:
+ case 9:
return this.precpred(this._ctx, 9);
- case 7:
+ case 10:
return this.precpred(this._ctx, 8);
- case 8:
+ case 11:
return this.precpred(this._ctx, 7);
- case 9:
+ case 12:
return this.precpred(this._ctx, 6);
}
return true;
}
- public static readonly _serializedATN: number[] = [4,1,83,517,2,0,7,0,2,
+ public static readonly _serializedATN: number[] = [4,1,92,579,2,0,7,0,2,
1,7,1,2,2,7,2,2,3,7,3,2,4,7,4,2,5,7,5,2,6,7,6,2,7,7,7,2,8,7,8,2,9,7,9,2,
10,7,10,2,11,7,11,2,12,7,12,2,13,7,13,2,14,7,14,2,15,7,15,2,16,7,16,2,17,
7,17,2,18,7,18,2,19,7,19,2,20,7,20,2,21,7,21,2,22,7,22,2,23,7,23,2,24,7,
- 24,2,25,7,25,2,26,7,26,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,
- 1,0,1,0,3,0,69,8,0,1,0,1,0,1,1,1,1,1,2,3,2,76,8,2,1,2,1,2,1,3,1,3,1,3,1,
- 4,1,4,3,4,85,8,4,1,4,1,4,1,4,1,5,1,5,1,5,4,5,93,8,5,11,5,12,5,94,1,6,1,
- 6,1,6,3,6,100,8,6,1,7,1,7,1,7,3,7,105,8,7,1,8,1,8,1,8,1,8,1,9,1,9,3,9,113,
- 8,9,1,9,1,9,1,9,1,9,1,9,1,9,5,9,121,8,9,10,9,12,9,124,9,9,1,9,1,9,1,10,
- 1,10,1,10,1,10,1,10,1,10,1,11,3,11,135,8,11,1,11,1,11,1,12,1,12,1,12,1,
- 12,1,12,1,12,1,12,3,12,146,8,12,1,12,1,12,1,12,1,12,1,12,1,12,1,12,1,12,
- 1,12,3,12,157,8,12,1,12,1,12,1,12,1,12,1,13,1,13,1,13,1,13,1,13,1,13,3,
- 13,169,8,13,1,13,1,13,1,13,1,13,1,13,1,13,3,13,177,8,13,1,13,1,13,1,13,
- 1,13,1,13,1,13,1,13,1,13,1,13,3,13,188,8,13,1,13,1,13,1,13,1,13,1,14,1,
- 14,1,14,1,14,1,14,1,14,1,14,1,14,3,14,202,8,14,1,14,1,14,1,14,1,14,1,14,
- 1,14,1,14,1,14,3,14,212,8,14,1,14,1,14,1,14,1,14,1,14,1,14,1,14,1,14,1,
- 15,1,15,1,15,1,15,1,15,1,15,1,15,1,15,3,15,230,8,15,1,15,1,15,1,15,1,15,
- 1,15,1,15,3,15,238,8,15,1,15,1,15,1,15,1,15,1,15,1,15,1,15,1,15,3,15,248,
- 8,15,1,15,1,15,1,15,1,15,1,15,1,15,1,15,1,15,1,15,3,15,259,8,15,1,15,1,
- 15,1,15,1,15,1,15,1,16,1,16,1,16,1,16,1,16,1,16,1,16,1,16,1,16,1,16,3,16,
- 276,8,16,1,17,1,17,3,17,280,8,17,1,18,1,18,1,18,4,18,285,8,18,11,18,12,
- 18,286,1,19,1,19,1,19,1,19,3,19,293,8,19,1,20,1,20,1,20,4,20,298,8,20,11,
- 20,12,20,299,1,21,1,21,1,21,1,21,1,22,1,22,1,22,1,22,1,22,1,22,1,23,1,23,
- 1,23,1,23,1,23,1,23,1,23,1,23,1,23,1,23,1,23,1,23,1,23,1,23,1,23,1,23,1,
- 23,1,23,1,23,1,23,1,23,1,23,1,23,1,23,1,23,1,23,1,23,1,23,1,23,1,23,1,23,
- 3,23,343,8,23,1,23,1,23,1,23,1,23,1,23,1,23,3,23,351,8,23,1,23,1,23,1,23,
- 1,23,1,23,1,23,1,23,1,23,1,23,1,23,1,23,1,23,1,23,1,23,1,23,1,23,1,23,1,
- 23,1,23,1,23,1,23,1,23,1,23,1,23,1,23,1,23,1,23,1,23,1,23,1,23,1,23,1,23,
- 1,23,1,23,1,23,1,23,1,23,1,23,1,23,1,23,1,23,5,23,394,8,23,10,23,12,23,
- 397,9,23,1,23,1,23,1,23,1,23,1,23,3,23,404,8,23,1,23,1,23,1,23,1,23,1,23,
- 1,23,3,23,412,8,23,1,23,1,23,1,23,1,23,5,23,418,8,23,10,23,12,23,421,9,
- 23,1,23,1,23,1,23,1,23,1,23,1,23,1,23,3,23,430,8,23,1,23,1,23,1,23,1,23,
- 1,23,1,23,1,23,1,23,1,23,1,23,1,23,1,23,1,23,1,23,1,23,1,23,1,23,5,23,449,
- 8,23,10,23,12,23,452,9,23,1,24,1,24,1,24,1,24,1,25,1,25,1,25,1,25,1,25,
- 1,25,1,25,1,25,3,25,466,8,25,1,26,1,26,1,26,1,26,1,26,1,26,1,26,1,26,1,
- 26,1,26,3,26,478,8,26,1,26,1,26,1,26,1,26,1,26,1,26,1,26,1,26,1,26,1,26,
- 3,26,490,8,26,1,26,1,26,1,26,1,26,1,26,1,26,1,26,1,26,1,26,1,26,1,26,1,
- 26,1,26,1,26,1,26,1,26,1,26,1,26,1,26,1,26,5,26,512,8,26,10,26,12,26,515,
- 9,26,1,26,0,2,46,52,27,0,2,4,6,8,10,12,14,16,18,20,22,24,26,28,30,32,34,
- 36,38,40,42,44,46,48,50,52,0,10,1,0,24,36,1,0,13,14,1,0,55,56,2,0,50,50,
- 52,52,1,0,21,22,1,0,50,53,1,0,40,41,1,0,1,2,1,0,65,66,1,0,77,78,572,0,68,
- 1,0,0,0,2,72,1,0,0,0,4,75,1,0,0,0,6,79,1,0,0,0,8,84,1,0,0,0,10,89,1,0,0,
- 0,12,96,1,0,0,0,14,101,1,0,0,0,16,106,1,0,0,0,18,112,1,0,0,0,20,127,1,0,
- 0,0,22,134,1,0,0,0,24,145,1,0,0,0,26,168,1,0,0,0,28,193,1,0,0,0,30,221,
- 1,0,0,0,32,275,1,0,0,0,34,279,1,0,0,0,36,281,1,0,0,0,38,288,1,0,0,0,40,
- 294,1,0,0,0,42,301,1,0,0,0,44,305,1,0,0,0,46,429,1,0,0,0,48,453,1,0,0,0,
- 50,465,1,0,0,0,52,489,1,0,0,0,54,69,3,8,4,0,55,69,3,10,5,0,56,69,3,12,6,
- 0,57,69,3,14,7,0,58,69,3,16,8,0,59,69,3,48,24,0,60,69,3,4,2,0,61,69,3,2,
- 1,0,62,69,3,36,18,0,63,69,3,38,19,0,64,69,3,40,20,0,65,69,3,46,23,0,66,
- 69,3,34,17,0,67,69,3,18,9,0,68,54,1,0,0,0,68,55,1,0,0,0,68,56,1,0,0,0,68,
- 57,1,0,0,0,68,58,1,0,0,0,68,59,1,0,0,0,68,60,1,0,0,0,68,61,1,0,0,0,68,62,
- 1,0,0,0,68,63,1,0,0,0,68,64,1,0,0,0,68,65,1,0,0,0,68,66,1,0,0,0,68,67,1,
- 0,0,0,68,69,1,0,0,0,69,70,1,0,0,0,70,71,5,0,0,1,71,1,1,0,0,0,72,73,5,60,
- 0,0,73,3,1,0,0,0,74,76,5,47,0,0,75,74,1,0,0,0,75,76,1,0,0,0,76,77,1,0,0,
- 0,77,78,5,57,0,0,78,5,1,0,0,0,79,80,3,4,2,0,80,81,3,48,24,0,81,7,1,0,0,
- 0,82,85,3,2,1,0,83,85,5,10,0,0,84,82,1,0,0,0,84,83,1,0,0,0,85,86,1,0,0,
- 0,86,87,5,49,0,0,87,88,3,46,23,0,88,9,1,0,0,0,89,92,3,8,4,0,90,91,5,54,
- 0,0,91,93,3,8,4,0,92,90,1,0,0,0,93,94,1,0,0,0,94,92,1,0,0,0,94,95,1,0,0,
- 0,95,11,1,0,0,0,96,97,3,8,4,0,97,99,5,49,0,0,98,100,3,48,24,0,99,98,1,0,
- 0,0,99,100,1,0,0,0,100,13,1,0,0,0,101,102,3,46,23,0,102,104,5,49,0,0,103,
- 105,3,48,24,0,104,103,1,0,0,0,104,105,1,0,0,0,105,15,1,0,0,0,106,107,3,
- 46,23,0,107,108,5,49,0,0,108,109,3,46,23,0,109,17,1,0,0,0,110,113,3,2,1,
- 0,111,113,5,10,0,0,112,110,1,0,0,0,112,111,1,0,0,0,113,114,1,0,0,0,114,
- 115,5,49,0,0,115,116,3,2,1,0,116,117,5,6,0,0,117,122,3,20,10,0,118,119,
- 5,54,0,0,119,121,3,20,10,0,120,118,1,0,0,0,121,124,1,0,0,0,122,120,1,0,
- 0,0,122,123,1,0,0,0,123,125,1,0,0,0,124,122,1,0,0,0,125,126,5,7,0,0,126,
- 19,1,0,0,0,127,128,5,6,0,0,128,129,3,46,23,0,129,130,5,54,0,0,130,131,3,
- 34,17,0,131,132,5,7,0,0,132,21,1,0,0,0,133,135,5,23,0,0,134,133,1,0,0,0,
- 134,135,1,0,0,0,135,136,1,0,0,0,136,137,7,0,0,0,137,23,1,0,0,0,138,146,
- 5,11,0,0,139,140,5,12,0,0,140,141,5,4,0,0,141,142,5,5,0,0,142,143,5,48,
- 0,0,143,144,5,4,0,0,144,146,5,5,0,0,145,138,1,0,0,0,145,139,1,0,0,0,146,
- 147,1,0,0,0,147,148,5,6,0,0,148,149,3,46,23,0,149,156,5,7,0,0,150,151,5,
- 15,0,0,151,152,5,4,0,0,152,153,3,2,1,0,153,154,5,5,0,0,154,157,1,0,0,0,
- 155,157,3,2,1,0,156,150,1,0,0,0,156,155,1,0,0,0,157,158,1,0,0,0,158,159,
- 5,6,0,0,159,160,3,2,1,0,160,161,5,7,0,0,161,25,1,0,0,0,162,163,5,12,0,0,
- 163,164,5,4,0,0,164,165,3,46,23,0,165,166,5,5,0,0,166,169,1,0,0,0,167,169,
- 7,1,0,0,168,162,1,0,0,0,168,167,1,0,0,0,169,176,1,0,0,0,170,171,5,48,0,
- 0,171,172,5,4,0,0,172,173,3,46,23,0,173,174,5,5,0,0,174,177,1,0,0,0,175,
- 177,7,2,0,0,176,170,1,0,0,0,176,175,1,0,0,0,177,178,1,0,0,0,178,179,5,6,
- 0,0,179,180,3,46,23,0,180,187,5,7,0,0,181,182,5,15,0,0,182,183,5,4,0,0,
- 183,184,3,2,1,0,184,185,5,5,0,0,185,188,1,0,0,0,186,188,3,2,1,0,187,181,
- 1,0,0,0,187,186,1,0,0,0,188,189,1,0,0,0,189,190,5,6,0,0,190,191,3,2,1,0,
- 191,192,5,7,0,0,192,27,1,0,0,0,193,194,5,16,0,0,194,201,5,4,0,0,195,196,
- 5,15,0,0,196,197,5,4,0,0,197,198,3,2,1,0,198,199,5,5,0,0,199,202,1,0,0,
- 0,200,202,3,2,1,0,201,195,1,0,0,0,201,200,1,0,0,0,202,203,1,0,0,0,203,204,
- 5,5,0,0,204,211,5,4,0,0,205,206,5,15,0,0,206,207,5,4,0,0,207,208,3,2,1,
- 0,208,209,5,5,0,0,209,212,1,0,0,0,210,212,3,2,1,0,211,205,1,0,0,0,211,210,
- 1,0,0,0,212,213,1,0,0,0,213,214,5,6,0,0,214,215,3,2,1,0,215,216,5,7,0,0,
- 216,217,5,5,0,0,217,218,5,6,0,0,218,219,3,46,23,0,219,220,5,7,0,0,220,29,
- 1,0,0,0,221,222,5,16,0,0,222,229,5,4,0,0,223,224,5,15,0,0,224,225,5,4,0,
- 0,225,226,3,2,1,0,226,227,5,5,0,0,227,230,1,0,0,0,228,230,3,2,1,0,229,223,
- 1,0,0,0,229,228,1,0,0,0,230,237,1,0,0,0,231,232,5,48,0,0,232,233,5,4,0,
- 0,233,234,3,4,2,0,234,235,5,5,0,0,235,238,1,0,0,0,236,238,5,55,0,0,237,
- 231,1,0,0,0,237,236,1,0,0,0,238,239,1,0,0,0,239,240,5,5,0,0,240,247,5,4,
- 0,0,241,242,5,15,0,0,242,243,5,4,0,0,243,244,3,2,1,0,244,245,5,5,0,0,245,
- 248,1,0,0,0,246,248,3,2,1,0,247,241,1,0,0,0,247,246,1,0,0,0,248,249,1,0,
- 0,0,249,250,5,6,0,0,250,251,3,2,1,0,251,258,5,7,0,0,252,253,5,48,0,0,253,
- 254,5,4,0,0,254,255,3,4,2,0,255,256,5,5,0,0,256,259,1,0,0,0,257,259,5,55,
- 0,0,258,252,1,0,0,0,258,257,1,0,0,0,259,260,1,0,0,0,260,261,5,5,0,0,261,
- 262,5,6,0,0,262,263,3,46,23,0,263,264,5,7,0,0,264,31,1,0,0,0,265,266,3,
- 2,1,0,266,267,5,49,0,0,267,268,3,46,23,0,268,276,1,0,0,0,269,270,3,46,23,
- 0,270,271,7,3,0,0,271,272,3,2,1,0,272,273,7,3,0,0,273,274,3,46,23,0,274,
- 276,1,0,0,0,275,265,1,0,0,0,275,269,1,0,0,0,276,33,1,0,0,0,277,280,3,42,
- 21,0,278,280,3,44,22,0,279,277,1,0,0,0,279,278,1,0,0,0,280,35,1,0,0,0,281,
- 284,3,2,1,0,282,283,5,54,0,0,283,285,3,2,1,0,284,282,1,0,0,0,285,286,1,
- 0,0,0,286,284,1,0,0,0,286,287,1,0,0,0,287,37,1,0,0,0,288,289,3,2,1,0,289,
- 292,7,4,0,0,290,293,3,4,2,0,291,293,3,6,3,0,292,290,1,0,0,0,292,291,1,0,
- 0,0,293,39,1,0,0,0,294,297,3,38,19,0,295,296,5,54,0,0,296,298,3,38,19,0,
- 297,295,1,0,0,0,298,299,1,0,0,0,299,297,1,0,0,0,299,300,1,0,0,0,300,41,
- 1,0,0,0,301,302,3,46,23,0,302,303,7,5,0,0,303,304,3,46,23,0,304,43,1,0,
- 0,0,305,306,3,46,23,0,306,307,7,5,0,0,307,308,3,46,23,0,308,309,7,5,0,0,
- 309,310,3,46,23,0,310,45,1,0,0,0,311,312,6,23,-1,0,312,313,3,2,1,0,313,
- 314,5,59,0,0,314,430,1,0,0,0,315,316,3,2,1,0,316,317,7,2,0,0,317,318,5,
- 58,0,0,318,430,1,0,0,0,319,320,3,2,1,0,320,321,5,48,0,0,321,322,5,4,0,0,
- 322,323,3,46,23,0,323,324,5,5,0,0,324,325,5,58,0,0,325,430,1,0,0,0,326,
- 430,5,20,0,0,327,328,5,19,0,0,328,329,5,4,0,0,329,330,3,46,23,0,330,331,
- 5,5,0,0,331,430,1,0,0,0,332,333,3,22,11,0,333,334,5,6,0,0,334,335,3,46,
- 23,0,335,336,5,7,0,0,336,430,1,0,0,0,337,430,3,24,12,0,338,430,3,26,13,
- 0,339,430,3,28,14,0,340,430,3,30,15,0,341,343,5,23,0,0,342,341,1,0,0,0,
- 342,343,1,0,0,0,343,344,1,0,0,0,344,345,5,37,0,0,345,346,5,6,0,0,346,347,
- 3,46,23,0,347,348,5,7,0,0,348,430,1,0,0,0,349,351,5,23,0,0,350,349,1,0,
- 0,0,350,351,1,0,0,0,351,352,1,0,0,0,352,353,5,38,0,0,353,354,5,6,0,0,354,
- 355,3,46,23,0,355,356,5,7,0,0,356,430,1,0,0,0,357,358,5,39,0,0,358,359,
- 5,4,0,0,359,360,3,46,23,0,360,361,5,5,0,0,361,362,5,6,0,0,362,363,3,46,
- 23,0,363,364,5,7,0,0,364,430,1,0,0,0,365,366,7,6,0,0,366,367,5,6,0,0,367,
- 368,3,46,23,0,368,369,5,7,0,0,369,430,1,0,0,0,370,371,5,8,0,0,371,372,3,
- 46,23,0,372,373,5,8,0,0,373,430,1,0,0,0,374,430,3,6,3,0,375,430,3,4,2,0,
- 376,377,5,47,0,0,377,430,3,46,23,11,378,379,5,16,0,0,379,380,5,4,0,0,380,
- 381,3,46,23,0,381,382,5,5,0,0,382,383,5,4,0,0,383,384,3,46,23,0,384,385,
- 5,5,0,0,385,430,1,0,0,0,386,430,5,17,0,0,387,430,3,2,1,0,388,389,3,2,1,
- 0,389,390,5,6,0,0,390,395,3,32,16,0,391,392,5,54,0,0,392,394,3,32,16,0,
- 393,391,1,0,0,0,394,397,1,0,0,0,395,393,1,0,0,0,395,396,1,0,0,0,396,398,
- 1,0,0,0,397,395,1,0,0,0,398,403,5,7,0,0,399,400,5,60,0,0,400,401,3,4,2,
- 0,401,402,5,60,0,0,402,404,1,0,0,0,403,399,1,0,0,0,403,404,1,0,0,0,404,
- 430,1,0,0,0,405,406,5,15,0,0,406,407,5,4,0,0,407,408,3,2,1,0,408,409,5,
- 5,0,0,409,412,1,0,0,0,410,412,3,2,1,0,411,405,1,0,0,0,411,410,1,0,0,0,412,
- 413,1,0,0,0,413,414,5,6,0,0,414,419,3,46,23,0,415,416,5,54,0,0,416,418,
- 3,46,23,0,417,415,1,0,0,0,418,421,1,0,0,0,419,417,1,0,0,0,419,420,1,0,0,
- 0,420,422,1,0,0,0,421,419,1,0,0,0,422,423,5,7,0,0,423,430,1,0,0,0,424,430,
- 5,10,0,0,425,426,5,6,0,0,426,427,3,46,23,0,427,428,5,7,0,0,428,430,1,0,
- 0,0,429,311,1,0,0,0,429,315,1,0,0,0,429,319,1,0,0,0,429,326,1,0,0,0,429,
- 327,1,0,0,0,429,332,1,0,0,0,429,337,1,0,0,0,429,338,1,0,0,0,429,339,1,0,
- 0,0,429,340,1,0,0,0,429,342,1,0,0,0,429,350,1,0,0,0,429,357,1,0,0,0,429,
- 365,1,0,0,0,429,370,1,0,0,0,429,374,1,0,0,0,429,375,1,0,0,0,429,376,1,0,
- 0,0,429,378,1,0,0,0,429,386,1,0,0,0,429,387,1,0,0,0,429,388,1,0,0,0,429,
- 411,1,0,0,0,429,424,1,0,0,0,429,425,1,0,0,0,430,450,1,0,0,0,431,432,10,
- 10,0,0,432,433,5,18,0,0,433,449,3,46,23,11,434,435,10,7,0,0,435,436,5,46,
- 0,0,436,449,3,46,23,8,437,438,10,6,0,0,438,439,5,47,0,0,439,449,3,46,23,
- 7,440,441,10,27,0,0,441,449,7,2,0,0,442,443,10,26,0,0,443,444,5,48,0,0,
- 444,445,5,4,0,0,445,446,3,46,23,0,446,447,5,5,0,0,447,449,1,0,0,0,448,431,
- 1,0,0,0,448,434,1,0,0,0,448,437,1,0,0,0,448,440,1,0,0,0,448,442,1,0,0,0,
- 449,452,1,0,0,0,450,448,1,0,0,0,450,451,1,0,0,0,451,47,1,0,0,0,452,450,
- 1,0,0,0,453,454,7,7,0,0,454,455,3,52,26,0,455,456,7,8,0,0,456,49,1,0,0,
- 0,457,458,5,67,0,0,458,459,5,75,0,0,459,460,7,9,0,0,460,461,5,76,0,0,461,
- 462,5,75,0,0,462,463,5,78,0,0,463,466,5,76,0,0,464,466,5,68,0,0,465,457,
- 1,0,0,0,465,464,1,0,0,0,466,51,1,0,0,0,467,468,6,26,-1,0,468,469,5,70,0,
- 0,469,470,5,75,0,0,470,471,3,46,23,0,471,472,5,76,0,0,472,490,1,0,0,0,473,
- 474,5,67,0,0,474,477,5,75,0,0,475,478,3,52,26,0,476,478,5,77,0,0,477,475,
- 1,0,0,0,477,476,1,0,0,0,478,479,1,0,0,0,479,480,5,76,0,0,480,481,5,75,0,
- 0,481,482,3,52,26,0,482,483,5,76,0,0,483,490,1,0,0,0,484,490,5,72,0,0,485,
- 486,5,73,0,0,486,487,3,52,26,0,487,488,5,74,0,0,488,490,1,0,0,0,489,467,
- 1,0,0,0,489,473,1,0,0,0,489,484,1,0,0,0,489,485,1,0,0,0,490,513,1,0,0,0,
- 491,492,10,4,0,0,492,493,5,69,0,0,493,512,3,52,26,5,494,495,10,9,0,0,495,
- 496,5,71,0,0,496,512,5,78,0,0,497,498,10,8,0,0,498,499,5,71,0,0,499,500,
- 5,75,0,0,500,501,5,78,0,0,501,512,5,76,0,0,502,503,10,7,0,0,503,504,5,71,
- 0,0,504,512,3,50,25,0,505,506,10,6,0,0,506,507,5,71,0,0,507,508,5,75,0,
- 0,508,509,3,50,25,0,509,510,5,76,0,0,510,512,1,0,0,0,511,491,1,0,0,0,511,
- 494,1,0,0,0,511,497,1,0,0,0,511,502,1,0,0,0,511,505,1,0,0,0,512,515,1,0,
- 0,0,513,511,1,0,0,0,513,514,1,0,0,0,514,53,1,0,0,0,515,513,1,0,0,0,39,68,
- 75,84,94,99,104,112,122,134,145,156,168,176,187,201,211,229,237,247,258,
- 275,279,286,292,299,342,350,395,403,411,419,429,448,450,465,477,489,511,
- 513];
+ 24,2,25,7,25,2,26,7,26,2,27,7,27,2,28,7,28,2,29,7,29,1,0,1,0,1,0,1,0,1,
+ 0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,3,0,76,8,0,1,0,1,0,1,1,5,1,81,
+ 8,1,10,1,12,1,84,9,1,1,1,1,1,5,1,88,8,1,10,1,12,1,91,9,1,1,2,1,2,1,3,3,
+ 3,96,8,3,1,3,1,3,1,4,1,4,1,4,1,5,1,5,3,5,105,8,5,1,5,1,5,1,5,1,6,1,6,1,
+ 6,4,6,113,8,6,11,6,12,6,114,1,7,1,7,1,7,3,7,120,8,7,1,8,1,8,1,8,3,8,125,
+ 8,8,1,9,1,9,1,9,1,9,1,10,1,10,3,10,133,8,10,1,10,1,10,1,10,1,10,1,10,1,
+ 10,5,10,141,8,10,10,10,12,10,144,9,10,1,10,1,10,1,11,1,11,1,11,1,11,1,11,
+ 1,11,1,12,3,12,155,8,12,1,12,1,12,1,13,1,13,1,13,1,13,1,13,1,13,1,13,3,
+ 13,166,8,13,1,13,1,13,1,13,1,13,1,13,1,13,1,13,1,13,1,13,3,13,177,8,13,
+ 1,13,1,13,1,13,1,13,1,14,1,14,1,14,1,14,1,14,1,14,3,14,189,8,14,1,14,1,
+ 14,1,14,1,14,1,14,1,14,3,14,197,8,14,1,14,1,14,1,14,1,14,1,14,1,14,1,14,
+ 1,14,1,14,3,14,208,8,14,1,14,1,14,1,14,1,14,1,15,1,15,1,15,1,15,1,15,1,
+ 15,1,15,1,15,3,15,222,8,15,1,15,1,15,1,15,1,15,1,15,1,15,1,15,1,15,3,15,
+ 232,8,15,1,15,1,15,1,15,1,15,1,15,1,15,1,15,1,15,1,16,1,16,1,16,1,16,1,
+ 16,1,16,1,16,1,16,3,16,250,8,16,1,16,1,16,1,16,1,16,1,16,1,16,3,16,258,
+ 8,16,1,16,1,16,1,16,1,16,1,16,1,16,1,16,1,16,3,16,268,8,16,1,16,1,16,1,
+ 16,1,16,1,16,1,16,1,16,1,16,1,16,3,16,279,8,16,1,16,1,16,1,16,1,16,1,16,
+ 1,17,1,17,1,17,1,17,1,17,1,17,1,17,1,17,1,17,1,17,3,17,296,8,17,1,18,1,
+ 18,3,18,300,8,18,1,19,1,19,1,19,4,19,305,8,19,11,19,12,19,306,1,20,1,20,
+ 1,20,1,20,3,20,313,8,20,1,21,1,21,1,21,4,21,318,8,21,11,21,12,21,319,1,
+ 22,1,22,1,22,1,22,1,23,1,23,1,23,1,23,1,23,1,23,1,24,1,24,1,24,5,24,335,
+ 8,24,10,24,12,24,338,9,24,1,25,1,25,1,25,1,25,1,25,1,25,1,25,1,25,1,25,
+ 1,25,1,25,1,25,1,25,1,25,1,25,1,25,1,25,1,25,1,25,1,25,1,25,1,25,1,25,1,
+ 25,1,25,5,25,365,8,25,10,25,12,25,368,9,25,1,25,1,25,1,25,1,25,1,25,1,25,
+ 1,25,1,25,1,25,1,25,1,25,1,25,3,25,382,8,25,1,25,1,25,1,25,1,25,1,25,1,
+ 25,3,25,390,8,25,1,25,1,25,1,25,1,25,1,25,1,25,1,25,1,25,1,25,1,25,1,25,
+ 1,25,1,25,1,25,1,25,1,25,1,25,1,25,1,25,1,25,1,25,1,25,1,25,1,25,1,25,1,
+ 25,1,25,1,25,1,25,1,25,1,25,1,25,1,25,1,25,1,25,1,25,1,25,1,25,1,25,1,25,
+ 1,25,1,25,1,25,1,25,1,25,5,25,437,8,25,10,25,12,25,440,9,25,1,25,1,25,1,
+ 25,1,25,1,25,3,25,447,8,25,1,25,1,25,1,25,1,25,1,25,1,25,3,25,455,8,25,
+ 1,25,1,25,1,25,1,25,5,25,461,8,25,10,25,12,25,464,9,25,1,25,1,25,1,25,1,
+ 25,1,25,1,25,1,25,3,25,473,8,25,1,25,1,25,1,25,1,25,1,25,1,25,1,25,1,25,
+ 1,25,1,25,1,25,1,25,1,25,1,25,1,25,1,25,1,25,1,25,1,25,1,25,1,25,1,25,1,
+ 25,1,25,1,25,1,25,1,25,1,25,1,25,1,25,5,25,505,8,25,10,25,12,25,508,9,25,
+ 1,26,1,26,1,26,1,26,1,27,1,27,1,27,1,27,1,27,1,27,1,28,1,28,1,28,1,28,1,
+ 28,1,28,1,28,1,28,3,28,528,8,28,1,29,1,29,1,29,1,29,1,29,1,29,1,29,1,29,
+ 1,29,1,29,3,29,540,8,29,1,29,1,29,1,29,1,29,1,29,1,29,1,29,1,29,1,29,1,
+ 29,3,29,552,8,29,1,29,1,29,1,29,1,29,1,29,1,29,1,29,1,29,1,29,1,29,1,29,
+ 1,29,1,29,1,29,1,29,1,29,1,29,1,29,1,29,1,29,5,29,574,8,29,10,29,12,29,
+ 577,9,29,1,29,2,82,89,2,50,58,30,0,2,4,6,8,10,12,14,16,18,20,22,24,26,28,
+ 30,32,34,36,38,40,42,44,46,48,50,52,54,56,58,0,11,1,0,27,39,1,0,14,15,1,
+ 0,58,59,2,0,53,53,55,55,1,0,23,24,1,0,53,56,1,0,43,44,1,0,1,2,1,0,72,73,
+ 1,0,86,87,2,0,77,77,79,79,641,0,75,1,0,0,0,2,82,1,0,0,0,4,92,1,0,0,0,6,
+ 95,1,0,0,0,8,99,1,0,0,0,10,104,1,0,0,0,12,109,1,0,0,0,14,116,1,0,0,0,16,
+ 121,1,0,0,0,18,126,1,0,0,0,20,132,1,0,0,0,22,147,1,0,0,0,24,154,1,0,0,0,
+ 26,165,1,0,0,0,28,188,1,0,0,0,30,213,1,0,0,0,32,241,1,0,0,0,34,295,1,0,
+ 0,0,36,299,1,0,0,0,38,301,1,0,0,0,40,308,1,0,0,0,42,314,1,0,0,0,44,321,
+ 1,0,0,0,46,325,1,0,0,0,48,331,1,0,0,0,50,472,1,0,0,0,52,509,1,0,0,0,54,
+ 513,1,0,0,0,56,527,1,0,0,0,58,551,1,0,0,0,60,76,3,10,5,0,61,76,3,12,6,0,
+ 62,76,3,14,7,0,63,76,3,16,8,0,64,76,3,18,9,0,65,76,3,52,26,0,66,76,3,6,
+ 3,0,67,76,3,4,2,0,68,76,3,38,19,0,69,76,3,40,20,0,70,76,3,42,21,0,71,76,
+ 3,50,25,0,72,76,3,36,18,0,73,76,3,20,10,0,74,76,3,2,1,0,75,60,1,0,0,0,75,
+ 61,1,0,0,0,75,62,1,0,0,0,75,63,1,0,0,0,75,64,1,0,0,0,75,65,1,0,0,0,75,66,
+ 1,0,0,0,75,67,1,0,0,0,75,68,1,0,0,0,75,69,1,0,0,0,75,70,1,0,0,0,75,71,1,
+ 0,0,0,75,72,1,0,0,0,75,73,1,0,0,0,75,74,1,0,0,0,75,76,1,0,0,0,76,77,1,0,
+ 0,0,77,78,5,0,0,1,78,1,1,0,0,0,79,81,9,0,0,0,80,79,1,0,0,0,81,84,1,0,0,
+ 0,82,83,1,0,0,0,82,80,1,0,0,0,83,85,1,0,0,0,84,82,1,0,0,0,85,89,3,54,27,
+ 0,86,88,9,0,0,0,87,86,1,0,0,0,88,91,1,0,0,0,89,90,1,0,0,0,89,87,1,0,0,0,
+ 90,3,1,0,0,0,91,89,1,0,0,0,92,93,5,67,0,0,93,5,1,0,0,0,94,96,5,50,0,0,95,
+ 94,1,0,0,0,95,96,1,0,0,0,96,97,1,0,0,0,97,98,5,60,0,0,98,7,1,0,0,0,99,100,
+ 3,6,3,0,100,101,3,52,26,0,101,9,1,0,0,0,102,105,3,4,2,0,103,105,5,11,0,
+ 0,104,102,1,0,0,0,104,103,1,0,0,0,105,106,1,0,0,0,106,107,5,52,0,0,107,
+ 108,3,50,25,0,108,11,1,0,0,0,109,112,3,10,5,0,110,111,5,57,0,0,111,113,
+ 3,10,5,0,112,110,1,0,0,0,113,114,1,0,0,0,114,112,1,0,0,0,114,115,1,0,0,
+ 0,115,13,1,0,0,0,116,117,3,10,5,0,117,119,5,52,0,0,118,120,3,52,26,0,119,
+ 118,1,0,0,0,119,120,1,0,0,0,120,15,1,0,0,0,121,122,3,50,25,0,122,124,5,
+ 52,0,0,123,125,3,52,26,0,124,123,1,0,0,0,124,125,1,0,0,0,125,17,1,0,0,0,
+ 126,127,3,50,25,0,127,128,5,52,0,0,128,129,3,50,25,0,129,19,1,0,0,0,130,
+ 133,3,4,2,0,131,133,5,11,0,0,132,130,1,0,0,0,132,131,1,0,0,0,133,134,1,
+ 0,0,0,134,135,5,52,0,0,135,136,3,4,2,0,136,137,5,6,0,0,137,142,3,22,11,
+ 0,138,139,5,57,0,0,139,141,3,22,11,0,140,138,1,0,0,0,141,144,1,0,0,0,142,
+ 140,1,0,0,0,142,143,1,0,0,0,143,145,1,0,0,0,144,142,1,0,0,0,145,146,5,7,
+ 0,0,146,21,1,0,0,0,147,148,5,6,0,0,148,149,3,50,25,0,149,150,5,57,0,0,150,
+ 151,3,36,18,0,151,152,5,7,0,0,152,23,1,0,0,0,153,155,5,26,0,0,154,153,1,
+ 0,0,0,154,155,1,0,0,0,155,156,1,0,0,0,156,157,7,0,0,0,157,25,1,0,0,0,158,
+ 166,5,12,0,0,159,160,5,13,0,0,160,161,5,4,0,0,161,162,5,5,0,0,162,163,5,
+ 51,0,0,163,164,5,4,0,0,164,166,5,5,0,0,165,158,1,0,0,0,165,159,1,0,0,0,
+ 166,167,1,0,0,0,167,168,5,6,0,0,168,169,3,50,25,0,169,176,5,7,0,0,170,171,
+ 5,16,0,0,171,172,5,4,0,0,172,173,3,4,2,0,173,174,5,5,0,0,174,177,1,0,0,
+ 0,175,177,3,4,2,0,176,170,1,0,0,0,176,175,1,0,0,0,177,178,1,0,0,0,178,179,
+ 5,6,0,0,179,180,3,4,2,0,180,181,5,7,0,0,181,27,1,0,0,0,182,183,5,13,0,0,
+ 183,184,5,4,0,0,184,185,3,50,25,0,185,186,5,5,0,0,186,189,1,0,0,0,187,189,
+ 7,1,0,0,188,182,1,0,0,0,188,187,1,0,0,0,189,196,1,0,0,0,190,191,5,51,0,
+ 0,191,192,5,4,0,0,192,193,3,50,25,0,193,194,5,5,0,0,194,197,1,0,0,0,195,
+ 197,7,2,0,0,196,190,1,0,0,0,196,195,1,0,0,0,197,198,1,0,0,0,198,199,5,6,
+ 0,0,199,200,3,50,25,0,200,207,5,7,0,0,201,202,5,16,0,0,202,203,5,4,0,0,
+ 203,204,3,4,2,0,204,205,5,5,0,0,205,208,1,0,0,0,206,208,3,4,2,0,207,201,
+ 1,0,0,0,207,206,1,0,0,0,208,209,1,0,0,0,209,210,5,6,0,0,210,211,3,4,2,0,
+ 211,212,5,7,0,0,212,29,1,0,0,0,213,214,5,17,0,0,214,221,5,4,0,0,215,216,
+ 5,16,0,0,216,217,5,4,0,0,217,218,3,4,2,0,218,219,5,5,0,0,219,222,1,0,0,
+ 0,220,222,3,4,2,0,221,215,1,0,0,0,221,220,1,0,0,0,222,223,1,0,0,0,223,224,
+ 5,5,0,0,224,231,5,4,0,0,225,226,5,16,0,0,226,227,5,4,0,0,227,228,3,4,2,
+ 0,228,229,5,5,0,0,229,232,1,0,0,0,230,232,3,4,2,0,231,225,1,0,0,0,231,230,
+ 1,0,0,0,232,233,1,0,0,0,233,234,5,6,0,0,234,235,3,4,2,0,235,236,5,7,0,0,
+ 236,237,5,5,0,0,237,238,5,6,0,0,238,239,3,50,25,0,239,240,5,7,0,0,240,31,
+ 1,0,0,0,241,242,5,17,0,0,242,249,5,4,0,0,243,244,5,16,0,0,244,245,5,4,0,
+ 0,245,246,3,4,2,0,246,247,5,5,0,0,247,250,1,0,0,0,248,250,3,4,2,0,249,243,
+ 1,0,0,0,249,248,1,0,0,0,250,257,1,0,0,0,251,252,5,51,0,0,252,253,5,4,0,
+ 0,253,254,3,6,3,0,254,255,5,5,0,0,255,258,1,0,0,0,256,258,5,58,0,0,257,
+ 251,1,0,0,0,257,256,1,0,0,0,258,259,1,0,0,0,259,260,5,5,0,0,260,267,5,4,
+ 0,0,261,262,5,16,0,0,262,263,5,4,0,0,263,264,3,4,2,0,264,265,5,5,0,0,265,
+ 268,1,0,0,0,266,268,3,4,2,0,267,261,1,0,0,0,267,266,1,0,0,0,268,269,1,0,
+ 0,0,269,270,5,6,0,0,270,271,3,4,2,0,271,278,5,7,0,0,272,273,5,51,0,0,273,
+ 274,5,4,0,0,274,275,3,6,3,0,275,276,5,5,0,0,276,279,1,0,0,0,277,279,5,58,
+ 0,0,278,272,1,0,0,0,278,277,1,0,0,0,279,280,1,0,0,0,280,281,5,5,0,0,281,
+ 282,5,6,0,0,282,283,3,50,25,0,283,284,5,7,0,0,284,33,1,0,0,0,285,286,3,
+ 4,2,0,286,287,5,52,0,0,287,288,3,50,25,0,288,296,1,0,0,0,289,290,3,50,25,
+ 0,290,291,7,3,0,0,291,292,3,4,2,0,292,293,7,3,0,0,293,294,3,50,25,0,294,
+ 296,1,0,0,0,295,285,1,0,0,0,295,289,1,0,0,0,296,35,1,0,0,0,297,300,3,44,
+ 22,0,298,300,3,46,23,0,299,297,1,0,0,0,299,298,1,0,0,0,300,37,1,0,0,0,301,
+ 304,3,4,2,0,302,303,5,57,0,0,303,305,3,4,2,0,304,302,1,0,0,0,305,306,1,
+ 0,0,0,306,304,1,0,0,0,306,307,1,0,0,0,307,39,1,0,0,0,308,309,3,4,2,0,309,
+ 312,7,4,0,0,310,313,3,6,3,0,311,313,3,8,4,0,312,310,1,0,0,0,312,311,1,0,
+ 0,0,313,41,1,0,0,0,314,317,3,40,20,0,315,316,5,57,0,0,316,318,3,40,20,0,
+ 317,315,1,0,0,0,318,319,1,0,0,0,319,317,1,0,0,0,319,320,1,0,0,0,320,43,
+ 1,0,0,0,321,322,3,50,25,0,322,323,7,5,0,0,323,324,3,50,25,0,324,45,1,0,
+ 0,0,325,326,3,50,25,0,326,327,7,5,0,0,327,328,3,50,25,0,328,329,7,5,0,0,
+ 329,330,3,50,25,0,330,47,1,0,0,0,331,336,3,50,25,0,332,333,5,63,0,0,333,
+ 335,3,50,25,0,334,332,1,0,0,0,335,338,1,0,0,0,336,334,1,0,0,0,336,337,1,
+ 0,0,0,337,49,1,0,0,0,338,336,1,0,0,0,339,340,6,25,-1,0,340,341,3,4,2,0,
+ 341,342,5,66,0,0,342,473,1,0,0,0,343,344,3,4,2,0,344,345,7,2,0,0,345,346,
+ 5,65,0,0,346,473,1,0,0,0,347,348,3,4,2,0,348,349,5,51,0,0,349,350,5,4,0,
+ 0,350,351,3,50,25,0,351,352,5,5,0,0,352,353,5,65,0,0,353,473,1,0,0,0,354,
+ 473,5,22,0,0,355,356,5,21,0,0,356,357,5,4,0,0,357,358,3,50,25,0,358,359,
+ 5,5,0,0,359,473,1,0,0,0,360,361,5,61,0,0,361,366,3,48,24,0,362,363,5,64,
+ 0,0,363,365,3,48,24,0,364,362,1,0,0,0,365,368,1,0,0,0,366,364,1,0,0,0,366,
+ 367,1,0,0,0,367,369,1,0,0,0,368,366,1,0,0,0,369,370,5,62,0,0,370,473,1,
+ 0,0,0,371,372,3,24,12,0,372,373,5,6,0,0,373,374,3,50,25,0,374,375,5,7,0,
+ 0,375,473,1,0,0,0,376,473,3,26,13,0,377,473,3,28,14,0,378,473,3,30,15,0,
+ 379,473,3,32,16,0,380,382,5,26,0,0,381,380,1,0,0,0,381,382,1,0,0,0,382,
+ 383,1,0,0,0,383,384,5,40,0,0,384,385,5,6,0,0,385,386,3,50,25,0,386,387,
+ 5,7,0,0,387,473,1,0,0,0,388,390,5,26,0,0,389,388,1,0,0,0,389,390,1,0,0,
+ 0,390,391,1,0,0,0,391,392,5,41,0,0,392,393,5,6,0,0,393,394,3,50,25,0,394,
+ 395,5,7,0,0,395,473,1,0,0,0,396,397,5,42,0,0,397,398,5,4,0,0,398,399,3,
+ 50,25,0,399,400,5,5,0,0,400,401,5,6,0,0,401,402,3,50,25,0,402,403,5,7,0,
+ 0,403,473,1,0,0,0,404,405,7,6,0,0,405,406,5,6,0,0,406,407,3,50,25,0,407,
+ 408,5,7,0,0,408,473,1,0,0,0,409,410,5,9,0,0,410,411,3,50,25,0,411,412,5,
+ 9,0,0,412,473,1,0,0,0,413,414,5,8,0,0,414,415,3,50,25,0,415,416,5,8,0,0,
+ 416,473,1,0,0,0,417,473,3,8,4,0,418,473,3,6,3,0,419,420,5,50,0,0,420,473,
+ 3,50,25,12,421,422,5,17,0,0,422,423,5,4,0,0,423,424,3,50,25,0,424,425,5,
+ 5,0,0,425,426,5,4,0,0,426,427,3,50,25,0,427,428,5,5,0,0,428,473,1,0,0,0,
+ 429,473,5,18,0,0,430,473,3,4,2,0,431,432,3,4,2,0,432,433,5,6,0,0,433,438,
+ 3,34,17,0,434,435,5,57,0,0,435,437,3,34,17,0,436,434,1,0,0,0,437,440,1,
+ 0,0,0,438,436,1,0,0,0,438,439,1,0,0,0,439,441,1,0,0,0,440,438,1,0,0,0,441,
+ 446,5,7,0,0,442,443,5,67,0,0,443,444,3,6,3,0,444,445,5,67,0,0,445,447,1,
+ 0,0,0,446,442,1,0,0,0,446,447,1,0,0,0,447,473,1,0,0,0,448,449,5,16,0,0,
+ 449,450,5,4,0,0,450,451,3,4,2,0,451,452,5,5,0,0,452,455,1,0,0,0,453,455,
+ 3,4,2,0,454,448,1,0,0,0,454,453,1,0,0,0,455,456,1,0,0,0,456,457,5,6,0,0,
+ 457,462,3,50,25,0,458,459,5,57,0,0,459,461,3,50,25,0,460,458,1,0,0,0,461,
+ 464,1,0,0,0,462,460,1,0,0,0,462,463,1,0,0,0,463,465,1,0,0,0,464,462,1,0,
+ 0,0,465,466,5,7,0,0,466,473,1,0,0,0,467,473,5,11,0,0,468,469,5,6,0,0,469,
+ 470,3,50,25,0,470,471,5,7,0,0,471,473,1,0,0,0,472,339,1,0,0,0,472,343,1,
+ 0,0,0,472,347,1,0,0,0,472,354,1,0,0,0,472,355,1,0,0,0,472,360,1,0,0,0,472,
+ 371,1,0,0,0,472,376,1,0,0,0,472,377,1,0,0,0,472,378,1,0,0,0,472,379,1,0,
+ 0,0,472,381,1,0,0,0,472,389,1,0,0,0,472,396,1,0,0,0,472,404,1,0,0,0,472,
+ 409,1,0,0,0,472,413,1,0,0,0,472,417,1,0,0,0,472,418,1,0,0,0,472,419,1,0,
+ 0,0,472,421,1,0,0,0,472,429,1,0,0,0,472,430,1,0,0,0,472,431,1,0,0,0,472,
+ 454,1,0,0,0,472,467,1,0,0,0,472,468,1,0,0,0,473,506,1,0,0,0,474,475,10,
+ 11,0,0,475,476,5,20,0,0,476,505,3,50,25,12,477,478,10,10,0,0,478,479,5,
+ 19,0,0,479,505,3,50,25,11,480,481,10,7,0,0,481,482,5,50,0,0,482,505,3,50,
+ 25,8,483,484,10,6,0,0,484,485,5,49,0,0,485,505,3,50,25,7,486,487,10,32,
+ 0,0,487,505,7,2,0,0,488,489,10,31,0,0,489,490,5,51,0,0,490,491,5,4,0,0,
+ 491,492,3,50,25,0,492,493,5,5,0,0,493,505,1,0,0,0,494,495,10,30,0,0,495,
+ 496,5,10,0,0,496,497,5,4,0,0,497,498,3,50,25,0,498,499,5,57,0,0,499,500,
+ 3,50,25,0,500,501,5,5,0,0,501,505,1,0,0,0,502,503,10,29,0,0,503,505,5,25,
+ 0,0,504,474,1,0,0,0,504,477,1,0,0,0,504,480,1,0,0,0,504,483,1,0,0,0,504,
+ 486,1,0,0,0,504,488,1,0,0,0,504,494,1,0,0,0,504,502,1,0,0,0,505,508,1,0,
+ 0,0,506,504,1,0,0,0,506,507,1,0,0,0,507,51,1,0,0,0,508,506,1,0,0,0,509,
+ 510,7,7,0,0,510,511,3,58,29,0,511,512,7,8,0,0,512,53,1,0,0,0,513,514,7,
+ 7,0,0,514,515,7,9,0,0,515,516,7,10,0,0,516,517,7,9,0,0,517,518,7,8,0,0,
+ 518,55,1,0,0,0,519,520,5,74,0,0,520,521,5,84,0,0,521,522,7,9,0,0,522,523,
+ 5,85,0,0,523,524,5,84,0,0,524,525,5,87,0,0,525,528,5,85,0,0,526,528,5,75,
+ 0,0,527,519,1,0,0,0,527,526,1,0,0,0,528,57,1,0,0,0,529,530,6,29,-1,0,530,
+ 531,5,78,0,0,531,532,5,84,0,0,532,533,3,50,25,0,533,534,5,85,0,0,534,552,
+ 1,0,0,0,535,536,5,74,0,0,536,539,5,84,0,0,537,540,3,58,29,0,538,540,5,86,
+ 0,0,539,537,1,0,0,0,539,538,1,0,0,0,540,541,1,0,0,0,541,542,5,85,0,0,542,
+ 543,5,84,0,0,543,544,3,58,29,0,544,545,5,85,0,0,545,552,1,0,0,0,546,552,
+ 5,81,0,0,547,548,5,82,0,0,548,549,3,58,29,0,549,550,5,83,0,0,550,552,1,
+ 0,0,0,551,529,1,0,0,0,551,535,1,0,0,0,551,546,1,0,0,0,551,547,1,0,0,0,552,
+ 575,1,0,0,0,553,554,10,4,0,0,554,555,5,76,0,0,555,574,3,58,29,5,556,557,
+ 10,9,0,0,557,558,5,80,0,0,558,574,5,87,0,0,559,560,10,8,0,0,560,561,5,80,
+ 0,0,561,562,5,84,0,0,562,563,5,87,0,0,563,574,5,85,0,0,564,565,10,7,0,0,
+ 565,566,5,80,0,0,566,574,3,56,28,0,567,568,10,6,0,0,568,569,5,80,0,0,569,
+ 570,5,84,0,0,570,571,3,56,28,0,571,572,5,85,0,0,572,574,1,0,0,0,573,553,
+ 1,0,0,0,573,556,1,0,0,0,573,559,1,0,0,0,573,564,1,0,0,0,573,567,1,0,0,0,
+ 574,577,1,0,0,0,575,573,1,0,0,0,575,576,1,0,0,0,576,59,1,0,0,0,577,575,
+ 1,0,0,0,43,75,82,89,95,104,114,119,124,132,142,154,165,176,188,196,207,
+ 221,231,249,257,267,278,295,299,306,312,319,336,366,381,389,438,446,454,
+ 462,472,504,506,527,539,551,573,575];
private static __ATN: ATN;
public static get _ATN(): ATN {
@@ -2755,6 +3075,9 @@ export class StatementContext extends ParserRuleContext {
public piecewise_assign(): Piecewise_assignContext {
return this.getTypedRuleContext(Piecewise_assignContext, 0) as Piecewise_assignContext;
}
+ public insert_matrix(): Insert_matrixContext {
+ return this.getTypedRuleContext(Insert_matrixContext, 0) as Insert_matrixContext;
+ }
public get ruleIndex(): number {
return LatexParser.RULE_statement;
}
@@ -2769,6 +3092,28 @@ export class StatementContext extends ParserRuleContext {
}
+export class Insert_matrixContext extends ParserRuleContext {
+ constructor(parser?: LatexParser, parent?: ParserRuleContext, invokingState?: number) {
+ super(parent, invokingState);
+ this.parser = parser;
+ }
+ public u_insert_matrix(): U_insert_matrixContext {
+ return this.getTypedRuleContext(U_insert_matrixContext, 0) as U_insert_matrixContext;
+ }
+ public get ruleIndex(): number {
+ return LatexParser.RULE_insert_matrix;
+ }
+ // @Override
+ public accept(visitor: LatexParserVisitor): Result {
+ if (visitor.visitInsert_matrix) {
+ return visitor.visitInsert_matrix(this);
+ } else {
+ return visitor.visitChildren(this);
+ }
+ }
+}
+
+
export class IdContext extends ParserRuleContext {
constructor(parser?: LatexParser, parent?: ParserRuleContext, invokingState?: number) {
super(parent, invokingState);
@@ -3114,8 +3459,8 @@ export class Trig_functionContext extends ParserRuleContext {
public CMD_COTH(): TerminalNode {
return this.getToken(LatexParser.CMD_COTH, 0);
}
- public BACK_SLASH(): TerminalNode {
- return this.getToken(LatexParser.BACK_SLASH, 0);
+ public BACKSLASH(): TerminalNode {
+ return this.getToken(LatexParser.BACKSLASH, 0);
}
public get ruleIndex(): number {
return LatexParser.RULE_trig_function;
@@ -3675,6 +4020,37 @@ export class Condition_chainContext extends ParserRuleContext {
}
+export class Matrix_rowContext extends ParserRuleContext {
+ constructor(parser?: LatexParser, parent?: ParserRuleContext, invokingState?: number) {
+ super(parent, invokingState);
+ this.parser = parser;
+ }
+ public expr_list(): ExprContext[] {
+ return this.getTypedRuleContexts(ExprContext) as ExprContext[];
+ }
+ public expr(i: number): ExprContext {
+ return this.getTypedRuleContext(ExprContext, i) as ExprContext;
+ }
+ public AMPERSAND_list(): TerminalNode[] {
+ return this.getTokens(LatexParser.AMPERSAND);
+ }
+ public AMPERSAND(i: number): TerminalNode {
+ return this.getToken(LatexParser.AMPERSAND, i);
+ }
+ public get ruleIndex(): number {
+ return LatexParser.RULE_matrix_row;
+ }
+ // @Override
+ public accept(visitor: LatexParserVisitor): Result {
+ if (visitor.visitMatrix_row) {
+ return visitor.visitMatrix_row(this);
+ } else {
+ return visitor.visitChildren(this);
+ }
+ }
+}
+
+
export class ExprContext extends ParserRuleContext {
constructor(parser?: LatexParser, parent?: ParserRuleContext, invokingState?: number) {
super(parent, invokingState);
@@ -3704,8 +4080,8 @@ export class LnContext extends ExprContext {
public R_PAREN(): TerminalNode {
return this.getToken(LatexParser.R_PAREN, 0);
}
- public BACK_SLASH(): TerminalNode {
- return this.getToken(LatexParser.BACK_SLASH, 0);
+ public BACKSLASH(): TerminalNode {
+ return this.getToken(LatexParser.BACKSLASH, 0);
}
// @Override
public accept(visitor: LatexParserVisitor): Result {
@@ -3733,8 +4109,8 @@ export class LogContext extends ExprContext {
public R_PAREN(): TerminalNode {
return this.getToken(LatexParser.R_PAREN, 0);
}
- public BACK_SLASH(): TerminalNode {
- return this.getToken(LatexParser.BACK_SLASH, 0);
+ public BACKSLASH(): TerminalNode {
+ return this.getToken(LatexParser.BACKSLASH, 0);
}
// @Override
public accept(visitor: LatexParserVisitor): Result {
@@ -3840,6 +4216,38 @@ export class DerivativeContext extends ExprContext {
}
}
}
+export class MatrixContext extends ExprContext {
+ constructor(parser: LatexParser, ctx: ExprContext) {
+ super(parser, ctx.parentCtx, ctx.invokingState);
+ super.copyFrom(ctx);
+ }
+ public BEGIN_MATRIX(): TerminalNode {
+ return this.getToken(LatexParser.BEGIN_MATRIX, 0);
+ }
+ public matrix_row_list(): Matrix_rowContext[] {
+ return this.getTypedRuleContexts(Matrix_rowContext) as Matrix_rowContext[];
+ }
+ public matrix_row(i: number): Matrix_rowContext {
+ return this.getTypedRuleContext(Matrix_rowContext, i) as Matrix_rowContext;
+ }
+ public END_MATRIX(): TerminalNode {
+ return this.getToken(LatexParser.END_MATRIX, 0);
+ }
+ public DOUBLE_BACKSLASH_list(): TerminalNode[] {
+ return this.getTokens(LatexParser.DOUBLE_BACKSLASH);
+ }
+ public DOUBLE_BACKSLASH(i: number): TerminalNode {
+ return this.getToken(LatexParser.DOUBLE_BACKSLASH, i);
+ }
+ // @Override
+ public accept(visitor: LatexParserVisitor): Result {
+ if (visitor.visitMatrix) {
+ return visitor.visitMatrix(this);
+ } else {
+ return visitor.visitChildren(this);
+ }
+ }
+}
export class SubExprContext extends ExprContext {
constructor(parser: LatexParser, ctx: ExprContext) {
super(parser, ctx.parentCtx, ctx.invokingState);
@@ -3863,6 +4271,29 @@ export class SubExprContext extends ExprContext {
}
}
}
+export class NormContext extends ExprContext {
+ constructor(parser: LatexParser, ctx: ExprContext) {
+ super(parser, ctx.parentCtx, ctx.invokingState);
+ super.copyFrom(ctx);
+ }
+ public DOUBLE_VBAR_list(): TerminalNode[] {
+ return this.getTokens(LatexParser.DOUBLE_VBAR);
+ }
+ public DOUBLE_VBAR(i: number): TerminalNode {
+ return this.getToken(LatexParser.DOUBLE_VBAR, i);
+ }
+ public expr(): ExprContext {
+ return this.getTypedRuleContext(ExprContext, 0) as ExprContext;
+ }
+ // @Override
+ public accept(visitor: LatexParserVisitor): Result {
+ if (visitor.visitNorm) {
+ return visitor.visitNorm(this);
+ } else {
+ return visitor.visitChildren(this);
+ }
+ }
+}
export class SqrtContext extends ExprContext {
constructor(parser: LatexParser, ctx: ExprContext) {
super(parser, ctx.parentCtx, ctx.invokingState);
@@ -4216,6 +4647,38 @@ export class SubtractContext extends ExprContext {
}
}
}
+export class IndexContext extends ExprContext {
+ constructor(parser: LatexParser, ctx: ExprContext) {
+ super(parser, ctx.parentCtx, ctx.invokingState);
+ super.copyFrom(ctx);
+ }
+ public expr_list(): ExprContext[] {
+ return this.getTypedRuleContexts(ExprContext) as ExprContext[];
+ }
+ public expr(i: number): ExprContext {
+ return this.getTypedRuleContext(ExprContext, i) as ExprContext;
+ }
+ public UNDERSCORE(): TerminalNode {
+ return this.getToken(LatexParser.UNDERSCORE, 0);
+ }
+ public L_BRACE(): TerminalNode {
+ return this.getToken(LatexParser.L_BRACE, 0);
+ }
+ public COMMA(): TerminalNode {
+ return this.getToken(LatexParser.COMMA, 0);
+ }
+ public R_BRACE(): TerminalNode {
+ return this.getToken(LatexParser.R_BRACE, 0);
+ }
+ // @Override
+ public accept(visitor: LatexParserVisitor): Result {
+ if (visitor.visitIndex) {
+ return visitor.visitIndex(this);
+ } else {
+ return visitor.visitChildren(this);
+ }
+ }
+}
export class TrigContext extends ExprContext {
constructor(parser: LatexParser, ctx: ExprContext) {
super(parser, ctx.parentCtx, ctx.invokingState);
@@ -4299,6 +4762,29 @@ export class AbsContext extends ExprContext {
}
}
}
+export class MatrixMultiplyContext extends ExprContext {
+ constructor(parser: LatexParser, ctx: ExprContext) {
+ super(parser, ctx.parentCtx, ctx.invokingState);
+ super.copyFrom(ctx);
+ }
+ public expr_list(): ExprContext[] {
+ return this.getTypedRuleContexts(ExprContext) as ExprContext[];
+ }
+ public expr(i: number): ExprContext {
+ return this.getTypedRuleContext(ExprContext, i) as ExprContext;
+ }
+ public CMD_TIMES(): TerminalNode {
+ return this.getToken(LatexParser.CMD_TIMES, 0);
+ }
+ // @Override
+ public accept(visitor: LatexParserVisitor): Result {
+ if (visitor.visitMatrixMultiply) {
+ return visitor.visitMatrixMultiply(this);
+ } else {
+ return visitor.visitChildren(this);
+ }
+ }
+}
export class UnaryMinusContext extends ExprContext {
constructor(parser: LatexParser, ctx: ExprContext) {
super(parser, ctx.parentCtx, ctx.invokingState);
@@ -4336,6 +4822,26 @@ export class VariableContext extends ExprContext {
}
}
}
+export class TransposeContext extends ExprContext {
+ constructor(parser: LatexParser, ctx: ExprContext) {
+ super(parser, ctx.parentCtx, ctx.invokingState);
+ super.copyFrom(ctx);
+ }
+ public expr(): ExprContext {
+ return this.getTypedRuleContext(ExprContext, 0) as ExprContext;
+ }
+ public TRANSPOSE(): TerminalNode {
+ return this.getToken(LatexParser.TRANSPOSE, 0);
+ }
+ // @Override
+ public accept(visitor: LatexParserVisitor): Result {
+ if (visitor.visitTranspose) {
+ return visitor.visitTranspose(this);
+ } else {
+ return visitor.visitChildren(this);
+ }
+ }
+}
export class U_blockContext extends ParserRuleContext {
@@ -4372,6 +4878,57 @@ export class U_blockContext extends ParserRuleContext {
}
+export class U_insert_matrixContext extends ParserRuleContext {
+ public _numRows!: Token;
+ public _numColumns!: Token;
+ constructor(parser?: LatexParser, parent?: ParserRuleContext, invokingState?: number) {
+ super(parent, invokingState);
+ this.parser = parser;
+ }
+ public L_BRACKET(): TerminalNode {
+ return this.getToken(LatexParser.L_BRACKET, 0);
+ }
+ public ALT_L_BRACKET(): TerminalNode {
+ return this.getToken(LatexParser.ALT_L_BRACKET, 0);
+ }
+ public U_COMMA(): TerminalNode {
+ return this.getToken(LatexParser.U_COMMA, 0);
+ }
+ public U_CMD_TIMES(): TerminalNode {
+ return this.getToken(LatexParser.U_CMD_TIMES, 0);
+ }
+ public R_BRACKET(): TerminalNode {
+ return this.getToken(LatexParser.R_BRACKET, 0);
+ }
+ public ALT_R_BRACKET(): TerminalNode {
+ return this.getToken(LatexParser.ALT_R_BRACKET, 0);
+ }
+ public U_NUMBER_list(): TerminalNode[] {
+ return this.getTokens(LatexParser.U_NUMBER);
+ }
+ public U_NUMBER(i: number): TerminalNode {
+ return this.getToken(LatexParser.U_NUMBER, i);
+ }
+ public U_ONE_list(): TerminalNode[] {
+ return this.getTokens(LatexParser.U_ONE);
+ }
+ public U_ONE(i: number): TerminalNode {
+ return this.getToken(LatexParser.U_ONE, i);
+ }
+ public get ruleIndex(): number {
+ return LatexParser.RULE_u_insert_matrix;
+ }
+ // @Override
+ public accept(visitor: LatexParserVisitor): Result {
+ if (visitor.visitU_insert_matrix) {
+ return visitor.visitU_insert_matrix(this);
+ } else {
+ return visitor.visitChildren(this);
+ }
+ }
+}
+
+
export class U_fractionContext extends ParserRuleContext {
constructor(parser?: LatexParser, parent?: ParserRuleContext, invokingState?: number) {
super(parent, invokingState);
diff --git a/src/parser/LatexParserVisitor.ts b/src/parser/LatexParserVisitor.ts
index e4f4cfd4..d0eae510 100644
--- a/src/parser/LatexParserVisitor.ts
+++ b/src/parser/LatexParserVisitor.ts
@@ -5,6 +5,7 @@ import {ParseTreeVisitor} from 'antlr4';
import { StatementContext } from "./LatexParser";
+import { Insert_matrixContext } from "./LatexParser";
import { IdContext } from "./LatexParser";
import { NumberContext } from "./LatexParser";
import { Number_with_unitsContext } from "./LatexParser";
@@ -27,13 +28,16 @@ import { GuessContext } from "./LatexParser";
import { Guess_listContext } from "./LatexParser";
import { Condition_singleContext } from "./LatexParser";
import { Condition_chainContext } from "./LatexParser";
+import { Matrix_rowContext } from "./LatexParser";
import { LnContext } from "./LatexParser";
import { LogContext } from "./LatexParser";
import { BuiltinFunctionContext } from "./LatexParser";
import { NumberExprContext } from "./LatexParser";
import { PiExprContext } from "./LatexParser";
import { DerivativeContext } from "./LatexParser";
+import { MatrixContext } from "./LatexParser";
import { SubExprContext } from "./LatexParser";
+import { NormContext } from "./LatexParser";
import { SqrtContext } from "./LatexParser";
import { IntegralContext } from "./LatexParser";
import { FunctionContext } from "./LatexParser";
@@ -47,13 +51,17 @@ import { BaseLogContext } from "./LatexParser";
import { AddContext } from "./LatexParser";
import { SingleIntSqrtContext } from "./LatexParser";
import { SubtractContext } from "./LatexParser";
+import { IndexContext } from "./LatexParser";
import { TrigContext } from "./LatexParser";
import { DivideIntsContext } from "./LatexParser";
import { NDerivativeContext } from "./LatexParser";
import { AbsContext } from "./LatexParser";
+import { MatrixMultiplyContext } from "./LatexParser";
import { UnaryMinusContext } from "./LatexParser";
import { VariableContext } from "./LatexParser";
+import { TransposeContext } from "./LatexParser";
import { U_blockContext } from "./LatexParser";
+import { U_insert_matrixContext } from "./LatexParser";
import { U_fractionContext } from "./LatexParser";
import { UnitSubExprContext } from "./LatexParser";
import { UnitExponentContext } from "./LatexParser";
@@ -78,6 +86,12 @@ export default class LatexParserVisitor extends ParseTreeVisitor
* @return the visitor result
*/
visitStatement?: (ctx: StatementContext) => Result;
+ /**
+ * Visit a parse tree produced by `LatexParser.insert_matrix`.
+ * @param ctx the parse tree
+ * @return the visitor result
+ */
+ visitInsert_matrix?: (ctx: Insert_matrixContext) => Result;
/**
* Visit a parse tree produced by `LatexParser.id`.
* @param ctx the parse tree
@@ -210,6 +224,12 @@ export default class LatexParserVisitor extends ParseTreeVisitor
* @return the visitor result
*/
visitCondition_chain?: (ctx: Condition_chainContext) => Result;
+ /**
+ * Visit a parse tree produced by `LatexParser.matrix_row`.
+ * @param ctx the parse tree
+ * @return the visitor result
+ */
+ visitMatrix_row?: (ctx: Matrix_rowContext) => Result;
/**
* Visit a parse tree produced by the `ln`
* labeled alternative in `LatexParser.expr`.
@@ -252,6 +272,13 @@ export default class LatexParserVisitor extends ParseTreeVisitor
* @return the visitor result
*/
visitDerivative?: (ctx: DerivativeContext) => Result;
+ /**
+ * Visit a parse tree produced by the `matrix`
+ * labeled alternative in `LatexParser.expr`.
+ * @param ctx the parse tree
+ * @return the visitor result
+ */
+ visitMatrix?: (ctx: MatrixContext) => Result;
/**
* Visit a parse tree produced by the `subExpr`
* labeled alternative in `LatexParser.expr`.
@@ -259,6 +286,13 @@ export default class LatexParserVisitor extends ParseTreeVisitor
* @return the visitor result
*/
visitSubExpr?: (ctx: SubExprContext) => Result;
+ /**
+ * Visit a parse tree produced by the `norm`
+ * labeled alternative in `LatexParser.expr`.
+ * @param ctx the parse tree
+ * @return the visitor result
+ */
+ visitNorm?: (ctx: NormContext) => Result;
/**
* Visit a parse tree produced by the `sqrt`
* labeled alternative in `LatexParser.expr`.
@@ -350,6 +384,13 @@ export default class LatexParserVisitor extends ParseTreeVisitor
* @return the visitor result
*/
visitSubtract?: (ctx: SubtractContext) => Result;
+ /**
+ * Visit a parse tree produced by the `index`
+ * labeled alternative in `LatexParser.expr`.
+ * @param ctx the parse tree
+ * @return the visitor result
+ */
+ visitIndex?: (ctx: IndexContext) => Result;
/**
* Visit a parse tree produced by the `trig`
* labeled alternative in `LatexParser.expr`.
@@ -378,6 +419,13 @@ export default class LatexParserVisitor extends ParseTreeVisitor
* @return the visitor result
*/
visitAbs?: (ctx: AbsContext) => Result;
+ /**
+ * Visit a parse tree produced by the `matrixMultiply`
+ * labeled alternative in `LatexParser.expr`.
+ * @param ctx the parse tree
+ * @return the visitor result
+ */
+ visitMatrixMultiply?: (ctx: MatrixMultiplyContext) => Result;
/**
* Visit a parse tree produced by the `unaryMinus`
* labeled alternative in `LatexParser.expr`.
@@ -392,12 +440,25 @@ export default class LatexParserVisitor extends ParseTreeVisitor
* @return the visitor result
*/
visitVariable?: (ctx: VariableContext) => Result;
+ /**
+ * Visit a parse tree produced by the `transpose`
+ * labeled alternative in `LatexParser.expr`.
+ * @param ctx the parse tree
+ * @return the visitor result
+ */
+ visitTranspose?: (ctx: TransposeContext) => Result;
/**
* Visit a parse tree produced by `LatexParser.u_block`.
* @param ctx the parse tree
* @return the visitor result
*/
visitU_block?: (ctx: U_blockContext) => Result;
+ /**
+ * Visit a parse tree produced by `LatexParser.u_insert_matrix`.
+ * @param ctx the parse tree
+ * @return the visitor result
+ */
+ visitU_insert_matrix?: (ctx: U_insert_matrixContext) => Result;
/**
* Visit a parse tree produced by `LatexParser.u_fraction`.
* @param ctx the parse tree
diff --git a/src/parser/LatexToSympy.ts b/src/parser/LatexToSympy.ts
index e3896899..737777d2 100644
--- a/src/parser/LatexToSympy.ts
+++ b/src/parser/LatexToSympy.ts
@@ -6,7 +6,8 @@ import type { FieldTypes, Statement, QueryStatement, RangeQueryStatement, UserFu
FunctionArgumentAssignment, LocalSubstitution, LocalSubstitutionRange,
Exponent, GuessAssignmentStatement, FunctionUnitsQuery,
SolveParametersWithGuesses, ErrorStatement, EqualityStatement,
- EqualityUnitsQueryStatement, Insertion, SolveParameters, AssignmentList } from "./types";
+ EqualityUnitsQueryStatement, Insertion, Replacement,
+ SolveParameters, AssignmentList, ImmediateUpdate, CodeFunctionQueryStatement, CodeFunctionRawQuery } from "./types";
import { RESERVED, GREEK_CHARS, UNASSIGNABLE, COMPARISON_MAP,
UNITS_WITH_OFFSET, TYPE_PARSING_ERRORS, BUILTIN_FUNCTION_MAP } from "./constants.js";
import type {
@@ -25,9 +26,11 @@ import type {
SubExprContext, UnitSubExprContext, UnitNameContext,
U_blockContext, Condition_singleContext, Condition_chainContext,
ConditionContext, Piecewise_argContext, Piecewise_assignContext,
- BaseLogSingleCharContext, DivideIntsContext, Assign_listContext,
- Assign_plus_queryContext, SingleIntSqrtContext
+ Insert_matrixContext, BaseLogSingleCharContext, DivideIntsContext,
+ Assign_listContext, Assign_plus_queryContext, SingleIntSqrtContext,
+ MatrixContext, IndexContext, MatrixMultiplyContext, TransposeContext, NormContext
} from "./LatexParser";
+import { getBlankMatrixLatex } from "../utility";
type UnitBlockData = {
@@ -95,7 +98,7 @@ export class LatexToSympy extends LatexParserVisitor {
+ visitQuery = (ctx: QueryContext): QueryStatement | RangeQueryStatement | CodeFunctionQueryStatement => {
let sympy = this.visit(ctx.expr()) as string;
const {units, unitsLatex, units_valid, dimensions} = this.visitU_block(ctx.u_block());
@@ -471,10 +481,12 @@ export class LatexToSympy extends LatexParserVisitor 1) {
this.addParsingErrorMessage('Only one range may be specified for plotting.');
@@ -499,6 +511,67 @@ export class LatexToSympy extends LatexParserVisitor implicitParam.name));
+
+ for (const parameter of codeFunction.functionParameters) {
+ const localSub = this.localSubs.find(localSub => localSub.parameter === parameter) as LocalSubstitution;
+ const argument = this.arguments.find(argument => argument.name === localSub.argument && argument.type === "assignment") as FunctionArgumentAssignment;
+ if (!isNaN(Number(argument.sympy))) {
+ parameterValues.push(argument.sympy);
+ parameterUnits.push("");
+ } else if (implicitParamsNames.has(argument.sympy)) {
+ const implicitParam = this.implicitParams.find(implicitParam => implicitParam.name === argument.sympy);
+ parameterValues.push(implicitParam.original_value);
+ parameterUnits.push(implicitParam.units);
+ } else {
+ isCodeFunctionQuery = false;
+ }
+ }
+ if (isCodeFunctionQuery) {
+
+ const codeFunctionRawQuery: CodeFunctionRawQuery = {
+ type: "query",
+ exponents: [],
+ implicitParams: [],
+ params: [codeFunction.sympy,],
+ functions: [],
+ arguments: [],
+ localSubs: [],
+ units: units,
+ unitsLatex: unitsLatex,
+ dimensions: dimensions,
+ units_valid: units_valid,
+ isExponent: false,
+ isFunctionArgument: false,
+ isFunction: false,
+ isUnitsQuery: false,
+ isEqualityUnitsQuery: false,
+ isFromPlotCell: false,
+ sympy: codeFunction.sympy,
+ isRange: false,
+ isCodeFunctionQuery: false,
+ isCodeFunctionRawQuery: true
+ };
+
+ finalQuery = {
+ ...initialQuery,
+ isCodeFunctionQuery: true,
+ codeFunctionRawQuery: codeFunctionRawQuery,
+ generateCode: false,
+ functionName: codeFunction.sympy,
+ parameterNames: codeFunction.functionParameters,
+ parameterValues: parameterValues,
+ parameterUnits: parameterUnits,
+ };
+ }
}
return finalQuery;
@@ -549,7 +622,9 @@ export class LatexToSympy extends LatexParserVisitor {
+ return `_IndexMatrix(${this.visit(ctx.expr(0))}, ${this.visit(ctx.expr(1))}-1, ${this.visit(ctx.expr(2))}-1)`;
+ }
+
visitArgument = (ctx: ArgumentContext): (LocalSubstitution | LocalSubstitutionRange)[] => {
const newSubs: (LocalSubstitution | LocalSubstitutionRange)[] = [];
@@ -809,14 +898,18 @@ export class LatexToSympy extends LatexParserVisitor {
+ return `_Transpose(${this.visit(ctx.expr())})`;
+ }
+
visitUnitExponent = (ctx: UnitExponentContext) => {
return `${this.visit(ctx.u_expr())}^${ctx.U_NUMBER().toString()}`;
}
@@ -1157,9 +1257,30 @@ export class LatexToSympy extends LatexParserVisitor {
+ let sympy = "Matrix([";
+
+ let row = 0;
+ while (ctx.matrix_row(row)) {
+ sympy += "[";
+ let col = 0;
+ while (ctx.matrix_row(row).expr(col)) {
+ sympy += this.visit(ctx.matrix_row(row).expr(col)) + ',';
+ col++;
+ }
+ sympy += "],";
+ row++;
+ }
+
+ sympy += "])";
+
+ return sympy;
+ }
+
visitLn = (ctx: LnContext) => {
- if (!ctx.BACK_SLASH()) {
- this.insertions.push({
+ if (!ctx.BACKSLASH()) {
+ this.pendingEdits.push({
+ type: "insertion",
location: ctx.CMD_LN().parentCtx.start.column,
text: '\\'
})
@@ -1168,8 +1289,9 @@ export class LatexToSympy extends LatexParserVisitor {
- if (!ctx.BACK_SLASH()) {
- this.insertions.push({
+ if (!ctx.BACKSLASH()) {
+ this.pendingEdits.push({
+ type: "insertion",
location: ctx.CMD_LOG().parentCtx.start.column,
text: '\\'
})
@@ -1181,6 +1303,10 @@ export class LatexToSympy extends LatexParserVisitor {
+ return `_norm(${this.visit(ctx.expr())})`;
+ }
+
visitUnaryMinus = (ctx: UnaryMinusContext) => {
return `(-(${this.visit(ctx.expr())}))`;
}
@@ -1211,6 +1337,10 @@ export class LatexToSympy extends LatexParserVisitor {
+ return `_MatMul(${this.visit(ctx.expr(0))}, ${this.visit(ctx.expr(1))})`;
+ }
+
visitUnitMultiply = (ctx: UnitMultiplyContext) => {
return `${this.visit(ctx.u_expr(0))}*${this.visit(ctx.u_expr(1))}`;
}
@@ -1235,11 +1365,11 @@ export class LatexToSympy extends LatexParserVisitor {
- return `${this.visit(ctx.expr(0))}+${this.visit(ctx.expr(1))}`;
+ return `Add(${this.visit(ctx.expr(0))}, ${this.visit(ctx.expr(1))})`;
}
visitSubtract = (ctx: SubtractContext) => {
- return `${this.visit(ctx.expr(0))}-${this.visit(ctx.expr(1))}`;
+ return `Add(${this.visit(ctx.expr(0))}, -(${this.visit(ctx.expr(1))}))`;
}
visitVariable = (ctx: VariableContext) => {
@@ -1257,10 +1387,12 @@ export class LatexToSympy extends LatexParserVisitor {
+ const child = ctx.u_insert_matrix();
+
+ const numRows = parseFloat(child._numRows.text);
+ const numColumns = parseFloat(child._numColumns.text);
+
+ if (!Number.isInteger(numRows) || !Number.isInteger(numColumns)) {
+ this.addParsingErrorMessage('The requested number of rows or columns for a matrix must be integer values');
+ return {type: "error"};
+ }
+
+ if (numRows <= 0 || numColumns <= 0) {
+ this.addParsingErrorMessage('The requested number of rows or columns for a matrix must be positive values');;
+ return {type: "error"};
+ }
+
+ const blankMatrixLatex = getBlankMatrixLatex(numRows, numColumns);
+
+ let startLocation: number;
+
+ if (child.L_BRACKET()) {
+ startLocation = child.L_BRACKET().symbol.start;
+ } else {
+ startLocation = child.ALT_L_BRACKET().symbol.start;
+ }
+
+ // check for a directly proceeding '\left'
+ const leftLocation = this.sourceLatex.slice(0, startLocation).lastIndexOf("\\left");
+ if (this.sourceLatex.slice(leftLocation, startLocation).trim() === "\\left") {
+ startLocation = leftLocation;
+ }
+
+ let endLocation: number;
+
+ if (child.R_BRACKET()) {
+ endLocation = child.R_BRACKET().symbol.stop;
+ } else {
+ endLocation = child.ALT_R_BRACKET().symbol.stop;
+ }
+
+ this.pendingEdits.push({
+ type:"replacement",
+ location: startLocation,
+ deletionLength: endLocation - startLocation + 1,
+ text: blankMatrixLatex
+ });
+
+ return { type: "immediateUpdate" };
+ }
}
diff --git a/src/parser/constants.ts b/src/parser/constants.ts
index d63d06f2..7902a170 100644
--- a/src/parser/constants.ts
+++ b/src/parser/constants.ts
@@ -12,7 +12,12 @@ export const BUILTIN_FUNCTION_MAP = new Map([
['real', '_re'],
['imag', '_im'],
['conj', '_conjugate'],
- ['angle', '_arg']
+ ['angle', '_arg'],
+ ['inv', '_Inverse'],
+ ['det', '_Determinant'],
+ ['transpose', '_Transpose'],
+ ['norm', '_norm'],
+ ['dot', '_dot']
]);
export const COMPARISON_MAP = new Map([
diff --git a/src/parser/types.ts b/src/parser/types.ts
index 6a6dddfa..ebd0031d 100644
--- a/src/parser/types.ts
+++ b/src/parser/types.ts
@@ -7,18 +7,23 @@ export type ImplicitParameter = {
units: string;
unitsLatex: string;
dimensions: number[];
+ original_value: string;
si_value: string;
units_valid: boolean;
};
export type Statement = AssignmentStatement | AssignmentList | QueryStatement | RangeQueryStatement |
- EqualityStatement | BlankStatement | UnitsStatement |
+ CodeFunctionQueryStatement | EqualityStatement | BlankStatement | UnitsStatement |
ErrorStatement | SolveParameters | SolveParametersWithGuesses |
ExpressionStatement | NumberStatement | ParameterStatement |
- ConditionStatement;
+ ConditionStatement | ImmediateUpdate;
+export type ImmediateUpdate = {
+ type: "immediateUpdate";
+}
+
export type BlankStatement = {
type: "blank";
params: [];
@@ -119,6 +124,8 @@ export type AssignmentStatement = BaseAssignmentStatement & {
localSubs: (LocalSubstitution | LocalSubstitutionRange)[];
isFromPlotCell: false;
isRange: false;
+ isCodeFunctionQuery: false;
+ isCodeFunctionRawQuery: false;
};
export type AssignmentList = {
@@ -173,6 +180,8 @@ type BaseQueryStatement = {
export type QueryStatement = BaseQueryStatement & {
isRange: false;
+ isCodeFunctionQuery: false;
+ isCodeFunctionRawQuery: false;
};
export type EqualityUnitsQueryStatement = Omit & {
@@ -180,8 +189,10 @@ export type EqualityUnitsQueryStatement = Omit & {
+export type RangeQueryStatement = BaseQueryStatement & {
isRange: true;
+ isCodeFunctionQuery: false;
+ isCodeFunctionRawQuery: false;
cellNum: number;
numPoints: number;
freeParameter: string;
@@ -195,6 +206,24 @@ export type RangeQueryStatement = Omit & {
outputName: string;
};
+export type CodeFunctionQueryStatement = BaseQueryStatement & {
+ isRange: false;
+ isCodeFunctionQuery: true;
+ isCodeFunctionRawQuery: false;
+ functionName: string;
+ parameterNames: string[];
+ parameterValues: string[];
+ parameterUnits: string[];
+ generateCode: boolean;
+ codeFunctionRawQuery: CodeFunctionRawQuery;
+};
+
+export type CodeFunctionRawQuery = BaseQueryStatement & {
+ isRange: false;
+ isCodeFunctionQuery: false;
+ isCodeFunctionRawQuery: true;
+}
+
export type FunctionArgumentQuery = Pick & {
name: string;
isExponent: false;
@@ -202,6 +231,8 @@ export type FunctionArgumentQuery = Pick & {
@@ -211,9 +242,27 @@ export type FunctionUnitsQuery = Pick & {
@@ -14,12 +15,26 @@ export type FiniteImagResult = Omit & {
numeric: true,
realPart: string;
imagPart: string;
+ generatedCode?: string;
};
-export function isFiniteImagResult(result: Result | FiniteImagResult): result is FiniteImagResult {
+export function isFiniteImagResult(result: Result | FiniteImagResult | MatrixResult): result is FiniteImagResult {
+ if (isMatrixResult(result)) {
+ return false;
+ }
return result.numeric && !result.real && result.finite;
}
+export type MatrixResult = {
+ matrixResult: true;
+ results: ((Result | FiniteImagResult)[])[];
+ generatedCode?: string;
+};
+
+export function isMatrixResult(result: Result | FiniteImagResult | MatrixResult): result is MatrixResult {
+ return "matrixResult" in result && result.matrixResult;
+}
+
export type PlotData = {
numericOutput: boolean;
numericInput: boolean;
@@ -58,6 +73,6 @@ export type SystemResult = {
export type Results = {
error: null | string;
- results: (Result | FiniteImagResult | PlotResult[])[];
+ results: (Result | FiniteImagResult | MatrixResult | PlotResult[])[];
systemResults: SystemResult[];
};
\ No newline at end of file
diff --git a/src/sheet/Sheet.ts b/src/sheet/Sheet.ts
index e6c0c894..7cea589e 100644
--- a/src/sheet/Sheet.ts
+++ b/src/sheet/Sheet.ts
@@ -1,11 +1,12 @@
import type { DatabaseCell } from "../cells/BaseCell"
-import type { Result, FiniteImagResult, PlotResult, SystemResult } from "../resultTypes";
+import type { Result, FiniteImagResult, PlotResult,
+ MatrixResult, SystemResult } from "../resultTypes";
export type Sheet = {
config?: Config; // early sheets did not have a config property
cells: DatabaseCell[];
title: string;
- results: (Result | FiniteImagResult | PlotResult[])[];
+ results: (Result | FiniteImagResult | MatrixResult | PlotResult[])[];
system_results: (SystemResult)[];
nextId: number;
sheetId: string;
diff --git a/src/stores.ts b/src/stores.ts
index 6652e38a..ce44dc7c 100644
--- a/src/stores.ts
+++ b/src/stores.ts
@@ -13,7 +13,8 @@ import DeletedCellClass from "./cells/DeletedCell";
import InsertCell from "./cells/InsertCell";
import type { History } from './database/types';
-import type { Result, FiniteImagResult, PlotResult, SystemResult } from './resultTypes';
+import type { Result, FiniteImagResult, PlotResult,
+ MatrixResult, SystemResult } from './resultTypes';
import { type InsertedSheet, type Sheet, getDefaultConfig } from './sheet/Sheet';
const defaultTitle = 'New Sheet';
@@ -24,7 +25,7 @@ export const autosaveNeeded = writable(false);
export const config = writable(getDefaultConfig())
export const cells: Writable = writable([]);
export const title = writable(defaultTitle);
-export const results: Writable<(Result | FiniteImagResult | PlotResult[])[]> = writable([]);
+export const results: Writable<(Result | FiniteImagResult | MatrixResult | PlotResult[])[]> = writable([]);
export const system_results: Writable = writable([]);
export const sheetId = writable('');
export const insertedSheets: Writable = writable([]);
diff --git a/src/types.ts b/src/types.ts
index 99c1c883..869c165c 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -2,19 +2,22 @@ import type MathCell from "./cells/MathCell";
import type MathCellElement from "./MathCell.svelte";
import type { SystemDefinition } from "./cells/SystemCell";
import type { Statement } from "./parser/types";
+import type { MathField } from "./cells/MathField";
export type ModalInfo = {
state: "uploadSheet" | "uploadPending" | "success" | "error" | "requestPersistentStorage" |
"retrieving" | "restoring" | "bugReport" | "supportedUnits" | "opening" | "saving" |
"termsAndConditions" | "newVersion" | "insertSheet" | "keyboardShortcuts" |
- "updateAvailable" | "sheetSettings",
+ "updateAvailable" | "sheetSettings" | "generateCode" | "customMatrix",
modalOpen: boolean,
heading: string,
url?: string,
error?: string,
insertionLocation?: number,
mathCell?: MathCell,
- mathCellElement?: MathCellElement
+ mathCellElement?: MathCellElement,
+ codeGenerationIndex?: number,
+ targetMathField?: MathField
}
diff --git a/src/utility.ts b/src/utility.ts
index 4eb7d718..94c2c04b 100644
--- a/src/utility.ts
+++ b/src/utility.ts
@@ -87,4 +87,207 @@ export function debounce(func: Function, timeout = 300){
clearTimeout(timer);
timer = setTimeout(() => { func.apply(this, args); }, timeout);
};
-}
\ No newline at end of file
+}
+
+
+export function getBlankMatrixLatex(numRows: number, numColumns: number): string {
+ let blankMatrixLatex = "\\begin{bmatrix} ";
+
+ for (let row = 0; row < numRows; row++) {
+ for (let col = 0; col < numColumns; col++) {
+ blankMatrixLatex += "\\placeholder{} ";
+ if (col < numColumns -1) {
+ blankMatrixLatex += "& "
+ }
+ }
+
+ if (row < numRows -1) {
+ blankMatrixLatex += String.raw`\\ `
+ }
+ }
+ blankMatrixLatex += " \\end{bmatrix}";
+
+ return blankMatrixLatex;
+}
+
+
+export const PYTHON_RESERVED = new Set([
+ "FileNotFoundError",
+ "execfile",
+ "exec",
+ "ImportWarning",
+ "class",
+ "frozenset",
+ "ModuleNotFoundError",
+ "UnicodeDecodeError",
+ "as",
+ "delattr",
+ "MemoryError",
+ "ChildProcessError",
+ "type",
+ "BaseException",
+ "KeyError",
+ "slice",
+ "ConnectionError",
+ "Exception",
+ "SyntaxWarning",
+ "bin",
+ "AttributeError",
+ "return",
+ "while",
+ "EnvironmentError",
+ "hex",
+ "OverflowError",
+ "IsADirectoryError",
+ "UnicodeWarning",
+ "staticmethod",
+ "else",
+ "runfile",
+ "import",
+ "max",
+ "Warning",
+ "GeneratorExit",
+ "bytes",
+ "bool",
+ "print",
+ "ReferenceError",
+ "RuntimeWarning",
+ "credits",
+ "globals",
+ "pow",
+ "NotImplemented",
+ "from",
+ "range",
+ "hash",
+ "pass",
+ "if",
+ "def",
+ "FileExistsError",
+ "vars",
+ "ProcessLookupError",
+ "NameError",
+ "chr",
+ "SystemError",
+ "SystemExit",
+ "callable",
+ "ConnectionAbortedError",
+ "TabError",
+ "ZeroDivisionError",
+ "with",
+ "yield",
+ "iter",
+ "InterruptedError",
+ "NotImplementedError",
+ "ImportError",
+ "RuntimeError",
+ "ConnectionRefusedError",
+ "map",
+ "tuple",
+ "BlockingIOError",
+ "False",
+ "TimeoutError",
+ "continue",
+ "is",
+ "id",
+ "setattr",
+ "elif",
+ "ConnectionResetError",
+ "del",
+ "float",
+ "ascii",
+ "list",
+ "TypeError",
+ "break",
+ "for",
+ "True",
+ "BrokenPipeError",
+ "IOError",
+ "copyright",
+ "input",
+ "super",
+ "compile",
+ "and",
+ "eval",
+ "any",
+ "isinstance",
+ "dir",
+ "classmethod",
+ "NotADirectoryError",
+ "zip",
+ "bytearray",
+ "FloatingPointError",
+ "or",
+ "ord",
+ "divmod",
+ "finally",
+ "BytesWarning",
+ "IndentationError",
+ "format",
+ "dict",
+ "min",
+ "object",
+ "property",
+ "EOFError",
+ "str",
+ "PermissionError",
+ "display",
+ "nonlocal",
+ "lambda",
+ "len",
+ "in",
+ "memoryview",
+ "None",
+ "reversed",
+ "UnicodeError",
+ "AssertionError",
+ "UnboundLocalError",
+ "assert",
+ "set",
+ "async",
+ "all",
+ "int",
+ "Ellipsis",
+ "sum",
+ "open",
+ "help",
+ "await",
+ "BufferError",
+ "IndexError",
+ "repr",
+ "try",
+ "not",
+ "PendingDeprecationWarning",
+ "StopAsyncIteration",
+ "complex",
+ "sorted",
+ "RecursionError",
+ "round",
+ "abs",
+ "FutureWarning",
+ "SyntaxError",
+ "oct",
+ "StopIteration",
+ "except",
+ "UserWarning",
+ "filter",
+ "issubclass",
+ "locals",
+ "getattr",
+ "global",
+ "hasattr",
+ "UnicodeEncodeError",
+ "KeyboardInterrupt",
+ "ArithmeticError",
+ "get_ipython",
+ "raise",
+ "enumerate",
+ "OSError",
+ "UnicodeTranslateError",
+ "ValueError",
+ "next",
+ "ResourceWarning",
+ "license",
+ "breakpoint",
+ "DeprecationWarning",
+ "LookupError",
+]);
\ No newline at end of file
diff --git a/tests/test_basic.spec.mjs b/tests/test_basic.spec.mjs
index 684ff1ab..82332935 100644
--- a/tests/test_basic.spec.mjs
+++ b/tests/test_basic.spec.mjs
@@ -167,8 +167,7 @@ test('Test basic functionality', async () => {
await page.click('#add-math-cell');
await page.type(':nth-match(math-field.editable, 1)', '1[meter] + 2[sec]=');
await page.waitForSelector('text=Updating...', {state: 'detached'});
- content = await page.textContent('#result-units-0');
- expect(content).toBe('Dimension Error');
+ await expect(page.locator('#cell-0 >> text=Dimension Error')).toBeVisible();
await page.click('#add-math-cell');
await page.type(':nth-match(math-field.editable, 2)', '/0.010[m]*2[mm]');
@@ -205,8 +204,7 @@ test('Test basic functionality', async () => {
}
await page.type(':nth-match(math-field.editable, 2)', 'gallon');
await page.waitForSelector('text=Updating...', {state: 'detached'});
- content = await page.textContent('#result-units-1');
- expect(content).toBe('Units Mismatch');
+ await expect(page.locator('#cell-1 >> text=Units Mismatch')).toBeVisible();
await page.forceDeleteCell(0);
await page.forceDeleteCell(0);
@@ -328,8 +326,7 @@ test('Test basic functionality', async () => {
await page.click('#add-math-cell');
await page.type(':nth-match(math-field.editable, 2)', 'ln(5[inches])=');
await page.waitForSelector('text=Updating...', {state: 'detached'});
- content = await page.textContent('#result-units-1');
- expect(content).toBe('Dimension Error');
+ await expect(page.locator('#cell-1 >> text=Dimension Error')).toBeVisible();
// check base 10 log
await page.click('#add-math-cell');
@@ -357,8 +354,7 @@ test('Test basic functionality', async () => {
await page.press(':nth-match(math-field.editable, 5)', 'ArrowRight');
await page.type(':nth-match(math-field.editable, 5)', '=');
await page.waitForSelector('text=Updating...', {state: 'detached'});
- content = await page.textContent('#result-units-4');
- expect(content).toBe('Dimension Error');
+ await expect(page.locator('#cell-4 >> text=Dimension Error')).toBeVisible();
// check log without slash
await page.click('#add-math-cell');
@@ -397,8 +393,7 @@ test('Test basic functionality', async () => {
await page.press(':nth-match(math-field.editable, 1)', 'ArrowRight');
await page.type(':nth-match(math-field.editable, 1)', '=[inch]');
await page.waitForSelector('text=Updating...', {state: 'detached'});
- content = await page.textContent('#result-units-0');
- expect(content).toBe('User Units Not Supported for Symbolic Results');
+ await expect(page.locator('#cell-0 >> text=User Units Not Supported for Symbolic Results')).toBeVisible();
await page.forceDeleteCell(0);
@@ -486,7 +481,7 @@ test('Test basic functionality', async () => {
await page.type(':nth-match(math-field.editable, 5)', 'x+y-z=[m]');
await page.waitForSelector('text=Updating...', {state: 'detached'});
content = await page.textContent('#result-value-4');
- expect(content).toBe('0');
+ expect(content).toBe('=0');
await page.click('#add-math-cell');
await page.type(':nth-match(math-field.editable, 6)', 's=.1[inch]');
@@ -498,7 +493,7 @@ test('Test basic functionality', async () => {
await page.type(':nth-match(math-field.editable, 9)', 's+t-u=[inch]');
await page.waitForSelector('text=Updating...', {state: 'detached'});
content = await page.textContent('#result-value-8');
- expect(content).toBe('0');
+ expect(content).toBe('=0');
content = await page.textContent('#result-units-8');
expect(content).toBe('inch');
@@ -514,7 +509,7 @@ test('Test basic functionality', async () => {
await page.type(':nth-match(math-field.editable, 14)', 'w=zz+2*xx');
await page.waitForSelector('text=Updating...', {state: 'detached'});
content = await page.textContent('#result-value-12');
- expect(content).toBe('1\\times 10^{-200}');
+ expect(content).toBe('=1\\times 10^{-200}');
for(let i=0; i<14; i++){
await page.forceDeleteCell(0);
@@ -531,8 +526,7 @@ test('Test basic functionality', async () => {
await page.type(':nth-match(math-field.editable, 3)', '=[inches]');
await page.type(':nth-match(math-field.editable, 2)', '[m]');
await page.waitForSelector('text=Updating...', {state: 'detached'});
- content = await page.textContent('#result-units-2');
- expect(content).toBe('Units Mismatch')
+ await expect(page.locator('#cell-2 >> text=Units Mismatch')).toBeVisible();
for(let i=0; i<3; i++){
await page.forceDeleteCell(0);
@@ -583,27 +577,23 @@ test('Test basic functionality', async () => {
content = await page.textContent('#result-value-2');
expect(parseLatexFloat(content)).toBeCloseTo(100, precision);
- content = await page.textContent('#result-units-3');
- expect(content).toBe('Exponent Not Dimensionless');
+ await expect(page.locator('#cell-3 >> text=Exponent Not Dimensionless')).toBeVisible();
- content = await page.textContent('#result-units-4');
- expect(content).toBe('Exponent Not Dimensionless');
+ await expect(page.locator('#cell-4 >> text=Exponent Not Dimensionless')).toBeVisible();
content = await page.textContent('#result-units-5');
expect(content).toBe('miles^2');
content = await page.textContent('#result-value-5');
expect(parseLatexFloat(content)).toBeCloseTo(100, precision);
- content = await page.textContent('#result-units-6');
- expect(content).toBe('Exponent Not Dimensionless');
+ await expect(page.locator('#cell-6 >> text=Exponent Not Dimensionless')).toBeVisible();
content = await page.textContent('#result-units-8');
expect(content).toBe('')
content = await page.textContent('#result-value-8');
expect(parseLatexFloat(content)).toBeCloseTo(100, precision);
- content = await page.textContent('#result-units-10');
- expect(content).toBe('Exponent Not Dimensionless');
+ await expect(page.locator('#cell-10 >> text=Exponent Not Dimensionless')).toBeVisible();
content = await page.textContent('#result-units-11');
expect(content).toBe('')
@@ -755,10 +745,8 @@ test('Test function notation with exponents and units', async () => {
expect(parseLatexFloat(content)).toBeCloseTo(512, precision-1);
content = await page.textContent('#result-value-3');
expect(parseLatexFloat(content)).toBeCloseTo(32, precision);
- content = await page.textContent('#result-units-4');
- expect(content).toBe('Exponent Not Dimensionless');
- content = await page.textContent('#result-units-5');
- expect(content).toBe('Exponent Not Dimensionless');
+ await expect(page.locator('#cell-4 >> text=Exponent Not Dimensionless')).toBeVisible();
+ await expect(page.locator('#cell-5 >> text=Exponent Not Dimensionless')).toBeVisible();
});
@@ -1137,12 +1125,12 @@ test('Test unit names that contain numbers', async () => {
await page.waitForSelector('.status-footer', { state: 'detached' });
let content = await page.textContent('#result-value-0');
- expect(content).toBe('10');
+ expect(content).toBe('=10');
content = await page.textContent('#result-units-0');
expect(content).toBe('mmH2O');
content = await page.textContent('#result-value-1');
- expect(content).toBe('1');
+ expect(content).toBe('=1');
content = await page.textContent('#result-units-1');
expect(content).toBe('m^2');
@@ -1351,4 +1339,131 @@ test('Test disabling of latex rendering modifiers', async () => {
let content = await page.textContent('#result-value-0');
expect(content).toBe('a_{vertical}');
+});
+
+test('Test inverse', async () => {
+ await page.locator('#cell-0 >> math-field.editable').type('2^-1');
+ await page.locator('#cell-0 >> math-field.editable').press('Tab');
+ await page.locator('#cell-0 >> math-field.editable').type('=');
+
+ await page.locator('#add-math-cell').click();
+
+ await page.locator('#cell-1 >> math-field.editable').type('2[m]^-1');
+ await page.locator('#cell-1 >> math-field.editable').press('Tab');
+ await page.locator('#cell-1 >> math-field.editable').type('=');
+
+ await page.locator('#add-math-cell').click();
+
+ await page.locator('#cell-2 >> math-field.editable').type('a^-1');
+ await page.locator('#cell-2 >> math-field.editable').press('Tab');
+ await page.locator('#cell-2 >> math-field.editable').type('=');
+
+ await page.locator('#add-math-cell').click();
+
+ await page.locator('#cell-3 >> math-field.editable').type('a=2[m]');
+
+
+ await page.waitForSelector('.status-footer', { state: 'detached'});
+
+ let content = await page.textContent('#result-value-0');
+ expect(parseFloat(content)).toBeCloseTo(0.5, precision);
+
+ content = await page.textContent('#result-value-1');
+ expect(parseFloat(content)).toBeCloseTo(0.5, precision);
+ content = await page.textContent('#result-units-1');
+ expect(content).toBe('m^-1');
+
+ content = await page.textContent('#result-value-2');
+ expect(parseFloat(content)).toBeCloseTo(0.5, precision);
+ content = await page.textContent('#result-units-2');
+ expect(content).toBe('m^-1');
+});
+
+test('Negative grouping', async () => {
+ await page.locator('#cell-0 >> math-field.editable').type('a+(b-a)=');
+
+ await page.locator('#add-math-cell').click();
+ await page.locator('#cell-1 >> math-field.editable').type('a-(b-a)=');
+
+ await page.locator('#add-math-cell').click();
+ await page.locator('#cell-2 >> math-field.editable').type('a-b-a=');
+
+ await page.locator('#add-math-cell').click();
+ await page.locator('#cell-3 >> math-field.editable').type('-a-(b+a)=');
+
+ await page.locator('#add-math-cell').click();
+ await page.locator('#cell-4 >> math-field.editable').type('-a+-(b+a)=');
+
+ await page.waitForSelector('.status-footer', { state: 'detached'});
+
+ let content = await page.textContent('#result-value-0');
+ expect(content).toBe('b');
+
+ content = await page.textContent('#result-value-1');
+ expect(content).toBe('2 a - b');
+
+ content = await page.textContent('#result-value-2');
+ expect(content).toBe('- b');
+
+ content = await page.textContent('#result-value-3');
+ expect(content).toBe('- 2 a - b');
+
+ content = await page.textContent('#result-value-3');
+ expect(content).toBe('- 2 a - b');
+});
+
+test('Negative grouping with fractions', async () => {
+ await page.setLatex(0, String.raw`a+\frac{b-a}{1}=`);
+
+ await page.locator('#add-math-cell').click();
+ await page.setLatex(1, String.raw`a-\frac{b-a}{1}=`);
+
+ await page.locator('#add-math-cell').click();
+ await page.setLatex(2, String.raw`-a-\frac{b+a}{1}=`);
+
+ await page.locator('#add-math-cell').click();
+ await page.setLatex(3, String.raw`-a+-\frac{b+a}{1}=`);
+
+
+ await page.waitForSelector('.status-footer', { state: 'detached'});
+
+ let content = await page.textContent('#result-value-0');
+ expect(content).toBe('b');
+
+ content = await page.textContent('#result-value-1');
+ expect(content).toBe('2 a - b');
+
+ content = await page.textContent('#result-value-3');
+ expect(content).toBe('- 2 a - b');
+
+ content = await page.textContent('#result-value-3');
+ expect(content).toBe('- 2 a - b');
+});
+
+test('Negative grouping with fractions with negative denominator', async () => {
+ await page.setLatex(0, String.raw`a+\frac{b-a}{-1}=`);
+
+ await page.locator('#add-math-cell').click();
+ await page.setLatex(1, String.raw`a-\frac{b-a}{-1}=`);
+
+ await page.locator('#add-math-cell').click();
+ await page.setLatex(2, String.raw`-a-\frac{b+a}{-1}=`);
+
+ await page.locator('#add-math-cell').click();
+ await page.setLatex(3, String.raw`-a+-\frac{b+a}{-1}=`);
+
+
+ await page.waitForSelector('.status-footer', { state: 'detached'});
+
+ let content = await page.textContent('#result-value-0');
+ expect(content).toBe('2 a - b');
+
+ content = await page.textContent('#result-value-1');
+ expect(content).toBe('b');
+
+ content = await page.textContent('#result-value-3');
+ expect(content).toBe('b');
+
+ content = await page.textContent('#result-value-3');
+ expect(content).toBe('b');
});
\ No newline at end of file
diff --git a/tests/test_file_save_open.spec.mjs b/tests/test_file_save_open.spec.mjs
index bef8309d..d7698f7b 100644
--- a/tests/test_file_save_open.spec.mjs
+++ b/tests/test_file_save_open.spec.mjs
@@ -221,7 +221,7 @@ test('Test file results displayed during recalc but not if sheet edited', async
await expect(page.locator('#result-value-0')).not.toBeVisible();
// wait for calculation to finish
- await page.waitForSelector('.status-footer', { state: 'detached', timeout: 60000 });
+ await page.waitForSelector('.status-footer', { state: 'detached', timeout: 240000 });
// make sure result is displayed after calculation
content = await page.locator('#result-value-0').textContent();
diff --git a/tests/test_functions.spec.mjs b/tests/test_functions.spec.mjs
index 562b7b58..ec8e3dc2 100644
--- a/tests/test_functions.spec.mjs
+++ b/tests/test_functions.spec.mjs
@@ -42,8 +42,7 @@ test('Test trigonometric functions', async () => {
await page.click('#add-math-cell');
await page.type(':nth-match(math-field.editable, 5)', 'csc(1[sec])=');
await page.waitForSelector('.status-footer', {state: 'detached'});
- content = await page.textContent('#result-units-4');
- expect(content).toBe('Dimension Error');
+ await expect(page.locator('#cell-4 >> text=Dimension Error')).toBeVisible();
await page.click('#add-math-cell');
await page.type(':nth-match(math-field.editable, 6)', 'sin(1)=');
@@ -179,11 +178,9 @@ test('Test min/max functions', async ({ browserName }) => {
content = await page.locator('#result-value-7').textContent();
expect(parseLatexFloat(content)).toBeCloseTo(-1, precision);
- content = await page.textContent('#result-units-8');
- expect(content).toBe('Dimension Error');
+ await expect(page.locator('#cell-8 >> text=Dimension Error')).toBeVisible();
- content = await page.textContent('#result-units-9');
- expect(content).toBe('Units Mismatch');
+ await expect(page.locator('#cell-9 >> text=Units Mismatch')).toBeVisible();
await page.locator('#add-math-cell').click();
await page.locator('math-field.editable').nth(10).type('1[Pa]*min(0,x2)+1[N]=');
@@ -198,8 +195,7 @@ test('Test min/max functions', async ({ browserName }) => {
await page.setLatex(13, 'x2=-1\\left[\\frac{m}{m}\\right]')
await page.waitForSelector('.status-footer', { state: 'detached' });
- content = await page.locator('#result-units-10').textContent();
- expect(content).toBe('Dimension Error');
+ await expect(page.locator('#cell-10 >> text=Dimension Error')).toBeVisible();
content = await page.locator('#result-units-11').textContent();
expect(content).toBe('N');
diff --git a/tests/test_generated_code.spec.mjs b/tests/test_generated_code.spec.mjs
new file mode 100644
index 00000000..e371d76d
--- /dev/null
+++ b/tests/test_generated_code.spec.mjs
@@ -0,0 +1,426 @@
+import { test, expect } from '@playwright/test';
+import { cot, pi, sqrt, tan, cos} from 'mathjs';
+
+import { precision, loadPyodide, newSheet, parseLatexFloat } from './utility.mjs';
+
+let page;
+
+// loading pyodide takes a long time (especially in resource constrained CI environments)
+// load page once and use for all tests in this file
+test.beforeAll(async ({ browser }) => {page = await loadPyodide(browser, page);} );
+
+// give each test a blank sheet to start with (this doesn't reload pyodide)
+test.beforeEach(async () => newSheet(page));
+
+test('Unitless function', async () => {
+ await page.setLatex(0, String.raw`y=x`);
+
+ await page.locator('#add-math-cell').click()
+ await page.setLatex(1, String.raw`y\left(x=10\right)=`);
+
+ await page.locator('#code-gen-1').click();
+
+ let content = await page.locator('code').textContent();
+
+ expect(content).toBe(`def y(x):
+ """
+ Function 'y' automatically generated by EngineeringPaper.xyz
+
+ Parameters
+ ----------
+ x : float
+ 'x' is unitless.
+
+ Returns
+ -------
+ float
+ Return value is unitless.
+ """
+
+ result = x
+
+ return result
+`);
+
+ await page.keyboard.press('Escape');
+});
+
+test('Function with input and output units', async () => {
+ await page.setLatex(0, String.raw`y=x`);
+
+ await page.locator('#add-math-cell').click()
+ await page.setLatex(1, String.raw`y\left(x=10\left\lbrack mm\right\rbrack\right)=\left\lbrack mm\right\rbrack`);
+
+ await page.locator('#code-gen-1').click();
+
+ let content = await page.locator('code').textContent();
+
+ expect(content).toBe(`def y(x):
+ """
+ Function 'y' automatically generated by EngineeringPaper.xyz
+
+ Parameters
+ ----------
+ x : float
+ 'x' has units of [mm].
+
+ Returns
+ -------
+ float
+ Return value has units of [mm].
+ """
+
+ x = x * 0.001
+
+ result = x
+
+ return result / 0.001
+`);
+
+ await page.keyboard.press('Escape');
+});
+
+test('Function with temperature input and output', async () => {
+ await page.setLatex(0, String.raw`y=x`);
+
+ await page.locator('#add-math-cell').click()
+ await page.setLatex(1, String.raw`y\left(x=-40\left\lbrack degF\right\rbrack\right)=\left\lbrack degF\right\rbrack`);
+
+ await page.locator('#code-gen-1').click();
+
+ let content = await page.locator('code').textContent();
+
+ expect(content).toBe(`def y(x):
+ """
+ Function 'y' automatically generated by EngineeringPaper.xyz
+
+ Parameters
+ ----------
+ x : float
+ 'x' has units of [degF].
+
+ Returns
+ -------
+ float
+ Return value has units of [degF].
+ """
+
+ x = (x + 459.67) * 0.5555555555555556
+
+ result = x
+
+ return (result / 0.5555555555555556) - 459.67
+`);
+
+ await page.keyboard.press('Escape');
+});
+
+test('Function with temperature input and output, offset only', async () => {
+ await page.setLatex(0, String.raw`y=x`);
+
+ await page.locator('#add-math-cell').click()
+ await page.setLatex(1, String.raw`y\left(x=-40\left\lbrack degC\right\rbrack\right)=\left\lbrack degC\right\rbrack`);
+
+ await page.locator('#code-gen-1').click();
+
+ let content = await page.locator('code').textContent();
+
+ expect(content).toBe(`def y(x):
+ """
+ Function 'y' automatically generated by EngineeringPaper.xyz
+
+ Parameters
+ ----------
+ x : float
+ 'x' has units of [degC].
+
+ Returns
+ -------
+ float
+ Return value has units of [degC].
+ """
+
+ x = x + 273.15
+
+ result = x
+
+ return result - 273.15
+`);
+
+ await page.keyboard.press('Escape');
+});
+
+test('Funciton with two inputs', async () => {
+ await page.setLatex(0, String.raw`y=x\cdot z`);
+
+ await page.locator('#add-math-cell').click()
+ await page.setLatex(1, String.raw`y\left(x=10\left\lbrack m\right\rbrack,\:z=1\left\lbrack sec\right\rbrack\right)=`);
+
+ await page.locator('#code-gen-1').click();
+
+ let content = await page.locator('code').textContent();
+
+ expect(content).toBe(`def y(x, z):
+ """
+ Function 'y' automatically generated by EngineeringPaper.xyz
+
+ Parameters
+ ----------
+ x : float
+ 'x' has units of [m].
+ z : float
+ 'z' has units of [sec].
+
+ Returns
+ -------
+ float
+ Return value has units of [m sec].
+ """
+
+ result = x*z
+
+ return result
+`);
+
+ await page.keyboard.press('Escape');
+});
+
+test('Function with unitless matrix output', async () => {
+ await page.setLatex(0, String.raw`y=\begin{bmatrix}a & b\\ c & d\end{bmatrix}`);
+
+ await page.locator('#add-math-cell').click()
+ await page.setLatex(1, String.raw`y\left(a=1,\:b=2,\:c=3,\:d=4\right)=`);
+
+ await page.locator('#code-gen-1').click();
+
+ let content = await page.locator('code').textContent();
+
+ expect(content).toBe(`import numpy
+
+def y(a, b, c, d):
+ """
+ Function 'y' automatically generated by EngineeringPaper.xyz
+
+ Parameters
+ ----------
+ a : float
+ 'a' is unitless.
+ b : float
+ 'b' is unitless.
+ c : float
+ 'c' is unitless.
+ d : float
+ 'd' is unitless.
+
+ Returns
+ -------
+ numpy.array
+ Return value is a matrix with units [[unitless, unitless], [unitless, unitless]]
+ """
+
+ result = numpy.array([[a, b], [c, d]])
+
+ return result
+`);
+
+ await page.keyboard.press('Escape');
+});
+
+test('Function with matrix output with units', async () => {
+ await page.setLatex(0, String.raw`y=\begin{bmatrix}a & b\\ c & d\end{bmatrix}`);
+
+ await page.locator('#add-math-cell').click()
+ await page.setLatex(1, String.raw`y\left(a=1\left\lbrack mm\right\rbrack,\:b=1\left\lbrack mm^2\right\rbrack,\:c=1\left\lbrack mm^3\right\rbrack,\:d=1\left\lbrack mm^3\right\rbrack\right)=`);
+
+ await page.locator('#code-gen-1').click();
+
+ let content = await page.locator('code').textContent();
+
+ expect(content).toBe(`import numpy
+
+def y(a, b, c, d):
+ """
+ Function 'y' automatically generated by EngineeringPaper.xyz
+
+ Parameters
+ ----------
+ a : float
+ 'a' has units of [mm].
+ b : float
+ 'b' has units of [mm^2].
+ c : float
+ 'c' has units of [mm^3].
+ d : float
+ 'd' has units of [mm^3].
+
+ Returns
+ -------
+ numpy.array
+ Return value is a matrix with units [[m, m^2], [m^3, m^3]]
+ """
+
+ a = a * 0.001
+ b = b * 0.000001
+ c = c * 1e-9
+ d = d * 1e-9
+
+ result = numpy.array([[a, b], [c, d]])
+
+ return result
+`);
+
+ await page.keyboard.press('Escape');
+});
+
+test('Function with matrix output with units and user units', async () => {
+ await page.setLatex(0, String.raw`y=\begin{bmatrix}a & b\\ c & d\end{bmatrix}`);
+
+ await page.locator('#add-math-cell').click()
+ await page.setLatex(1, String.raw`y\left(a=1\left\lbrack in\right\rbrack,\:b=2\left\lbrack in\right\rbrack,\:c=3\left\lbrack in\right\rbrack,\:d=4\left\lbrack in\right\rbrack\right)=\left\lbrack in\right\rbrack`);
+
+ await page.locator('#code-gen-1').click();
+
+ let content = await page.locator('code').textContent();
+
+ expect(content).toBe(`import numpy
+
+def y(a, b, c, d):
+ """
+ Function 'y' automatically generated by EngineeringPaper.xyz
+
+ Parameters
+ ----------
+ a : float
+ 'a' has units of [in].
+ b : float
+ 'b' has units of [in].
+ c : float
+ 'c' has units of [in].
+ d : float
+ 'd' has units of [in].
+
+ Returns
+ -------
+ numpy.array
+ Return value is a matrix with units [[in, in], [in, in]]
+ """
+
+ a = a * 0.0254
+ b = b * 0.0254
+ c = c * 0.0254
+ d = d * 0.0254
+
+ result = numpy.array([[a, b], [c, d]])
+
+ return result / 0.0254
+`);
+
+ await page.keyboard.press('Escape');
+});
+
+test('Codegen button appears only when appropriate', async () => {
+ await page.setLatex(0, String.raw`y=x`);
+
+ await page.locator('#add-math-cell').click()
+
+ await page.setLatex(1, String.raw`y=`);
+ await page.waitForSelector('text=Updating...', {state: 'detached'});
+ await expect(page.locator('#code-gen-1')).toBeHidden();
+
+ await page.setLatex(1, String.raw`y\left(x=z\right)=`);
+ await page.waitForSelector('text=Updating...', {state: 'detached'});
+ await expect(page.locator('#code-gen-1')).toBeHidden();
+
+ await page.setLatex(1, String.raw`y\left(x=1,s=t\right)=`);
+ await page.waitForSelector('text=Updating...', {state: 'detached'});
+ await expect(page.locator('#code-gen-1')).toBeHidden();
+
+ await page.setLatex(1, String.raw`y\left(x=1\left\lbrack m\right\rbrack\right)=\left\lbrack sec\right\rbrack`);
+ await page.waitForSelector('text=Updating...', {state: 'detached'});
+ await expect(page.locator('#code-gen-1')).toBeHidden();
+
+ await page.setLatex(1, String.raw`2\cdot y\left(x=1\right)=`);
+ await page.waitForSelector('text=Updating...', {state: 'detached'});
+ await expect(page.locator('#code-gen-1')).toBeHidden();
+
+ await page.setLatex(1, String.raw`y\left(x=1\right)=`);
+ await page.waitForSelector('text=Updating...', {state: 'detached'});
+ await expect(page.locator('#code-gen-1')).toBeVisible();
+});
+
+test('Numpy function rewrite fix, sympy #25514', async () => {
+ await page.setLatex(0, String.raw`y=\sec\left(x\right)^2`);
+
+ await page.locator('#add-math-cell').click()
+ await page.setLatex(1, String.raw`y\left(x=1\right)=`);
+
+ await page.locator('#code-gen-1').click();
+
+ let content = await page.locator('code').textContent();
+
+ expect(content).toBe(`import numpy
+
+def y(x):
+ """
+ Function 'y' automatically generated by EngineeringPaper.xyz
+
+ Parameters
+ ----------
+ x : float
+ 'x' is unitless.
+
+ Returns
+ -------
+ float
+ Return value is unitless.
+ """
+
+ result = (numpy.cos(x)**(-1.0))**2
+
+ return result
+`);
+
+ await page.keyboard.press('Escape');
+});
+
+test('Variable name rewriting', async () => {
+ await page.setLatex(0, String.raw`I=Add\cdot\left(x+Add+def\right)`);
+
+ await page.locator('#add-math-cell').click()
+ await page.setLatex(1, String.raw`I\left(x=1\left\lbrack mm\right\rbrack,\:Add=2\left\lbrack mm\right\rbrack,\:def=3\left\lbrack mm\right\rbrack\right)=`);
+
+ await page.locator('#code-gen-1').click();
+
+ let content = await page.locator('code').textContent();
+
+ expect(content).toBe(`def I(x, Add, def_as_variable):
+ """
+ Function 'I' automatically generated by EngineeringPaper.xyz
+
+ Parameters
+ ----------
+ x : float
+ 'x' has units of [mm].
+ Add : float
+ 'Add' has units of [mm].
+ def_as_variable : float
+ 'def_as_variable' has units of [mm].
+
+ Returns
+ -------
+ float
+ Return value has units of [m^2].
+ """
+
+ x = x * 0.001
+ Add = Add * 0.001
+ def_as_variable = def_as_variable * 0.001
+
+ result = Add*(Add + def_as_variable + x)
+
+ return result
+`);
+
+ await page.keyboard.press('Escape');
+});
+
diff --git a/tests/test_matrix_addition.spec.mjs b/tests/test_matrix_addition.spec.mjs
new file mode 100644
index 00000000..7e5369b8
--- /dev/null
+++ b/tests/test_matrix_addition.spec.mjs
@@ -0,0 +1,197 @@
+import { test, expect } from '@playwright/test';
+import { cot, pi, sqrt, tan, cos} from 'mathjs';
+
+import { precision, loadPyodide, newSheet, parseLatexFloat } from './utility.mjs';
+
+let page;
+
+// loading pyodide takes a long time (especially in resource constrained CI environments)
+// load page once and use for all tests in this file
+test.beforeAll(async ({ browser }) => {page = await loadPyodide(browser, page);} );
+
+// give each test a blank sheet to start with (this doesn't reload pyodide)
+test.beforeEach(async () => newSheet(page));
+
+test('Matrix addition', async () => {
+ await page.setLatex(0, String.raw`\begin{bmatrix}a & b\\ c & d\end{bmatrix}+\begin{bmatrix}5 & 6\\ 7 & 8\end{bmatrix}=`);
+
+ await page.waitForSelector('text=Updating...', {state: 'detached'});
+
+ let content = await page.textContent(`#result-value-0`);
+ expect(content).toBe(String.raw`\begin{bmatrix} a + 5 & b + 6 \\ c + 7 & d + 8 \end{bmatrix}`);
+
+ // add some numbers for variables that define first matrix
+ await page.locator('#add-math-cell').click();
+ await page.setLatex(1, String.raw`a=1,b=2,c=3,d=4`);
+
+ await page.waitForSelector('text=Updating...', {state: 'detached'});
+
+ content = await page.textContent(`#result-value-0`);
+ expect(content).toBe(String.raw`\begin{bmatrix} 6 & 8 \\ 10 & 12 \end{bmatrix}`);
+});
+
+test('Matrix subtraction', async () => {
+ await page.setLatex(0, String.raw`\begin{bmatrix}a & b\\ c & d\end{bmatrix}-\begin{bmatrix}5 & 6\\ 7 & 8\end{bmatrix}=`);
+
+ await page.waitForSelector('text=Updating...', {state: 'detached'});
+
+ let content = await page.textContent(`#result-value-0`);
+ expect(content).toBe(String.raw`\begin{bmatrix} a - 5 & b - 6 \\ c - 7 & d - 8 \end{bmatrix}`);
+
+ // add some numbers for variables that define first matrix
+ await page.locator('#add-math-cell').click();
+ await page.setLatex(1, String.raw`a=1,b=2,c=3,d=4`);
+
+ await page.waitForSelector('text=Updating...', {state: 'detached'});
+
+ content = await page.textContent(`#result-value-0`);
+ expect(content).toBe(String.raw`\begin{bmatrix} -4 & -4 \\ -4 & -4 \end{bmatrix}`);
+});
+
+test('Matrix addition with units', async () => {
+ await page.setLatex(0, String.raw`\begin{bmatrix}a & b\\ c & d\end{bmatrix}+\begin{bmatrix}5\left\lbrack m\right\rbrack & 6\left\lbrack s\right\rbrack\\ 7\left\lbrack kg\right\rbrack & 8\left\lbrack radian\right\rbrack\end{bmatrix}=`);
+
+ await page.waitForSelector('text=Updating...', {state: 'detached'});
+
+ let content = await page.textContent(`#result-value-0`);
+ expect(content).toBe(String.raw`\begin{bmatrix} a + 5 & b + 6 \\ c + 7 & d + 8 \end{bmatrix}`);
+
+ // add some numbers for variables that define first matrix
+ await page.locator('#add-math-cell').click();
+ await page.setLatex(1, String.raw`a=1\left\lbrack m\right\rbrack,b=2\left\lbrack s\right\rbrack,c=3\left\lbrack kg\right\rbrack,d=4\left\lbrack radian\right\rbrack`);
+
+ await page.waitForSelector('text=Updating...', {state: 'detached'});
+
+ content = await page.textContent(`#result-value-0`);
+ expect(content).toBe(String.raw`\begin{bmatrix} 6\left\lbrack m\right\rbrack & 8\left\lbrack sec\right\rbrack \\ 10\left\lbrack kg\right\rbrack & 12\left\lbrack rad\right\rbrack \end{bmatrix}`);
+});
+
+test('Matrix addition with incompatible units', async () => {
+ await page.setLatex(0, String.raw`\begin{bmatrix}a & b\\ c & d\end{bmatrix}+\begin{bmatrix}5\left\lbrack m\right\rbrack & 6\left\lbrack s\right\rbrack\\ 7\left\lbrack kg\right\rbrack & 8\left\lbrack radian\right\rbrack\end{bmatrix}=`);
+
+ await page.waitForSelector('text=Updating...', {state: 'detached'});
+
+ let content = await page.textContent(`#result-value-0`);
+ expect(content).toBe(String.raw`\begin{bmatrix} a + 5 & b + 6 \\ c + 7 & d + 8 \end{bmatrix}`);
+
+ // add some numbers for variables that define first matrix
+ await page.locator('#add-math-cell').click();
+ await page.setLatex(1, String.raw`a=1\left\lbrack s\right\rbrack,b=2\left\lbrack s\right\rbrack,c=3\left\lbrack kg\right\rbrack,d=4\left\lbrack radian\right\rbrack`);
+
+ await page.waitForSelector('text=Updating...', {state: 'detached'});
+
+ await expect(page.locator('#cell-0 >> text=Dimension Error')).toBeAttached();
+});
+
+test('Test subtraction with units', async () => {
+ await page.setLatex(0, String.raw`\begin{bmatrix}a & b\\ c & d\end{bmatrix}-\begin{bmatrix}5\left\lbrack m\right\rbrack & 6\left\lbrack s\right\rbrack\\ 7\left\lbrack kg\right\rbrack & 8\left\lbrack radian\right\rbrack\end{bmatrix}=`);
+
+ await page.waitForSelector('text=Updating...', {state: 'detached'});
+
+ let content = await page.textContent(`#result-value-0`);
+ expect(content).toBe(String.raw`\begin{bmatrix} a - 5 & b - 6 \\ c - 7 & d - 8 \end{bmatrix}`);
+
+ // add some numbers for variables that define first matrix
+ await page.locator('#add-math-cell').click();
+ await page.setLatex(1, String.raw`a=1\left\lbrack m\right\rbrack,b=2\left\lbrack s\right\rbrack,c=3\left\lbrack kg\right\rbrack,d=4\left\lbrack radian\right\rbrack`);
+
+ await page.waitForSelector('text=Updating...', {state: 'detached'});
+
+ content = await page.textContent(`#result-value-0`);
+ expect(content).toBe(String.raw`\begin{bmatrix} -4\left\lbrack m\right\rbrack & -4\left\lbrack sec\right\rbrack \\ -4\left\lbrack kg\right\rbrack & -4\left\lbrack rad\right\rbrack \end{bmatrix}`);
+});
+
+test('Incompatible size addition', async () => {
+ await page.setLatex(0, String.raw`\begin{bmatrix}a & b\\ c & d\\ e & f\end{bmatrix}+\begin{bmatrix}5\left\lbrack m\right\rbrack & 6\left\lbrack s\right\rbrack\\ 7\left\lbrack kg\right\rbrack & 8\left\lbrack radian\right\rbrack\end{bmatrix}=`);
+
+ await page.waitForSelector('text=Updating...', {state: 'detached'});
+
+ await expect(page.locator('.status-footer >> text=ShapeError')).toBeVisible();
+});
+
+test('nonsquare addition', async () => {
+ await page.setLatex(0, String.raw`\begin{bmatrix}a & b\\ c & d\\ e_0 & f\end{bmatrix}+\begin{bmatrix}1\left\lbrack m\right\rbrack & 2\left\lbrack s\right\rbrack\\ 3\left\lbrack kg\right\rbrack & 4\left\lbrack radian\right\rbrack\\ 5\left\lbrack kelvin\right\rbrack & 6\left\lbrack ampere\right\rbrack\end{bmatrix}=`);
+
+ await page.waitForSelector('text=Updating...', {state: 'detached'});
+
+ let content = await page.textContent(`#result-value-0`);
+ expect(content).toBe(String.raw`\begin{bmatrix} a + 1 & b + 2 \\ c + 3 & d + 4 \\ e_{0} + 5 & f + 6 \end{bmatrix}`);
+
+ // add some numbers for variables that define first matrix
+ await page.locator('#add-math-cell').click();
+ await page.setLatex(1, String.raw`a=6\left\lbrack m\right\rbrack,\:b=5\left\lbrack s\right\rbrack,\:c=4\left\lbrack kg\right\rbrack,d=3\left\lbrack radian\right\rbrack,e_0=2\left\lbrack K\right\rbrack,f=1\left\lbrack A\right\rbrack`);
+
+ await page.waitForSelector('text=Updating...', {state: 'detached'});
+
+ content = await page.textContent(`#result-value-0`);
+ expect(content).toBe(String.raw`\begin{bmatrix} 7\left\lbrack m\right\rbrack & 7\left\lbrack sec\right\rbrack \\ 7\left\lbrack kg\right\rbrack & 7\left\lbrack rad\right\rbrack \\ 7\left\lbrack kelvin\right\rbrack & 7\left\lbrack ampere\right\rbrack \end{bmatrix}`);
+});
+
+test('Addition with literal and variable matrices', async () => {
+ await page.setLatex(0, String.raw`A+\begin{bmatrix}5\left\lbrack m\right\rbrack & 6\left\lbrack s\right\rbrack\\ 7\left\lbrack kg\right\rbrack & 8\left\lbrack radian\right\rbrack\end{bmatrix}=`);
+ await page.locator('#add-math-cell').click();
+ await page.setLatex(1, String.raw`$$ A=\begin{bmatrix}a & b\\ c & d\end{bmatrix} $$`);
+
+ await page.waitForSelector('text=Updating...', {state: 'detached'});
+
+ let content = await page.textContent(`#result-value-0`);
+ expect(content).toBe(String.raw`\begin{bmatrix} a + 5 & b + 6 \\ c + 7 & d + 8 \end{bmatrix}`);
+
+ // add some numbers for variables that define first matrix
+ await page.locator('#add-math-cell').click();
+ await page.setLatex(2, String.raw`a=1\left\lbrack m\right\rbrack,b=2\left\lbrack s\right\rbrack,c=3\left\lbrack kg\right\rbrack,d=4\left\lbrack radian\right\rbrack`);
+
+ await page.waitForSelector('text=Updating...', {state: 'detached'});
+
+ content = await page.textContent(`#result-value-0`);
+ expect(content).toBe(String.raw`\begin{bmatrix} 6\left\lbrack m\right\rbrack & 8\left\lbrack sec\right\rbrack \\ 10\left\lbrack kg\right\rbrack & 12\left\lbrack rad\right\rbrack \end{bmatrix}`);
+});
+
+test('Addition with two variable matrices', async () => {
+ await page.setLatex(0, String.raw`A+B=`);
+
+ await page.locator('#add-math-cell').click();
+ await page.setLatex(1, String.raw`A=\begin{bmatrix}a & b\\ c & d\end{bmatrix}`);
+
+ await page.locator('#add-math-cell').click();
+ await page.setLatex(2, String.raw`B=\begin{bmatrix}5\left\lbrack m\right\rbrack & 6\left\lbrack s\right\rbrack\\ 7\left\lbrack kg\right\rbrack & 8\left\lbrack radian\right\rbrack\end{bmatrix}`);
+
+ await page.waitForSelector('text=Updating...', {state: 'detached'});
+
+ let content = await page.textContent(`#result-value-0`);
+ expect(content).toBe(String.raw`\begin{bmatrix} a + 5 & b + 6 \\ c + 7 & d + 8 \end{bmatrix}`);
+
+ // add some numbers for variables that define first matrix
+ await page.locator('#add-math-cell').click();
+ await page.setLatex(3, String.raw`a=1\left\lbrack m\right\rbrack,b=2\left\lbrack s\right\rbrack,c=3\left\lbrack kg\right\rbrack,d=4\left\lbrack radian\right\rbrack`);
+
+ await page.waitForSelector('text=Updating...', {state: 'detached'});
+
+ content = await page.textContent(`#result-value-0`);
+ expect(content).toBe(String.raw`\begin{bmatrix} 6\left\lbrack m\right\rbrack & 8\left\lbrack sec\right\rbrack \\ 10\left\lbrack kg\right\rbrack & 12\left\lbrack rad\right\rbrack \end{bmatrix}`);
+});
+
+test('Addition scalar and variable matrix', async () => {
+ // Ideally would generate an error, however sympy generates a symbolic result
+ // sympy won't generate a numerical result so it will be clear to the user what is happening
+ await page.setLatex(0, String.raw`1+A=`);
+
+ await page.locator('#add-math-cell').click();
+ await page.setLatex(1, String.raw`A=\begin{bmatrix}1 & 2\\ 3 & 4\end{bmatrix}`);
+
+ await page.waitForSelector('text=Updating...', {state: 'detached'});
+
+ let content = await page.textContent(`#result-value-0`);
+ expect(content).toBe(String.raw`1 + \left[\begin{matrix}1 & 2\\3 & 4\end{matrix}\right]`);
+});
+
+test('Addition scalar and literal matrix', async () => {
+ // Ideally would generate an error, however sympy generates a symbolic result
+ // sympy won't generate a numerical result so it will be clear to the user what is happening
+ await page.setLatex(0, String.raw`1+\begin{bmatrix}1 & 2\\ 3 & 4\end{bmatrix}=`);
+
+ await page.waitForSelector('text=Updating...', {state: 'detached'});
+
+ let content = await page.textContent(`#result-value-0`);
+ expect(content).toBe(String.raw`1 + \left[\begin{matrix}1 & 2\\3 & 4\end{matrix}\right]`);
+});
diff --git a/tests/test_matrix_calc.spec.mjs b/tests/test_matrix_calc.spec.mjs
new file mode 100644
index 00000000..12f878bb
--- /dev/null
+++ b/tests/test_matrix_calc.spec.mjs
@@ -0,0 +1,40 @@
+import { test, expect } from '@playwright/test';
+import { cot, pi, sqrt, tan, cos} from 'mathjs';
+
+import { precision, loadPyodide, newSheet, parseLatexFloat } from './utility.mjs';
+
+let page;
+
+// loading pyodide takes a long time (especially in resource constrained CI environments)
+// load page once and use for all tests in this file
+test.beforeAll(async ({ browser }) => {page = await loadPyodide(browser, page);} );
+
+// give each test a blank sheet to start with (this doesn't reload pyodide)
+test.beforeEach(async () => newSheet(page));
+
+test('Defininte integral', async () => {
+ await page.setLatex(0, String.raw`\int_0^1\left(\begin{bmatrix}x & x^2\\ x^3 & x^4\end{bmatrix}\right)\mathrm{d}\left(x\right)=`);
+
+ await page.waitForSelector('text=Updating...', {state: 'detached'});
+
+ let content = await page.textContent(`#result-value-0`);
+ expect(content).toBe(String.raw`\begin{bmatrix} 0.5 & 0.333333333333333 \\ 0.25 & 0.2 \end{bmatrix}`);
+});
+
+test('Indefininte integral', async () => {
+ await page.setLatex(0, String.raw`\int\left(\begin{bmatrix}x & x^2\\ x^3 & x^4\end{bmatrix}\right)\mathrm{d}\left(x\right)=`);
+
+ await page.waitForSelector('text=Updating...', {state: 'detached'});
+
+ let content = await page.textContent(`#result-value-0`);
+ expect(content).toBe(String.raw`\begin{bmatrix} \frac{x^{2}}{2} & \frac{x^{3}}{3} \\ \frac{x^{4}}{4} & \frac{x^{5}}{5} \end{bmatrix}`);
+});
+
+test('Derivative', async () => {
+ await page.setLatex(0, String.raw`\frac{\mathrm{d}}{\mathrm{d}\left(x\right)}\left(\begin{bmatrix}x & x^2\\ x^3 & x^4\end{bmatrix}\right)=`);
+
+ await page.waitForSelector('text=Updating...', {state: 'detached'});
+
+ let content = await page.textContent(`#result-value-0`);
+ expect(content).toBe(String.raw`\begin{bmatrix} 1 & 2 x \\ 3 x^{2} & 4 x^{3} \end{bmatrix}`);
+});
\ No newline at end of file
diff --git a/tests/test_matrix_determinant.spec.mjs b/tests/test_matrix_determinant.spec.mjs
new file mode 100644
index 00000000..76773c2e
--- /dev/null
+++ b/tests/test_matrix_determinant.spec.mjs
@@ -0,0 +1,119 @@
+import { test, expect } from '@playwright/test';
+import { cot, pi, sqrt, tan, cos} from 'mathjs';
+
+import { precision, loadPyodide, newSheet, parseLatexFloat } from './utility.mjs';
+
+let page;
+
+// loading pyodide takes a long time (especially in resource constrained CI environments)
+// load page once and use for all tests in this file
+test.beforeAll(async ({ browser }) => {page = await loadPyodide(browser, page);} );
+
+// give each test a blank sheet to start with (this doesn't reload pyodide)
+test.beforeEach(async () => newSheet(page));
+
+
+test('Determinant of matrix literal using keyboard entry', async () => {
+ await page.locator('#cell-0 >> math-field.editable').type("det([2,2");
+ await page.locator('#cell-0 >> math-field.editable').press("Enter");
+ await page.locator('#cell-0 >> math-field.editable').type("1");
+ await page.locator('#cell-0 >> math-field.editable').press("Tab");
+ await page.locator('#cell-0 >> math-field.editable').type("2");
+ await page.locator('#cell-0 >> math-field.editable').press("Tab");
+ await page.locator('#cell-0 >> math-field.editable').type("3");
+ await page.locator('#cell-0 >> math-field.editable').press("Tab");
+ await page.locator('#cell-0 >> math-field.editable').type("4");
+ await page.locator('#cell-0 >> math-field.editable').press("Tab");
+ await page.locator('#cell-0 >> math-field.editable').press("Tab");
+ await page.locator('#cell-0 >> math-field.editable').type("=");
+
+ await page.waitForSelector('text=Updating...', {state: 'detached'});
+
+ let content = await page.textContent(`#result-value-0`);
+ expect(parseLatexFloat(content)).toBeCloseTo(-2, precision);
+});
+
+test('Determinant of large matrix with units', async () => {
+ await page.setLatex(0, String.raw`\mathrm{det}\left(\begin{bmatrix}1\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack\\ 0\left\lbrack m\right\rbrack & 1\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack\\ 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 1\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack\\ 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 1\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack\\ 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 1\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack\\ 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 1\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack\\ 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 1\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack\\ 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 1\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack\\ 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 1\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack\\ 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 1\left\lbrack m\right\rbrack\end{bmatrix}\right)=`);
+
+ await page.waitForSelector('text=Updating...', {state: 'detached'});
+
+ let content = await page.textContent(`#result-value-0`);
+ expect(parseLatexFloat(content)).toBeCloseTo(1, precision);
+
+ content = await page.textContent('#result-units-0');
+ expect(content).toBe('m^10');
+});
+
+test('Determinant of matrix literal with symbolic entries', async () => {
+ await page.setLatex(0, String.raw`\mathrm{det}\left(\begin{bmatrix}a & b\\ c & d\end{bmatrix}\right)=`);
+
+ await page.waitForSelector('text=Updating...', {state: 'detached'});
+
+ let content = await page.textContent(`#result-value-0`);
+ expect(content).toBe('a d - b c');
+});
+
+test('Determinant of nonsquare matrix', async () => {
+ await page.setLatex(0, String.raw`\mathrm{det}\left(\begin{bmatrix}1 & 2\\ 3 & 4\\ 5 & 6\end{bmatrix}\right)=`);
+
+ await page.waitForSelector('text=Updating...', {state: 'detached'});
+
+ await expect(page.locator('text=NonSquareMatrixError')).toBeVisible();
+});
+
+test('Determinant of variable matrix', async () => {
+ await page.locator('#cell-0 >> math-field.editable').type("det(A)=");
+ await page.locator('#add-math-cell').click();
+ await page.setLatex(1, String.raw`A=\begin{bmatrix}a & b\\ c & d\end{bmatrix}`);
+
+ await page.waitForSelector('text=Updating...', {state: 'detached'});
+
+ let content = await page.textContent(`#result-value-0`);
+ expect(content).toBe('a d - b c');
+});
+
+test('Determinant of variable matrix with units', async () => {
+ await page.locator('#cell-0 >> math-field.editable').type("det(A)=");
+ await page.locator('#add-math-cell').click();
+ await page.setLatex(1, String.raw`A=\begin{bmatrix}a & b\\ c & d\end{bmatrix}`);
+ await page.locator('#add-math-cell').click();
+ await page.setLatex(2, String.raw`a=1\left\lbrack m\right\rbrack,\:b=2\left\lbrack m\right\rbrack,\:c=3\left\lbrack m\right\rbrack,\:d=4\left\lbrack m\right\rbrack`);
+
+ await page.waitForSelector('text=Updating...', {state: 'detached'});
+
+ let content = await page.textContent(`#result-value-0`);
+ expect(parseLatexFloat(content)).toBeCloseTo(-2, precision);
+
+ content = await page.textContent('#result-units-0');
+ expect(content).toBe('m^2');
+});
+
+test('Determinant of variable matrix consistent mixed units', async () => {
+ await page.locator('#cell-0 >> math-field.editable').type("det(A)=");
+ await page.locator('#add-math-cell').click();
+ await page.setLatex(1, String.raw`A=\begin{bmatrix}a & b\\ c & d\end{bmatrix}`);
+ await page.locator('#add-math-cell').click();
+ await page.setLatex(2, String.raw`a=1\left\lbrack m\right\rbrack,\:b=2\left\lbrack m^2\right\rbrack,\:c=3\left\lbrack m\right\rbrack,\:d=4\left\lbrack m^2\right\rbrack`);
+
+ await page.waitForSelector('text=Updating...', {state: 'detached'});
+
+ let content = await page.textContent(`#result-value-0`);
+ expect(parseLatexFloat(content)).toBeCloseTo(-2, precision);
+
+ content = await page.textContent('#result-units-0');
+ expect(content).toBe('m^3');
+});
+
+test('Determinant of variable matrix inconsistent mixed units', async () => {
+ await page.locator('#cell-0 >> math-field.editable').type("det(A)=");
+ await page.locator('#add-math-cell').click();
+ await page.setLatex(1, String.raw`A=\begin{bmatrix}a & b\\ c & d\end{bmatrix}`);
+ await page.locator('#add-math-cell').click();
+ await page.setLatex(2, String.raw`a=1\left\lbrack m\right\rbrack,\:b=2\left\lbrack m^2\right\rbrack,\:c=3\left\lbrack m\right\rbrack,\:d=4\left\lbrack m^3\right\rbrack`);
+
+ await page.waitForSelector('text=Updating...', {state: 'detached'});
+
+ await expect(page.locator("#cell-0 >> text=Dimension Error")).toBeAttached();
+});
+
diff --git a/tests/test_matrix_indexing.spec.mjs b/tests/test_matrix_indexing.spec.mjs
new file mode 100644
index 00000000..ab6674cf
--- /dev/null
+++ b/tests/test_matrix_indexing.spec.mjs
@@ -0,0 +1,117 @@
+import { test, expect } from '@playwright/test';
+import { cot, pi, sqrt, tan, cos} from 'mathjs';
+
+import { precision, loadPyodide, newSheet, parseLatexFloat } from './utility.mjs';
+
+let page;
+
+// loading pyodide takes a long time (especially in resource constrained CI environments)
+// load page once and use for all tests in this file
+test.beforeAll(async ({ browser }) => {page = await loadPyodide(browser, page);} );
+
+// give each test a blank sheet to start with (this doesn't reload pyodide)
+test.beforeEach(async () => newSheet(page));
+
+test('Indexing square and nonsquare matrix literals', async () => {
+ await page.setLatex(0, String.raw`\begin{bmatrix}a & b\\ c & d\\ e & f\end{bmatrix}_{1,1}+\begin{bmatrix}a & b\\ c & d\end{bmatrix}_{1,2}+\begin{bmatrix}a & b & c\\ d & e & f\end{bmatrix}_{2,1}+\begin{bmatrix}a & b & c\\ d & e & f\end{bmatrix}_{2,3}=`);
+
+ await page.waitForSelector('text=Updating...', {state: 'detached'});
+
+ let content = await page.textContent(`#result-value-0`);
+ expect(content).toBe(String.raw`a + b + d + f`);
+});
+
+test('Indexing with variable mathematical expression indices', async () => {
+ await page.setLatex(0, String.raw`\begin{bmatrix}a & b\\ c & d\\ e & f\end{bmatrix}_{3-2,a3-a2}+\begin{bmatrix}a & b\\ c & d\end{bmatrix}_{a2-1,\frac{a8}{a4}}+\begin{bmatrix}a & b & c\\ d & e & f\end{bmatrix}_{a10\cdot\frac{a2}{a10},\frac42-1}+\begin{bmatrix}a & b & c\\ d & e & f\end{bmatrix}_{a2,a3}=`);
+ await page.locator('#add-math-cell').click();
+
+ await page.setLatex(1, String.raw`a1=1,\:a2=2,\:a3=3,\:a4=4,\:a5=5,\:a6=6,a7=7,a8=8,a9=9,a10=10`);
+
+ await page.waitForSelector('text=Updating...', {state: 'detached'});
+
+ let content = await page.textContent(`#result-value-0`);
+ expect(content).toBe(String.raw`a + b + d + f`);
+});
+
+test('Indexing variable matrices', async () => {
+ await page.setLatex(0, String.raw`A_{3-2,a3-a2}+B_{a2-1,\frac{a8}{a4}}+C_{a10\cdot\frac{a2}{a10},\frac42-1}+D_{2,3}=`);
+ await page.locator('#add-math-cell').click();
+ await page.setLatex(1, String.raw`a1=1,\:a2=2,\:a3=3,\:a4=4,\:a5=5,\:a6=6,a7=7,a8=8,a9=9,a10=10`);
+ await page.locator('#add-math-cell').click();
+ await page.setLatex(2, String.raw`A=\begin{bmatrix}a & b\\ c & d\\ e & f\end{bmatrix}`);
+ await page.locator('#add-math-cell').click();
+ await page.setLatex(3, String.raw`B=\begin{bmatrix}a & b\\ c & d\end{bmatrix}`);
+ await page.locator('#add-math-cell').click();
+ await page.setLatex(4, String.raw`C=\begin{bmatrix}a & b & c\\ d & e & f\end{bmatrix}`);
+ await page.locator('#add-math-cell').click();
+ await page.setLatex(5, String.raw`D=\begin{bmatrix}a & b & c\\ d & e & f\end{bmatrix}`);
+
+ await page.waitForSelector('text=Updating...', {state: 'detached'});
+
+ let content = await page.textContent(`#result-value-0`);
+ expect(content).toBe(String.raw`a + b + d + f`);
+});
+
+test('Indexing variable matrices with units', async () => {
+ await page.setLatex(0, String.raw`A_{3-2,a3-a2}+B_{a2-1,\frac{a8}{a4}}+C_{a10\cdot\frac{a2}{a10},\frac42-1}+D_{2,3}=`);
+ await page.locator('#add-math-cell').click();
+ await page.setLatex(1, String.raw`a1=1,\:a2=2,\:a3=3,\:a4=4,\:a5=5,\:a6=6,a7=7,a8=8,a9=9,a10=10`);
+ await page.locator('#add-math-cell').click();
+ await page.setLatex(2, String.raw`A=\begin{bmatrix}a & b\\ c & d\\ e & f\end{bmatrix}`);
+ await page.locator('#add-math-cell').click();
+ await page.setLatex(3, String.raw`B=\begin{bmatrix}a & b\\ c & d\end{bmatrix}`);
+ await page.locator('#add-math-cell').click();
+ await page.setLatex(4, String.raw`C=\begin{bmatrix}a & b & c\\ d & e & f\end{bmatrix}`);
+ await page.locator('#add-math-cell').click();
+ await page.setLatex(5, String.raw`D=\begin{bmatrix}a & b & c\\ d & e & f\end{bmatrix}`);
+ await page.locator('#add-math-cell').click();
+ await page.setLatex(6, String.raw`a=1\left\lbrack m\right\rbrack,\:b=2\left\lbrack m\right\rbrack,\:d=3\left\lbrack m\right\rbrack,\:f=4\left\lbrack m\right\rbrack`);
+
+ await page.waitForSelector('text=Updating...', {state: 'detached'});
+
+ let content = await page.textContent(`#result-value-0`);
+ expect(parseLatexFloat(content)).toBeCloseTo(10, precision);
+
+ content = await page.textContent('#result-units-0');
+ expect(content).toBe('m');
+});
+
+test('Zero index', async () => {
+ await page.setLatex(0, String.raw`\begin{bmatrix}a & b\\ c & d\\ e & f\end{bmatrix}_{0,1}=`);
+
+ await page.waitForSelector('text=Updating...', {state: 'detached'});
+
+ await expect(page.locator("text=Matrix indices must evaluate to a finite real integer and be greater than 0")).toBeVisible();
+});
+
+test('Negative index', async () => {
+ await page.setLatex(0, String.raw`\begin{bmatrix}a & b\\ c & d\\ e & f\end{bmatrix}_{1,-1}=`);
+
+ await page.waitForSelector('text=Updating...', {state: 'detached'});
+
+ await expect(page.locator("text=Matrix indices must evaluate to a finite real integer and be greater than 0")).toBeVisible();
+});
+
+test('Out of range index', async () => {
+ await page.setLatex(0, String.raw`\begin{bmatrix}a & b\\ c & d\\ e & f\end{bmatrix}_{1,3}=`);
+
+ await page.waitForSelector('text=Updating...', {state: 'detached'});
+
+ await expect(page.locator("text=Index out of range")).toBeVisible();
+});
+
+test('Noninteger index', async () => {
+ await page.setLatex(0, String.raw`\begin{bmatrix}a & b\\ c & d\\ e & f\end{bmatrix}_{1,1.1}=`);
+
+ await page.waitForSelector('text=Updating...', {state: 'detached'});
+
+ await expect(page.locator("text=Matrix indices must evaluate to a finite real integer and be greater than 0")).toBeVisible();
+});
+
+test('Nonnumeric index', async () => {
+ await page.setLatex(0, String.raw`\begin{bmatrix}a & b\\ c & d\\ e & f\end{bmatrix}_{1,z}=`);
+
+ await page.waitForSelector('text=Updating...', {state: 'detached'});
+
+ await expect(page.locator("text=Matrix indices must evaluate to a finite real integer and be greater than 0")).toBeVisible();
+});
\ No newline at end of file
diff --git a/tests/test_matrix_inverse.spec.mjs b/tests/test_matrix_inverse.spec.mjs
new file mode 100644
index 00000000..76c61051
--- /dev/null
+++ b/tests/test_matrix_inverse.spec.mjs
@@ -0,0 +1,130 @@
+import { test, expect } from '@playwright/test';
+import { cot, pi, sqrt, tan, cos} from 'mathjs';
+
+import { precision, loadPyodide, newSheet, parseLatexFloat } from './utility.mjs';
+
+let page;
+
+// loading pyodide takes a long time (especially in resource constrained CI environments)
+// load page once and use for all tests in this file
+test.beforeAll(async ({ browser }) => {page = await loadPyodide(browser, page);} );
+
+// give each test a blank sheet to start with (this doesn't reload pyodide)
+test.beforeEach(async () => newSheet(page));
+
+test('Matrix inverse numeric', async () => {
+ await page.setLatex(0, String.raw`\mathrm{inv}\left(\begin{bmatrix}2 & 3\\ 1 & 2\end{bmatrix}\right)=`);
+
+ await page.waitForSelector('text=Updating...', {state: 'detached'});
+
+ let content = await page.textContent(`#result-value-0`);
+ expect(content).toBe(String.raw`\begin{bmatrix} 2 & -3 \\ -1 & 2 \end{bmatrix}`);
+});
+
+test('Matrix inverse numeric with units', async () => {
+ await page.setLatex(0, String.raw`\mathrm{inv}\left(\begin{bmatrix}2\left\lbrack m\right\rbrack & 3\left\lbrack m\right\rbrack\\ 1\left\lbrack m\right\rbrack & 2\left\lbrack m\right\rbrack\end{bmatrix}\right)=`);
+
+ await page.waitForSelector('text=Updating...', {state: 'detached'});
+
+ let content = await page.textContent(`#result-value-0`);
+ expect(content).toBe(String.raw`\begin{bmatrix} 2\left\lbrack \frac{1}{m}\right\rbrack & -3\left\lbrack \frac{1}{m}\right\rbrack \\ -1\left\lbrack \frac{1}{m}\right\rbrack & 2\left\lbrack \frac{1}{m}\right\rbrack \end{bmatrix}`);
+});
+
+test('Matrix exponent inverse numeric with units', async () => {
+ await page.setLatex(0, String.raw`\begin{bmatrix}2\left\lbrack m\right\rbrack & 3\left\lbrack m\right\rbrack\\ 1\left\lbrack m\right\rbrack & 2\left\lbrack m\right\rbrack\end{bmatrix}^{-1}=`);
+
+ await page.waitForSelector('text=Updating...', {state: 'detached'});
+
+ let content = await page.textContent(`#result-value-0`);
+ expect(content).toBe(String.raw`\begin{bmatrix} 2\left\lbrack \frac{1}{m}\right\rbrack & -3\left\lbrack \frac{1}{m}\right\rbrack \\ -1\left\lbrack \frac{1}{m}\right\rbrack & 2\left\lbrack \frac{1}{m}\right\rbrack \end{bmatrix}`);
+});
+
+test('Matrix inverse with variable matrix', async () => {
+ await page.setLatex(0, String.raw`A=\begin{bmatrix}2 & 3\\ 1 & 2\end{bmatrix}`);
+ await page.locator('#add-math-cell').click();
+ await page.setLatex(1, String.raw`inv\left(A\right)=`);
+
+ await page.waitForSelector('text=Updating...', {state: 'detached'});
+
+ let content = await page.textContent(`#result-value-1`);
+ expect(content).toBe(String.raw`\begin{bmatrix} 2 & -3 \\ -1 & 2 \end{bmatrix}`);
+});
+
+test('Matrix exponent inverse with variable matrix', async () => {
+ await page.setLatex(0, String.raw`A=\begin{bmatrix}2 & 3\\ 1 & 2\end{bmatrix}`);
+ await page.locator('#add-math-cell').click();
+ await page.setLatex(1, String.raw`A^{-1}=`);
+
+ await page.waitForSelector('text=Updating...', {state: 'detached'});
+
+ let content = await page.textContent(`#result-value-1`);
+ expect(content).toBe(String.raw`\begin{bmatrix} 2 & -3 \\ -1 & 2 \end{bmatrix}`);
+});
+
+test('Matrix inverse with mixed units', async () => {
+ await page.setLatex(0, String.raw`\mathrm{inv}\left(\begin{bmatrix}2\left\lbrack m\right\rbrack & 3\left\lbrack s\right\rbrack\\ 1\left\lbrack m\right\rbrack & 2\left\lbrack s\right\rbrack\end{bmatrix}\right)=`);
+
+ await page.waitForSelector('text=Updating...', {state: 'detached'});
+
+ let content = await page.textContent(`#result-value-0`);
+ expect(content).toBe(String.raw`\begin{bmatrix} 2\left\lbrack \frac{1}{m}\right\rbrack & -3\left\lbrack \frac{1}{m}\right\rbrack \\ -1\left\lbrack Hz\right\rbrack & 2\left\lbrack Hz\right\rbrack \end{bmatrix}`);
+});
+
+test('Matrix inverse exponent with mixed units', async () => {
+ await page.setLatex(0, String.raw`\begin{bmatrix}2\left\lbrack m\right\rbrack & 3\left\lbrack s\right\rbrack\\ 1\left\lbrack m\right\rbrack & 2\left\lbrack s\right\rbrack\end{bmatrix}^{-1}=`);
+
+ await page.waitForSelector('text=Updating...', {state: 'detached'});
+
+ let content = await page.textContent(`#result-value-0`);
+ expect(content).toBe(String.raw`\begin{bmatrix} 2\left\lbrack \frac{1}{m}\right\rbrack & -3\left\lbrack \frac{1}{m}\right\rbrack \\ -1\left\lbrack Hz\right\rbrack & 2\left\lbrack Hz\right\rbrack \end{bmatrix}`);
+});
+
+test('Matrix inverse with inconsistent units', async () => {
+ await page.setLatex(0, String.raw`\mathrm{inv}\left(\begin{bmatrix}2\left\lbrack m\right\rbrack & 3\left\lbrack s\right\rbrack\\ 1\left\lbrack s\right\rbrack & 2\left\lbrack s\right\rbrack\end{bmatrix}\right)=`);
+
+ await page.waitForSelector('text=Updating...', {state: 'detached'});
+
+ await expect(page.locator('#cell-0 >> text=Dimension Error')).toBeAttached();
+});
+
+test('Matrix inverse exponent with inconsistent units', async () => {
+ await page.setLatex(0, String.raw`\begin{bmatrix}2\left\lbrack m\right\rbrack & 3\left\lbrack s\right\rbrack\\ 1\left\lbrack s\right\rbrack & 2\left\lbrack s\right\rbrack\end{bmatrix}^{-1}=`);
+
+ await page.waitForSelector('text=Updating...', {state: 'detached'});
+
+ await expect(page.locator('#cell-0 >> text=Dimension Error')).toBeAttached();
+});
+
+test('Inverse for nonsquare matrix', async () => {
+ await page.setLatex(0, String.raw`inv\left(\begin{bmatrix}1 & 2\\ 3 & 4\\ 5 & 6\end{bmatrix}\right)=`);
+
+ await page.waitForSelector('text=Updating...', {state: 'detached'});
+
+ await expect(page.locator('.status-footer >> text=NonSquare')).toBeVisible();
+});
+
+test('Inverse for singular matrix', async () => {
+ await page.setLatex(0, String.raw`\mathrm{inv}\left(\begin{bmatrix}1 & 1\\ 1 & 1\end{bmatrix}\right)=`);
+
+ await page.waitForSelector('text=Updating...', {state: 'detached'});
+
+ await expect(page.locator('.status-footer >> text=NonInvertible')).toBeVisible();
+});
+
+test('Inverse of symbolic matrix', async () => {
+ await page.setLatex(0, String.raw`\mathrm{inv}\left(\begin{bmatrix}a & b\\ c & d\end{bmatrix}\right)=`);
+
+ await page.waitForSelector('text=Updating...', {state: 'detached'});
+
+ let content = await page.textContent(`#result-value-0`);
+ expect(content).toBe(String.raw`\begin{bmatrix} \frac{d}{a d - b c} & - \frac{b}{a d - b c} \\ - \frac{c}{a d - b c} & \frac{a}{a d - b c} \end{bmatrix}`);
+});
+
+test('Inverse of large matrix with units', async () => {
+ await page.setLatex(0, String.raw`\left(\begin{bmatrix}1\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack\\ 0\left\lbrack m\right\rbrack & 1\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack\\ 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 1\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack\\ 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 1\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack\\ 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 1\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack\\ 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 1\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack\\ 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 1\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack\\ 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 1\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack\\ 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 1\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack\\ 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 1\left\lbrack m\right\rbrack\end{bmatrix}\times\begin{bmatrix}1\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack\\ 0\left\lbrack m\right\rbrack & 1\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack\\ 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 1\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack\\ 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 1\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack\\ 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 1\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack\\ 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 1\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack\\ 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 1\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack\\ 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 1\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack\\ 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 1\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack\\ 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 0\left\lbrack m\right\rbrack & 1\left\lbrack m\right\rbrack\end{bmatrix}^{-1}\right)^{-1}=`);
+
+ await page.waitForSelector('text=Updating...', {state: 'detached'});
+
+ let content = await page.textContent(`#result-value-0`);
+ expect(content).toBe(String.raw`\begin{bmatrix} 1 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 \\ 0 & 1 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 \\ 0 & 0 & 1 & 0 & 0 & 0 & 0 & 0 & 0 & 0 \\ 0 & 0 & 0 & 1 & 0 & 0 & 0 & 0 & 0 & 0 \\ 0 & 0 & 0 & 0 & 1 & 0 & 0 & 0 & 0 & 0 \\ 0 & 0 & 0 & 0 & 0 & 1 & 0 & 0 & 0 & 0 \\ 0 & 0 & 0 & 0 & 0 & 0 & 1 & 0 & 0 & 0 \\ 0 & 0 & 0 & 0 & 0 & 0 & 0 & 1 & 0 & 0 \\ 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 1 & 0 \\ 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 1 \end{bmatrix}`);
+});
diff --git a/tests/test_matrix_keyboard.spec.mjs b/tests/test_matrix_keyboard.spec.mjs
new file mode 100644
index 00000000..e7e95e2c
--- /dev/null
+++ b/tests/test_matrix_keyboard.spec.mjs
@@ -0,0 +1,78 @@
+import { test, expect } from '@playwright/test';
+import { cot, pi, sqrt, tan, cos} from 'mathjs';
+
+import { precision, loadPyodide, newSheet, parseLatexFloat } from './utility.mjs';
+
+let page;
+
+// loading pyodide takes a long time (especially in resource constrained CI environments)
+// load page once and use for all tests in this file
+test.beforeAll(async ({ browser }) => {page = await loadPyodide(browser, page);} );
+
+// give each test a blank sheet to start with (this doesn't reload pyodide)
+test.beforeEach(async () => newSheet(page));
+
+test('Matrix inverse keyboard entry', async () => {
+ await page.locator('#cell-0 >> math-field.editable').type('1[m]*inv([2,2');
+ await page.locator('#cell-0 >> math-field.editable').press('Enter');
+ await page.locator('#cell-0 >> math-field.editable').type('2');
+ await page.locator('#cell-0 >> math-field.editable').press('Tab');
+ await page.locator('#cell-0 >> math-field.editable').type('3');
+ await page.locator('#cell-0 >> math-field.editable').press('Tab');
+ await page.locator('#cell-0 >> math-field.editable').type('1');
+ await page.locator('#cell-0 >> math-field.editable').press('Tab');
+ await page.locator('#cell-0 >> math-field.editable').type('2');
+ await page.locator('#cell-0 >> math-field.editable').press('Tab');
+ await page.locator('#cell-0 >> math-field.editable').press('Tab');
+
+ await page.locator('#cell-0 >> math-field.editable').type('@');
+
+ await page.locator('#cell-0 >> math-field.editable').type('[2,2');
+ await page.locator('#cell-0 >> math-field.editable').press('Enter');
+ await page.locator('#cell-0 >> math-field.editable').type('2[m]');
+ await page.locator('#cell-0 >> math-field.editable').press('Tab');
+ await page.locator('#cell-0 >> math-field.editable').type('-3[m]');
+ await page.locator('#cell-0 >> math-field.editable').press('Tab');
+ await page.locator('#cell-0 >> math-field.editable').type('-1[m]');
+ await page.locator('#cell-0 >> math-field.editable').press('Tab');
+ await page.locator('#cell-0 >> math-field.editable').type('2[m]');
+
+ await page.locator('#cell-0 >> math-field.editable').press('ArrowRight');
+ await page.locator('#cell-0 >> math-field.editable').type('^-1');
+
+ await page.locator('#cell-0 >> math-field.editable').press('Tab');
+ await page.locator('#cell-0 >> math-field.editable').type('=');
+
+ await page.waitForSelector('text=Updating...', {state: 'detached'});
+
+ let content = await page.textContent(`#result-value-0`);
+ expect(content).toBe(String.raw`\begin{bmatrix} 1 & 0 \\ 0 & 1 \end{bmatrix}`);
+});
+
+test('Matrix virtual keyboard entry', async () => {
+ await page.getByRole('button', { name: 'Matrices' }).click();
+ await page.getByRole('button').filter({ hasText: '2×1' }).click();
+ await page.locator('#cell-0 >> math-field.editable').type('a');
+ await page.locator('#cell-0 >> math-field.editable').press('Tab');
+ await page.locator('#cell-0 >> math-field.editable').type('b');
+ await page.locator('#cell-0 >> math-field.editable').press('Tab');
+ await page.getByRole('button').filter({ hasText: 'ATAT' }).click();
+
+ await page.getByRole('button').filter({ hasText: '××' }).click();
+
+ await page.getByRole('button').filter({ hasText: 'M×N' }).click();
+
+ await page.getByRole('button', { name: 'Increment number' }).first().click();
+ await page.getByRole('button', { name: 'Insert', exact: true }).click();
+
+ await page.locator('#cell-0 >> math-field.editable').type('c');
+ await page.locator('#cell-0 >> math-field.editable').press('Tab');
+ await page.locator('#cell-0 >> math-field.editable').type('d');
+ await page.locator('#cell-0 >> math-field.editable').press('Tab');
+ await page.locator('#cell-0 >> math-field.editable').type('=');
+
+ await page.waitForSelector('text=Updating...', {state: 'detached'});
+
+ let content = await page.textContent(`#result-value-0`);
+ expect(content).toBe(String.raw`\begin{bmatrix} a c + b d \end{bmatrix}`);
+});
diff --git a/tests/test_matrix_multiplication.spec.mjs b/tests/test_matrix_multiplication.spec.mjs
new file mode 100644
index 00000000..013d53b4
--- /dev/null
+++ b/tests/test_matrix_multiplication.spec.mjs
@@ -0,0 +1,434 @@
+import { test, expect } from '@playwright/test';
+import { cot, pi, sqrt, tan, cos} from 'mathjs';
+
+import { precision, loadPyodide, newSheet, parseLatexFloat } from './utility.mjs';
+
+let page;
+
+// loading pyodide takes a long time (especially in resource constrained CI environments)
+// load page once and use for all tests in this file
+test.beforeAll(async ({ browser }) => {page = await loadPyodide(browser, page);} );
+
+// give each test a blank sheet to start with (this doesn't reload pyodide)
+test.beforeEach(async () => newSheet(page));
+
+test('Square multiplication', async () => {
+ await page.setLatex(0, String.raw`\begin{bmatrix}a & b\\ c & d\end{bmatrix}\cdot\begin{bmatrix}5 & 6\\ 7 & 8\end{bmatrix}=`);
+
+ await page.waitForSelector('text=Updating...', {state: 'detached'});
+
+ let content = await page.textContent(`#result-value-0`);
+ expect(content).toBe(String.raw`\begin{bmatrix} 5 a + 7 b & 6 a + 8 b \\ 5 c + 7 d & 6 c + 8 d \end{bmatrix}`);
+
+ // add some numbers for variables that define first matrix
+ await page.locator('#add-math-cell').click();
+ await page.setLatex(1, String.raw`a=1,b=2,c=3,d=4`);
+
+ await page.waitForSelector('text=Updating...', {state: 'detached'});
+
+ content = await page.textContent(`#result-value-0`);
+ expect(content).toBe(String.raw`\begin{bmatrix} 19 & 22 \\ 43 & 50 \end{bmatrix}`);
+
+ // swap order of multiplication, should not commute
+ await page.setLatex(0, String.raw`\begin{bmatrix}5 & 6\\ 7 & 8\end{bmatrix}\cdot\begin{bmatrix}a & b\\ c & d\end{bmatrix}=`);
+ await page.waitForSelector('text=Updating...', {state: 'detached'});
+
+ content = await page.textContent(`#result-value-0`);
+ expect(content).toBe(String.raw`\begin{bmatrix} 23 & 34 \\ 31 & 46 \end{bmatrix}`);
+});
+
+test('Square multiplication with matrix multiplication operator', async () => {
+ await page.setLatex(0, String.raw`\begin{bmatrix}a & b\\ c & d\end{bmatrix}\times\begin{bmatrix}5 & 6\\ 7 & 8\end{bmatrix}=`);
+
+ await page.waitForSelector('text=Updating...', {state: 'detached'});
+
+ let content = await page.textContent(`#result-value-0`);
+ expect(content).toBe(String.raw`\begin{bmatrix} 5 a + 7 b & 6 a + 8 b \\ 5 c + 7 d & 6 c + 8 d \end{bmatrix}`);
+
+ // add some numbers for variables that define first matrix
+ await page.locator('#add-math-cell').click();
+ await page.setLatex(1, String.raw`a=1,b=2,c=3,d=4`);
+
+ await page.waitForSelector('text=Updating...', {state: 'detached'});
+
+ content = await page.textContent(`#result-value-0`);
+ expect(content).toBe(String.raw`\begin{bmatrix} 19 & 22 \\ 43 & 50 \end{bmatrix}`);
+
+ // swap order of multiplication, should not commute
+ await page.setLatex(0, String.raw`\begin{bmatrix}5 & 6\\ 7 & 8\end{bmatrix}\times\begin{bmatrix}a & b\\ c & d\end{bmatrix}=`);
+ await page.waitForSelector('text=Updating...', {state: 'detached'});
+
+ content = await page.textContent(`#result-value-0`);
+ expect(content).toBe(String.raw`\begin{bmatrix} 23 & 34 \\ 31 & 46 \end{bmatrix}`);
+});
+
+test('Square variable matrix times literal matrix using matrix multiplication operator', async () => {
+ await page.setLatex(0, String.raw`A\times\begin{bmatrix}5 & 6\\ 7 & 8\end{bmatrix}=`);
+
+ await page.locator('#add-math-cell').click();
+ await page.setLatex(1, String.raw`A=\begin{bmatrix}a & b\\ c & d\end{bmatrix}`);
+
+ await page.waitForSelector('text=Updating...', {state: 'detached'});
+
+ let content = await page.textContent(`#result-value-0`);
+ expect(content).toBe(String.raw`\begin{bmatrix} 5 a + 7 b & 6 a + 8 b \\ 5 c + 7 d & 6 c + 8 d \end{bmatrix}`);
+
+ // add some numbers for variables that define first matrix
+ await page.locator('#add-math-cell').click();
+ await page.setLatex(2, String.raw`a=1,b=2,c=3,d=4`);
+
+ await page.waitForSelector('text=Updating...', {state: 'detached'});
+
+ content = await page.textContent(`#result-value-0`);
+ expect(content).toBe(String.raw`\begin{bmatrix} 19 & 22 \\ 43 & 50 \end{bmatrix}`);
+
+ // swap order of multiplication, should not commute
+ await page.setLatex(0, String.raw`\begin{bmatrix}5 & 6\\ 7 & 8\end{bmatrix}\times A=`);
+ await page.waitForSelector('text=Updating...', {state: 'detached'});
+
+ content = await page.textContent(`#result-value-0`);
+ expect(content).toBe(String.raw`\begin{bmatrix} 23 & 34 \\ 31 & 46 \end{bmatrix}`);
+});
+
+test('Square variable matrix times variable matrix using matrix multiplication operator', async () => {
+ await page.setLatex(0, String.raw`A\times B=`);
+
+ await page.locator('#add-math-cell').click();
+ await page.setLatex(1, String.raw`A=\begin{bmatrix}a & b\\ c & d\end{bmatrix}`);
+
+ await page.locator('#add-math-cell').click();
+ await page.setLatex(2, String.raw`B=\begin{bmatrix}5 & 6\\ 7 & 8\end{bmatrix}`);
+
+ await page.waitForSelector('text=Updating...', {state: 'detached'});
+
+ let content = await page.textContent(`#result-value-0`);
+ expect(content).toBe(String.raw`\begin{bmatrix} 5 a + 7 b & 6 a + 8 b \\ 5 c + 7 d & 6 c + 8 d \end{bmatrix}`);
+
+ // add some numbers for variables that define first matrix
+ await page.locator('#add-math-cell').click();
+ await page.setLatex(3, String.raw`a=1,b=2,c=3,d=4`);
+
+ await page.waitForSelector('text=Updating...', {state: 'detached'});
+
+ content = await page.textContent(`#result-value-0`);
+ expect(content).toBe(String.raw`\begin{bmatrix} 19 & 22 \\ 43 & 50 \end{bmatrix}`);
+
+ // swap order of multiplication, should not commute
+ await page.setLatex(0, String.raw`B\times A=`);
+ await page.waitForSelector('text=Updating...', {state: 'detached'});
+
+ content = await page.textContent(`#result-value-0`);
+ expect(content).toBe(String.raw`\begin{bmatrix} 23 & 34 \\ 31 & 46 \end{bmatrix}`);
+});
+
+test('Units with square multiplication', async () => {
+ await page.setLatex(0, String.raw`\begin{bmatrix}a & b\\ c & d\end{bmatrix}\cdot\begin{bmatrix}5\left\lbrack kg\right\rbrack & 6\left\lbrack kg\right\rbrack\\ 7\left\lbrack kg\right\rbrack & 8\left\lbrack kg\right\rbrack\end{bmatrix}=`);
+
+ await page.waitForSelector('text=Updating...', {state: 'detached'});
+
+ let content = await page.textContent(`#result-value-0`);
+ expect(content).toBe(String.raw`\begin{bmatrix} 5 a + 7 b & 6 a + 8 b \\ 5 c + 7 d & 6 c + 8 d \end{bmatrix}`);
+
+ // add some numbers for variables that define first matrix
+ await page.locator('#add-math-cell').click();
+ await page.setLatex(1, String.raw`a=1\left\lbrack\frac{1}{m^3}\right\rbrack,b=2\left\lbrack\frac{1}{m^3}\right\rbrack,c=3\left\lbrack\frac{1}{m^3}\right\rbrack,d=4\left\lbrack\frac{1}{m^3}\right\rbrack`);
+
+ await page.waitForSelector('text=Updating...', {state: 'detached'});
+
+ content = await page.textContent(`#result-value-0`);
+ expect(content).toBe(String.raw`\begin{bmatrix} 19\left\lbrack \frac{kg}{m^{3}}\right\rbrack & 22\left\lbrack \frac{kg}{m^{3}}\right\rbrack \\ 43\left\lbrack \frac{kg}{m^{3}}\right\rbrack & 50\left\lbrack \frac{kg}{m^{3}}\right\rbrack \end{bmatrix}`);
+});
+
+test('Units with square variable matrix times variable matrix using matrix multiplication operator', async () => {
+ await page.setLatex(0, String.raw`A\times B=`);
+
+ await page.locator('#add-math-cell').click();
+ await page.setLatex(1, String.raw`A=\begin{bmatrix}a & b\\ c & d\end{bmatrix}`);
+
+ await page.locator('#add-math-cell').click();
+ await page.setLatex(2, String.raw`B=\begin{bmatrix}5\left\lbrack kg\right\rbrack & 6\left\lbrack kg\right\rbrack\\ 7\left\lbrack kg\right\rbrack & 8\left\lbrack kg\right\rbrack\end{bmatrix}`);
+
+ await page.waitForSelector('text=Updating...', {state: 'detached'});
+
+ let content = await page.textContent(`#result-value-0`);
+ expect(content).toBe(String.raw`\begin{bmatrix} 5 a + 7 b & 6 a + 8 b \\ 5 c + 7 d & 6 c + 8 d \end{bmatrix}`);
+
+ // add some numbers for variables that define first matrix
+ await page.locator('#add-math-cell').click();
+ await page.setLatex(3, String.raw`a=1\left\lbrack\frac{1}{m^3}\right\rbrack,b=2\left\lbrack\frac{1}{m^3}\right\rbrack,c=3\left\lbrack\frac{1}{m^3}\right\rbrack,d=4\left\lbrack\frac{1}{m^3}\right\rbrack`);
+
+ await page.waitForSelector('text=Updating...', {state: 'detached'});
+
+ content = await page.textContent(`#result-value-0`);
+ expect(content).toBe(String.raw`\begin{bmatrix} 19\left\lbrack \frac{kg}{m^{3}}\right\rbrack & 22\left\lbrack \frac{kg}{m^{3}}\right\rbrack \\ 43\left\lbrack \frac{kg}{m^{3}}\right\rbrack & 50\left\lbrack \frac{kg}{m^{3}}\right\rbrack \end{bmatrix}`);
+
+ // swap order of multiplication, should not commute
+ await page.setLatex(0, String.raw`B\times A=`);
+ await page.waitForSelector('text=Updating...', {state: 'detached'});
+
+ content = await page.textContent(`#result-value-0`);
+ expect(content).toBe(String.raw`\begin{bmatrix} 23\left\lbrack \frac{kg}{m^{3}}\right\rbrack & 34\left\lbrack \frac{kg}{m^{3}}\right\rbrack \\ 31\left\lbrack \frac{kg}{m^{3}}\right\rbrack & 46\left\lbrack \frac{kg}{m^{3}}\right\rbrack \end{bmatrix}`);
+});
+
+test('Mixed compatible units with square variable matrix times variable matrix using matrix multiplication operator', async () => {
+ await page.setLatex(0, String.raw`A\times B=`);
+
+ await page.locator('#add-math-cell').click();
+ await page.setLatex(1, String.raw`A=\begin{bmatrix}a & b\\ c & d\end{bmatrix}`);
+
+ await page.locator('#add-math-cell').click();
+ await page.setLatex(2, String.raw`B=\begin{bmatrix}5\left\lbrack kg\right\rbrack & 6\left\lbrack kg\right\rbrack\\ 7\left\lbrack kg\right\rbrack & 8\left\lbrack kg\right\rbrack\end{bmatrix}`);
+
+ await page.waitForSelector('text=Updating...', {state: 'detached'});
+
+ let content = await page.textContent(`#result-value-0`);
+ expect(content).toBe(String.raw`\begin{bmatrix} 5 a + 7 b & 6 a + 8 b \\ 5 c + 7 d & 6 c + 8 d \end{bmatrix}`);
+
+ // add some numbers for variables that define first matrix
+ await page.locator('#add-math-cell').click();
+ await page.setLatex(3, String.raw`a=1\left\lbrack\frac{1}{m^3}\right\rbrack,b=2\left\lbrack\frac{1}{m^3}\right\rbrack,c=3\left\lbrack\frac{1}{m^3}\right\rbrack,d=4\left\lbrack\frac{1}{m^3}\right\rbrack`);
+
+ await page.waitForSelector('text=Updating...', {state: 'detached'});
+
+ content = await page.textContent(`#result-value-0`);
+ expect(content).toBe(String.raw`\begin{bmatrix} 19\left\lbrack \frac{kg}{m^{3}}\right\rbrack & 22\left\lbrack \frac{kg}{m^{3}}\right\rbrack \\ 43\left\lbrack \frac{kg}{m^{3}}\right\rbrack & 50\left\lbrack \frac{kg}{m^{3}}\right\rbrack \end{bmatrix}`);
+
+ // swap order of multiplication, should not commute
+ await page.setLatex(0, String.raw`B\times A=`);
+ await page.waitForSelector('text=Updating...', {state: 'detached'});
+
+ content = await page.textContent(`#result-value-0`);
+ expect(content).toBe(String.raw`\begin{bmatrix} 23\left\lbrack \frac{kg}{m^{3}}\right\rbrack & 34\left\lbrack \frac{kg}{m^{3}}\right\rbrack \\ 31\left\lbrack \frac{kg}{m^{3}}\right\rbrack & 46\left\lbrack \frac{kg}{m^{3}}\right\rbrack \end{bmatrix}`);
+});
+
+test('Incompatible units with square variable matrix times variable matrix using matrix multiplication operator', async () => {
+ await page.setLatex(0, String.raw`A\times B=`);
+
+ await page.locator('#add-math-cell').click();
+ await page.setLatex(1, String.raw`A=\begin{bmatrix}a & b\\ c & d\end{bmatrix}`);
+
+ await page.locator('#add-math-cell').click();
+ await page.setLatex(2, String.raw`B=\begin{bmatrix}5\left\lbrack kg\right\rbrack & 6\left\lbrack kg\right\rbrack\\ 7\left\lbrack kg\right\rbrack & 8\left\lbrack kg\right\rbrack\end{bmatrix}`);
+
+ await page.locator('#add-math-cell').click();
+ await page.setLatex(3, String.raw`a=1\left\lbrack\frac{1}{m^3}\right\rbrack,b=2\left\lbrack\frac{1}{m^3}\right\rbrack,c=3\left\lbrack\frac{1}{m^3}\right\rbrack,d=4\left\lbrack\frac{1}{m^2}\right\rbrack`);
+
+ await page.waitForSelector('text=Updating...', {state: 'detached'});
+
+ await expect(page.locator('#cell-0 >> text=Dimension Error')).toBeAttached();
+});
+
+test('Incompatible multiplication with matrix variables and matrix multiplication operator', async () => {
+ await page.setLatex(0, String.raw`A\times B=`);
+
+ await page.locator('#add-math-cell').click();
+ await page.setLatex(1, String.raw`A=\begin{bmatrix}a & b\\ c & d\end{bmatrix}`);
+
+ await page.locator('#add-math-cell').click();
+ await page.setLatex(2, String.raw`B=\begin{bmatrix}e_0\\ f\\ g\end{bmatrix}`);
+
+ await page.waitForSelector('text=Updating...', {state: 'detached'});
+
+ await expect(page.locator('.status-footer >> text=ShapeError')).toBeVisible();
+});
+
+test('Incompatible multiplication with matrix literals', async () => {
+ await page.setLatex(0, String.raw`\begin{bmatrix}a & b\\ c & d\end{bmatrix}\cdot\begin{bmatrix}e_0\\ f\\ g\end{bmatrix}=`);
+
+ await page.waitForSelector('text=Updating...', {state: 'detached'});
+
+ await expect(page.locator('.status-footer >> text=ShapeError')).toBeVisible();
+});
+
+test('Incompatible multiplication with matrix literals and matrix multiplication operator', async () => {
+ await page.setLatex(0, String.raw`\begin{bmatrix}a & b\\ c & d\end{bmatrix}\times\begin{bmatrix}e_0\\ f\\ g\end{bmatrix}=`);
+
+ await page.waitForSelector('text=Updating...', {state: 'detached'});
+
+ await expect(page.locator('.status-footer >> text=ShapeError')).toBeVisible();
+});
+
+test('Scalar literal times matrix literal', async () => {
+ await page.setLatex(0, String.raw`5\cdot\begin{bmatrix}1 & 2\\ 3 & 4\end{bmatrix}=`);
+
+ await page.waitForSelector('text=Updating...', {state: 'detached'});
+
+ let content = await page.textContent(`#result-value-0`);
+ expect(content).toBe(String.raw`\begin{bmatrix} 5 & 10 \\ 15 & 20 \end{bmatrix}`);
+
+ // change order of scalar-matrix multiplication, should commute
+ await page.setLatex(0, String.raw`\begin{bmatrix}1 & 2\\ 3 & 4\end{bmatrix}\cdot 5=`);
+
+ await page.waitForSelector('text=Updating...', {state: 'detached'});
+
+ content = await page.textContent(`#result-value-0`);
+ expect(content).toBe(String.raw`\begin{bmatrix} 5 & 10 \\ 15 & 20 \end{bmatrix}`);
+});
+
+test('Units with scalar literal times matrix literal', async () => {
+ await page.setLatex(0, String.raw`5\left\lbrack s\right\rbrack\cdot\begin{bmatrix}1\left\lbrack m\right\rbrack & 2\left\lbrack kg\right\rbrack\\ 3\left\lbrack radian\right\rbrack & 4\left\lbrack m^2\right\rbrack\end{bmatrix}=`);
+
+ await page.waitForSelector('text=Updating...', {state: 'detached'});
+
+ let content = await page.textContent(`#result-value-0`);
+ expect(content).toBe(String.raw`\begin{bmatrix} 5\left\lbrack m\cdot sec\right\rbrack & 10\left\lbrack kg\cdot sec\right\rbrack \\ 15\left\lbrack sec\cdot rad\right\rbrack & 20\left\lbrack m^{2}\cdot sec\right\rbrack \end{bmatrix}`);
+
+ // change order of scalar-matrix multiplication, should commute
+ await page.setLatex(0, String.raw`\begin{bmatrix}1\left\lbrack m\right\rbrack & 2\left\lbrack kg\right\rbrack\\ 3\left\lbrack radian\right\rbrack & 4\left\lbrack m^2\right\rbrack\end{bmatrix}\cdot 5\left\lbrack s\right\rbrack=`);
+
+ await page.waitForSelector('text=Updating...', {state: 'detached'});
+
+ content = await page.textContent(`#result-value-0`);
+ expect(content).toBe(String.raw`\begin{bmatrix} 5\left\lbrack m\cdot sec\right\rbrack & 10\left\lbrack kg\cdot sec\right\rbrack \\ 15\left\lbrack sec\cdot rad\right\rbrack & 20\left\lbrack m^{2}\cdot sec\right\rbrack \end{bmatrix}`);
+});
+
+test('Variable scalar times variable matrix', async () => {
+ await page.setLatex(0, String.raw`a\cdot A=`);
+
+ await page.locator('#add-math-cell').click();
+ await page.setLatex(1, String.raw`a=5\left\lbrack s\right\rbrack`);
+
+ await page.locator('#add-math-cell').click();
+ await page.setLatex(2, String.raw`A=\begin{bmatrix}1\left\lbrack m\right\rbrack & 2\left\lbrack kg\right\rbrack\\ 3\left\lbrack radian\right\rbrack & 4\left\lbrack m^2\right\rbrack\end{bmatrix}`);
+
+ await page.waitForSelector('text=Updating...', {state: 'detached'});
+
+ let content = await page.textContent(`#result-value-0`);
+ expect(content).toBe(String.raw`\begin{bmatrix} 5\left\lbrack m\cdot sec\right\rbrack & 10\left\lbrack kg\cdot sec\right\rbrack \\ 15\left\lbrack sec\cdot rad\right\rbrack & 20\left\lbrack m^{2}\cdot sec\right\rbrack \end{bmatrix}`);
+
+ // change order of scalar-matrix multiplication, should commute
+ await page.setLatex(0, String.raw`A\cdot a=`);
+
+ await page.waitForSelector('text=Updating...', {state: 'detached'});
+
+ content = await page.textContent(`#result-value-0`);
+ expect(content).toBe(String.raw`\begin{bmatrix} 5\left\lbrack m\cdot sec\right\rbrack & 10\left\lbrack kg\cdot sec\right\rbrack \\ 15\left\lbrack sec\cdot rad\right\rbrack & 20\left\lbrack m^{2}\cdot sec\right\rbrack \end{bmatrix}`);
+});
+
+test('Cross product with column vectors and variable entries', async () => {
+ await page.setLatex(0, String.raw`\begin{bmatrix}a1\\ a2\\ a3\end{bmatrix}\times\begin{bmatrix}b1\\ b2\\ b3\end{bmatrix}=`);
+
+ await page.waitForSelector('text=Updating...', {state: 'detached'});
+
+ let content = await page.textContent(`#result-value-0`);
+ expect(content).toBe(String.raw`\begin{bmatrix} a_{2} b_{3} - a_{3} b_{2} \\ - a_{1} b_{3} + a_{3} b_{1} \\ a_{1} b_{2} - a_{2} b_{1} \end{bmatrix}`);
+});
+
+test('Cross product with column vectors and numeric entries', async () => {
+ await page.setLatex(0, String.raw`\begin{bmatrix}1\\ 2\\ 3\end{bmatrix}\times\begin{bmatrix}4\\ 5\\ 6\end{bmatrix}=`);
+
+ await page.waitForSelector('text=Updating...', {state: 'detached'});
+
+ let content = await page.textContent(`#result-value-0`);
+ expect(content).toBe(String.raw`\begin{bmatrix} -3 \\ 6 \\ -3 \end{bmatrix}`);
+});
+
+test('Cross product with column vectors and numeric entries and units', async () => {
+ await page.setLatex(0, String.raw`\begin{bmatrix}1\left\lbrack m\right\rbrack\\ 2\left\lbrack kg\right\rbrack\\ 3\left\lbrack sec\right\rbrack\end{bmatrix}\times\begin{bmatrix}4\left\lbrack m\right\rbrack\\ 5\left\lbrack kg\right\rbrack\\ 6\left\lbrack sec\right\rbrack\end{bmatrix}=`);
+
+ await page.waitForSelector('text=Updating...', {state: 'detached'});
+
+ let content = await page.textContent(`#result-value-0`);
+ expect(content).toBe(String.raw`\begin{bmatrix} -3\left\lbrack kg\cdot sec\right\rbrack \\ 6\left\lbrack m\cdot sec\right\rbrack \\ -3\left\lbrack kg\cdot m\right\rbrack \end{bmatrix}`);
+});
+
+test('Cross product with column vectors and numeric entries and incompatible units', async () => {
+ await page.setLatex(0, String.raw`\begin{bmatrix}1\left\lbrack m\right\rbrack\\ 2\left\lbrack kg\right\rbrack\\ 3\left\lbrack sec\right\rbrack\end{bmatrix}\times\begin{bmatrix}4\left\lbrack m\right\rbrack\\ 5\left\lbrack kg\right\rbrack\\ 6\left\lbrack m\right\rbrack\end{bmatrix}=`);
+
+ await page.waitForSelector('text=Updating...', {state: 'detached'});
+
+ await expect(page.locator('text=Dimension Error')).toBeAttached();
+});
+
+test('Cross product with row vectors and symbolic values', async () => {
+ await page.setLatex(0, String.raw`\begin{bmatrix}a1 & a2 & a3\end{bmatrix}\times\begin{bmatrix}b1 & b2 & b3\end{bmatrix}=`);
+
+ await page.waitForSelector('text=Updating...', {state: 'detached'});
+
+ let content = await page.textContent(`#result-value-0`);
+ expect(content).toBe(String.raw`\begin{bmatrix} a_{2} b_{3} - a_{3} b_{2} & - a_{1} b_{3} + a_{3} b_{1} & a_{1} b_{2} - a_{2} b_{1} \end{bmatrix}`);
+});
+
+test('Cross product with variable column vectors', async () => {
+ await page.setLatex(0, String.raw`v1\times v2=`);
+
+ await page.locator('#add-math-cell').click();
+ await page.setLatex(1, String.raw`v1\:=\:\begin{bmatrix}a1\\ a2\\ a3\end{bmatrix}`);
+
+ await page.locator('#add-math-cell').click();
+ await page.setLatex(2, String.raw`v2\:=\:\begin{bmatrix}b1\\ b2\\ b3\end{bmatrix}`);
+
+ await page.waitForSelector('text=Updating...', {state: 'detached'});
+
+ let content = await page.textContent(`#result-value-0`);
+ expect(content).toBe(String.raw`\begin{bmatrix} a_{2} b_{3} - a_{3} b_{2} \\ - a_{1} b_{3} + a_{3} b_{1} \\ a_{1} b_{2} - a_{2} b_{1} \end{bmatrix}`);
+});
+
+test('Dot product with column vectors and symbolic entries', async () => {
+ await page.setLatex(0, String.raw`\mathrm{dot}\left(\begin{bmatrix}a1\\ a2\\ a3\end{bmatrix},\begin{bmatrix}b1\\ b2\\ b3\end{bmatrix}\right)=`);
+
+ await page.waitForSelector('text=Updating...', {state: 'detached'});
+
+ let content = await page.textContent(`#result-value-0`);
+ expect(content).toBe(String.raw`a_{1} b_{1} + a_{2} b_{2} + a_{3} b_{3}`);
+});
+
+test('Dot product with variable column vectors', async () => {
+ await page.setLatex(0, String.raw`\mathrm{dot}\left(v1,v2\right)=`);
+
+ await page.locator('#add-math-cell').click();
+ await page.setLatex(1, String.raw`\mathrm{dot}\left(v1^{\mathrm{T}},v2\right)=`);
+
+ await page.locator('#add-math-cell').click();
+ await page.setLatex(2, String.raw`\mathrm{dot}\left(v1,v2^{\mathrm{T}}\right)=`);
+
+ await page.locator('#add-math-cell').click();
+ await page.setLatex(3, String.raw`\mathrm{dot}\left(v1^{\mathrm{T}},v2^{\mathrm{T}}\right)=`);
+
+ await page.locator('#add-math-cell').click();
+ await page.setLatex(4, String.raw`v1\:=\:\begin{bmatrix}a1\\ a2\\ a3\end{bmatrix}`);
+
+ await page.locator('#add-math-cell').click();
+ await page.setLatex(5, String.raw`v2\:=\:\begin{bmatrix}b1\\ b2\\ b3\end{bmatrix}`);
+
+ await page.waitForSelector('text=Updating...', {state: 'detached'});
+
+ let content = await page.textContent(`#result-value-0`);
+ expect(content).toBe(String.raw`a_{1} b_{1} + a_{2} b_{2} + a_{3} b_{3}`);
+
+ content = await page.textContent(`#result-value-1`);
+ expect(content).toBe(String.raw`a_{1} b_{1} + a_{2} b_{2} + a_{3} b_{3}`);
+
+ content = await page.textContent(`#result-value-2`);
+ expect(content).toBe(String.raw`a_{1} b_{1} + a_{2} b_{2} + a_{3} b_{3}`);
+});
+
+test('Dot product with incompatible matrix dimensions', async () => {
+ await page.setLatex(0, String.raw`\mathrm{dot}\left(\begin{bmatrix}a1\\ a2\\ a3\end{bmatrix},\begin{bmatrix}b1\\ b2\end{bmatrix}\right)=`);
+
+ await page.waitForSelector('text=Updating...', {state: 'detached'});
+
+ await expect(page.locator('text=Dimensions incorrect for dot product')).toBeVisible();
+});
+
+test('Dot product with column vectors and numeric entries', async () => {
+ await page.setLatex(0, String.raw`\mathrm{dot}\left(\begin{bmatrix}1\\ 2\\ 3\end{bmatrix},\begin{bmatrix}4\\ 5\\ 6\end{bmatrix}\right)=`);
+
+ await page.waitForSelector('text=Updating...', {state: 'detached'});
+
+ let content = await page.textContent(`#result-value-0`);
+ expect(parseLatexFloat(content)).toBeCloseTo(32, precision);
+});
+
+test('Dot product with column vectors and numeric entries with units', async () => {
+ await page.setLatex(0, String.raw`\mathrm{dot}\left(\begin{bmatrix}1\left\lbrack m\right\rbrack\\ 2\left\lbrack m\right\rbrack\\ 3\left\lbrack m\right\rbrack\end{bmatrix},\begin{bmatrix}4\left\lbrack m\right\rbrack\\ 5\left\lbrack m\right\rbrack\\ 6\left\lbrack m\right\rbrack\end{bmatrix}\right)=`);
+
+ await page.waitForSelector('text=Updating...', {state: 'detached'});
+
+ let content = await page.textContent(`#result-value-0`);
+ expect(parseLatexFloat(content)).toBeCloseTo(32, precision);
+
+ content = await page.textContent('#result-units-0');
+ expect(content).toBe('m^2');
+});
+
diff --git a/tests/test_matrix_norm.spec.mjs b/tests/test_matrix_norm.spec.mjs
new file mode 100644
index 00000000..f734679d
--- /dev/null
+++ b/tests/test_matrix_norm.spec.mjs
@@ -0,0 +1,108 @@
+import { test, expect } from '@playwright/test';
+import { cot, pi, sqrt, tan, cos} from 'mathjs';
+
+import { precision, loadPyodide, newSheet, parseLatexFloat } from './utility.mjs';
+
+let page;
+
+// loading pyodide takes a long time (especially in resource constrained CI environments)
+// load page once and use for all tests in this file
+test.beforeAll(async ({ browser }) => {page = await loadPyodide(browser, page);} );
+
+// give each test a blank sheet to start with (this doesn't reload pyodide)
+test.beforeEach(async () => newSheet(page));
+
+
+test('Norm of vector with symbolic entries using all three notations', async () => {
+ await page.setLatex(0, String.raw`||\begin{bmatrix}a\\ b\\ c\end{bmatrix}||=`);
+
+ await page.locator('#add-math-cell').click();
+ await page.setLatex(1, String.raw`\mathrm{norm}\left(\begin{bmatrix}a\\ b\\ c\end{bmatrix}\right)=`);
+
+ await page.locator('#add-math-cell').click();
+ await page.setLatex(2, String.raw`\left\Vert\begin{bmatrix}a\\ b\\ c\end{bmatrix}\right\Vert=`);
+
+ await page.waitForSelector('text=Updating...', {state: 'detached'});
+
+ let content = await page.textContent(`#result-value-0`);
+ expect(content).toBe(String.raw`\sqrt{\left|{a}\right|^{2} + \left|{b}\right|^{2} + \left|{c}\right|^{2}}`);
+
+ content = await page.textContent(`#result-value-1`);
+ expect(content).toBe(String.raw`\sqrt{\left|{a}\right|^{2} + \left|{b}\right|^{2} + \left|{c}\right|^{2}}`);
+
+ content = await page.textContent(`#result-value-2`);
+ expect(content).toBe(String.raw`\sqrt{\left|{a}\right|^{2} + \left|{b}\right|^{2} + \left|{c}\right|^{2}}`);
+});
+
+test('Norm of row vector with symbolic entries', async () => {
+ await page.setLatex(0, String.raw`\left\Vert\begin{bmatrix}a & b & c\end{bmatrix}\right\Vert=`);
+
+ await page.waitForSelector('text=Updating...', {state: 'detached'});
+
+ let content = await page.textContent(`#result-value-0`);
+ expect(content).toBe(String.raw`\sqrt{\left|{a}\right|^{2} + \left|{b}\right|^{2} + \left|{c}\right|^{2}}`);
+});
+
+test('Norm of row vector with numeric entries', async () => {
+ await page.setLatex(0, String.raw`\left\Vert\begin{bmatrix}1\\ 2\\ 3\end{bmatrix}\right\Vert=`);
+
+ await page.waitForSelector('text=Updating...', {state: 'detached'});
+
+ let content = await page.textContent(`#result-value-0`);
+ expect(parseLatexFloat(content)).toBeCloseTo(sqrt(14), precision);
+});
+
+test('Norm of row vector with numeric entries and units', async () => {
+ await page.setLatex(0, String.raw`\left\Vert\begin{bmatrix}1000\left\lbrack mm\right\rbrack\\ 2000\left\lbrack mm\right\rbrack\\ 3000\left\lbrack mm\right\rbrack\end{bmatrix}\right\Vert=`);
+
+ await page.waitForSelector('text=Updating...', {state: 'detached'});
+
+ let content = await page.textContent(`#result-value-0`);
+ expect(parseLatexFloat(content)).toBeCloseTo(sqrt(14), precision);
+
+ content = await page.textContent('#result-units-0');
+ expect(content).toBe('m');
+});
+
+test('Norm of row vector with numeric entries and inconsistent units units', async () => {
+ await page.setLatex(0, String.raw`\left\Vert\begin{bmatrix}1000\left\lbrack mm\right\rbrack\\ 2000\left\lbrack mm\right\rbrack\\ 3000\left\lbrack sec\right\rbrack\end{bmatrix}\right\Vert=`);
+
+ await page.waitForSelector('text=Updating...', {state: 'detached'});
+
+ await expect(page.locator("#cell-0 >> text=Dimension Error")).toBeAttached();
+});
+
+test('Norm of matrix', async () => {
+ await page.setLatex(0, String.raw`\left\Vert\begin{bmatrix}1\left\lbrack m\right\rbrack & 2\left\lbrack m\right\rbrack\\ 3\left\lbrack m\right\rbrack & 4\left\lbrack m\right\rbrack\\ 5\left\lbrack m\right\rbrack & 6\left\lbrack m\right\rbrack\end{bmatrix}\right\Vert=`);
+
+ await page.waitForSelector('text=Updating...', {state: 'detached'});
+
+ let content = await page.textContent(`#result-value-0`);
+ expect(parseLatexFloat(content)).toBeCloseTo(sqrt(91), precision);
+
+ content = await page.textContent('#result-units-0');
+ expect(content).toBe('m');
+});
+
+test('Norm of scalar', async () => {
+ await page.setLatex(0, String.raw`||v||=`);
+
+ await page.locator('#add-math-cell').click();
+ await page.setLatex(1, String.raw`v=1`);
+
+ await page.waitForSelector('text=Updating...', {state: 'detached'});
+
+ await expect(page.locator("text=object has no attribute 'norm'")).toBeVisible();
+});
+
+test('Norm of variable vector', async () => {
+ await page.setLatex(0, String.raw`||v||=`);
+
+ await page.locator('#add-math-cell').click();
+ await page.setLatex(1, String.raw`v=\begin{bmatrix}a\\ b\\ c\end{bmatrix}`);
+
+ await page.waitForSelector('text=Updating...', {state: 'detached'});
+
+ let content = await page.textContent(`#result-value-0`);
+ expect(content).toBe(String.raw`\sqrt{\left|{a}\right|^{2} + \left|{b}\right|^{2} + \left|{c}\right|^{2}}`);
+});
diff --git a/tests/test_matrix_transpose.spec.mjs b/tests/test_matrix_transpose.spec.mjs
new file mode 100644
index 00000000..f6a70238
--- /dev/null
+++ b/tests/test_matrix_transpose.spec.mjs
@@ -0,0 +1,60 @@
+import { test, expect } from '@playwright/test';
+import { cot, pi, sqrt, tan, cos} from 'mathjs';
+
+import { precision, loadPyodide, newSheet, parseLatexFloat } from './utility.mjs';
+
+let page;
+
+// loading pyodide takes a long time (especially in resource constrained CI environments)
+// load page once and use for all tests in this file
+test.beforeAll(async ({ browser }) => {page = await loadPyodide(browser, page);} );
+
+// give each test a blank sheet to start with (this doesn't reload pyodide)
+test.beforeEach(async () => newSheet(page));
+
+test('Matrix transpose numeric using function', async () => {
+ await page.setLatex(0, String.raw`\mathrm{transpose}\left(\begin{bmatrix}1 & 2\\ 3 & 4\end{bmatrix}\right)=`);
+
+ await page.waitForSelector('text=Updating...', {state: 'detached'});
+
+ let content = await page.textContent(`#result-value-0`);
+ expect(content).toBe(String.raw`\begin{bmatrix} 1 & 3 \\ 2 & 4 \end{bmatrix}`);
+});
+
+test('Matrix tranpose with units using transpose notation', async () => {
+ await page.setLatex(0, String.raw`\begin{bmatrix}1\left\lbrack m\right\rbrack & 2\left\lbrack m\right\rbrack\\ 3\left\lbrack m\right\rbrack & 4\left\lbrack m\right\rbrack\end{bmatrix}^{\mathrm{T}}=`);
+
+ await page.waitForSelector('text=Updating...', {state: 'detached'});
+
+ let content = await page.textContent(`#result-value-0`);
+ expect(content).toBe(String.raw`\begin{bmatrix} 1\left\lbrack m\right\rbrack & 3\left\lbrack m\right\rbrack \\ 2\left\lbrack m\right\rbrack & 4\left\lbrack m\right\rbrack \end{bmatrix}`);
+});
+
+test('Matrix transpose with mixed units', async () => {
+ await page.setLatex(0, String.raw`\begin{bmatrix}1\left\lbrack m\right\rbrack & 2\left\lbrack m^2\right\rbrack\\ 3\left\lbrack m^3\right\rbrack & 4\left\lbrack m^4\right\rbrack\end{bmatrix}^{\mathrm{T}}=`);
+
+ await page.waitForSelector('text=Updating...', {state: 'detached'});
+
+ let content = await page.textContent(`#result-value-0`);
+ expect(content).toBe(String.raw`\begin{bmatrix} 1\left\lbrack m\right\rbrack & 3\left\lbrack m^3\right\rbrack \\ 2\left\lbrack m^2\right\rbrack & 4\left\lbrack m^{4}\right\rbrack \end{bmatrix}`);
+});
+
+test('Matrix transpose with variable matrix and using keyboard shortcut', async () => {
+ await page.setLatex(0, String.raw`A=\begin{bmatrix}1 & 2\\ 3 & 4\end{bmatrix}`);
+ await page.locator('#add-math-cell').click();
+ await page.locator('#cell-1 >> math-field.editable').type("A'=");
+
+ await page.waitForSelector('text=Updating...', {state: 'detached'});
+
+ let content = await page.textContent(`#result-value-1`);
+ expect(content).toBe(String.raw`\begin{bmatrix} 1 & 3 \\ 2 & 4 \end{bmatrix}`);
+});
+
+test('Column and row matrix transpose', async () => {
+ await page.setLatex(0, String.raw`\begin{bmatrix}a\\ b\end{bmatrix}^{\mathrm{T}}\times\begin{bmatrix}c & d\end{bmatrix}^{\mathrm{T}}=`);
+
+ await page.waitForSelector('text=Updating...', {state: 'detached'});
+
+ let content = await page.textContent(`#result-value-0`);
+ expect(content).toBe(String.raw`\begin{bmatrix} a c + b d \end{bmatrix}`);
+});
\ No newline at end of file
diff --git a/tests/test_piecewise_cell.spec.mjs b/tests/test_piecewise_cell.spec.mjs
index 0d3e99ed..870e064c 100644
--- a/tests/test_piecewise_cell.spec.mjs
+++ b/tests/test_piecewise_cell.spec.mjs
@@ -96,20 +96,16 @@ test('Test piecewise cell functionality', async ({ browserName }) => {
await page.waitForSelector('.status-footer', { state: 'detached' });
- let content = await page.textContent('#result-units-0');
- expect(content).toBe('Dimension Error');
- content = await page.textContent('#result-units-1');
- expect(content).toBe('Dimension Error');
+ await expect(page.locator('#cell-0 >> text=Dimension Error')).toBeVisible();
+ await expect(page.locator('#cell-1 >> text=Dimension Error')).toBeVisible();
await page.locator('#piecewise-expression-2-1 math-field.editable').dblclick();
await page.locator('#piecewise-expression-2-1 math-field.editable').type('33[m]');
await page.waitForSelector('.status-footer', { state: 'detached' });
- content = await page.textContent('#result-units-0');
- expect(content).toBe('Dimension Error');
- content = await page.textContent('#result-units-1');
- expect(content).toBe('Dimension Error');
+ await expect(page.locator('#cell-0 >> text=Dimension Error')).toBeVisible();
+ await expect(page.locator('#cell-1 >> text=Dimension Error')).toBeVisible();
// test GTE
await page.locator('#piecewise-condition-2-0 math-field.editable').dblclick();
@@ -117,7 +113,7 @@ test('Test piecewise cell functionality', async ({ browserName }) => {
await page.waitForSelector('.status-footer', { state: 'detached' });
- content = await page.locator('#result-value-0').textContent();
+ let content = await page.locator('#result-value-0').textContent();
expect(parseLatexFloat(content)).toBeCloseTo(1.5, precision);
content = await page.locator('#result-units-0').textContent();
expect(content).toBe('m');
diff --git a/tests/test_system_solve.spec.mjs b/tests/test_system_solve.spec.mjs
index 6a413e0c..7d2adcdf 100644
--- a/tests/test_system_solve.spec.mjs
+++ b/tests/test_system_solve.spec.mjs
@@ -312,8 +312,7 @@ test('Test function notation with equation solving and combined function/assignm
expect(parseLatexFloat(content)).toBeCloseTo(2, precision);
content = await page.textContent('#result-units-2');
expect(content).toBe('inch');
- content = await page.textContent('#result-units-3');
- expect(content).toBe('Dimension Error');
+ await expect(page.locator('#cell-3 >> text=Dimension Error')).toBeVisible();
content = await page.textContent('#result-value-6');
expect(parseLatexFloat(content)).toBeCloseTo(sqrt(2*9.81*.003), precision);
content = await page.textContent('#result-units-6');
@@ -826,4 +825,123 @@ test('Test handling currently selected solution greater than number of solutions
// make sure first solution radio button is selected
expect(await page.locator('#solution-radio-1-0').isChecked()).toBeTruthy();
+});
+
+test('Test matrix equation solve', async () => {
+
+ await page.forceDeleteCell(0);
+ await page.locator('#add-system-cell').click();
+
+ await page.setLatex(0, String.raw`\begin{bmatrix}1 & 0 & 0\\ 0 & 1 & 0\\ 0 & 0 & 1\end{bmatrix}\times\begin{bmatrix}a\\ b\\ c\end{bmatrix}=\begin{bmatrix}1\\ 2\\ 3\end{bmatrix}`, 0);
+ await page.locator('#system-parameterlist-0 math-field.editable').type('a,b,c');
+
+ await page.click('#add-math-cell');
+ await page.locator('#cell-1 >> math-field.editable').type('a=');
+
+ await page.click('#add-math-cell');
+ await page.locator('#cell-2 >> math-field.editable').type('b=');
+
+ await page.click('#add-math-cell');
+ await page.locator('#cell-3 >> math-field.editable').type('c=');
+
+ await page.waitForSelector('text=Updating...', {state: 'detached'});
+
+ // make sure first solution is both the selected solution and the displayed solution
+ let content = await page.textContent('#result-value-1');
+ expect(parseLatexFloat(content)).toBeCloseTo(1, precision);
+
+ content = await page.textContent('#result-value-2');
+ expect(parseLatexFloat(content)).toBeCloseTo(2, precision);
+
+ content = await page.textContent('#result-value-3');
+ expect(parseLatexFloat(content)).toBeCloseTo(3, precision);
+
+});
+
+test('Test numerical matrix equation solve', async () => {
+
+ await page.forceDeleteCell(0);
+ await page.locator('#add-system-cell').click();
+
+ await page.setLatex(0, String.raw`\begin{bmatrix}1 & 0 & 0\\ 0 & 1 & 0\\ 0 & 0 & 1\end{bmatrix}\times\begin{bmatrix}a\\ b\\ c\end{bmatrix}=\begin{bmatrix}1\\ 2\\ 3\end{bmatrix}`, 0);
+ await page.locator('#system-parameterlist-0 math-field.editable').type('a~.5,b~.5,c~.5');
+
+ await page.click('#add-math-cell');
+ await page.locator('#cell-1 >> math-field.editable').type('a=');
+
+ await page.click('#add-math-cell');
+ await page.locator('#cell-2 >> math-field.editable').type('b=');
+
+ await page.click('#add-math-cell');
+ await page.locator('#cell-3 >> math-field.editable').type('c=');
+
+ await page.waitForSelector('text=Updating...', {state: 'detached'});
+
+ // make sure first solution is both the selected solution and the displayed solution
+ let content = await page.textContent('#result-value-1');
+ expect(parseLatexFloat(content)).toBeCloseTo(1, precision);
+
+ content = await page.textContent('#result-value-2');
+ expect(parseLatexFloat(content)).toBeCloseTo(2, precision);
+
+ content = await page.textContent('#result-value-3');
+ expect(parseLatexFloat(content)).toBeCloseTo(3, precision);
+
+});
+
+test('Test determinant equation solve', async () => {
+ await page.forceDeleteCell(0);
+ await page.locator('#add-system-cell').click();
+
+ await page.setLatex(0, String.raw`\mathrm{det}\left(\begin{bmatrix}1-a & 0 & 0\\ 0 & 2-a & 0\\ 0 & 0 & 3-a\end{bmatrix}\right)=0`, 0);
+ await page.locator('#system-parameterlist-0 math-field.editable').type('a');
+
+ await page.click('#add-math-cell');
+ await page.locator('#cell-1 >> math-field.editable').type('a=');
+
+ await page.waitForSelector('text=Updating...', {state: 'detached'});
+
+ // make sure first solution is both the selected solution and the displayed solution
+ let content = await page.textContent('#result-value-1');
+ expect(parseLatexFloat(content)).toBeCloseTo(1, precision);
+
+});
+
+test('Test numerical determinant equation solve', async () => {
+ await page.forceDeleteCell(0);
+ await page.locator('#add-system-cell').click();
+
+ await page.setLatex(0, String.raw`\mathrm{det}\left(\begin{bmatrix}1-a & 0 & 0\\ 0 & 2-a & 0\\ 0 & 0 & 3-a\end{bmatrix}\right)=0`, 0);
+ await page.locator('#system-parameterlist-0 math-field.editable').type('a~.7');
+
+ await page.click('#add-math-cell');
+ await page.locator('#cell-1 >> math-field.editable').type('a=');
+
+ await page.waitForSelector('text=Updating...', {state: 'detached'});
+
+ // make sure first solution is both the selected solution and the displayed solution
+ let content = await page.textContent('#result-value-1');
+ expect(parseLatexFloat(content)).toBeCloseTo(1, precision);
+
+});
+
+test('Test numerical matrix equation solve with units', async () => {
+
+ await page.forceDeleteCell(0);
+ await page.locator('#add-system-cell').click();
+
+ await page.setLatex(0, String.raw`\begin{bmatrix}1\left\lbrack m\right\rbrack & 0 & 0\left\lbrack m\right\rbrack\\ 0\left\lbrack m\right\rbrack & 1 & 0\left\lbrack m\right\rbrack\\ 0\left\lbrack m\right\rbrack & 0 & 1\left\lbrack m\right\rbrack\end{bmatrix}\times\begin{bmatrix}a\\ b\\ c\end{bmatrix}=\begin{bmatrix}1\left\lbrack m\right\rbrack\\ 2\left\lbrack m\right\rbrack\\ 3\left\lbrack m\right\rbrack\end{bmatrix}`, 0);
+ await page.locator('#system-parameterlist-0 math-field.editable').type('a~.5,b~.5[m],c~.5');
+
+ await page.click('#add-math-cell');
+ await page.locator('#cell-1 >> math-field.editable').type('b=');
+
+ await page.waitForSelector('text=Updating...', {state: 'detached'});
+
+ // make sure first solution is both the selected solution and the displayed solution
+ let content = await page.textContent('#result-value-1');
+ expect(parseLatexFloat(content)).toBeCloseTo(2, precision);
+
+ content = await page.textContent('#result-units-1');
+ expect(content).toBe('m');
});
\ No newline at end of file
diff --git a/tests/utility.mjs b/tests/utility.mjs
index ae135728..fba53a45 100644
--- a/tests/utility.mjs
+++ b/tests/utility.mjs
@@ -65,12 +65,12 @@ export async function newSheet(page) {
export function complexLatex(input) {
- const cleanedInput = input.replace('\\cdot','').replaceAll(' ', '');
+ const cleanedInput = input.replace('\\cdot','').replace(/^=/, '').replaceAll(' ', '');
return complex(cleanedInput);
}
export function parseLatexFloat(input) {
- input = input.replace('\\times', '').replace('10^{', 'e').replace('}', '').replaceAll(' ', '');
+ input = input.replace('\\times', '').replace(/^=/, '').replace('10^{', 'e').replace('}', '').replaceAll(' ', '');
return Number(input);
}
\ No newline at end of file