github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-21 20:47:08 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #19512 from overleaf/mj-def-mathjax

Browse source 
[web] Pass def, let, and (re)newenvironment to mathjax

GitOrigin-RevId: b79b656024bcaddd1bd96a4b9ed297de2de043e3
This commit is contained in:
Mathias Jakobsen 2024-07-23 10:33:22 +01:00 committed by Copybot
parent 291fdd4e30
commit f4896b2152
4 changed files with 49 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
services/web/frontend/js/features/source-editor/extensions/visual/atomic-decorations.ts
View file

@ -616,14 +616,46 @@ export const atomicDecorations = (options: Options) => {
return false // no markup in verbatim content
} else if (
nodeRef.type.is('NewCommand') ||
nodeRef.type.is('RenewCommand')
nodeRef.type.is('RenewCommand') ||
nodeRef.type.is('Def')
) {
const argumentNode = nodeRef.node.getChild('LiteralArgContent')
if (argumentNode) {
const argument = state
.sliceDoc(argumentNode.from, argumentNode.to)
.trim()
if (/^\\\w+/.test(argument)) {
const nameNode =
nodeRef.node.getChild('LiteralArgContent') ??
nodeRef.node.getChild('Csname') ??
nodeRef.node.getChild('CtrlSym')
if (nameNode) {
const name = state.sliceDoc(nameNode.from, nameNode.to).trim()
if (/^\\\w+/.test(name)) {
const content = state.sliceDoc(nodeRef.from, nodeRef.to)
if (content) {
commandDefinitions += `${content}\n`
}
}
}
} else if (
nodeRef.type.is('RenewEnvironment') ||
nodeRef.type.is('NewEnvironment')
) {
const nameNode = nodeRef.node.getChild('LiteralArgContent')
if (nameNode) {
const name = state.sliceDoc(nameNode.from, nameNode.to).trim()
if (/^\w+/.test(name)) {
const content = state.sliceDoc(nodeRef.from, nodeRef.to)
if (content) {
commandDefinitions += `${content}\n`
}
}
}
} else if (nodeRef.type.is('Let')) {
const commandNodes = nodeRef.node.getChildren('Csname')
if (commandNodes.length !== 2) {
return
}
const nameNode = commandNodes[0]
if (nameNode) {
// We support more flexible names in let (Csname) than in newcommand
const name = state.sliceDoc(nameNode.from, nameNode.to).trim()
if (name.length > 1 && name.startsWith('\\')) {
const content = state.sliceDoc(nodeRef.from, nodeRef.to)
if (content) {
commandDefinitions += `${content}\n`

5
services/web/frontend/js/features/source-editor/languages/latex/latex-language.ts
View file

@ -129,7 +129,10 @@ export const LaTeXLanguage = LRLanguage.define({
) {
types.push('$TextArgument')
}
} else if (type.name.endsWith('Environment')) {
} else if (
type.name.endsWith('Environment') &&
!['NewEnvironment', 'RenewEnvironment'].includes(type.name)
) {
types.push('$Environment')
} else if (type.name.endsWith('Brace')) {
types.push('$Brace')

4
services/web/frontend/js/features/source-editor/lezer-latex/latex.grammar
View file

@ -60,6 +60,7 @@
IncludeGraphicsCtrlSeq,
CaptionCtrlSeq,
DefCtrlSeq,
LetCtrlSeq,
LeftCtrlSeq,
RightCtrlSeq,
NewCommandCtrlSeq,
@ -293,6 +294,9 @@ KnownCommand<ArgumentType> {
// allow more general Csname argument to \def commands, since other symbols such as '@' are often used in definitions
DefCtrlSeq optionalWhitespace? (Csname | CtrlSym) optionalWhitespace? (MacroParameter | OptionalMacroParameter)* optionalWhitespace? DefinitionArgument
} |
Let {
LetCtrlSeq Csname optionalWhitespace? "="? optionalWhitespace? Csname
} |
Hbox {
HboxCtrlSeq optionalWhitespace? TextArgument
} |

2
services/web/frontend/js/features/source-editor/lezer-latex/tokens.mjs
View file

@ -34,6 +34,7 @@ import {
IncludeGraphicsCtrlSeq,
CaptionCtrlSeq,
DefCtrlSeq,
LetCtrlSeq,
LeftCtrlSeq,
RightCtrlSeq,
NewCommandCtrlSeq,
@ -543,6 +544,7 @@ const otherKnowncommands = {
'\\includegraphics': IncludeGraphicsCtrlSeq,
'\\caption': CaptionCtrlSeq,
'\\def': DefCtrlSeq,
'\\let': LetCtrlSeq,
'\\left': LeftCtrlSeq,
'\\right': RightCtrlSeq,
'\\newcommand': NewCommandCtrlSeq,