improve logic for \\operatorname

qwinsi · Sep 8, 2024 · 4ac14df · 4ac14df
1 parent 8028e91
commit 4ac14df
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/src/parser.ts b/src/parser.ts
@@ -311,7 +311,7 @@ export function tokenize(latex: string): Token[] {
 
         tokens.push(token);
 
-        if (token.type === TokenType.COMMAND && ['\\text', '\\begin', '\\end'].includes(token.value)) {
+        if (token.type === TokenType.COMMAND && ['\\text', '\\operatorname', '\\begin', '\\end'].includes(token.value)) {
             if (pos >= latex.length || latex[pos] !== '{') {
                 throw new LatexParserError(`No content for ${token.value} command`);
             }

diff --git a/src/writer.ts b/src/writer.ts
@@ -197,15 +197,10 @@ export class TypstWriter {
                 // Fall through
             } else if (node.content === '\\operatorname') {
                 let body = node.args!;
-                if (body.length === 1 && body[0].type == 'ordgroup') {
-                    body = body[0].args!;
+                if (body.length !== 1 || body[0].type !== 'text') {
+                    throw new TypstWriterError(`Expecting body of \\operatorname to be text but got`, node);
                 }
-                const text = body.reduce((buff, n) => {
-                    // Hope convertToken() will not throw an error
-                    // If it does, the input is bad.
-                    buff += convertToken(n.content);
-                    return buff;
-                }, "" as string);
+                const text = body[0].content;
 
                 if (this.preferTypstIntrinsic && TYPST_INTRINSIC_SYMBOLS.includes(text)) {
                     // e.g. we prefer just sech over op("sech")