patrick/KaTeX
1
0
Fork 0
mirror of https://github.com/Smaug123/KaTeX synced 2025-10-06 19:58:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(macro): improve argument parsing (#2085)

Browse Source 
* Improve macro argument parsing

* Make \above a primitive command

* Fix screenshotter data

* Normalize argument where necessary

* Improve argument location info

* Update comments

* Minor refactor

* Modularize group parsers

* Allow braced and blank size argument

for non-strict mode and \genfrac, respectively.

* Minor refactor & update comments

* Remove raw option in parseStringGroup

* Update tests

* Fix { delimited parameter

* Update tests

* Update tests

* Normalize argument in \genfrac

* Update tests

* Consume space before scanning an optional argument

* Fix \\, \newline, and \cr behavior

* Fix flow error

* Update comments

* Remove unnecessary mode switching

Parser mode affects neither fetch nor consume.

* Allow single (active) character macro

* Add function property `primitive`

* Set \mathchoice and \*style primitive

* Separate size-related improvements out to #2139

* Fix flow error

* Update screenshots

* Update demo example

* Add a migration guide

* Fix capitalization

* Make a primitive function unexpandable

* Update screenshots

* Update screenshots

* Revert "Document \def doesn't support delimiters (#2288) (#2289)"

This reverts commit f96fba6f7f.

* Update comments, errors, and tests

* Update screenshots
This commit is contained in:
ylemkimon
2020-09-06 12:56:13 +09:00
committed by GitHub
parent 8578d74f82
commit dc5f97aaa2
35 changed files with 432 additions and 348 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
test/errors-spec.js
View File

@@ -94,11 +94,12 @@ describe("Parser:", function() {
describe("#parseArguments", function() {
it("complains about missing argument at end of input", function() {
expect`2\sqrt`.toFailWithParseError(
"Expected group after '\\sqrt' at end of input: 2\\sqrt");
"Expected group as argument to '\\sqrt'" +
" at end of input: 2\\sqrt");
});
it("complains about missing argument at end of group", function() {
expect`1^{2\sqrt}`.toFailWithParseError(
"Expected group after '\\sqrt'" +
"Expected group as argument to '\\sqrt'" +
" at position 10: 1^{2\\sqrt}̲");
});
it("complains about functions as arguments to others", function() {
@@ -166,7 +167,7 @@ describe("Parser.expect calls:", function() {
describe("#parseSpecialGroup expecting braces", function() {
it("complains about missing { for color", function() {
expect`\textcolor#ffffff{text}`.toFailWithParseError(
"Expected '{', got '#' at position 11:" +
"Invalid color: '#' at position 11:" +
" \\textcolor#̲ffffff{text}");
});
it("complains about missing { for size", function() {
@@ -176,23 +177,23 @@ describe("Parser.expect calls:", function() {
// Can't test for the [ of an optional group since it's optional
it("complains about missing } for color", function() {
expect`\textcolor{#ffffff{text}`.toFailWithParseError(
"Invalid color: '#ffffff{text' at position 12:" +
" \\textcolor{#̲f̲f̲f̲f̲f̲f̲{̲t̲e̲x̲t̲}");
"Unexpected end of input in a macro argument," +
" expected '}' at end of input: …r{#ffffff{text}");
});
it("complains about missing ] for size", function() {
expect`\rule[1em{2em}{3em}`.toFailWithParseError(
"Unexpected end of input in size" +
" at position 7: \\rule[1̲e̲m̲{̲2̲e̲m̲}̲{̲3̲e̲m̲}̲");
"Unexpected end of input in a macro argument," +
" expected ']' at end of input: …e[1em{2em}{3em}");
});
it("complains about missing ] for size at end of input", function() {
expect`\rule[1em`.toFailWithParseError(
"Unexpected end of input in size" +
" at position 7: \\rule[1̲e̲m̲");
"Unexpected end of input in a macro argument," +
" expected ']' at end of input: \\rule[1em");
});
it("complains about missing } for color at end of input", function() {
expect`\textcolor{#123456`.toFailWithParseError(
"Unexpected end of input in color" +
" at position 12: \\textcolor{#̲1̲2̲3̲4̲5̲6̲");
"Unexpected end of input in a macro argument," +
" expected '}' at end of input: …xtcolor{#123456");
});
});
@@ -206,11 +207,13 @@ describe("Parser.expect calls:", function() {
describe("#parseOptionalGroup expecting ]", function() {
it("at end of file", function() {
expect`\sqrt[3`.toFailWithParseError(
"Expected ']', got 'EOF' at end of input: \\sqrt[3");
"Unexpected end of input in a macro argument," +
" expected ']' at end of input: \\sqrt[3");
});
it("before group", function() {
expect`\sqrt[3{2}`.toFailWithParseError(
"Expected ']', got 'EOF' at end of input: \\sqrt[3{2}");
"Unexpected end of input in a macro argument," +
" expected ']' at end of input: \\sqrt[3{2}");
});
});
@@ -269,7 +272,7 @@ describe("functions.js:", function() {
describe("\\begin and \\end", function() {
it("reject invalid environment names", function() {
expect`\begin x\end y`.toFailWithParseError(
"Invalid environment name at position 8: \\begin x̲\\end y");
"No such environment: x at position 8: \\begin x̲\\end y");
});
});
@@ -293,22 +296,22 @@ describe("Lexer:", function() {
it("reject 3-digit hex notation without #", function() {
expect`\textcolor{1a2}{foo}`.toFailWithParseError(
"Invalid color: '1a2'" +
" at position 12: \\textcolor{1̲a̲2̲}{foo}");
" at position 11: \\textcolor{̲1̲a̲2̲}̲{foo}");
});
});
describe("#_innerLexSize", function() {
it("reject size without unit", function() {
expect`\rule{0}{2em}`.toFailWithParseError(
"Invalid size: '0' at position 7: \\rule{0̲}{2em}");
"Invalid size: '0' at position 6: \\rule{̲0̲}̲{2em}");
});
it("reject size with bogus unit", function() {
expect`\rule{1au}{2em}`.toFailWithParseError(
"Invalid unit: 'au' at position 7: \\rule{1̲a̲u̲}{2em}");
"Invalid unit: 'au' at position 6: \\rule{̲1̲a̲u̲}̲{2em}");
});
it("reject size without number", function() {
expect`\rule{em}{2em}`.toFailWithParseError(
"Invalid size: 'em' at position 7: \\rule{e̲m̲}{2em}");
"Invalid size: 'em' at position 6: \\rule{̲e̲m̲}̲{2em}");
});
});