add convertTree()

qwinsi · Sep 10, 2024 · 68d032c · 68d032c
1 parent df8eac9
commit 68d032c
Show file tree

Hide file tree

Showing 5 changed files with 291 additions and 189 deletions.
diff --git a/src/index.ts b/src/index.ts
@@ -1,6 +1,6 @@
 import { parseTex } from "./parser";
 import { Tex2TypstOptions } from "./types";
-import { TypstWriter } from "./writer";
+import { convertTree, TypstWriter } from "./writer";
 import { symbolMap } from "./map";
 
 
@@ -21,9 +21,10 @@ export function tex2typst(tex: string, options?: Tex2TypstOptions): string {
             opt.customTexMacros = options.customTexMacros;
         }
     }
-    const t = parseTex(tex, opt.customTexMacros!);
+    const texTree = parseTex(tex, opt.customTexMacros!);
+    const typstTree = convertTree(texTree);
     const writer = new TypstWriter(opt.nonStrict!, opt.preferTypstIntrinsic!);
-    writer.append(t);
+    writer.append(typstTree);
     return writer.finalize();
 }
 

diff --git a/src/parser.ts b/src/parser.ts
@@ -439,7 +439,7 @@ export class LatexParser {
             if (num_prime > 0) {
                 res.sup = { type: 'ordgroup', content: '', args:  [] };
                 for (let i = 0; i < num_prime; i++) {
-                    res.sup.args!.push({ type: 'symbol', content: '\\prime' });
+                    res.sup.args!.push({ type: 'element', content: "'" });
                 }
                 if (sup) {
                     res.sup.args!.push(sup);

diff --git a/src/types.ts b/src/types.ts
@@ -37,10 +37,20 @@ export interface TexNode {
     data?: TexSqrtData | TexSupsubData | TexArrayData;
 }
 
+export interface TypstSupsubData {
+    base: TypstNode;
+    sup?: TypstNode;
+    sub?: TypstNode;
+}
+
+export type TypstArrayData = TypstNode[][];
+
 export interface TypstNode {
-    type: 'atom' | 'symbol' | 'text' | 'softSpace' | 'comment' | 'newline';
+    type: 'atom' | 'symbol' | 'text' | 'softSpace' | 'comment' | 'newline'
+            | 'empty' | 'group' | 'supsub' | 'unaryFunc' | 'binaryFunc' | 'align' | 'matrix' | 'unknown';
     content: string;
     args?: TypstNode[];
+    data?: TypstSupsubData | TypstArrayData;
 }
 
 export interface Tex2TypstOptions {