Merge branch 'v4' into jpg

331cd4b Misc fixes on Te-Form pages

git-subtree-dir: content
git-subtree-split: 331cd4bb3cffa1fd580b1a2db8fb6e5ffdf7fee9

Dockerfile

@@ -1,3 +1,14 @@
+FROM python:latest as convert
+WORKDIR /usr/src/app
+COPY content/ ./
+COPY custom/convert-furigana/program/convert-furigana.py ./
+COPY custom/convert-usage/program/convert-usage.py ./
+ENV PIP_ROOT_USER_ACTION=ignore
+RUN python -m pip install --upgrade pip
+RUN python -m pip install beautifulsoup4
+RUN python convert-furigana.py .
+RUN python convert-usage.py .
+
 FROM node:20-slim as builder
 WORKDIR /usr/src/app
 COPY package.json .
@@ -8,4 +19,5 @@ FROM node:20-slim
 WORKDIR /usr/src/app
 COPY --from=builder /usr/src/app/ /usr/src/app/
 COPY . .
+COPY --from=convert /usr/src/app/ /usr/src/app/content/
 CMD ["npx", "quartz", "build", "--serve"]

content/.gitignore

@@ -0,0 +1,2 @@
+.obsidian/workspace.json
+0- Do-Not-Commit

content/.obsidian/app.json

@@ -0,0 +1,4 @@
+{
+  "alwaysUpdateLinks": true,
+  "showInlineTitle": false
+}

content/.obsidian/appearance.json

@@ -0,0 +1,11 @@
+{
+  "accentColor": "",
+  "theme": "moonstone",
+  "enabledCssSnippets": [
+    "usage",
+    "spacing",
+    "highlight-color"
+  ],
+  "cssTheme": "AnuPpuccin",
+  "showViewHeader": true
+}

content/.obsidian/community-plugins.json

@@ -0,0 +1,6 @@
+[
+  "obsidian-markdown-furigana",
+  "obsidian-style-settings",
+  "obsidian42-brat",
+  "obsidian-opener"
+]

content/.obsidian/core-plugins-migration.json

@@ -0,0 +1,30 @@
+{
+  "file-explorer": true,
+  "global-search": true,
+  "switcher": true,
+  "graph": true,
+  "backlink": true,
+  "canvas": true,
+  "outgoing-link": true,
+  "tag-pane": true,
+  "properties": false,
+  "page-preview": true,
+  "daily-notes": true,
+  "templates": true,
+  "note-composer": true,
+  "command-palette": true,
+  "slash-command": false,
+  "editor-status": true,
+  "bookmarks": true,
+  "markdown-importer": false,
+  "zk-prefixer": false,
+  "random-note": false,
+  "outline": true,
+  "word-count": true,
+  "slides": false,
+  "audio-recorder": false,
+  "workspaces": false,
+  "file-recovery": true,
+  "publish": false,
+  "sync": false
+}

content/.obsidian/core-plugins.json

@@ -0,0 +1,20 @@
+[
+  "file-explorer",
+  "global-search",
+  "switcher",
+  "graph",
+  "backlink",
+  "canvas",
+  "outgoing-link",
+  "tag-pane",
+  "page-preview",
+  "daily-notes",
+  "templates",
+  "note-composer",
+  "command-palette",
+  "editor-status",
+  "bookmarks",
+  "outline",
+  "word-count",
+  "file-recovery"
+]

content/.obsidian/graph.json

@@ -0,0 +1,22 @@
+{
+  "collapse-filter": true,
+  "search": "",
+  "showTags": false,
+  "showAttachments": false,
+  "hideUnresolved": false,
+  "showOrphans": true,
+  "collapse-color-groups": true,
+  "colorGroups": [],
+  "collapse-display": true,
+  "showArrow": false,
+  "textFadeMultiplier": 0,
+  "nodeSizeMultiplier": 1,
+  "lineSizeMultiplier": 1,
+  "collapse-forces": true,
+  "centerStrength": 0.518713248970312,
+  "repelStrength": 10,
+  "linkStrength": 1,
+  "linkDistance": 250,
+  "scale": 1,
+  "close": false
+}

content/.obsidian/plugins/obsidian-markdown-furigana/manifest.json

@@ -0,0 +1,10 @@
+{
+	"id": "obsidian-markdown-furigana",
+	"name": "Markdown Furigana",
+	"version": "1.3.0",
+	"minAppVersion": "0.9.12",
+	"description": "Simple Markdown to Furigana Rendering Plugin for Obsidian.",
+	"author": "Steven Kraft",
+	"authorUrl": "https://github.com/steven-kraft/obsidian-markdown-furigana",
+	"isDesktopOnly": false
+}

content/.obsidian/plugins/obsidian-opener/main.js

@@ -0,0 +1,377 @@
+/*
+THIS IS A GENERATED/BUNDLED FILE BY ESBUILD
+if you want to view the source, please visit the github repository of this plugin
+*/
+
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// main.ts
+var main_exports = {};
+__export(main_exports, {
+  default: () => Opener
+});
+module.exports = __toCommonJS(main_exports);
+var import_obsidian2 = require("obsidian");
+
+// node_modules/monkey-around/mjs/index.js
+function around(obj, factories) {
+  const removers = Object.keys(factories).map((key) => around1(obj, key, factories[key]));
+  return removers.length === 1 ? removers[0] : function() {
+    removers.forEach((r) => r());
+  };
+}
+function around1(obj, method, createWrapper) {
+  const original = obj[method], hadOwn = obj.hasOwnProperty(method);
+  let current = createWrapper(original);
+  if (original)
+    Object.setPrototypeOf(current, original);
+  Object.setPrototypeOf(wrapper, current);
+  obj[method] = wrapper;
+  return remove;
+  function wrapper(...args) {
+    if (current === original && obj[method] === wrapper)
+      remove();
+    return current.apply(this, args);
+  }
+  function remove() {
+    if (obj[method] === wrapper) {
+      if (hadOwn)
+        obj[method] = original;
+      else
+        delete obj[method];
+    }
+    if (current === original)
+      return;
+    current = original;
+    Object.setPrototypeOf(wrapper, original || Function);
+  }
+}
+
+// settings.ts
+var import_obsidian = require("obsidian");
+var OpenerSettingTab = class extends import_obsidian.PluginSettingTab {
+  display() {
+    const { containerEl } = this;
+    const plugin = this.plugin;
+    containerEl.empty();
+    new import_obsidian.Setting(containerEl).setName("New Tab Default").setDesc(
+      "Enable to open new files in a new tab (or existing tab, if it was previously opened). Disable for default Obsidian behavior."
+    ).addToggle(
+      (toggle) => toggle.setValue(plugin.settings.newTab).onChange((value) => {
+        plugin.settings.newTab = value;
+        plugin.saveSettings();
+      })
+    );
+    new import_obsidian.Setting(containerEl).setName("PDF Default App").setDesc(
+      "Enable to open pdfs with system viewer app. Disable for default behavior (open pdfs in Obsidian)."
+    ).addToggle(
+      (toggle) => toggle.setValue(plugin.settings.PDFApp).onChange((value) => {
+        plugin.settings.PDFApp = value;
+        plugin.saveSettings();
+      })
+    );
+    new import_obsidian.Setting(containerEl).setName("Default app only when Ctrl/Cmd-Key is held").setDesc(
+      "Open in default app only when Ctrl/Cmd-Key is held. Disable to always\u201A open with system viewer."
+    ).addToggle(
+      (toggle) => toggle.setValue(plugin.settings.extOnlyWhenMetaKey).onChange((value) => {
+        plugin.settings.extOnlyWhenMetaKey = value;
+        plugin.saveSettings();
+      })
+    );
+    new import_obsidian.Setting(containerEl).setName("Open everything outside of Obsidian").setDesc(
+      "Enable to open all obsidian supported extensions with system viewer instead. Disable for default behavior (open within Obsidian). Defaults supported extensions are 'png', 'webp', 'jpg', 'jpeg', 'gif', 'bmp', 'svg', 'mp3', 'webm', 'wav', 'm4a', 'ogg','3gp', 'flac', 'mp4', 'ogv', 'mov', 'mkv'."
+    ).addToggle(
+      (toggle) => toggle.setValue(plugin.settings.allExt).onChange((value) => {
+        plugin.settings.allExt = value;
+        plugin.saveSettings();
+      })
+    );
+    new import_obsidian.Setting(containerEl).setName("Open Outside Obsidian: Manual List").setDesc("This shouldn't be necessary, but you can manually enable custom extensions here.").addToggle(
+      (toggle) => toggle.setValue(plugin.settings.custExt).onChange((value) => {
+        plugin.settings.custExt = value;
+        plugin.saveSettings();
+        this.display();
+      })
+    );
+    if (plugin.settings.custExt) {
+      new import_obsidian.Setting(containerEl).setName("Manual List").setDesc("Enter extension names (without the dot, ie, just docx separated by newlines).").addTextArea((textArea) => {
+        textArea.inputEl.rows = 5;
+        textArea.setValue(plugin.settings.custExtList.join("\n")).onChange(async (value) => {
+          plugin.settings.custExtList = value.split("\n");
+          plugin.saveSettings();
+        });
+      }).settingEl.style.borderTop = "none";
+    }
+  }
+};
+
+// constants.ts
+var DEFAULT_SETTINGS = {
+  newTab: true,
+  PDFApp: true,
+  extOnlyWhenMetaKey: true,
+  allExt: false,
+  custExt: false,
+  custExtList: []
+};
+
+// main.ts
+var Opener = class extends import_obsidian2.Plugin {
+  constructor() {
+    super(...arguments);
+    this.isMetaKeyHeld = null;
+    this.sameTabOnce = false;
+    // Meta key listeners
+    // arrow syntax to preserve `this` context
+    this.keyDownHandler = (e) => {
+      if (e.key === "Meta" || e.key === "Control") {
+        this.isMetaKeyHeld = true;
+      }
+    };
+    this.keyUpHandler = (e) => {
+      if (e.key === "Meta" || e.key === "Control") {
+        this.isMetaKeyHeld = false;
+      }
+    };
+    // Mouse handler is needed because the key handler will not fire if the app is out of focus
+    this.mouseDownHandler = (e) => {
+      if (e.metaKey || e.ctrlKey) {
+        this.isMetaKeyHeld = true;
+      } else {
+        this.isMetaKeyHeld = false;
+      }
+    };
+  }
+  async onload() {
+    console.log("loading " + this.manifest.name + " plugin");
+    await this.loadSettings();
+    this.addSettingTab(new OpenerSettingTab(this.app, this));
+    this.updateMetaKeyListeners();
+    this.monkeyPatchOpenFile();
+    this.addCommands();
+    this.addMenuItem();
+  }
+  onunload() {
+    this.uninstallMonkeyPatchOpenFile && this.uninstallMonkeyPatchOpenFile();
+    this.removeMetaKeyListeners();
+    console.log("unloading " + this.manifest.name + " plugin");
+  }
+  async loadSettings() {
+    const data = await this.loadData();
+    this.settings = Object.assign({}, DEFAULT_SETTINGS, data);
+  }
+  async saveSettings() {
+    await this.saveData(this.settings);
+    this.updateMetaKeyListeners();
+  }
+  addCommands() {
+    this.addCommand({
+      id: "same-tab-once",
+      name: "Open next file in same tab (Obsidian default behavior)",
+      checkCallback: (checking) => {
+        if (checking) {
+          return this.settings.newTab;
+        }
+        this.sameTabOnce = true;
+        new import_obsidian2.Notice("Next file will open in same tab");
+      }
+    });
+    this.addCommand({
+      id: "enable-new-tab",
+      name: "Enable new tab for all files",
+      checkCallback: (checking) => {
+        if (checking) {
+          return !this.settings.newTab;
+        }
+        this.settings.newTab = true;
+        this.saveSettings();
+        new import_obsidian2.Notice("Opener: New tab for all files enabled");
+      }
+    });
+    this.addCommand({
+      id: "disable-new-tab",
+      name: "Disable new tab for all files",
+      checkCallback: (checking) => {
+        if (checking) {
+          return this.settings.newTab;
+        }
+        this.settings.newTab = false;
+        this.saveSettings();
+        new import_obsidian2.Notice("Opener: New tab for all files disabled");
+      }
+    });
+    this.addCommand({
+      id: "enable-pdf",
+      name: "Enable open all PDFs with default app",
+      checkCallback: (checking) => {
+        if (checking) {
+          return !this.settings.PDFApp;
+        }
+        this.settings.PDFApp = true;
+        this.saveSettings();
+        new import_obsidian2.Notice("Opener: Open all PDFs with default app enabled");
+      }
+    });
+    this.addCommand({
+      id: "disable-pdf",
+      name: "Disable open all PDFs with default app",
+      checkCallback: (checking) => {
+        if (checking) {
+          return this.settings.PDFApp;
+        }
+        this.settings.PDFApp = false;
+        this.saveSettings();
+        new import_obsidian2.Notice("Opener: Open all PDFs with default app disabled");
+      }
+    });
+    this.addCommand({
+      id: "open-graph-view-in-new-tab",
+      name: "Open Graph View in new tab",
+      callback: () => {
+        this.app.commands.executeCommandById("workspace:new-tab");
+        this.app.commands.executeCommandById("graph:open");
+      }
+    });
+  }
+  // add command to right-click menu
+  addMenuItem() {
+    this.registerEvent(
+      this.app.workspace.on("file-menu", (menu, file, source, leaf) => {
+        if (file instanceof import_obsidian2.TFile) {
+          menu.addItem((item) => {
+            item.setSection("open");
+            item.setTitle("Open in same tab").onClick(() => {
+              this.sameTabOnce = true;
+              this.app.workspace.getLeaf().openFile(file);
+            });
+          });
+        }
+      })
+    );
+  }
+  addMetaKeyListeners() {
+    if (this.isMetaKeyHeld !== null)
+      return;
+    this.isMetaKeyHeld = false;
+    document.addEventListener("keydown", this.keyDownHandler);
+    document.addEventListener("keyup", this.keyUpHandler);
+    document.addEventListener("mousedown", this.mouseDownHandler, { capture: true });
+  }
+  removeMetaKeyListeners() {
+    if (this.isMetaKeyHeld === null)
+      return;
+    document.removeEventListener("keydown", this.keyDownHandler);
+    document.removeEventListener("keyup", this.keyUpHandler);
+    document.removeEventListener("mousedown", this.mouseDownHandler, { capture: true });
+    this.isMetaKeyHeld = null;
+  }
+  updateMetaKeyListeners() {
+    if (this.settings.extOnlyWhenMetaKey) {
+      this.addMetaKeyListeners();
+    } else {
+      this.removeMetaKeyListeners();
+    }
+  }
+  monkeyPatchOpenFile() {
+    const parentThis = this;
+    this.uninstallMonkeyPatchOpenFile = around(import_obsidian2.WorkspaceLeaf.prototype, {
+      openFile(oldOpenFile) {
+        return async function(file, openState) {
+          var _a, _b, _c, _d, _e, _f, _g, _h;
+          const defaultBehavior = () => {
+            return oldOpenFile.apply(this, [file, openState]);
+          };
+          const preparedEmptyLeave = ((_a = this.getViewState()) == null ? void 0 : _a.type) == "empty";
+          if (((_b = openState == null ? void 0 : openState.state) == null ? void 0 : _b.mode) && preparedEmptyLeave) {
+            return defaultBehavior();
+          }
+          if (file.path == ((_c = app.workspace.getActiveFile()) == null ? void 0 : _c.path) && ((_d = openState == null ? void 0 : openState.eState) == null ? void 0 : _d.subpath)) {
+            return defaultBehavior();
+          }
+          if (parentThis.sameTabOnce) {
+            parentThis.sameTabOnce = false;
+            return defaultBehavior();
+          }
+          const ALLEXT = ["png", "webp", "jpg", "jpeg", "gif", "bmp", "svg", "mp3", "webm", "wav", "m4a", "ogg", "3gp", "flac", "mp4", "ogv", "mov", "mkv"];
+          const OBSID_OPENABLE = ALLEXT.concat(["md", "canvas", "pdf"]);
+          if (parentThis.settings.PDFApp && file.extension == "pdf" || parentThis.settings.allExt && ALLEXT.includes(file.extension) || parentThis.settings.custExt && parentThis.settings.custExtList.includes(file.extension)) {
+            if (!parentThis.settings.extOnlyWhenMetaKey || parentThis.isMetaKeyHeld) {
+              new import_obsidian2.Notice("Opening external file with default app (Opener Plugin)");
+              if (preparedEmptyLeave) {
+                this.detach();
+              }
+              parentThis.app.openWithDefaultApp(file.path);
+              return;
+            } else {
+              new import_obsidian2.Notice("Opener Tip: Hold Cmd/Ctrl key to open with default app");
+            }
+          }
+          if (!parentThis.settings.newTab) {
+            return defaultBehavior();
+          }
+          if (this.group) {
+            new import_obsidian2.Notice("Opener: This is a Linked Tab! Opening in same tab therefore.");
+            return defaultBehavior();
+          }
+          const matchingLeaves = [];
+          const pushLeaveIfMatching = (leaf) => {
+            var _a2;
+            if (((_a2 = leaf.getViewState().state) == null ? void 0 : _a2.file) == file.path) {
+              matchingLeaves.push(leaf);
+            }
+          };
+          app.workspace.iterateRootLeaves(pushLeaveIfMatching);
+          (_g = (_f = (_e = app.workspace.getLayout()) == null ? void 0 : _e.floating) == null ? void 0 : _f.children) == null ? void 0 : _g.forEach((win) => {
+            var _a2;
+            if ((win == null ? void 0 : win.type) !== "window")
+              return console.log("Opener-Plugin: Strange floating object found (no window)", win);
+            (_a2 = win.children) == null ? void 0 : _a2.forEach((tabs) => {
+              var _a3;
+              if ((tabs == null ? void 0 : tabs.type) !== "tabs")
+                return console.log("Opener-Plugin: Strange floating object found (no tabs)", tabs);
+              (_a3 = tabs.children) == null ? void 0 : _a3.forEach((leaf) => {
+                if ((leaf == null ? void 0 : leaf.type) !== "leaf")
+                  return console.log("Opener-Plugin: Strange floating object found (no leaf)", leaf);
+                pushLeaveIfMatching(app.workspace.getLeafById(leaf.id));
+              });
+            });
+          });
+          if (matchingLeaves.length) {
+            if (preparedEmptyLeave) {
+              new import_obsidian2.Notice(`File is now open in ${matchingLeaves.length + 1} Tabs`);
+              return defaultBehavior();
+            } else {
+              return oldOpenFile.apply(matchingLeaves[0], [file, openState]);
+            }
+          }
+          if (preparedEmptyLeave) {
+            return defaultBehavior();
+          }
+          if (!((_h = parentThis.app.viewRegistry) == null ? void 0 : _h.getTypeByExtension(file.extension))) {
+            return defaultBehavior();
+          }
+          return oldOpenFile.apply(app.workspace.getLeaf("tab"), [
+            file,
+            openState
+          ]);
+        };
+      }
+    });
+  }
+};

content/.obsidian/plugins/obsidian-opener/manifest.json

@@ -0,0 +1 @@
+{"id":"obsidian-opener","name":"Opener","minAppVersion":"0.15.9","description":"Open links in new/existing tabs by default. Open PDFs in System App by default. Can open other file formats in System Apps if desired.","author":"Aidan Gibson","authorUrl":"https://github.com/aidan-gibson","isDesktopOnly":false,"version":"2.1.2"}

content/.obsidian/plugins/obsidian-style-settings/data.json

@@ -0,0 +1,5 @@
+{
+  "anuppuccin-theme-settings@@anuppuccin-theme-light": "ctp-latte",
+  "anuppuccin-theme-settings@@anuppuccin-light-theme-accents": "ctp-accent-light-lavender",
+  "anuppuccin-theme-settings@@anuppuccin-theme-accents": "ctp-accent-lavender"
+}

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

@@ -0,0 +1,10 @@
+{
+	"id": "obsidian-style-settings",
+	"name": "Style Settings",
+	"version": "1.0.8",
+	"minAppVersion": "0.11.5",
+	"description": "Offers controls for adjusting theme, plugin, and snippet CSS variables.",
+	"author": "mgmeyers",
+	"authorUrl": "https://github.com/mgmeyers/obsidian-style-settings",
+	"isDesktopOnly": false
+}

content/.obsidian/plugins/obsidian42-brat/data.json

@@ -0,0 +1,16 @@
+{
+  "pluginList": [
+    "aidan-gibson/obsidian-opener"
+  ],
+  "pluginSubListFrozenVersion": [],
+  "themesList": [],
+  "updateAtStartup": true,
+  "updateThemesAtStartup": true,
+  "enableAfterInstall": true,
+  "loggingEnabled": false,
+  "loggingPath": "BRAT-log",
+  "loggingVerboseEnabled": false,
+  "debuggingMode": false,
+  "notificationsEnabled": true,
+  "personalAccessToken": ""
+}

content/.obsidian/plugins/obsidian42-brat/manifest.json

@@ -0,0 +1,15 @@
+{
+	"id": "obsidian42-brat",
+	"name": "BRAT",
+	"version": "1.0.1",
+	"minAppVersion": "1.4.16",
+	"description": "Easily install a beta version of a plugin for testing.",
+	"author": "TfTHacker",
+	"authorUrl": "https://github.com/TfTHacker/obsidian42-brat",
+	"helpUrl": "https://tfthacker.com/BRAT",
+	"isDesktopOnly": false,
+	"fundingUrl": {
+		"Buy Me a Coffee": "https://bit.ly/o42-kofi",
+		"Visit my site": "https://tfthacker.com"
+	}
+}

content/.obsidian/plugins/obsidian42-brat/styles.css

@@ -0,0 +1,3 @@
+.brat-modal .modal-button-container {
+  margin-top: 5px !important;
+}

content/.obsidian/snippets/highlight-color.css

@@ -0,0 +1,3 @@
+.cm-s-obsidian span.cm-formatting-highlight, .cm-s-obsidian span.cm-highlight, .markdown-rendered mark {
+    --text-highlight-bg: #e6cee7;
+}

content/.obsidian/snippets/spacing.css

@@ -0,0 +1,3 @@
+.cm-s-obsidian .cm-line.HyperMD-header {
+    padding-top: 0;
+}

content/.obsidian/snippets/usage.css

@@ -0,0 +1,34 @@
+.usage {
+    display:flex;
+    flex-direction: row;
+    align-items: center;
+}
+
+.usage p {
+    margin:0;
+}
+
+.usage .box {
+    border: 1px solid black;
+    border-radius: 0.5rem;
+    padding: 0.2rem 0.3rem 0.2rem 0.3rem;
+    display: inline-block;
+    width: fit-content;
+    margin: 0.2rem;
+}
+
+.usage .left {
+    padding-right: 1.7rem;
+
+    background-image: linear-gradient(black, black), linear-gradient(black, black);
+    background-repeat: no-repeat;
+    background-size: 8px 2px;
+    background-position: top right, bottom right;
+
+    border-right: solid black;
+    border-width: 0 2px;
+}
+
+.usage .right {
+    padding-left: 1rem;
+}

content/.obsidian/themes/AnuPpuccin/manifest.json

@@ -0,0 +1,7 @@
+{
+  "name": "AnuPpuccin",
+  "version": "1.4.5",
+  "minAppVersion": "0.16.0",
+  "author": "Anubis",
+  "authorUrl": "https://github.com/AnubisNekhet"
+}

content/2- Conjugation/2- TeF - basics.md

@@ -0,0 +1,230 @@
+# 2- Te-Form - basics
+
+## Rule
+
+### Verbs
+
+The easiest way to identify whether to use て or で is by looking at the preceding kana.
+If the plain (dictionary) form of the verb finishes in ぐ, ぬ, ぶ, or む, then で will be used.
+る-Verbs never use で.
+
+| Ending              | Ending Te-Form | Verb           | Te-Form                       | Hiragana            |
+| ------------------- | -------------- | -------------- | ----------------------------- | ------------------- |
+| **る verbs**         |                |                |                               |                     |
+| (い・え)る              | て              | 食べる            | 食べ==て==                       | たべて                 |
+| **う verbs**         |                |                |                               |                     |
+| う<br>つ<br>る         | <br>って<br>     | 歌う<br>打つ<br>座る | 歌==って==<br>打==って==<br>座==って== | うたって<br>うって<br>すわって |
+| む<br>ぶ<br>ぬ         | <br>んで         | 休む<br>飛ぶ<br>死ぬ | 休==んで==<br>飛==んで==<br>死==んで== | やすんで<br>とんで<br>しんで  |
+| く                   | いて             | 歩く             | 歩==いて==                       | あるいて                |
+| ぐ                   | いで             | 泳ぐ             | 泳==いで==                       | およいで                |
+| す                   | して             | 話す             | 話==して==                       | はなして                |
+| **Irregular Verbs** |                |                |                               |                     |
+|                     |                | する             | し==て==                        |                     |
+|                     |                | 行く             | 行==って==                       | いって                 |
+|                     |                | 来る             | 来==て==                        | きて                  |
+
+### Adjectives and nouns
+
+| Form                 | Word  | Word Te-Form |
+| -------------------- | ----- | ------------ |
+| **いA** + ~~い~~ く + て | おもしろい | おもしろ==くて==   |
+| **なA** + で           | しずか   | しずか==で==     |
+| **N** + で            | 猫     | 猫==で==       |
+
+### Song
+
+A common way to remember this form is by a song. Here is one sung by Hatsune Miku.
+
+![Te Song](https://www.youtube.com/watch?v=Cj-P-nEPoe0)
+
+| Ending | Te-Form |
+| ------ | ------- |
+| う・つ・る  | って      |
+| む・ぶ・ぬ  | んで      |
+| く      | いて      |
+| ぐ      | いで      |
+| いく     | いって     |
+| くる     | きて      |
+| する     | して      |
+| す      | して      |
+
+## Basic functions
+
+### Connection
+
+The most basic function of the Te-Form: form connection between **verbs**.
+
+> [!info] Example
+> 食べ==て=={寝|ね}る。
+> To eat, then sleep.
+
+This also works with **いA**, **なA**, and **nouns**.
+
+> [!info] Example
+> あの{自転車|じてんしゃ}は{便利|べんり}==で=={軽|かる}い。
+> That bicycle is useful and light.
+
+### Reasons
+
+Used primarily for reasons beyond control of the speaker.
+
+> [!info] Example
+> 大雨==で==バスが止まりました。
+> The bus stopped with rain. (the reason is the rain)
+
+### Manners
+
+Highlights something being used, whether a tool, a circumstance, a situation, etc.
+
+> [!info] Examples
+> 私はご{飯|はん}を{急|いそ}い==で==食べる。
+> I eat food in a hurry.
+> 
+> ハサミ==で=={野菜|やさい}を{切|き}ります。
+> I cut my vegetables using scissors.
+
+## Sequence and non-sequence
+
+Only for **verbs**.
+
+### て sequence
+
+Used to list a sequence of events that happen one after another. Must be used for ordered sequence of what is being said!
+
+> [!info] Example
+> パンを買==って==、食べた。
+> I bought some bread, then ate it.
+
+### て non-sequence
+
+The particle can also contrast things that have some sort of relationship. It can mean something like "and" or "while", but is not really similar to "but": it always has the same weight in the sentence, as opposed to expressions like けど・のに, etc.
+
+> [!info] Examples
+> 朝は雨が{降|ふ}==って=={夕方|ゆう|がた}は{晴|は}れた。
+> It rained this morning, **and** then it cleared up in the afternoon. (there is no particular emphasis on either event).
+>
+> 朝は雨が降った==けど==夕方は晴れた。
+> It rained this morning, **but then** it cleared up in the afternoon. (there is emphasis on the fact that it stopped raining).
+
+### てから
+
+Used to say that something will happen after something else : "after doing (A), (B)".
+Only for **verbs**.
+
+> [!info] Example
+> {洗濯|せん|たく}をし==てから==、出かける。
+> After doing the laundry, I will go out.
+
+⚠ Simple present (るから) and past (たから) have a meaning closer to "because" or "since".
+
+## States
+
+### ている form
+
+| Plain | Polite |
+| ----- | ------ |
+| ている   | ています   |
+| てる    | てます    |
+
+ている is often shortened to てる. This applies to all tenses, including てる, てて, てた, and even てます.
+Only for **verbs**.
+
+Sometimes ている can become しとる (like in manga).
+
+#### 1/ State of existence: is being done
+
+Used to convey a constant state of the verb being done, executed, etc. It is continuing to exist in a specific state.
+
+> [!info] Example
+>今ラーメンを食べ==ています==。
+>I am eating ramen now.
+
+#### 2/ State of existence: has been done
+
+Expresses "existing in a of state of having been done".
+In English, a different tense would have been used, but in Japanese it is also Te-form.
+
+> [!info] Examples
+> お前はもう死==んでいる==。
+> You are already dead.
+> 
+> クラスは始ま==っている==。
+> The class has already started. (existing in the state of having started)
+> 
+> お母さんは今買い物に行==っています==。
+> My mom went out to go shopping. (existing in the state of having gone)
+> 
+> 先生がめちゃ{怒|おこ}==っている==。
+> My teacher is very angry. (existing in the state of having gotten angry)
+
+Then, how to differentiate from the past form? Think about if the action can happen twice. For example, something cannot start twice, so it will use ている. The same applies for dying. This will not work for all verbs, but for the majority.
+
+> [!info] Example
+> ピアノが{落|お}ち==ている==。
+> The piano has fallen. (existing in the state of having fallen)
+> Something has fallen and is already on the ground, so it cannot fall again. ている will be used.
+
+#### 3/ State of existence: frequent and repeated action
+
+Used for the repetition of common activities. They are not continuing per se, but are occurring at such a frequency that they are considered to be continuous.
+For example: going to work, having a hobby, doing sports, etc.
+
+You can see it as "continuing to exist in a specific state".
+Expression of time are often used with this meaning.
+
+> [!info] Examples
+> 私は毎日ギターを{弾|ひ}い==ている==。
+> I play my guitar everyday (hobby).
+> 
+> {毎晩|まい|ばん}９時に{寝|ね}==ている==。
+> I sleep at 9 every night (habit).
+> 
+> {彼|かれ}は学校で{働|はたら}い==ている==。
+> He works at a school (regular activity).
+
+### ていた・ていました
+
+Means that something was happening, someone was doing something. If an object has changed state and is still in the state, it can also be used, for example a broken window.
+Only for **verbs**.
+
+ていた can be shortened to てた, and ていました to てました.
+
+> [!info] Example
+> {勉強|べんきょう}をし==ていた==けど、今は{休|やす}んでいる。
+> I was studying but am taking a break right now.
+
+### てある
+
+Shares with ている the meaning of being in an ongoing state, meaning that something has been done. It is also similar to a simple past form. However, the nuance is that this form is only used with transitive verbs on inanimate objects, meaning either:
+* the action has been done intentionally (focuses on a person's intention),
+* the focus is the resulting state of the action.
+
+> [!info] Examples
+> 明日の{弁当|べん|とう}はもう作==ってある==。
+> Tomorrow's lunch has already been prepared.
+> 
+> ドアが{開|あ}け==てある==。
+> The door has been left open (intentionally).
+
+Only for **transitive verbs**.
+
+### ておく
+
+Means to do something in advance, to complete something in preparation for something.
+If used in past form ておいた, means that the completed action was in preparation for the current situation.
+Only for **verbs**.
+
+Can be shortened as とく.
+
+> [!info] Example
+> メロンパンを買==っておく==。
+> I'll buy a melon pan (in preparation for a something, for example a picnic).
+
+### まだ～ていません
+
+This means "still have not done something". 
+Only for **verbs**.
+
+> [!info] Example
+> このゲームは==まだ==し==ていない==。
+> I haven't played this game yet.

content/2- Conjugation/3- TeF - manner - give receive.md

@@ -0,0 +1,118 @@
+# 3- Te-Form - manner of doing - give & receive
+
+## Manner of doing
+
+### てしまう
+
+<div class="usage">
+<div>
+	<p><span class="box">Vて</span> + しまう</p>
+	<p><span class="box">V<strike>て</strike></span> + ちゃう</p>
+	<p><span class="box">V<strike>で</strike></span> + じゃう</p>
+</div>
+</div>
+
+This means "by accident, unfortunately" or "completely".
+Only for **verbs**.
+
+> [!info] Examples
+> {宿題|しゅく|だい}もうや==ってしまいました==。
+> I've already finished my homework.
+> 
+> もう{全部|ぜん|ぶ}食べ==ちゃった==。。。
+> I've already eaten everything...
+
+### てみる
+
+Used to express the meaning of trying something, usually something new.
+Can also be used to suggest to someone to try something.
+Used in past tense, it implies a successful attempt.
+Only for **verbs**.
+
+> [!info] Example
+> これを食べ==てみる==か？
+> Do you want to try this food?
+
+### ていく・てくる
+
+ていく combines the Te-form with the verb 行く.
+てくる combines the Te-form with the verb 来る. 
+Both can be used when representing time or a physical place. Kanji and hiragana can be used, and they can be conjugated.
+Only for **verbs**.
+
+The first meaning is the following:
+* ていく means to go and do something.
+* てくる means to do and come back.
+
+> [!info] Examples
+> 家で食べ==ていく==か？
+> Want to go and eat at my home?
+> 
+> {晩御飯|ばんごはん}を買==ってきた==。
+> I brought tonight's dinner. (bought and came with).
+
+The second meaning is:
+* ていく means to start doing something with your own agency.
+* てくる on the contrary, is when something comes to the listener without agency from them.
+
+> [!info] Examples
+> 彼は駅まで歩い==ていきます==。
+> He walk to the station.
+> 
+> 雨が{降|ふ}==ってきた==。
+> It started raining.
+
+## Give and receive
+
+Extends the common forms of あげる, くれる, and もらう, but what is received or given is now a verb, instead of a noun.
+
+### てあげる
+
+Expresses that someone is doing or did something for someone else.
+The person that received the favor is followed by the に particle.
+Only for **verbs**.
+
+> [!info] Example
+> 母にケーキを買==ってあげた==。
+> I bought a cake for my mother.
+> 
+
+### てくれる
+
+Used to ask a favor from someone or to say that something was done to the speaker.
+The person that received the favor (usually oneself and thus omitted) is followed by the に particle.
+Only for **verbs**.
+
+> [!info] Example
+> {友達|とも|だち}がギターを{教|おし}え==てくれる==。
+> My friend will teach me the guitar.
+
+#### てくれてありがとう
+
+This form expresses gratitude for something that benefited the speaker. It is not used for something expected.
+Only for **verbs**.
+
+> [!info] Example
+> 今日来==てくれてありがとう==！
+> Thank you for coming today!
+
+### てもらう
+
+This form expresses gratitude for a favor that the recipient generally requested for, or where gratitude is the focus.
+Only for **verbs**.
+
+> [!info] Example
+> {友達|とも|だち}が手伝==ってもらった==。
+> My friend helped me (and I owe him / because I asked him and I am grateful)
+
+### てくれない・てもらえない
+
+Used as a mean to ask for a favor like "would you, could you?". Used in a similar form to じゃないか.
+Only for **verbs**.
+
+> [!info] Example
+> {電気|でん|き}をつけ==てもらえない==か。
+> Could you please turn on the lights?
+> 
+> 電気をつけ==ないでもらえない==か。
+> Could you please turn off the light?

content/2- Conjugation/4- TeF - even if.md

@@ -0,0 +1,69 @@
+# 4- Te-Form - even if
+
+For **verbs**, **adjectives** and **nouns**.
+
+## Even if: ても・でも
+
+Works by adding も to the Te-Form.
+
+> [!info] Example
+> 安==くても==、買いません。
+> Even if it's cheap, I won't buy it.
+> 
+> 好き==でも==、買えなかった。
+> Even if I liked it, I didn't bought it.
+
+### てもいい
+
+Means that something is "alright". Frequently used for questions.
+
+> [!info] Example
+> ここに{座|すわ}==ってもいい==？
+> Is it okay if I sit here?
+> 
+> {冷|つめ}たい==でもいい==。
+> It's okay even if it's cold.
+
+### ても～なくても
+
+Means "whether or not". A form a bit strange, where the verb is repeated two times in the following manner: VてもVなくても.
+
+> [!info] Example
+> 食べ==ても==食べ==なくても==、{構|かま}いません。
+> It doesn't matter whether you eat it orb not.
+
+### ても構わない・てもかまわない
+
+Means that it doesn't matter or that the speaker doesn't mind.
+
+> [!info] Example
+> 雨が{降|ふ}==っても構わない==。
+> I don't mind if it rains.
+
+### ても始まらない・てもはじまらない
+
+Means that even if you do it, it will never start: that it's no use.
+Only for **verbs**.
+
+> [!info] Example
+> この時間に会==っても始まらない==。
+> There's no point meeting at this time of the day.
+
+### いくら～ても・どんなに～ても
+
+Means "no matter how much".
+
+> [!info] Example
+> ==いくら==好き==でも==、買えません。
+> No matter how much you like it, I won't buy it for you.
+> 
+> ==どんなに==高==くても==、買います。
+> No matter how expensive, I'll buy it.
+
+### たとえ〜ても
+
+Used to make a supposition. Would translate to something like "even if... is the case".
+
+> [!info] Example
+> ==たとえ=={新幹線|しん|かん|せん}==でも==、１時間かかる。
+> Even if you take the Shinkansen, it will take one hour.

content/index.md

@@ -0,0 +1,48 @@
+# Japanese Grammar
+
+Welcome to my Japanese Grammar project!
+
+## Goal
+
+The goal of this website is to be a synthesis of useful resources for my Japanese learning adventure. I want to have grammar points next to each other, independently of any "difficulty level", set up in a logical and consistent form. I don't want to have to open 5 pages to compare information, and I don't want a deep dive into a notion. The goal is to be a reminder of the things I learn, rather than a way to learn. I want a few examples to grasp it, but I do not want to have ten of the same kind. And nothing quite fits for me!
+
+## Sources
+
+Of course, since I'm _learning_ the language, I need to borrow what I write from different sources. So this website uses data from the websites listed here. I don't want any recognition of what is here! It's mostly a compilation of what people who are way better in this language have made before.
+
+* [Bunpro](https://bunpro.jp/grammar_points)
+* [JLPT Sensei](https://jlptsensei.com/#jlpt-grammar-lists)
+* [Maggie Sensei](https://maggiesensei.com/)
+* [Try! Series of books](https://2024.ask-books.com/tag/try/)
+* [Hedgehog Japanese](https://hedgehog-japanese.com/category/grammar/)
+* [Wasabi](https://www.wasabi-jpn.com/category/japanese-grammar/)
+* [Japanese StackExchange](https://japanese.stackexchange.com/)
+* [Guide du Japonais](https://guidedujaponais.fr/)
+
+## Other useful resources
+
+In addition to those I cited, here are other resources I find useful.
+
+### Kanjis
+
+* [Remembering the Kanji (RTK)](https://en.wikipedia.org/wiki/Remembering_the_Kanji_and_Remembering_the_Hanzi), a kanji learning method
+* [Kanji Koohii](https://kanji.koohii.com/), a website using the RTK method and spaced repetition
+* [Remember the JLPT](https://git.marchal.dev/keb/remember-the-JLPT), a tool I made to learn kanjis by JLPT levels
+
+### Reading
+
+* [Sakubun](https://sakubun.xyz/)
+* [NHK News Web Easy](https://www3.nhk.or.jp/news/easy/)
+
+### Grammar
+
+* [jtest4you](https://japanesetest4you.com/)
+* [Japanese Conjugation Drill](https://drill.marchal.dev)
+
+### Vocabulary
+
+* [Jisho](https://jisho.org/), an online dictionary
+
+## Any errors?
+
+If you find any error, please do contact me! You can find my website in the footer of any page of this website. Thanks!

custom/build-run.sh

@@ -0,0 +1,2 @@
+docker build -t quartz-jpg .
+cd custom && docker-compose up -d --force-recreate

custom/convert-furigana/LICENSE

@@ -0,0 +1,9 @@
+MIT License
+
+Copyright (c) 2024 keb
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

custom/convert-furigana/README.md

@@ -0,0 +1,43 @@
+# convert-furigana
+
+## What is it?
+
+There are a few extensions that add [furigana](https://en.wikipedia.org/wiki/Furigana) support to Markdown. I use [Obsidian](https://obsidian.md/), and therefore its furigana extension: [obsidian-markdown-furigana](https://github.com/steven-kraft/obsidian-markdown-furigana). It works well, but by nature is limited by being used within Obsidian.
+
+For that purpose, this python script converts this specific syntax to common, all-platforms HTML ruby tags.
+
+## Process
+
+This specific extension syntax is as following:
+```
+{漢字|かんじ}
+{漢字|かん|じ}
+```
+
+When processed by this script, the result is:
+```
+<ruby>漢字<rt>かんじ</rt></ruby>
+<ruby>漢<rt>かん</rt>字<rt>じ</rt></ruby>
+```
+
+Which leads visually from, by default markdown standards:
+
+> {漢字|かんじ}
+>
+> {漢字|かん|じ}
+
+to common HTML ruby syntax:
+
+> <ruby>漢字<rt>かんじ</rt></ruby>
+>
+> <ruby>漢<rt>かん</rt>字<rt>じ</rt></ruby>
+
+## Limitations
+
+This has been made for my personal use, which is only kanjis with kanas as furigana. The regexp used do not recognize other inputs. But you can modify them easily for your use if needed.
+
+## Usage
+
+Usage: `python3 convert-furigana.py [root folder]`
+
+Note: Please be careful, this software applies modifications recursively!

custom/convert-furigana/examples/furigana1.md

@@ -0,0 +1,6 @@
+{僕|ボク}の{筆記|ひっ|き}
+
+### ～によるN
+
+* テレビによる{報道|ほうどう}
+* この{地震|じ|しん}による{津波|つ|なみ}の{心配|しんぱい}はありません。

custom/convert-furigana/examples/subfolder/furigana2.md

@@ -0,0 +1,7 @@
+## ふりがなテスト
+
+{漢字|かんじ}
+
+{漢字|かん|じ}
+
+{漢字|カン|ジ}

custom/convert-furigana/program/convert-furigana.py

@@ -0,0 +1,71 @@
+import sys
+import os
+from glob import glob
+import re
+
+### Patterns ###
+
+# https://www.reddit.com/r/learnpython/comments/h0tsaa/regex_expression_for_japanese_extracting/
+re_brace = '{(.+?)}'
+re_kanji = '([㐀-䶵一-鿋豈-頻]+)'
+re_kana = '([ぁ-ゟ゠-ヿ]+)'
+
+### Open file ###
+
+def open_file(filename):
+    with open(filename, 'r', encoding='utf-8-sig') as file:
+        filedata = file.read()
+        return filedata
+
+### Replace ###
+
+def write_ruby_simple(kanji, kana):
+    return f"<ruby>{kanji}<rt>{kana}</rt></ruby>"
+
+def write_ruby_multiple(kanji, kanas):
+    result = f"<ruby>"
+    for idx, kana in enumerate(kanas):
+        result += f"{kanji[idx]}"
+        result += f"<rt>{kana}</rt>"
+    result += f"</ruby>"
+    return result
+
+def convert_to_ruby(content):
+    kanji = re.search(re_kanji, content.group())
+    kana = re.findall(re_kana, content.group())
+
+    if (len(kana) == 1):
+        return write_ruby_simple(kanji.group(), kana[0])
+    else:
+        return write_ruby_multiple(kanji.group(), kana)
+
+def convert_pattern(text):
+    res_text = re.sub(re_brace, convert_to_ruby, text)
+    return res_text
+
+### Write to file ###
+
+def write_file(filename, text):
+    with open(filename, 'w', encoding='utf-8-sig') as file:
+        file.write(text)
+
+
+### Execution ###
+
+file_list = []
+
+if len(sys.argv) > 1:
+    path = sys.argv[1]
+    for filename in glob(path + "/**/*.md", recursive=True):
+        if (os.path.isfile(filename)):
+            file_list.append(filename)
+else:
+    print(f"Usage: python3 {sys.argv[0]} [root folder]")
+    print(f"Note: Please be careful, this software applies modifications recursively!")
+
+for filename in file_list:
+    print(f"Found file {filename}, processing...", end='')
+    data = open_file(filename)
+    text = convert_pattern(data)
+    write_file(filename, text)
+    print(f" done!")

custom/convert-usage/LICENSE

@@ -0,0 +1,9 @@
+MIT License
+
+Copyright (c) 2024 keb
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

custom/convert-usage/README.md

@@ -0,0 +1,17 @@
+# convert-usage
+
+## Obsidian snippet
+
+For my Japanese Grammar (JPG) project, I have created a style for explanation on the usage of certain grammar points. There is no simple way to make it in Markdown, so I tried to make it with the least amount of HTML possible. You can find it in `examples/sample.md`. However, for it to work, you have to import a custom [CSS snippet](https://help.obsidian.md/Extending+Obsidian/CSS+snippets) to Obsidian, which is located in `obsidian-snippet/usage.css`. But using it, you will have this kind of result:
+
+![Obsidian screenshot](./screenshot.png)
+
+## convert-usage.py
+
+In my Quartz rendering of my markdown data, I want this kind of data to be in a callout. However, it is not possible to combine HTML and Markdown in Obsidian. For that purpose, this script encapsulates it directly in HTML. To make it both compatible in Obsidian and Quartz, and to be still easy to write, it's done with this python script. This is probably super specific and will not be of use for anybody except me!
+
+## Usage
+
+Usage: `python3 convert-usage.py [root folder]`
+
+Note: Please be careful, this software applies modifications recursively!

custom/convert-usage/examples/sample.md

@@ -0,0 +1,33 @@
+# test file
+
+## Lorem ipsum
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit. Mauris massa eros, feugiat eu dapibus nec, fermentum vel ex. Nulla malesuada luctus pretium. Phasellus ac felis ut nisi lacinia malesuada nec vel odio. Donec tincidunt tincidunt lorem vel tempus. Nullam sed efficitur ligula, a porttitor nibh. Praesent justo dui, venenatis ac mi non, laoreet consequat libero. Aenean ut molestie mauris. Proin mattis volutpat ligula eget tincidunt. Fusce ex eros, condimentum consectetur efficitur vitae, euismod at justo.
+
+**Usage**
+
+<div class="usage">
+<div class="left">
+	<p><span class="box">item1</span></p>
+	<p><span class="box">item2</span></p>
+	<p><span class="box">item3</span></p>
+	<p><span class="box">item4</span></p>
+</div>
+	<p class="right">+ final</p>
+</div>
+
+## Phasellus tristique
+
+Phasellus tristique rutrum enim. Integer vitae ex at turpis convallis posuere nec nec erat. Cras finibus erat mauris. Suspendisse id diam at sapien luctus faucibus. Pellentesque fermentum auctor libero, ut porta orci porttitor quis. In varius at sem sed ultricies. Mauris iaculis convallis erat, congue tincidunt turpis luctus vitae.
+
+**Usage**
+
+<div class="usage">
+<div class="left">
+	<p><span class="box">アイテム１</span></p>
+	<p><span class="box">アイテム２</span></p>
+	<p><span class="box">アイテム３</span></p>
+	<p><span class="box">アイテム４</span></p>
+</div>
+	<p class="right">＋ ファイナル</p>
+</div>

custom/convert-usage/examples/sample2.md

@@ -0,0 +1,23 @@
+# test file
+
+## Lorem ipsum
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit. Mauris massa eros, feugiat eu dapibus nec, fermentum vel ex. Nulla malesuada luctus pretium. Phasellus ac felis ut nisi lacinia malesuada nec vel odio. Donec tincidunt tincidunt lorem vel tempus. Nullam sed efficitur ligula, a porttitor nibh. Praesent justo dui, venenatis ac mi non, laoreet consequat libero. Aenean ut molestie mauris. Proin mattis volutpat ligula eget tincidunt. Fusce ex eros, condimentum consectetur efficitur vitae, euismod at justo.
+
+**Usage**
+
+<div class="usage">
+<div class="left">
+	<p><span class="box">item1</span></p>
+	<p><span class="box">item2</span></p>
+	<p><span class="box">item3</span></p>
+	<p><span class="box">item4</span></p>
+</div>
+	<p class="right">+ final</p>
+</div>
+
+## Callout
+
+> [!info] Example
+> Callout example
+> Careful with BS4 encoding some characters

custom/convert-usage/obsidian-snippets/usage.css

@@ -0,0 +1,35 @@
+.box {
+    display: inline-block;
+    width: fit-content;
+    margin: 0.2rem;
+    padding: 0.2rem 0.3rem 0.2rem 0.3rem;
+
+    border: 1px solid black;
+    border-radius: 0.5rem;
+}
+
+.usage {
+    display:flex;
+    flex-direction: row;
+    align-items: center;
+}
+
+.left {
+    padding-right: 1.7rem;
+
+    background-image: linear-gradient(black, black), linear-gradient(black, black);
+    background-repeat: no-repeat;
+    background-size: 8px 2px;
+    background-position: top right, bottom right;
+
+    border-right: solid black;
+    border-width: 0 2px;
+}
+
+.left p {
+    margin:0;
+}
+
+.right {
+    padding-left: 1rem;
+}

custom/convert-usage/program/convert-usage.py

@@ -0,0 +1,66 @@
+import sys
+import os
+from glob import glob
+from bs4 import BeautifulSoup
+import re
+
+### Patterns ###
+
+re_usage = r'(^\*\*Usage\*\*$\n\n)'
+callout_title_html = '''
+    <div class="callout-title">
+        <div class="callout-icon"></div>
+        <div class="callout-title-inner"><p>Usage</p></div>
+    </div>'''
+
+### Open file ###
+
+def open_file(filename):
+    with open(filename, 'r', encoding='utf-8-sig') as file:
+        filedata = file.read()
+        return filedata
+
+### Write to file ###
+
+def write_file(filename, text):
+    with open(filename, 'w', encoding='utf-8-sig') as file:
+        file.write(text)
+
+### Replace ###
+
+def convert_pattern(text):
+    text, success = re.subn(re_usage, '', text, flags=re.MULTILINE)
+    if (success == 0):
+        return text
+
+    soup = BeautifulSoup(text, features="html.parser")
+
+    for tag in soup.find_all('div', {"class": "usage"}):
+        new_blockquote = soup.new_tag("blockquote", **{"class": "callout notes", "data-callout": "notes"})
+        tag.wrap(new_blockquote)
+
+        calloutTitle = BeautifulSoup(callout_title_html, features="html.parser")
+        tag.insert_before(calloutTitle)
+
+    return (soup.decode(False, formatter=None))
+
+
+### Execution ###
+
+file_list = []
+
+if len(sys.argv) > 1:
+    path = sys.argv[1]
+    for filename in glob(path + "/**/*.md", recursive=True):
+        if (os.path.isfile(filename)):
+            file_list.append(filename)
+else:
+    print(f"Usage: python3 {sys.argv[0]} [root folder]")
+    print(f"Note: Please be careful, this software applies modifications recursively!")
+
+for filename in file_list:
+    print(f"Found file {filename}, processing...", end='')
+    data = open_file(filename)
+    text = convert_pattern(data)
+    write_file(filename, text)
+    print(f" done!")

custom/docker-compose.yml

@@ -0,0 +1,14 @@
+version: '3.4'
+
+services:
+  quartz:
+    image: quartz-jpg
+    build:
+      context: .
+      dockerfile: Dockerfile
+    environment:
+      NODE_ENV: production
+    container_name: quartz-jpg-container
+    restart: always
+    ports:
+      - 8080:8080

custom/update-repos.sh

@@ -0,0 +1,8 @@
+git fetch convert-furigana main
+git subtree pull --prefix custom/convert-furigana convert-furigana main --squash
+
+git fetch convert-usage main
+git subtree pull --prefix custom/convert-usage convert-usage main --squash
+
+git fetch content main
+git subtree pull --prefix content content main --squash

quartz.config.ts

@@ -8,14 +8,14 @@ import * as Plugin from "./quartz/plugins"
  */
 const config: QuartzConfig = {
   configuration: {
-    pageTitle: "🪴 Quartz 4.0",
+    pageTitle: "Japanese",
     enableSPA: true,
     enablePopovers: true,
     analytics: {
       provider: "plausible",
     },
     locale: "en-US",
-    baseUrl: "quartz.jzhao.xyz",
+    baseUrl: "jp.marchal.dev",
     ignorePatterns: ["private", "templates", ".obsidian"],
     defaultDateType: "created",
     theme: {
@@ -56,7 +56,7 @@ const config: QuartzConfig = {
       Plugin.CreatedModifiedDate({
         priority: ["frontmatter", "filesystem"],
       }),
-      Plugin.Latex({ renderEngine: "katex" }),
+      Plugin.Latex({ renderEngine: "katex" }), // mathjax or katex
       Plugin.SyntaxHighlighting({
         theme: {
           light: "github-light",
@@ -64,9 +64,11 @@ const config: QuartzConfig = {
         },
         keepBackground: false,
       }),
-      Plugin.ObsidianFlavoredMarkdown({ enableInHtmlEmbed: false }),
+      Plugin.ObsidianFlavoredMarkdown({ enableInHtmlEmbed: true, enableYouTubeEmbed: true }),
       Plugin.GitHubFlavoredMarkdown(),
-      Plugin.TableOfContents(),
+      Plugin.TableOfContents({
+        maxDepth: 4,
+      }),
       Plugin.CrawlLinks({ markdownLinkResolution: "shortest" }),
       Plugin.Description(),
     ],
@@ -88,4 +90,4 @@ const config: QuartzConfig = {
   },
 }
 
-export default config
+export default config

quartz.layout.ts

@@ -7,8 +7,7 @@ export const sharedPageComponents: SharedLayout = {
   header: [],
   footer: Component.Footer({
     links: {
-      GitHub: "https://github.com/jackyzha0/quartz",
+      "Théo Marchal": "https://theo.marchal.dev"
-      "Discord Community": "https://discord.gg/cRFFHYye7t",
     },
   }),
 }
@@ -16,22 +15,19 @@ export const sharedPageComponents: SharedLayout = {
 // components for pages that display a single page (e.g. a single note)
 export const defaultContentPageLayout: PageLayout = {
   beforeBody: [
-    Component.Breadcrumbs(),
+    Component.MobileOnly(Component.Explorer()),
-    Component.ArticleTitle(),
+    Component.Breadcrumbs()
-    Component.ContentMeta(),
-    Component.TagList(),
   ],
   left: [
     Component.PageTitle(),
     Component.MobileOnly(Component.Spacer()),
+    Component.MobileOnly(Component.Darkmode()),
     Component.Search(),
-    Component.Darkmode(),
+    Component.DesktopOnly(Component.Explorer())
-    Component.DesktopOnly(Component.Explorer()),
   ],
   right: [
-    Component.Graph(),
+    Component.DesktopOnly(Component.Darkmode()),
     Component.DesktopOnly(Component.TableOfContents()),
-    Component.Backlinks(),
   ],
 }
 

quartz/styles/custom.scss

@@ -1,3 +1,182 @@
 @use "./base.scss";
+@use "./variables.scss" as *;
 
-// put your custom CSS here!
+.text-highlight {
+    background-color: #ddcee5;
+}
+
+:root[saved-theme="dark"] .text-highlight {
+    background-color: #7d4e95;
+}
+
+.callout {
+    border: 3px solid #885a9f;
+    background-color:initial;
+    border-radius: 1rem;
+}
+
+.callout-title {
+    --color: #885a9f;
+}
+
+:root[saved-theme="dark"] .callout {
+    border: 3px solid #a672c0;
+}
+
+:root[saved-theme="dark"] .callout-title {
+    --color: #a672c0;
+}
+
+table {
+    border: 2px solid var(--gray);
+
+    & thead > tr {
+        border-bottom: 2px solid var(--lightgray);
+
+        & th {
+            border: 1px solid var(--lightgray);
+        }
+    }
+
+    & td {
+        border: 1px solid var(--lightgray);
+    }
+}
+
+.callout.note {
+    & table {
+        margin: 0;
+        margin-bottom: 0.5rem;
+
+        & thead {
+            display: none;
+        }
+
+        & td {
+            padding: 0;
+        }
+    }
+}
+
+ul.overflow, ol.overflow {
+    max-height: 75dvh;
+}
+
+ul.overflow::after, ol.overflow::after {
+    position:initial;
+}
+
+#toc-content {
+    & ul {
+      & > li > a {
+        opacity: 0.75;
+      }
+    }
+}
+
+.page {
+    & > #quartz-body {
+
+        & .center {
+            & p {
+                font-size: 1.15rem;
+                white-space: break-spaces;
+                hyphens: none;
+            }
+            
+            & li {
+                font-size: 1.15rem;
+            }
+
+            & h4 {
+                font-size: 1.3rem;
+            }
+
+            & h3 {
+                font-size: 1.5rem;
+            }
+            
+            & h2 {
+                font-size: 1.7rem;
+            }
+            
+            & h1 {
+                font-size: 2rem;
+            }
+        }
+
+        & .sidebar {
+            @media all and (max-width: $fullPageWidth) {
+                margin-top: 1rem;
+            }
+       }
+
+        & .right.sidebar {
+        @media all and (max-width: $fullPageWidth) {
+            margin-top: 0;
+        }
+        }
+    }
+}
+
+hr {
+    margin: 1rem auto;
+}
+
+footer {
+    margin-bottom: 2rem;
+
+    & p {
+        font-size: 1rem;
+    }
+
+    @media all and (max-width: $fullPageWidth) {
+        margin-bottom: 1rem;
+    }
+}
+
+
+
+// Usage
+
+.usage {
+    display:flex;
+    flex-direction: row;
+    align-items: center;
+    margin-bottom: 1rem;
+    margin-top: 0.5rem;
+}
+
+.usage p {
+    margin:0;
+}
+
+.usage .box {
+    border: 1px solid var(--darkgray);
+    border-radius: 0.5rem;
+    padding: 0.2rem 0.3rem 0.2rem 0.3rem;
+    display: inline-block;
+    width: fit-content;
+    margin: 0.2rem;
+}
+
+.usage .left {
+    padding-right: 1.7rem;
+
+    background-image: linear-gradient(var(--darkgray), var(--darkgray)), linear-gradient(var(--darkgray), var(--darkgray));
+    background-repeat: no-repeat;
+    background-size: 8px 2px;
+    background-position: top right, bottom right;
+
+    border-right: solid var(--darkgray);
+    border-width: 0 2px;
+}
+
+.usage .right {
+    padding-left: 1rem;
+}
+
+.usage .r {
+    margin-left: 0.25rem;
+    margin-right: 0.25rem;
+}

quartz/styles/variables.scss

@@ -2,7 +2,7 @@ $pageWidth: 750px;
 $mobileBreakpoint: 600px;
 $tabletBreakpoint: 1000px;
 $sidePanelWidth: 380px;
-$topSpacing: 6rem;
+$topSpacing: 2rem;
 $fullPageWidth: $pageWidth + 2 * $sidePanelWidth;
 $boldWeight: 700;
 $semiBoldWeight: 600;