tex2typst 0.0.19 → 0.2.0

package/src/types.ts

@@ -1,11 +1,17 @@
-export interface KatexParseNode {
+export interface LatexParseNode {
     type: string;
-    mode: string;
-    text?: string;
-    body?: KatexParseNode | KatexParseNode[] | KatexParseNode[][];
-    loc?: any;
+    content?: string;
+    arg1?: LatexParseNode;
+    arg2?: LatexParseNode;
+    args?: LatexParseNode[];
+    base?: LatexParseNode;
+    sub?: LatexParseNode;
+    sup?: LatexParseNode;
+    exponent?: LatexParseNode;
+    body?: LatexParseNode | LatexParseNode[] | LatexParseNode[][];
 }
 
+
 export interface TexSupsubData {
     base: TexNode;
     sup?: TexNode;
@@ -28,7 +34,7 @@ export interface TexNode {
 }
 
 export interface TypstNode {
-    type: 'atom' | 'symbol' | 'text' | 'softSpace';
+    type: 'atom' | 'symbol' | 'text' | 'softSpace' | 'comment' | 'newline',
     content: string;
     args?: TypstNode[];
 }

package/src/writer.ts

@@ -55,6 +55,8 @@ export class TypstWriter {
             no_need_space ||= /[0-9]$/.test(this.buffer) && /^[0-9]/.test(str);
             // leading sign
             no_need_space ||= /[\(\[{]\s*(-|\+)$/.test(this.buffer) || this.buffer === "-" || this.buffer === "+";
+            // new line
+            no_need_space ||= str.startsWith('\n');
             // buffer is empty
             no_need_space ||= this.buffer === "";
             // other cases
@@ -101,7 +103,7 @@ export class TypstWriter {
 
             }
 
-            if (!base) {
+            if (base.type === 'empty') {
                 this.queue.push({ type: 'text', content: '' });
             } else {
                 this.appendWithBracketsIfNeeded(base);
@@ -208,9 +210,6 @@ export class TypstWriter {
                 if (this.preferTypstIntrinsic && TYPST_INTRINSIC_SYMBOLS.includes(text)) {
                     // e.g. we prefer just sech over op("sech")
                     this.queue.push({ type: 'symbol', content: text});
-                } else if (text.startsWith('SyMb01-')) {
-                    // special hacks made in parseTex()
-                    this.queue.push({ type: 'symbol', content: '\\' + text.substring(7)});
                 } else {
                     this.queue.push({ type: 'symbol', content: 'op' });
                     this.queue.push({ type: 'atom', content: '('});
@@ -226,6 +225,9 @@ export class TypstWriter {
             this.append(arg0);
             this.queue.push({ type: 'atom', content: ')'});
             this.insideFunctionDepth --;
+        } else if (node.type === 'newline') {
+            this.queue.push({ type: 'newline', content: '\n'});
+            return;
         } else if (node.type === 'align') {
             const matrix = node.irregularData as TexNode[][];
             matrix.forEach((row, i) => {
@@ -249,8 +251,12 @@ export class TypstWriter {
                 row.forEach((cell, j) => {
                     // There is a leading & in row
                     if (cell.type === 'ordgroup' && cell.args!.length === 0) {
+                        this.queue.push({ type: 'atom', content: ',' });
                         return;
                     }
+                    // if (j == 0 && cell.type === 'newline' && cell.content === '\n') {
+                        // return;
+                    // }
                     this.append(cell);
                     // cell.args!.forEach((n) => this.append(n));
                     if (j < row.length - 1) {
@@ -270,6 +276,8 @@ export class TypstWriter {
             } else {
                 throw new TypstWriterError(`Unknown macro: ${node.content}`, node);
             }
+        } else if (node.type === 'comment') {
+            this.queue.push({ type: 'comment', content: node.content });
         } else {
             throw new TypstWriterError(`Unimplemented node type to append: ${node.type}`, node);
         }
@@ -292,6 +300,12 @@ export class TypstWriter {
                     this.needSpaceAfterSingleItemScript = true;
                     str = '';
                     break;
+                case 'comment':
+                    str = `//${node.content}`;
+                    break;
+                case 'newline':
+                    str = '\n';
+                    break;
                 default:
                     throw new TypstWriterError(`Unexpected node type to stringify: ${node.type}`, node)
             }
@@ -350,7 +364,9 @@ function convertToken(token: string): string {
     if (/^[a-zA-Z0-9]$/.test(token)) {
         return token;
     } else if (token === '\\\\') {
-        return '\\\n';
+        return '\\';
+    } else if (token == '/') {
+        return '\\/';
     } else if (['\\$', '\\#', '\\&', '\\_'].includes(token)) {
         return token;
     } else if (token.startsWith('\\')) {

package/tsconfig.json

@@ -11,7 +11,7 @@
     // "disableReferencedProjectLoad": true,             /* Reduce the number of projects loaded automatically by TypeScript. */
 
     /* Language and Environment */
-    "target": "es2015",                                  /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */
+    "target": "es2021",                                  /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */
     // "lib": [],                                        /* Specify a set of bundled library declaration files that describe the target runtime environment. */
     // "jsx": "preserve",                                /* Specify what JSX code is generated. */
     // "experimentalDecorators": true,                   /* Enable experimental support for legacy experimental decorators. */