fix: KaTeX parsing on shared links

This commit is contained in:
Tom Moor
2023-03-27 21:02:24 -04:00
parent 8cc4cff0d7
commit ce294bd1e7
2 changed files with 29 additions and 17 deletions

View File

@@ -6,6 +6,9 @@ export const REGEX_INLINE_MATH_DOLLARS = /\$\$(.+)\$\$/;
export const REGEX_BLOCK_MATH_DOLLARS = /\$\$\$\s+$/; export const REGEX_BLOCK_MATH_DOLLARS = /\$\$\$\s+$/;
const inlineMathDelimiter = "$$";
const blockMathDelimiter = "$$$";
// test if potential opening or closing delimiter // test if potential opening or closing delimiter
// assumes that there is a "$" at state.src[pos] // assumes that there is a "$" at state.src[pos]
function isValidDelimiter(state: StateInline, pos: number) { function isValidDelimiter(state: StateInline, pos: number) {
@@ -36,7 +39,10 @@ function isValidDelimiter(state: StateInline, pos: number) {
function mathInline(state: StateInline, silent: boolean): boolean { function mathInline(state: StateInline, silent: boolean): boolean {
let match, token, res, pos; let match, token, res, pos;
if (state.src[state.pos] !== "$") { if (
state.src.slice(state.pos, state.pos + inlineMathDelimiter.length) !==
inlineMathDelimiter
) {
return false; return false;
} }
@@ -53,10 +59,10 @@ function mathInline(state: StateInline, silent: boolean): boolean {
// this loop will assume that the first leading backtick can not // this loop will assume that the first leading backtick can not
// be the first character in state.src, which is known since // be the first character in state.src, which is known since
// we have found an opening delimiter already // we have found an opening delimiter already
const start = state.pos + 1; const start = state.pos + inlineMathDelimiter.length;
match = start; match = start;
while ((match = state.src.indexOf("$", match)) !== 1) { while ((match = state.src.indexOf(inlineMathDelimiter, match)) !== 1) {
// found potential $, look for escapes, pos will point to // found potential delimeter, look for escapes, pos will point to
// first non escape when complete // first non escape when complete
pos = match - 1; pos = match - 1;
while (state.src[pos] === "\\") { while (state.src[pos] === "\\") {
@@ -79,12 +85,12 @@ function mathInline(state: StateInline, silent: boolean): boolean {
return true; return true;
} }
// check if we have empty content (ex. $$) do not parse // check if we have empty content (ex. $$$$) do not parse
if (match - start === 0) { if (match - start === 0) {
if (!silent) { if (!silent) {
state.pending += "$$"; state.pending += inlineMathDelimiter + inlineMathDelimiter;
} }
state.pos = start + 1; state.pos = start + inlineMathDelimiter.length;
return true; return true;
} }
@@ -100,11 +106,11 @@ function mathInline(state: StateInline, silent: boolean): boolean {
if (!silent) { if (!silent) {
token = state.push("math_inline", "math", 0); token = state.push("math_inline", "math", 0);
token.markup = "$"; token.markup = inlineMathDelimiter;
token.content = state.src.slice(start, match); token.content = state.src.slice(start, match);
} }
state.pos = match + 1; state.pos = match + inlineMathDelimiter.length;
return true; return true;
} }
@@ -122,22 +128,26 @@ function mathDisplay(
pos = state.bMarks[start] + state.tShift[start], pos = state.bMarks[start] + state.tShift[start],
max = state.eMarks[start]; max = state.eMarks[start];
if (pos + 2 > max) { if (pos + blockMathDelimiter.length > max) {
return false; return false;
} }
if (state.src.slice(pos, pos + 2) !== "$$") { if (
state.src.slice(pos, pos + blockMathDelimiter.length) !== blockMathDelimiter
) {
return false; return false;
} }
pos += 2; pos += blockMathDelimiter.length;
firstLine = state.src.slice(pos, max); firstLine = state.src.slice(pos, max);
if (silent) { if (silent) {
return true; return true;
} }
if (firstLine.trim().slice(-2) === "$$") { if (
firstLine.trim().slice(-blockMathDelimiter.length) === blockMathDelimiter
) {
// Single line expression // Single line expression
firstLine = firstLine.trim().slice(0, -2); firstLine = firstLine.trim().slice(0, -blockMathDelimiter.length);
found = true; found = true;
} }
@@ -156,8 +166,8 @@ function mathDisplay(
break; break;
} }
if (state.src.slice(pos, max).trim().slice(-2) === "$$") { if (state.src.slice(pos, max).trim().slice(-3) === blockMathDelimiter) {
lastPos = state.src.slice(0, max).lastIndexOf("$$"); lastPos = state.src.slice(0, max).lastIndexOf(blockMathDelimiter);
lastLine = state.src.slice(pos, lastPos); lastLine = state.src.slice(pos, lastPos);
found = true; found = true;
} }
@@ -172,7 +182,7 @@ function mathDisplay(
state.getLines(start + 1, next, state.tShift[start], true) + state.getLines(start + 1, next, state.tShift[start], true) +
(lastLine && lastLine.trim() ? lastLine : ""); (lastLine && lastLine.trim() ? lastLine : "");
token.map = [start, state.line]; token.map = [start, state.line];
token.markup = "$$"; token.markup = blockMathDelimiter;
return true; return true;
} }

View File

@@ -109,6 +109,8 @@ export default () => {
manifest: true, manifest: true,
sourcemap: true, sourcemap: true,
minify: "terser", minify: "terser",
// Prevent asset inling as it does not conform to CSP rules
assetsInlineLimit: 0,
target: browserslistToEsbuild(), target: browserslistToEsbuild(),
reportCompressedSize: false, reportCompressedSize: false,
terserOptions: { terserOptions: {