-
Notifications
You must be signed in to change notification settings - Fork 1.6k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
feat: switch to TeX style math blocks #5353
Merged
Merged
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,124 @@ | ||
<!doctype html> | ||
<html lang="en-US"> | ||
|
||
<head> | ||
<link href="/assets/index.css" rel="stylesheet" type="text/css" /> | ||
<script crossorigin="anonymous" src="/test-harness.js"></script> | ||
<script crossorigin="anonymous" src="/test-page-object.js"></script> | ||
<script crossorigin="anonymous" src="/__dist__/webchat-es5.js"></script> | ||
<style> | ||
[data-math-type=error] { | ||
color: #9d0000; | ||
border: 1px dashed currentColor; | ||
padding: 0.2em 0.4em; | ||
margin: 0 0.2em; | ||
border-radius: 2px; | ||
} | ||
</style> | ||
</head> | ||
|
||
<body> | ||
<template id="messages"> | ||
<x-message> | ||
## Basic Math | ||
|
||
1. Simple arithmetic: | ||
\(2 + 2 = 4\) | ||
|
||
2. Fractions: | ||
\[\frac{1}{2} + \frac{1}{3} = \frac{5}{6}\] | ||
|
||
## Algebra | ||
|
||
3. Quadratic formula: | ||
\[x = \frac{-b \pm \sqrt{b^2 - 4ac}}{2a}\] | ||
|
||
4. Binomial expansion: | ||
\[(x + y)^2 = x^2 + 2xy + y^2\] | ||
</x-message> | ||
<x-message> | ||
## Calculus | ||
|
||
5. Derivative notation: | ||
\[\frac{d}{dx} x^n = nx^{n-1}\] | ||
|
||
6. Integration: | ||
\[\int_0^1 x^2 dx = \frac{1}{3}\] | ||
|
||
7. Taylor series: | ||
\[e^x = \sum_{n=0}^{\infty} \frac{x^n}{n!}\] | ||
|
||
## Linear Algebra | ||
|
||
8. Matrix multiplication: | ||
\[ | ||
\begin{pmatrix} | ||
a & b \\ | ||
c & d | ||
\end{pmatrix} | ||
\begin{pmatrix} | ||
x \\ | ||
y | ||
\end{pmatrix} = | ||
\begin{pmatrix} | ||
ax + by \\ | ||
cx + dy | ||
\end{pmatrix} | ||
\] | ||
|
||
9. Determinant: | ||
\[\det\begin{pmatrix} | ||
a & b \\ | ||
c & d | ||
\end{pmatrix} = ad - bc\] | ||
</x-message> | ||
<x-message> | ||
## Physics | ||
|
||
10. Einstein's mass-energy equivalence: | ||
\[E = mc^2\] | ||
|
||
11. Schrödinger equation: | ||
\[i\hbar\frac{\partial}{\partial t}\Psi = \hat{H}\Psi\] | ||
|
||
## Invalid input examples | ||
|
||
12. Wrong expression is rendered: | ||
\(2++2\) | ||
|
||
13. Inline closing delimeter is required: | ||
\(x^2 | ||
|
||
14. Katex syntax error: | ||
\[\int_0^\infty e^{-x} dx = 1 +}\] | ||
</x-message> | ||
</template> | ||
<main id="webchat"></main> | ||
<script> | ||
run(async function () { | ||
await host.windowSize(640, 720, document.getElementById('webchat')); | ||
|
||
const { | ||
WebChat: { renderWebChat } | ||
} = window; // Imports in UMD fashion. | ||
|
||
const { directLine, store } = testHelpers.createDirectLineEmulator(); | ||
|
||
renderWebChat({ directLine, store }, document.getElementById('webchat')); | ||
|
||
await pageConditions.uiConnected(); | ||
|
||
const messages = Array.from(window.messages.content.querySelectorAll('x-message')).map(el => el.innerText) | ||
for (const message of messages) { | ||
await directLine.emulateIncomingActivity({ | ||
text: message, | ||
type: 'message' | ||
}); | ||
await host.snapshot('local'); | ||
await pageConditions.numActivitiesShown(messages.indexOf(message) + 1); | ||
} | ||
}); | ||
</script> | ||
</body> | ||
|
||
</html> |
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,103 @@ | ||
<!doctype html> | ||
<html lang="en-US"> | ||
|
||
<head> | ||
<link href="/assets/index.css" rel="stylesheet" type="text/css" /> | ||
<script crossorigin="anonymous" src="/test-harness.js"></script> | ||
<script crossorigin="anonymous" src="/test-page-object.js"></script> | ||
<script crossorigin="anonymous" src="/__dist__/webchat-es5.js"></script> | ||
<style> | ||
[data-math-type=error] { | ||
color: #9d0000; | ||
border: 1px dashed currentColor; | ||
padding: 0.2em 0.4em; | ||
margin: 0 0.2em; | ||
border-radius: 2px; | ||
} | ||
</style> | ||
</head> | ||
|
||
<body> | ||
<template id="messages"> | ||
<x-message> | ||
## Basic Notation | ||
|
||
Regular text with inline math \(x + y\) in the middle of a sentence. | ||
|
||
## Variables and Exponents | ||
|
||
1. Powers: Let's calculate \(x^2\) and \(y^3\) | ||
2. Subscripts: The sequence \(a_1, a_2, ..., a_n\) | ||
3. Both: Temperature is \(T_{room} = 20^{\circ}C\) | ||
|
||
## Greek Letters | ||
|
||
1. Common variables: \(\alpha\), \(\beta\), \(\gamma\), \(\theta\) | ||
2. Physics constants: Planck's constant \(\hbar\) | ||
3. Math constants: \(\pi \approx 3.14159\) | ||
</x-message> | ||
<x-message> | ||
## Operators | ||
|
||
1. Multiplication: \(5 \times 4\), \(5 \cdot 4\) | ||
2. Division: \(a \div b\), \(\frac{a}{b}\) | ||
3. Plus/minus: \(x \pm y\) | ||
|
||
## Functions | ||
|
||
1. Trigonometry: \(\sin(x)\), \(\cos(x)\), \(\tan(x)\) | ||
2. Logarithms: \(\log(x)\), \(\ln(x)\) | ||
3. Limits: \(\lim_{x \to \infty}\) | ||
|
||
## Special Symbols | ||
|
||
1. Infinity: \(\infty\) | ||
2. Approximately: \(\approx\) | ||
3. Not equal: \(\neq\) | ||
4. Less than or equal: \(\leq\) | ||
5. Greater than or equal: \(\geq\) | ||
</x-message> | ||
<x-message> | ||
## Complex Examples | ||
|
||
1. Chemical equation: \(H_2O + CO_2 \rightarrow H_2CO_3\) | ||
2. Physics formula: \(F = ma\) | ||
3. Statistics: \(\bar{x} = \frac{1}{n}\sum_{i=1}^n x_i\) | ||
4. Probability: \(P(A|B) = \frac{P(B|A)P(A)}{P(B)}\) | ||
|
||
## Common Errors to Avoid | ||
|
||
1. Closing parenthesis is required: \(x^2 | ||
2. Invalid operator is rendered: \(5 +* 3\) | ||
3. Syntax error renders error: \([\frac{1}{2\) | ||
</x-message> | ||
</template> | ||
<main id="webchat"></main> | ||
<script> | ||
run(async function () { | ||
await host.windowSize(640, 720, document.getElementById('webchat')); | ||
|
||
const { | ||
WebChat: { renderWebChat } | ||
} = window; // Imports in UMD fashion. | ||
|
||
const { directLine, store } = testHelpers.createDirectLineEmulator(); | ||
|
||
renderWebChat({ directLine, store }, document.getElementById('webchat')); | ||
|
||
await pageConditions.uiConnected(); | ||
|
||
const messages = Array.from(window.messages.content.querySelectorAll('x-message')).map(el => el.innerText) | ||
for (const message of messages) { | ||
await directLine.emulateIncomingActivity({ | ||
text: message, | ||
type: 'message' | ||
}); | ||
await host.snapshot('local'); | ||
await pageConditions.numActivitiesShown(messages.indexOf(message) + 1); | ||
} | ||
}); | ||
</script> | ||
</body> | ||
|
||
</html> |
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
export const BACKSLASH = 92; // '\' | ||
export const OPEN_PAREN = 40; // '(' | ||
export const CLOSE_PAREN = 41; // ')' | ||
export const OPEN_BRACKET = 91; // '[' | ||
export const CLOSE_BRACKET = 93; // ']' |
45 changes: 45 additions & 0 deletions
45
packages/bundle/src/markdown/mathExtension/htmlRenderer.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,45 @@ | ||
import { type HtmlExtension, type Token } from 'micromark-util-types'; | ||
|
||
export type CreateHtmlRendererOptions = { | ||
renderMath?: ((content: string, isDisplay: boolean) => string) | undefined; | ||
}; | ||
|
||
function extractMathContent(value) { | ||
const isDisplay = value.startsWith('\\['); | ||
const start = value.indexOf(isDisplay ? '[' : '(') + 1; | ||
const end = value.lastIndexOf(isDisplay ? ']' : ')') - 1; | ||
return { | ||
content: value.slice(start, end).trim(), | ||
isDisplay | ||
}; | ||
} | ||
|
||
export default function createHtmlRenderer(options: CreateHtmlRendererOptions = {}): HtmlExtension { | ||
return { | ||
exit: { | ||
math(token: Token) { | ||
const { content, isDisplay } = extractMathContent(this.sliceSerialize(token)); | ||
const defaults = isDisplay | ||
? ({ tag: options.renderMath ? 'figure' : 'pre', type: 'block' } as const) | ||
: ({ tag: 'span', type: 'inline' } as const); | ||
|
||
const render = ( | ||
content: string, | ||
type: 'block' | 'inline' | 'error' = defaults.type, | ||
tag: 'figure' | 'span' | 'pre' | 'code' = defaults.tag | ||
) => { | ||
this.tag(`<${tag} data-math-type="${type}">`); | ||
this.raw(content); | ||
this.tag(`</${tag}>`); | ||
}; | ||
|
||
try { | ||
render(options.renderMath?.(content, isDisplay) ?? content); | ||
} catch (error) { | ||
console.warn('Math rendering error:', error); | ||
render(content, 'error', isDisplay ? 'pre' : 'code'); | ||
} | ||
} | ||
} | ||
} as any; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
import { BACKSLASH } from './constants'; | ||
import { createTokenizer } from './tokenizer'; | ||
import { type Extension } from 'micromark-util-types'; | ||
|
||
export function math(): Extension { | ||
const construct = { | ||
name: 'math', | ||
tokenize: createTokenizer | ||
}; | ||
|
||
return { | ||
text: { [BACKSLASH]: construct }, | ||
flow: { [BACKSLASH]: construct } | ||
} as any; | ||
} | ||
|
||
export { type CreateHtmlRendererOptions as mathHtmlOptions, default as mathHtml } from './htmlRenderer'; |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Greek font is missing in the docker image, I verified it works as expected in my browser