Merge pull request #1906 from TriliumNext/importMarkdownfromClipboard

Fix incorrect import of multiple inline math.

Author: eliandoran

apps/server/src/services/import/markdown.spec.ts

@@ -188,6 +188,12 @@ second line 2</code></pre><ul><li>Hello</li><li>world</li></ul><ol><li>Hello</li
         expect(markdownService.renderToHtml(input, "Title")).toStrictEqual(expected);
     });
 
+    it("converts multiple inline math expressions into Mathtex format", () => {
+        const input = `Energy: $e=mc^{2}$, Force: $F=ma$.`;
+        const expected = /*html*/`<p>Energy: <span class="math-tex">\\(e=mc^{2}\\)</span>, Force: <span class="math-tex">\\(F=ma\\)</span>.</p>`;
+        expect(markdownService.renderToHtml(input, "Title")).toStrictEqual(expected);
+    });
+
     it("converts display math expressions into Mathtex format", () => {
         const input = `$$\sqrt{x^{2}+1}$$`;
         const expected = /*html*/`<p><span class="math-tex">\\[\sqrt{x^{2}+1}\\]</span></p>`;

apps/server/src/services/import/markdown.ts

@@ -25,7 +25,7 @@ class CustomMarkdownRenderer extends Renderer {
                 `<span class="math-tex">\\\[$1\\\]</span>`);
 
             // Inline math
-            text = text.replaceAll(/(?<!\\)\$(.+)\$/g,
+            text = text.replaceAll(/(?<!\\)\$(.+?)\$/g,
                 `<span class="math-tex">\\\($1\\\)</span>`);
         }