Merge pull request #228 from mgreminger/export-fixes

fix: don't include blank expressions in table markdown
mgreminger · Jan 14, 2024 · 4ef6fea · 4ef6fea
2 parents 1acc32a + 0c5b1b4
commit 4ef6fea
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 14 deletions.
diff --git a/src/App.svelte b/src/App.svelte
@@ -810,7 +810,7 @@
           statements.push(mathField.statement);
         }
       } else if (cell instanceof TableCell) {
-        const newStatements = cell.parseTableStatements(cellNum);
+        const newStatements = cell.parseTableStatements();
         for (const statement of newStatements) {
           endStatements.push(statement);
         }

diff --git a/src/TableCell.svelte b/src/TableCell.svelte
@@ -28,6 +28,7 @@
   import IconButton from "./IconButton.svelte";
 
   import { deltaToMarkdown } from "quill-delta-to-markdown";
+  import { column } from "mathjs";
 
   export let index: number;
   export let tableCell: TableCell;
@@ -43,23 +44,33 @@
       result += deltaToMarkdown((tableCell.rowJsons[row] as any)?.ops ?? "") + "\n";
     }
 
-    result += `$$ \\text{${tableCell.rowLabels[row].label}} \\quad `;
+    const columnExpressions = [];
 
-    if (tableCell.parameterFields.length > 1) {
-      result += ` \\begin{cases} `;
+    for (const [col, parameter] of tableCell.parameterFields.entries()) {
+      if (tableCell.rhsFields[row][col].latex.replaceAll(/\\:?/g,'').trim() !== "") {
+        columnExpressions.push(`${parameter.latex} & = \\quad ${tableCell.rhsFields[row][col].latex} ${tableCell.parameterUnitFields[col].latex}`);
+      }
+    }
+
+    if (columnExpressions.length > 0) {
+      result += `$$ \\text{${tableCell.rowLabels[row].label}} \\quad `;
+
+      if (columnExpressions.length > 1) {
+        result += ` \\begin{cases} `;
 
-      for (const [col, parameter] of tableCell.parameterFields.entries()) {
-        result += `${parameter.latex} & = \\quad ${tableCell.rhsFields[row][col].latex} ${tableCell.parameterUnitFields[col].latex}`;
-        if (col < tableCell.parameterFields.length - 1) {
-          result += " \\\\ ";
+        for (const [col, expression] of columnExpressions.entries()) {
+          result += expression;
+          if (col < columnExpressions.length - 1) {
+            result += " \\\\ ";
+          }
         }
+        result += " \\end{cases}";
+      } else {
+        result += columnExpressions[0].replace('& = \\quad', '=');
       }
-      result += " \\end{cases}";
-    } else {
-      result += `${tableCell.parameterFields[0].latex} = ${tableCell.rhsFields[row][0].latex} ${tableCell.parameterUnitFields[0].latex}`;
+      
+      result += " $$ \n\n";
     }
-    
-    result += " $$ \n\n";
 
     return result;
   }

diff --git a/src/cells/TableCell.ts b/src/cells/TableCell.ts
@@ -87,7 +87,7 @@ export default class TableCell extends BaseCell {
   }
 
 
-  parseTableStatements(cellNum: number): Statement[] {
+  parseTableStatements(): Statement[] {
     const rowIndex = this.selectedRow;
     const statements = [];