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

Require \[text]color HTML colors to be well-formed. (#827)

Browse Source 
Previously, the parser accepted all letters of the
alphabet for hex digits in HTML colors, and allowed any
number of digits. Now, only well-formed HTML hex colors
are allowed.
This commit is contained in:
Ashish Myles
2017-08-28 23:39:19 -04:00
committed by Kevin Barabash
parent 2fbb2b0128
commit be60165bb1
2 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Parser.js
View File

@@ -773,7 +773,7 @@ class Parser {
if (!res) {
return null;
}
const match = (/^(#[a-z0-9]+|[a-z]+)$/i).exec(res.text);
const match = (/^(#[a-f0-9]{3}|#[a-f0-9]{6}|[a-z]+)$/i).exec(res.text);
if (!match) {
throw new ParseError("Invalid color: '" + res.text + "'", res);
}

20
test/katex-spec.js
View File

@@ -788,8 +788,11 @@ describe("A text parser", function() {
describe("A color parser", function() {
const colorExpression = "\\blue{x}";
const newColorExpression = "\\redA{x}";
const customColorExpression = "\\textcolor{#fA6}{x}";
const badCustomColorExpression = "\\textcolor{bad-color}{x}";
const customColorExpression1 = "\\textcolor{#fA6}{x}";
const customColorExpression2 = "\\textcolor{#fA6fA6}{x}";
const badCustomColorExpression1 = "\\textcolor{bad-color}{x}";
const badCustomColorExpression2 = "\\textcolor{#fA6f}{x}";
const badCustomColorExpression3 = "\\textcolor{#gA6}{x}";
const oldColorExpression = "\\color{#fA6}xy";
it("should not fail", function() {
@@ -805,17 +808,22 @@ describe("A color parser", function() {
});
it("should parse a custom color", function() {
expect(customColorExpression).toParse();
expect(customColorExpression1).toParse();
expect(customColorExpression2).toParse();
});
it("should correctly extract the custom color", function() {
const parse = getParsed(customColorExpression)[0];
const parse1 = getParsed(customColorExpression1)[0];
const parse2 = getParsed(customColorExpression2)[0];
expect(parse.value.color).toEqual("#fA6");
expect(parse1.value.color).toEqual("#fA6");
expect(parse2.value.color).toEqual("#fA6fA6");
});
it("should not parse a bad custom color", function() {
expect(badCustomColorExpression).toNotParse();
expect(badCustomColorExpression1).toNotParse();
expect(badCustomColorExpression2).toNotParse();
expect(badCustomColorExpression3).toNotParse();
});
it("should parse new colors from the branding guide", function() {