vault backup: 2023-06-22 17:09:42

.obsidian/plugins/obsidian-admonition/data.json

@@ -2,7 +2,7 @@
   "userAdmonitions": {},
   "syntaxHighlight": false,
   "copyButton": false,
-  "version": "9.3.1",
+  "version": "9.3.2",
   "autoCollapse": false,
   "defaultCollapseType": "open",
   "injectColor": true,

.obsidian/plugins/obsidian-admonition/manifest.json

@@ -1,7 +1,7 @@
 {
     "id": "obsidian-admonition",
     "name": "Admonition",
-    "version": "9.3.1",
+    "version": "9.3.2",
     "minAppVersion": "1.1.0",
     "description": "Enhanced callouts for Obsidian.md",
     "author": "Jeremy Valentine",

.obsidian/plugins/obsidian-completr/main.js

@@ -78116,7 +78116,8 @@ var DEFAULT_SETTINGS = {
   frontMatterProviderEnabled: true,
   frontMatterTagAppendSuffix: true,
   frontMatterIgnoreCase: true,
-  calloutProviderEnabled: true
+  calloutProviderEnabled: true,
+  calloutProviderSource: "Completr" /* COMPLETR */
 };
 function intoCompletrPath(vault, ...path) {
   return vault.configDir + "/plugins/obsidian-completr/" + path.join("/");
@@ -79690,6 +79691,67 @@ ${indentation}- `;
 };
 var FrontMatter = new FrontMatterSuggestionProvider();
 
+// node_modules/obsidian-callout-manager/dist/api-esm.mjs
+function __awaiter(thisArg, _arguments, P, generator) {
+  function adopt(value) {
+    return value instanceof P ? value : new P(function(resolve) {
+      resolve(value);
+    });
+  }
+  return new (P || (P = Promise))(function(resolve, reject) {
+    function fulfilled(value) {
+      try {
+        step(generator.next(value));
+      } catch (e) {
+        reject(e);
+      }
+    }
+    function rejected(value) {
+      try {
+        step(generator["throw"](value));
+      } catch (e) {
+        reject(e);
+      }
+    }
+    function step(result) {
+      result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected);
+    }
+    step((generator = generator.apply(thisArg, _arguments || [])).next());
+  });
+}
+var PLUGIN_ID = "callout-manager";
+var PLUGIN_API_VERSION = "v1";
+function getApi(plugin) {
+  var _a;
+  return __awaiter(this, void 0, void 0, function* () {
+    const app = (_a = plugin === null || plugin === void 0 ? void 0 : plugin.app) !== null && _a !== void 0 ? _a : globalThis.app;
+    const { plugins } = app;
+    if (!plugins.enabledPlugins.has(PLUGIN_ID)) {
+      return void 0;
+    }
+    const calloutManagerInstance = yield new Promise((resolve, reject) => {
+      const instance = plugins.plugins[PLUGIN_ID];
+      if (instance !== void 0) {
+        return resolve(instance);
+      }
+      const interval = setInterval(() => {
+        const instance2 = plugins.plugins[PLUGIN_ID];
+        if (instance2 !== void 0) {
+          clearInterval(interval);
+          resolve(instance2);
+        }
+      }, 10);
+    });
+    return calloutManagerInstance.newApiHandle(PLUGIN_API_VERSION, plugin, () => {
+      calloutManagerInstance.destroyApiHandle(PLUGIN_API_VERSION, plugin);
+    });
+  });
+}
+function isInstalled(app) {
+  const appWithPlugins = app !== null && app !== void 0 ? app : globalThis.app;
+  return appWithPlugins.plugins.enabledPlugins.has(PLUGIN_ID);
+}
+
 // src/provider/callout_provider.ts
 var import_obsidian3 = require("obsidian");
 var CALLOUT_SUGGESTIONS_FILE = "callout_suggestions.json";
@@ -79700,6 +79762,7 @@ var CalloutSuggestionProvider = class {
   constructor() {
     this.blocksAllOtherProviders = true;
     this.loadedSuggestions = [];
+    this.boundLoadSuggestionsUsingCalloutManager = this.loadSuggestionsUsingCalloutManager.bind(this);
   }
   getSuggestions(context, settings) {
     if (!settings.calloutProviderEnabled)
@@ -79739,7 +79802,20 @@ var CalloutSuggestionProvider = class {
       });
     });
   }
-  async loadSuggestions(vault) {
+  async loadSuggestions(vault, plugin) {
+    const source = plugin.settings.calloutProviderSource;
+    const calloutManagerApi = await getApi(plugin);
+    if (calloutManagerApi != null) {
+      calloutManagerApi.off("change", this.boundLoadSuggestionsUsingCalloutManager);
+      if (source === "Callout Manager" /* CALLOUT_MANAGER */) {
+        calloutManagerApi.on("change", this.boundLoadSuggestionsUsingCalloutManager);
+        await this.loadSuggestionsUsingCalloutManager();
+        return;
+      }
+    }
+    await this.loadSuggestionsUsingCompletr(vault);
+  }
+  async loadSuggestionsUsingCompletr(vault) {
     const path = intoCompletrPath(vault, CALLOUT_SUGGESTIONS_FILE);
     if (!await vault.adapter.exists(path)) {
       const defaultCommands = generateDefaulCalloutOptions();
@@ -79758,6 +79834,15 @@ var CalloutSuggestionProvider = class {
     }
     this.loadedSuggestions = SuggestionBlacklist.filter(this.loadedSuggestions);
   }
+  async loadSuggestionsUsingCalloutManager() {
+    const api = await getApi();
+    this.loadedSuggestions = Array.from(api.getCallouts()).sort(({ id: a }, { id: b }) => a.localeCompare(b)).map((callout) => newSuggestion(
+      api.getTitle(callout),
+      callout.id,
+      callout.icon,
+      `rgb(${callout.color})`
+    ));
+  }
 };
 var Callout = new CalloutSuggestionProvider();
 function untrimEnd(string) {
@@ -80228,6 +80313,18 @@ var CompletrSettingsTab = class extends import_obsidian5.PluginSettingTab {
     });
     new import_obsidian5.Setting(containerEl).setName("Callout provider").setHeading();
     this.createEnabledSetting("calloutProviderEnabled", "Whether or not the callout provider is enabled", containerEl);
+    new import_obsidian5.Setting(containerEl).setName("Source").setDesc("Where callout suggestions come from.").addDropdown((component) => {
+      component.addOption("Completr", "Completr" /* COMPLETR */).setValue("Completr" /* COMPLETR */).onChange(async (value) => {
+        this.plugin.settings.calloutProviderSource = value;
+        await this.plugin.saveSettings();
+      });
+      if (isInstalled()) {
+        component.addOption("Callout Manager", "Callout Manager" /* CALLOUT_MANAGER */);
+        if (this.plugin.settings.calloutProviderSource === "Callout Manager" /* CALLOUT_MANAGER */) {
+          component.setValue(this.plugin.settings.calloutProviderSource);
+        }
+      }
+    });
   }
   async reloadWords() {
     if (this.isReloadingWords)
@@ -80540,7 +80637,7 @@ var CompletrPlugin = class extends import_obsidian6.Plugin {
       WordList.loadFromFiles(this.app.vault, this.settings);
       FileScanner.loadData(this.app.vault);
       Latex.loadCommands(this.app.vault);
-      Callout.loadSuggestions(this.app.vault);
+      Callout.loadSuggestions(this.app.vault, this);
     });
   }
   get suggestionPopup() {

.obsidian/plugins/obsidian-completr/manifest.json

@@ -1,7 +1,7 @@
 {
     "id": "obsidian-completr",
     "name": "Completr",
-    "version": "3.1.3",
+    "version": "3.2.0",
     "minAppVersion": "1.0.0",
     "description": "This plugin provides advanced auto-completion functionality for LaTeX, Frontmatter and standard writing.",
     "author": "tth05",

.obsidian/plugins/obsidian-completr/scanned_words.txt

@@ -2722,6 +2722,8 @@ ostrzegawczym
 operacyjny
 otwierający
 oznacza
+odwracającej
+operacyjnego
 GoTo
 GS
 Gl
@@ -20060,6 +20062,7 @@ Automaty
 Apply
 Analiza
 Amperomierz
+Amp
 Subtype
 SGw
 SI
@@ -24014,6 +24017,7 @@ Npięcia
 NVLKt
 Noise
 NxaltBnA
+Narysuj
 ColorSpace
 Contents
 Cx
@@ -37422,6 +37426,8 @@ cykliczny
 ciągi
 cyklicznego
 cyklicznych
+charakterystykę
+częstotliwościową
 bI
 bx
 bM
@@ -50653,6 +50659,7 @@ Współczynnik
 Wzmacniacz
 Woltomierz
 Wyznacz
+Wtórnika
 rM
 ra
 rv
@@ -54732,6 +54739,7 @@ wydłużony
 waga
 wielomianu
 wej
+wzmacniacza
 pDJ
 parenleftbigg
 parenrightbigg
@@ -64112,6 +64120,7 @@ niepewność
 naszym
 następnie
 nierozdzielnego
+nieodwracającej
 gNx
 gHI
 gri
@@ -66854,6 +66863,7 @@ kształcie
 krawędź
 krawędzi
 kodu
+komparatora
 üx
 ün
 ür

.obsidian/plugins/obsidian-excalidraw-plugin/data.json

@@ -210191,7 +210191,7 @@
     }
   },
   "defaultTrayMode": false,
-  "previousRelease": "1.9.2",
+  "previousRelease": "1.9.3",
   "showReleaseNotes": true,
   "showNewVersionNotification": true,
   "mathjaxSourceURL": "https://cdn.jsdelivr.net/npm/mathjax@3.2.1/es5/tex-svg.js",

.obsidian/plugins/obsidian-excalidraw-plugin/manifest.json

@@ -1,7 +1,7 @@
 {
   "id": "obsidian-excalidraw-plugin",
   "name": "Excalidraw",
-  "version": "1.9.2",
+  "version": "1.9.3",
   "minAppVersion": "1.1.6",
   "description": "An Obsidian plugin to edit and view Excalidraw drawings",
   "author": "Zsolt Viczian",

.obsidian/plugins/obsidian-git/main.js

@@ -31065,6 +31065,7 @@ var IsomorphicGit = class extends GitManager {
       "110": "DA",
       // Technically, two files: first one is deleted "D " and second one is untracked "??"
       "111": "  ",
+      "113": "MM",
       "120": "DA",
       // Same as "110"
       "121": " M",
@@ -32181,7 +32182,7 @@ var ObsidianGitSettingsTab = class extends import_obsidian8.PluginSettingTab {
         })
       );
       new import_obsidian8.Setting(containerEl).setName("Commit message on auto backup/commit").setDesc(
-        "Available placeholders: {{date}} (see below), {{hostname}} (see below) and {{numFiles}} (number of changed files in the commit)"
+        "Available placeholders: {{date}} (see below), {{hostname}} (see below), {{numFiles}} (number of changed files in the commit) and {{files}} (changed files in commit message)"
       ).addText(
         (text2) => text2.setPlaceholder("vault backup: {{date}}").setValue(plugin.settings.autoCommitMessage).onChange((value) => {
           plugin.settings.autoCommitMessage = value;
@@ -32191,7 +32192,7 @@ var ObsidianGitSettingsTab = class extends import_obsidian8.PluginSettingTab {
       containerEl.createEl("br");
       containerEl.createEl("h3", { text: "Commit message" });
       new import_obsidian8.Setting(containerEl).setName("Commit message on manual backup/commit").setDesc(
-        "Available placeholders: {{date}} (see below), {{hostname}} (see below) and {{numFiles}} (number of changed files in the commit)"
+        "Available placeholders: {{date}} (see below), {{hostname}} (see below), {{numFiles}} (number of changed files in the commit) and {{files}} (changed files in commit message)"
       ).addText(
         (text2) => text2.setPlaceholder("vault backup: {{date}}").setValue(
           plugin.settings.commitMessage ? plugin.settings.commitMessage : ""
@@ -32266,9 +32267,11 @@ var ObsidianGitSettingsTab = class extends import_obsidian8.PluginSettingTab {
           plugin.saveSettings();
         })
       );
-      containerEl.createEl("br");
-      containerEl.createEl("h3", { text: "Line author information" });
-      this.addLineAuthorInfoSettings();
+      if (plugin.gitManager instanceof SimpleGit) {
+        containerEl.createEl("br");
+        containerEl.createEl("h3", { text: "Line author information" });
+        this.addLineAuthorInfoSettings();
+      }
     }
     containerEl.createEl("br");
     containerEl.createEl("h3", { text: "Miscellaneous" });
@@ -35836,9 +35839,12 @@ var DiffView = class extends import_obsidian17.ItemView {
     super(leaf);
     this.plugin = plugin;
     this.gettingDiff = false;
+    this.gitRefreshBind = this.refresh.bind(this);
+    this.gitViewRefreshBind = this.refresh.bind(this);
     this.parser = new DOMParser();
     this.navigation = true;
-    addEventListener("git-refresh", this.refresh.bind(this));
+    addEventListener("git-refresh", this.gitRefreshBind);
+    addEventListener("git-view-refresh", this.gitViewRefreshBind);
   }
   getViewType() {
     return DIFF_VIEW_CONFIG.type;
@@ -35865,7 +35871,8 @@ var DiffView = class extends import_obsidian17.ItemView {
     return this.state;
   }
   onClose() {
-    removeEventListener("git-refresh", this.refresh.bind(this));
+    removeEventListener("git-refresh", this.gitRefreshBind);
+    removeEventListener("git-view-refresh", this.gitViewRefreshBind);
     return super.onClose();
   }
   onOpen() {
@@ -35884,16 +35891,26 @@ var DiffView = class extends import_obsidian17.ItemView {
         );
         this.contentEl.empty();
         if (!diff2) {
-          const content = await this.app.vault.adapter.read(
-            this.plugin.gitManager.getVaultPath(this.state.file)
-          );
-          const header = `--- /dev/null
+          if (this.plugin.gitManager instanceof SimpleGit && await this.plugin.gitManager.isTracked(
+            this.state.file
+          )) {
+            diff2 = [
+              `--- ${this.state.file}`,
+              `+++ ${this.state.file}`,
+              ""
+            ].join("\n");
+          } else {
+            const content = await this.app.vault.adapter.read(
+              this.plugin.gitManager.getVaultPath(this.state.file)
+            );
+            const header = `--- /dev/null
 +++ ${this.state.file}
 @@ -0,0 +1,${content.split("\n").length} @@`;
-          diff2 = [
-            ...header.split("\n"),
-            ...content.split("\n").map((line) => `+${line}`)
-          ].join("\n");
+            diff2 = [
+              ...header.split("\n"),
+              ...content.split("\n").map((line) => `+${line}`)
+            ].join("\n");
+          }
         }
         const diffEl = this.parser.parseFromString(html(diff2), "text/html").querySelector(".d2h-file-diff");
         this.contentEl.append(diffEl);
@@ -41968,12 +41985,12 @@ function instance9($$self, $$props, $$invalidate) {
           plugin.setState(0 /* idle */);
           return false;
         }
-        plugin.gitManager.commit(commitMessage).then(() => {
+        plugin.promiseQueue.addTask(() => plugin.gitManager.commit(commitMessage).then(() => {
           if (commitMessage !== plugin.settings.commitMessage) {
             $$invalidate(2, commitMessage = "");
           }
           plugin.setUpAutoBackup();
-        }).finally(triggerRefresh2);
+        }).finally(triggerRefresh2));
       }
     });
   }
@@ -41981,11 +41998,11 @@ function instance9($$self, $$props, $$invalidate) {
     return __awaiter(this, void 0, void 0, function* () {
       $$invalidate(5, loading = true);
       if (status2) {
-        plugin.createBackup(false, false, commitMessage).then(() => {
+        plugin.promiseQueue.addTask(() => plugin.createBackup(false, false, commitMessage).then(() => {
           if (commitMessage !== plugin.settings.commitMessage) {
             $$invalidate(2, commitMessage = "");
           }
-        }).finally(triggerRefresh2);
+        }).finally(triggerRefresh2));
       }
     });
   }
@@ -42039,26 +42056,26 @@ function instance9($$self, $$props, $$invalidate) {
   }
   function stageAll() {
     $$invalidate(5, loading = true);
-    plugin.gitManager.stageAll({ status: status2 }).finally(triggerRefresh2);
+    plugin.promiseQueue.addTask(() => plugin.gitManager.stageAll({ status: status2 }).finally(triggerRefresh2));
   }
   function unstageAll() {
     $$invalidate(5, loading = true);
-    plugin.gitManager.unstageAll({ status: status2 }).finally(triggerRefresh2);
+    plugin.promiseQueue.addTask(() => plugin.gitManager.unstageAll({ status: status2 }).finally(triggerRefresh2));
   }
   function push2() {
     $$invalidate(5, loading = true);
-    plugin.push().finally(triggerRefresh2);
+    plugin.promiseQueue.addTask(() => plugin.push().finally(triggerRefresh2));
   }
   function pull2() {
     $$invalidate(5, loading = true);
-    plugin.pullChangesFromRemote().finally(triggerRefresh2);
+    plugin.promiseQueue.addTask(() => plugin.pullChangesFromRemote().finally(triggerRefresh2));
   }
   function discard() {
     new DiscardModal(view.app, false, plugin.gitManager.getVaultPath("/")).myOpen().then((shouldDiscard) => {
       if (shouldDiscard === true) {
-        plugin.gitManager.discardAll({ status: plugin.cachedStatus }).finally(() => {
+        plugin.promiseQueue.addTask(() => plugin.gitManager.discardAll({ status: plugin.cachedStatus }).finally(() => {
           dispatchEvent(new CustomEvent("git-refresh"));
-        });
+        }));
       }
     });
   }
@@ -42815,7 +42832,7 @@ var ObsidianGit = class extends import_obsidian30.Plugin {
     (_a2 = this.settingsTab) == null ? void 0 : _a2.beforeSaveSettings();
     await this.saveData(this.settings);
   }
-  async saveLastAuto(date, mode) {
+  saveLastAuto(date, mode) {
     if (mode === "backup") {
       this.localStorage.setLastAutoBackup(date.toString());
     } else if (mode === "pull") {
@@ -42824,7 +42841,7 @@ var ObsidianGit = class extends import_obsidian30.Plugin {
       this.localStorage.setLastAutoPush(date.toString());
     }
   }
-  async loadLastAuto() {
+  loadLastAuto() {
     var _a2, _b, _c;
     return {
       backup: new Date((_a2 = this.localStorage.getLastAutoBackup()) != null ? _a2 : ""),
@@ -43044,13 +43061,17 @@ var ObsidianGit = class extends import_obsidian30.Plugin {
   }) {
     if (!await this.isAllInitialized())
       return false;
-    const hadConflict = this.localStorage.getConflict() === "true";
+    let hadConflict = this.localStorage.getConflict() === "true";
     let changedFiles;
     let status2;
     let unstagedFiles;
     if (this.gitManager instanceof SimpleGit) {
       this.mayDeleteConflictFile();
       status2 = await this.updateCachedStatus();
+      if (status2.conflicted.length == 0) {
+        this.localStorage.setConflict("false");
+        hadConflict = false;
+      }
       if (fromAutoBackup && status2.conflicted.length > 0) {
         this.displayError(
           `Did not commit, because you have conflicts in ${status2.conflicted.length} ${status2.conflicted.length == 1 ? "file" : "files"}. Please resolve them and commit per command.`
@@ -43107,15 +43128,16 @@ var ObsidianGit = class extends import_obsidian30.Plugin {
         committedFiles = await this.gitManager.commit(cmtMessage);
       } else {
         committedFiles = await this.gitManager.commitAll({
-          // A type error occurs here because `this.settings.autoCommitMessage` is possibly undefined.
-          // However, since `this.settings.autoCommitMessage` is always set to string in `this.migrateSettings`,
-          // `undefined` is never passed here. Therefore, temporarily ignore this error.
-          // @ts-ignore
           message: cmtMessage,
           status: status2,
           unstagedFiles
         });
       }
+      if (this.gitManager instanceof SimpleGit) {
+        if ((await this.updateCachedStatus()).conflicted.length == 0) {
+          this.localStorage.setConflict("false");
+        }
+      }
       let roughly = false;
       if (committedFiles === void 0) {
         roughly = true;

.obsidian/plugins/obsidian-git/manifest.json

@@ -5,5 +5,5 @@
     "isDesktopOnly": false,
     "fundingUrl": "https://ko-fi.com/vinzent",
     "js": "main.js",
-    "version": "2.20.0"
+    "version": "2.20.4"
 }

.obsidian/plugins/obsidian-icon-folder/manifest.json

@@ -1,7 +1,7 @@
 {
   "id": "obsidian-icon-folder",
   "name": "Icon Folder",
-  "version": "2.0.1",
+  "version": "2.1.2",
   "minAppVersion": "0.9.12",
   "description": "This plugin allows to add an emoji or an icon to a folder or file.",
   "author": "Florian Woelki",

.obsidian/plugins/obsidian-linter/manifest.json

@@ -1,7 +1,7 @@
 {
   "id": "obsidian-linter",
   "name": "Linter",
-  "version": "1.15.1",
+  "version": "1.16.0",
   "minAppVersion": "0.15.6",
   "description": "Formats and styles your notes. It can be used to format YAML tags, aliases, arrays, and metadata; footnotes; headings; spacing; math blocks; regular markdown contents like list, italics, and bold styles; and more with the use of custom rule options as well.",
   "author": "Victor Tao",

.obsidian/plugins/obsidian-style-settings/main.js

@@ -3756,26 +3756,27 @@ class CSSSettingsManager {
     setCSSVariables() {
         const [vars, themedLight, themedDark] = getCSSVariables(this.settings, this.config, this.gradients, this);
         this.styleTag.innerText = `
-      body.css-settings-manager {
-        ${vars.reduce((combined, current) => {
+			body.css-settings-manager {
+				${vars.reduce((combined, current) => {
             return combined + `--${current.key}: ${current.value}; `;
         }, '')}
-      }
+			}
 
-      body.theme-light.css-settings-manager {
-        ${themedLight.reduce((combined, current) => {
+			body.theme-light.css-settings-manager {
+				${themedLight.reduce((combined, current) => {
             return combined + `--${current.key}: ${current.value}; `;
         }, '')}
-      }
+			}
 
-      body.theme-dark.css-settings-manager {
-        ${themedDark.reduce((combined, current) => {
+			body.theme-dark.css-settings-manager {
+				${themedDark.reduce((combined, current) => {
             return combined + `--${current.key}: ${current.value}; `;
         }, '')}
-      }
-    `
+			}
+			`
             .trim()
             .replace(/[\r\n\s]+/g, ' ');
+        this.plugin.app.workspace.trigger('css-change', { source: 'style-settings' });
     }
     setConfig(settings) {
         this.config = {};
@@ -9640,8 +9641,10 @@ class CSSSettingsPlugin extends obsidian.Plugin {
                     this.activateView();
                 },
             });
-            this.registerEvent(this.app.workspace.on('css-change', () => {
-                this.parseCSS();
+            this.registerEvent(this.app.workspace.on('css-change', (data) => {
+                if ((data === null || data === void 0 ? void 0 : data.source) !== 'style-settings') {
+                    this.parseCSS();
+                }
             }));
             this.registerEvent(this.app.workspace.on('parse-style-settings', () => {
                 this.parseCSS();

.obsidian/plugins/obsidian-style-settings/manifest.json

@@ -1,7 +1,7 @@
 {
   "id": "obsidian-style-settings",
   "name": "Style Settings",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "minAppVersion": "0.11.5",
   "description": "Offers controls for adjusting theme, plugin, and snippet CSS variables.",
   "author": "mgmeyers",

.obsidian/plugins/quick-latex/manifest.json

@@ -1,7 +1,7 @@
 {
 	"id": "quick-latex",
 	"name": "Quick Latex for Obsidian",
-	"version": "2.6.1",
+	"version": "2.6.2",
 	"minAppVersion": "0.9.12",
 	"description": "Speedup latex math typing with auto fraction, align block shortcut, matrix shortcut...etc",
 	"author": "joeyuping",