refac: latex

src/lib/components/chat/Messages/MarkdownInlineTokens.svelte

@@ -37,10 +37,7 @@
 		</del>
 	{:else if token.type === 'inlineKatex'}
 		{#if token.text}
-			<KatexRenderer
+			<KatexRenderer content={revertSanitizedResponseContent(token.text)} displayMode={false} />
-				content={revertSanitizedResponseContent(token.text)}
-				displayMode={token?.displayMode ?? false}
-			/>
 		{/if}
 	{:else if token.type === 'text'}
 		{token.raw}

src/lib/components/chat/Messages/MarkdownTokens.svelte

@@ -116,6 +116,13 @@
 				displayMode={token?.displayMode ?? false}
 			/>
 		{/if}
+	{:else if token.type === 'blockKatex'}
+		{#if token.text}
+			<KatexRenderer
+				content={revertSanitizedResponseContent(token.text)}
+				displayMode={token?.displayMode ?? false}
+			/>
+		{/if}
 	{:else if token.type === 'space'}
 		{''}
 	{:else}

src/lib/utils/katex-extension.ts

@@ -1,29 +1,72 @@
 import katex from 'katex';
 
-const inlineRule =
+const DELIMITER_LIST = [
-	/^(\${1,2})(?!\$)((?:\\.|[^\\\n])*?(?:\\.|[^\\\n\$]))\1(?=[\s?!\.,:？！。，：]|$)/;
+    { left: '$$', right: '$$', display: false },
-const inlineRuleNonStandard = /^(\${1,2})(?!\$)((?:\\.|[^\\\n])*?(?:\\.|[^\\\n\$]))\1/; // Non-standard, even if there are no spaces before and after $ or $$, try to parse
+    { left: '$', right: '$', display: false },
+    { left: '\\pu{', right: '}', display: false },
+    { left: '\\ce{', right: '}', display: false },
+    { left: '\\(', right: '\\)', display: false },
+    { left: '( ', right: ' )', display: false },
+    { left: '\\[', right: '\\]', display: true },
+    { left: '[', right: ']', display: true }
+]
 
-const blockRule = /^(\${1,2})\n((?:\\[^]|[^\\])+?)\n\1(?:\n|$)/;
+// const DELIMITER_LIST = [
+//     { left: '$$', right: '$$', display: false },
+//     { left: '$', right: '$', display: false },
+// ];
 
-export default function (options = {}) {
+// const inlineRule = /^(\${1,2})(?!\$)((?:\\.|[^\\\n])*?(?:\\.|[^\\\n\$]))\1(?=[\s?!\.,:？！。，：]|$)/;
+// const blockRule = /^(\${1,2})\n((?:\\[^]|[^\\])+?)\n\1(?:\n|$)/;
+
+let inlinePatterns = [];
+let blockPatterns = [];
+
+function escapeRegex(string) {
+    return string.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&');
+}
+
+function generateRegexRules(delimiters) {
+    delimiters.forEach(delimiter => {
+        const { left, right } = delimiter;
+        // Ensure regex-safe delimiters
+        const escapedLeft = escapeRegex(left);
+        const escapedRight = escapeRegex(right);
+
+        // Inline pattern - Capture group $1, token content, followed by end delimiter and normal punctuation marks.
+        // Example: $text$
+        inlinePatterns.push(`${escapedLeft}((?:\\\\.|[^\\\\\\n])*?(?:\\\\.|[^\\\\\\n${escapedRight}]))${escapedRight}`);
+
+        // Block pattern - Starts and ends with the delimiter on new lines. Example:
+        // $$\ncontent here\n$$
+        blockPatterns.push(`${escapedLeft}\n((?:\\\\[^]|[^\\\\])+?)\n${escapedRight}`);
+    });
+
+    const inlineRule = new RegExp(`^(${inlinePatterns.join('|')})(?=[\\s?!.,:？！。，：]|$)`, 'u');
+    const blockRule = new RegExp(`^(${blockPatterns.join('|')})(?:\n|$)`, 'u');
+
+    return { inlineRule, blockRule };
+}
+
+const { inlineRule, blockRule } = generateRegexRules(DELIMITER_LIST);
+
+
+
+export default function(options = {}) {
   return {
     extensions: [
       inlineKatex(options, createRenderer(options, false)),
-			blockKatex(options, createRenderer(options, true))
+      blockKatex(options, createRenderer(options, true)),
-		]
+    ],
   };
 }
 
 function createRenderer(options, newlineAfter) {
-	return (token) =>
+  return (token) => katex.renderToString(token.text, { ...options, displayMode: token.displayMode }) + (newlineAfter ? '\n' : '');
-		katex.renderToString(token.text, { ...options, displayMode: token.displayMode }) +
-		(newlineAfter ? '\n' : '');
 }
 
 function inlineKatex(options, renderer) {
-	const nonStandard = options && options.nonStandard;
+  const ruleReg =  inlineRule;
-	const ruleReg = nonStandard ? inlineRuleNonStandard : inlineRule;
   return {
     name: 'inlineKatex',
     level: 'inline',
@@ -36,7 +79,7 @@ function inlineKatex(options, renderer) {
         if (index === -1) {
           return;
         }
-				const f = nonStandard ? index > -1 : index === 0 || indexSrc.charAt(index - 1) === ' ';
+        const f = index === 0 || indexSrc.charAt(index - 1) === ' ';
         if (f) {
           const possibleKatex = indexSrc.substring(index);
 
@@ -50,16 +93,19 @@ function inlineKatex(options, renderer) {
     },
     tokenizer(src, tokens) {
       const match = src.match(ruleReg);
+
       if (match) {
+        console.log(match)
+        const text = match.slice(2).filter((item) => item).find((item) => item.trim());
+
         return {
           type: 'inlineKatex',
           raw: match[0],
-					text: match[2].trim(),
+          text: text,
-					displayMode: match[1].length === 2
         };
       }
     },
-		renderer
+    renderer,
   };
 }
 
@@ -73,11 +119,11 @@ function blockKatex(options, renderer) {
         return {
           type: 'blockKatex',
           raw: match[0],
-					text: match[2].trim(),
+          text: match[0],
-					displayMode: match[1].length === 2
         };
       }
     },
-		renderer
+    renderer,
   };
 }
+