diff --git a/package-lock.json b/package-lock.json
index f24a63c..90ca378 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -6,7 +6,7 @@
"packages": {
"": {
"name": "execute-code",
- "version": "1.7.0",
+ "version": "1.8.1",
"license": "MIT",
"dependencies": {
"g": "^2.0.1",
@@ -1737,9 +1737,9 @@
"dev": true
},
"node_modules/obsidian": {
- "version": "1.1.1",
- "resolved": "https://registry.npmjs.org/obsidian/-/obsidian-1.1.1.tgz",
- "integrity": "sha512-GcxhsHNkPEkwHEjeyitfYNBcQuYGeAHFs1pEpZIv0CnzSfui8p8bPLm2YKLgcg20B764770B1sYGtxCvk9ptxg==",
+ "version": "1.2.8",
+ "resolved": "https://registry.npmjs.org/obsidian/-/obsidian-1.2.8.tgz",
+ "integrity": "sha512-HrC+feA8o0tXspj4lEAqxb1btwLwHD2oHXSwbbN+CdRHURqbCkuIDLld+nkuyJ1w1c9uvVDRVk8BoeOnWheOrQ==",
"dev": true,
"dependencies": {
"@types/codemirror": "0.0.108",
@@ -3425,9 +3425,9 @@
"dev": true
},
"obsidian": {
- "version": "1.1.1",
- "resolved": "https://registry.npmjs.org/obsidian/-/obsidian-1.1.1.tgz",
- "integrity": "sha512-GcxhsHNkPEkwHEjeyitfYNBcQuYGeAHFs1pEpZIv0CnzSfui8p8bPLm2YKLgcg20B764770B1sYGtxCvk9ptxg==",
+ "version": "1.2.8",
+ "resolved": "https://registry.npmjs.org/obsidian/-/obsidian-1.2.8.tgz",
+ "integrity": "sha512-HrC+feA8o0tXspj4lEAqxb1btwLwHD2oHXSwbbN+CdRHURqbCkuIDLld+nkuyJ1w1c9uvVDRVk8BoeOnWheOrQ==",
"dev": true,
"requires": {
"@types/codemirror": "0.0.108",
@@ -3787,4 +3787,4 @@
"peer": true
}
}
-}
\ No newline at end of file
+}
diff --git a/src/transforms/Magic.ts b/src/transforms/Magic.ts
index 7313553..46e4425 100644
--- a/src/transforms/Magic.ts
+++ b/src/transforms/Magic.ts
@@ -12,6 +12,7 @@
*/
import * as os from "os";
+import {Platform} from 'obsidian';
import { TOGGLE_HTML_SIGIL } from "src/Outputter";
// Regex for all languages.
@@ -41,8 +42,8 @@ const MAXIMA_PLOT_REGEX = /^plot2d\s*\(.*\[.+\]\)\s*[$;]/gm;
*/
export function insertVaultPath(source: string, vaultPath: string): string {
source = source.replace(VAULT_PATH_REGEX, `"${vaultPath.replace(/\\/g, "/")}"`);
- source = source.replace(VAULT_URL_REGEX, `"app://local/${vaultPath.replace(/\\/g, "/")}"`);
- source = source.replace(VAULT_REGEX, `"app://local/${vaultPath.replace(/\\/g, "/")}"`);
+ source = source.replace(VAULT_URL_REGEX, `"${Platform.resourcePathPrefix + vaultPath.replace(/\\/g, "/")}"`);
+ source = source.replace(VAULT_REGEX, `"${Platform.resourcePathPrefix + vaultPath.replace(/\\/g, "/")}"`);
return source;
}
@@ -57,8 +58,8 @@ export function insertVaultPath(source: string, vaultPath: string): string {
*/
export function insertNotePath(source: string, notePath: string): string {
source = source.replace(CURRENT_NOTE_PATH_REGEX, `"${notePath.replace(/\\/g, "/")}"`);
- source = source.replace(CURRENT_NOTE_URL_REGEX, `"app://local/${notePath.replace(/\\/g, "/")}"`);
- source = source.replace(CURRENT_NOTE_REGEX, `"app://local/${notePath.replace(/\\/g, "/")}"`);
+ source = source.replace(CURRENT_NOTE_URL_REGEX, `"${Platform.resourcePathPrefix + notePath.replace(/\\/g, "/")}"`);
+ source = source.replace(CURRENT_NOTE_REGEX, `"${Platform.resourcePathPrefix + notePath.replace(/\\/g, "/")}"`);
return source;
}
@@ -141,7 +142,7 @@ export function addInlinePlotsToR(source: string): string {
const matches = source.matchAll(R_PLOT_REGEX);
for (const match of matches) {
const tempFile = `${os.tmpdir()}/temp_${Date.now()}.png`.replace(/\\/g, "/");
- const substitute = `png("${tempFile}"); ${match[0]}; dev.off(); cat('${TOGGLE_HTML_SIGIL}
${TOGGLE_HTML_SIGIL}')`;
+ const substitute = `png("${tempFile}"); ${match[0]}; dev.off(); cat('${TOGGLE_HTML_SIGIL}
${TOGGLE_HTML_SIGIL}')`;
source = source.replace(match[0], substitute);
}
@@ -246,7 +247,7 @@ export function addInlinePlotsToOctave(source: string): string {
const matches = source.matchAll(OCTAVE_PLOT_REGEX);
for (const match of matches) {
const tempFile = `${os.tmpdir()}/temp_${Date.now()}.png`.replace(/\\/g, "/");
- const substitute = `${match[0]}; print -dpng ${tempFile}; disp('${TOGGLE_HTML_SIGIL}
${TOGGLE_HTML_SIGIL}');`;
+ const substitute = `${match[0]}; print -dpng ${tempFile}; disp('${TOGGLE_HTML_SIGIL}
${TOGGLE_HTML_SIGIL}');`;
source = source.replace(match[0], substitute);
}
@@ -259,7 +260,7 @@ export function addInlinePlotsToMaxima(source: string): string {
for (const match of matches) {
const tempFile = `${os.tmpdir()}/temp_${Date.now()}.png`.replace(/\\/g, "/");
const updated_plot_call = match[0].substring(0, match[0].lastIndexOf(')')) + `, [png_file, "${tempFile}"])`;
- const substitute = `${updated_plot_call}; print ('${TOGGLE_HTML_SIGIL}
${TOGGLE_HTML_SIGIL}');`;
+ const substitute = `${updated_plot_call}; print ('${TOGGLE_HTML_SIGIL}
${TOGGLE_HTML_SIGIL}');`;
source = source.replace(match[0], substitute);
}