improve error handle in js mathml convert

vertexi · Mar 15, 2024 · 2735520 · 2735520
1 parent 869e112
commit 2735520
Showing 1 changed file with 18 additions and 9 deletions.
diff --git a/tex2mathml/Views/MainView.axaml.cs b/tex2mathml/Views/MainView.axaml.cs
@@ -37,16 +37,25 @@ private void Formula_TextChanged(object? sender, TextChangedEventArgs e)
 
         string jstr = System.IO.File.ReadAllText("./assets/temml.min.js");
         engine.Execute(jstr);
-        var mathML = engine.Evaluate(@"temml.renderToString(inputtext)").ToObject();
-        if (mathML.ToString().IndexOf("error") == 0)
+        var mathML = new object();
+        try
         {
-            mathML = ReplaceFirstOccurrence(mathML.ToString(), @"<math>", @"<math xmlns=""http://www.w3.org/1998/Math/MathML"">");
+            mathML = engine.Evaluate(@"temml.renderToString(inputtext, { displayMode: true })").ToObject();
+            if (mathML.ToString().IndexOf("error") == 0)
+            {
+                mathML = ReplaceFirstOccurrence(mathML.ToString(), @"<math>", @"<math xmlns=""http://www.w3.org/1998/Math/MathML"">");
+            }
+            else {
+                mathML = @"<p>" + mathML + "</p>";
+            }
         }
-        else {
-            mathML = @"<p>" + mathML + "</p>";
+        catch (Exception jsEngineErr)
+        {
+            mathML = @"<p>" + jsEngineErr.Message + "</p>";
         }
-
-        var mathMlHtml = @"<!DOCTYPE html>
+        finally
+        {
+            var mathMlHtml = @"<!DOCTYPE html>
 
     <html>
       <head>
@@ -83,8 +92,8 @@ private void Formula_TextChanged(object? sender, TextChangedEventArgs e)
       </body>
     </html>
     ";
-        PART_WebView.HtmlContent = mathMlHtml;
-
+            PART_WebView.HtmlContent = mathMlHtml;
+        }
     }
 
     private void PART_WebView_WebViewNewWindowRequested(object? sender, WebViewCore.Events.WebViewNewWindowEventArgs e)