Second pass

.gitignore

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

.obsidian/community-plugins.json

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

.obsidian/core-plugins.json

@@ -27,7 +27,5 @@
   "file-recovery": true,
   "publish": false,
   "sync": false,
-  "webviewer": false,
-  "footnotes": false,
-  "bases": true
+  "webviewer": false
 }

.obsidian/plugins/obsidian-markdown-furigana/main.js

@@ -9,29 +9,29 @@ var obsidian = require('obsidian');
 var state = require('@codemirror/state');
 var view = require('@codemirror/view');
 
-/******************************************************************************
-Copyright (c) Microsoft Corporation.
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
-REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
-INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-***************************************************************************** */
-
-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());
-    });
+/******************************************************************************
+Copyright (c) Microsoft Corporation.
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+***************************************************************************** */
+
+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());
+    });
 }
 
 // Regular Expression for {{kanji|kana|kana|...}} format

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

@@ -1,10 +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
-}
+{
+	"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
+}

.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
+          ]);
+        };
+      }
+    });
+  }
+};

.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"}

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

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

.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": ""
+}

.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"
+	}
+}

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

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

.obsidian/snippets/highlight-color.css

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

.obsidian/snippets/spacing.css

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

.obsidian/snippets/usage.css

@@ -1,55 +1,55 @@
-.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;
-}
-
-.usage .r {
-    margin-left: 0.25rem;
-    margin-right: 0.25rem;
-}
-
-.usage .ileft {
-    padding-left: 1.7rem;
-
-    background-image: linear-gradient(black, black), linear-gradient(black, black);
-    background-repeat: no-repeat;
-    background-size: 8px 2px;
-    background-position: top left, bottom left;
-
-    border-left: solid black;
-    border-width: 0 2px;
-}
-
-.usage .iright {
-    padding-right: 1rem;
+.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;
+}
+
+.usage .r {
+    margin-left: 0.25rem;
+    margin-right: 0.25rem;
+}
+
+.usage .ileft {
+    padding-left: 1.7rem;
+
+    background-image: linear-gradient(black, black), linear-gradient(black, black);
+    background-repeat: no-repeat;
+    background-size: 8px 2px;
+    background-position: top left, bottom left;
+
+    border-left: solid black;
+    border-width: 0 2px;
+}
+
+.usage .iright {
+    padding-right: 1rem;
 }

Conjugation/Conditional.md

@@ -97,7 +97,7 @@ Negative form:
 	<p class="right">+ なければ</p>
 </div>
 
-See Conjugation [[Basics]] for verbs (the う sound transforms to the corresponding え sound).
+See Conjugation [[Basics]] for verbs (the う sound transforms the the corresponding え sound).
 
 Means "if". A conditional relationship without the cause-effect relationship of と.
 If A happens, then B. Situations must be hypothetical. Generally used for one-time results.
@@ -198,7 +198,7 @@ Means "if we assume that A, B".
 
 ## もし(も)
 
-Used with conditional forms ば, と, たら and ても (see [[TeF (4) - even if#Even if ても・でも|Even if: ても・でも]]).
+Used with conditional forms ば, と, たら and ても (see [[TeF (4) - even if#Even if ても・でも]]).
 もしも puts more emphasis than もし.
 
 > [!info] Example

Conjugation/Misc.md

@@ -1,18 +1,18 @@
 # Misc.
 
-## ～まい
+## ~まい (NEW!)
 
-～まい is the opposition of the volitional form (よう). It means "will not".
+~まい is the opposition of the volitional form (よう). It means "will not".
 
 Careful of two exceptions:
 * する => すまい
 * くる => こまい
 
 > [!info] Example
-> この{川|かわ}は{危|あぶ}ないようだ。ここで{泳|およぐ}ぐ==まい==。
+> この{川|かわは{危|あぶ}ないようだ。ここで{泳|およぐ}ぐ==まい==。
 > This river seems dangerous. I won't swim here.
 
-## ～得る・～得ない
+## ~得る・~得ない (NEW!)
 
 {得|え}る means "able to", "possible". Can be conjugated: えない, えた, えなかった.
 Made by:
@@ -20,12 +20,12 @@ Made by:
 * removing the ます stem from a verb and adding まい
 
 > [!info] Example
-> それはあり==得ない==。
+> それはあり?==得ない==。
 > That is impossible.
 
 ⚠ Can also be read うる (on this tense only).
 
-## ぬ
+## ぬ (NEW!)
 
 It is the traditional negative form of verbs: ぬ instead of ない.
 Exceptions:

Conjugation/TeF (2) - manner of doing.md

@@ -79,7 +79,7 @@ Means "glad that".
 ## ているところ
 
 Means "in the process/middle of doing". Can either talk about the exact moment or in general.
-See also [[Time - recently#たところ]].
+See also [[🔰 Grammar/Time#たところ]].
 
 > [!info] Example
 > {現在|げんざい}、{求職|きゅうしょく}し==ているところ==です。
@@ -115,7 +115,7 @@ Used with verbs in て form.
 > {夜|よる}ので、{歌|うた}え==ている場合じゃない==！
 > It's night, so it's no time to be singing!
 
-## てばかりはいられない
+## てばかりはいられない (NEW!)
 
 Means "can't keep doing". Can also be used as てばかりもいられない.
 
@@ -123,7 +123,7 @@ Means "can't keep doing". Can also be used as てばかりもいられない.
 > {走|は}==ってばかりはいられない==。
 > I can't keep running.
 
-## ていては
+## ていては (NEW!)
 
 Means "if something continues". Used generally for negative outcomes.
 Only used for verbs.
@@ -132,7 +132,7 @@ Only used for verbs.
 > {酒|さけ}しかを{飲|の}ん==でいては==、{健康|けんこう}が{悪|わる}くなる。
 > If you only drink alcool, your health will worsen.
 
-## てならない
+## てならない (NEW!)
 
 Means "extremely", "can't help but to do". Usually used for natural things occuring that cannot be controlled, like feeling.
 
@@ -140,7 +140,7 @@ Means "extremely", "can't help but to do". Usually used for natural things occur
 > この{町|まち}には{寒|さむ}く==てならない==。
 > It's extremely cold in this town.
 
-## てたまらない
+## てたまらない (NEW!)
 
 With verbs conjugated in the たい form, this means "can't help but want to".
 With other forms, this means "extremely".
@@ -149,7 +149,7 @@ With other forms, this means "extremely".
 >  {留学|りゅうがく}に{行|い}きたく==てたまらない==。
 > I can't help but want to go abroad.
 
-## てはいられない
+## てはいられない (NEW!)
 
 Means "unable to", "cannot afford to". 
 

Conjugation/TeF (3) - give & receive.md

@@ -1,56 +1,56 @@
-# Te-Form (3) - give & 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.
-> 
-
-For casual language, てやる can be used.
-
-## てくれる
-
-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?
+# Te-Form (3) - give & 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.
+> 
+
+For casual language, ==てやる== can be used.
+
+## てくれる
+
+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?

Conjugation/TeF (4) - even if.md

@@ -68,7 +68,9 @@ Used to make a supposition. Would translate to something like "even if... is the
 > ==たとえ=={新幹線|しん|かん|せん}==でも==、１時間かかる。
 > Even if you take the Shinkansen, it will take one hour.
 
-### てでも
+# NEW
+
+## てでも (NEW!)
 
 Means "even if I have to". Expresses a strong determination to do something.
 

Conjugation/TeF (5) - Misc.md

@@ -1,6 +1,6 @@
 # Te-Form (5) - Misc
 
-## て以来
+## て以来 (NEW!)
 
 て{以来|いらい} means "since". Not used for recent events.
 
@@ -8,7 +8,7 @@
 > {日本|にほん}に{引|ひ}っ{越|こき}し==て以来==、{帰国|きこく}していませんでした。
 > Ever since I moved to Japan, I haven't been back to my own country.
 
-## てこそ
+## てこそ (NEW!)
 
 Means "since", "only if", "unless", "until". Emphasizes on the relationship between the two parts of the sentence.
 
@@ -16,7 +16,7 @@ Means "since", "only if", "unless", "until". Emphasizes on the relationship betw
 > {先生|せんせい}にな==ってこそ==、{観点|かんてん}が{変|か}わる。
 > Only by becoming a teacher, your perspective changes.
 
-## てまで
+## てまで (NEW!)
 
 Means "to go as far as", "to do excessive effort".
 
@@ -24,7 +24,7 @@ Means "to go as far as", "to do excessive effort".
 > カードゲームが{好|す}きですけど、{全部|ぜんぶ}の{給料|きゅうりょう}を{費|つい}やし==てまで==と{思|おも}わない。
 > I like card games, but I don't want to spend my entire salary on them.
 
-## て当然だ
+## て当然だ (NEW!)
 
 て{当然|とうぜん}だ means that something is natural, expected.
 
@@ -32,7 +32,7 @@ Means "to go as far as", "to do excessive effort".
 > 私が{作|つく}ったから、{完璧|かんぺき}==で当然だ==！
 > I made it, so obviously it's perfect!
 
-## ては・では
+## ては・では (NEW!)
 
 It is used as a condition: "if", "when", "whenever". Generally expresses a negative outcome.
 は can be changed to ちゃ with verbs, and じゃ with な-adjectives and nouns.
@@ -41,9 +41,9 @@ It is used as a condition: "if", "when", "whenever". Generally expresses a negat
 > {授業|じゅぎょう}に{来|こ}なく==ては=={卒業|そつぎょう}できない。
 > If you don't come to class, you will not be able to graduate.
 
-## ては～ては
+## ては~ては (NEW!)
 
-Same structure as [[TeF (5) - Misc#ては・では]], this time only used with verbs. Means the repetition of an action or a phenomenon.
+Same structure as [[TeF (5) - Misc#ては・では (NEW!)]], this time only used with verbs. Means the repetition of an action or a phenomenon.
 The verbs can be in the same order or not in the two part.
 
 > [!info] Example

In addition.md

@@ -1,104 +1,104 @@
-# In addition
-
-## も～ば～も
-
-<div class="usage">
-	<p class="iright">N1 + も + </p>
-<div class="ileft">
-<div class="left">
-	<p><span class="box">V (ば)</span></p>
-	<p><span class="box">い-Adj <strike>い</strike> ければ</span></p>
-	<p><span class="box">な-Adj + なら</span></p>
-	<p><span class="box">N + なら</span></p>
-</div>
-</div>
-	<p class="right">+ N2 + も</p>
-</div>
-
-Means "also", "as well". Means that both N1 and N2 are true (and should share a connection).
-⚠ Despite using conditional form, it is not conditional in meaning.
-
-> [!info] Examples
-> {母|はは}はポルトガル{語|ご}==も==できれ==ば==スペイン{語|ご}==も=={話|はな}せる。
-> My mother can speak Portuguese as well as Spanish.
-
-## おまけに
-
-Means "in addition". Used for emphasis for similar qualities (positive, negative). Used orally.
-
-> [!info] Examples
-> {暑|あつ}くて==おまけに==エアコンが{壊|こわ}れてしまった。
-> It was hot, and to make matters worse, the air conditioning broke.
-
-## しかも
-
-Means "moreover", "what's more". Talks about a same subject, for objective information, implying that A and B exist at the same time. It is similar to おまけに, but used for writing.
-
-> [!info] Examples
-> このレストランはとても{美味|おい}しいね。==しかも==、{安|やす}いよ！
-> This restaurant is delicious. What's more, it's cheap!
-
-## 上に
-
-<div class="usage">
-<div class="left">
-	<p><span class="box">V</span></p>
-	<p><span class="box">い-Adj</span></p>
-	<p><span class="box">な-Adj + な</span></p>
-	<p><span class="box">N + の</span></p>
-</div>
-	<p class="right">+ 上(に)</p>
-</div>
-
-{上|うえ}に means "and also", "in addition", "as well". Used with similar qualities (positive with positive, negative with negative).
-
-> [!info] Examples
-> この{家|いえ}は{狭|せま}い==上に=={家賃|やちん}は{高|たか}すぎる。
-> This house is small, and the rent is too expensive.
-
-## その上
-
-その{上|うえ} means "besides", "in addition". Means the same as 上に, but with two separate sentences.
-
-> [!info] Examples
-> この{家|いえ}は{狭|せま}い。==その上==、{家賃|やちん}は{高|たか}すぎる。
-> This house is small. In addition, the rent is too expensive.
-
-## に加えて
-
-に{加|くわ}えて means "in addition to". It is formal, and often used in business settings.
-Used with nouns.
-
-> [!info] Examples
-> {今年|ことし}はピンポン==に加えて==バドミントンを{教|おし}えます。
-> This year, I'll be teaching badminton in addition to ping pong.
-
-## Not only, but also
-
-### はもちろん
-
-<div class="usage">
-<div class="">
-	<p><span class="box">N</span></p>
-</div>
-	<p class="r">+ はもちろん + </p>
-<div class="">
-	<p><span class="box">phrase</span></p>
-</div>
-	<p class="r">+ も・さえ</p>
-</div>
-
-Means "not only but also", "not to mention". The most common form.
-
-> [!info] Examples
-> このゲームセンターにはゲーム==はもちろん==ボウリング==も==あります。
-> This game center not only has games but also bowling.
-
-### はもとより
-
-Means "not only but also". Similar meaning than はもちろん. Conveys a sense of continuity. Used mostly in writing.
-Used with nouns.
-
-> [!info] Examples
-> {雪|ゆき}が{多|おお}いので、{電車|でんしゃ}==はもとより==タクシーもない。
-> There is so much snow that there are no trains, let alone taxis.
+# In addition
+
+## も～ば～も
+
+<div class="usage">
+	<p class="iright">N1 + も + </p>
+<div class="ileft">
+<div class="left">
+	<p><span class="box">V (ば)</span></p>
+	<p><span class="box">い-Adj <strike>い</strike> ければ</span></p>
+	<p><span class="box">な-Adj + なら</span></p>
+	<p><span class="box">N + なら</span></p>
+</div>
+</div>
+	<p class="right">+ N2 + も</p>
+</div>
+
+Means "also", "as well". Means that both N1 and N2 are true (and should share a connection).
+⚠ Despite using conditional form, it is not conditional in meaning.
+
+> [!info] Examples
+> {母|はは}はポルトガル{語|ご}==も==できれ==ば==スペイン{語|ご}==も=={話|はな}せる。
+> My mother can speak Portuguese as well as Spanish.
+
+## おまけに (NEW!)
+
+Means "in addition". Used for emphasis for similar qualities (positive, negative). Used orally.
+
+> [!info] Examples
+> {暑|あつ}くて==おまけに==エアコンが{壊|こわ}れてしまった。
+> It was hot, and to make matters worse, the air conditioning broke.
+
+## しかも (NEW!)
+
+Means "moreover", "what's more". Talks about a same subject, for objective information, implying that A and B exist at the same time. It is similar to おまけに, but used for writing.
+
+> [!info] Examples
+> このレストランはとても{美味|おい}しいね。==しかも==、{安|やす}いよ！
+> This restaurant is delicious. What's more, it's cheap!
+
+## 上に
+
+<div class="usage">
+<div class="left">
+	<p><span class="box">V</span></p>
+	<p><span class="box">い-Adj</span></p>
+	<p><span class="box">な-Adj + な</span></p>
+	<p><span class="box">N + の</span></p>
+</div>
+	<p class="right">+ 上(に)</p>
+</div>
+
+{上|うえ}に means "and also", "in addition", "as well". Used with similar qualities (positive with positive, negative with negative).
+
+> [!info] Examples
+> この{家|いえ}は{狭|せま}い==上に=={家賃|やちん}は{高|たか}すぎる。
+> This house is small, and the rent is too expensive.
+
+## その上 (NEW!)
+
+その{上|うえ} means "besides", "in addition". Means the same as 上に, but with two separate sentences.
+
+> [!info] Examples
+> この{家|いえ}は{狭|せま}い。==その上==、{家賃|やちん}は{高|たか}すぎる。
+> This house is small. In addition, the rent is too expensive.
+
+## に加えて (NEW!)
+
+に{加|くわ}えて means "in addition to". It is formal, and often used in business settings.
+Used with nouns.
+
+> [!info] Examples
+> {今年|ことし}はピンポン==に加えて==バドミントンを{教|おし}えます。
+> This year, I'll be teaching badminton in addition to ping pong.
+
+## Not only, but also
+
+### はもちろん
+
+<div class="usage">
+<div class="">
+	<p><span class="box">N</span></p>
+</div>
+	<p class="r">+ はもちろん + </p>
+<div class="">
+	<p><span class="box">phrase</span></p>
+</div>
+	<p class="r">+ も・さえ</p>
+</div>
+
+Means "not only but also", "not to mention". The most common form.
+
+> [!info] Examples
+> このゲームセンターにはゲーム==はもちろん==ボウリング==も==あります。
+> This game center not only has games but also bowling.
+
+### はもとより (NEW!)
+
+Means "not only but also". Similar meaning than はもちろん. Conveys a sense of continuity. Used mostly in writing.
+Used with nouns.
+
+> [!info] Examples
+> {雪|ゆき}が{多|おお}いので、{電車|でんしゃ}==はもとより==タクシーもない。
+> There is so much snow that there are no trains, let alone taxis.

index.md

@@ -1,15 +1,10 @@
----
-
-title: Japanese Grammar
-
----
 # 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 five 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!
+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
 
@@ -18,11 +13,11 @@ Of course, since I'm _learning_ the language, I need to get inspired from differ
 * [Bunpro](https://bunpro.jp/grammar_points)
 * [JLPT Sensei](https://jlptsensei.com/#jlpt-grammar-lists)
 * [Maggie Sensei](https://maggiesensei.com/)
-* [Try! Series of books](https://ask-books.com/jlpt-try-prep/)
-* [A Handbook of Japanese Grammar](https://www.9640.jp/nihongo/en/detail/?678)
+* [Try! Series of books](https://2024.ask-books.com/tag/try/)
 * [Hedgehog Japanese](https://hedgehog-japanese.com/category/grammar/)
-* [Wasabi](https://wasabi-jpn.com/magazine/japanese-grammar/wasabis-online-japanese-grammar-reference/?lang=en)
+* [Wasabi](https://www.wasabi-jpn.com/category/japanese-grammar/)
 * [Japanese StackExchange](https://japanese.stackexchange.com/)
+* [Guide du Japonais](https://guidedujaponais.fr/)
 * [Tofugu](https://www.tofugu.com)
 * [Imabi](https://imabi.org/table-of-contents-%e7%9b%ae%e6%ac%a1/)
 * [Tae-Kim's Guide](https://guidetojapanese.org/learn/)
@@ -53,10 +48,6 @@ In addition to those I cited, here are other resources I find useful.
 * [Jisho](https://jisho.org/), an online dictionary
 * [Tatoeba](https://tatoeba.org), for its sentences database
 
-### Apps
-
-- [Anki](https://apps.ankiweb.net/), the spaced repetition software
-
 ## Any errors?
 
 If you find any error, please do contact me! I wrote the examples by myself, so they might not be accurate. You can find my website in the footer of any page of this website. Thanks!

🔰 Grammar/Actions.md

@@ -1,135 +1,135 @@
-# Actions
-
-## になる
-
-<div class="usage">
-<div class="left">
-	<p><span class="box">い-Adj + <strike>い</strike> + く</span></p>
-	<p><span class="box">な-Adj + に</span></p>
-	<p><span class="box">N + に</span></p>
-</div>
-	<p class="right">+ なる</p>
-</div>
-
-Means "to become".
-
-> [!info] Example
-> {新幹線|しんかんせん}==になりたい==！
-> I want to become a bullet train!
-
-## にする
-
-### To decide
-
-Means "to decide".
-Used with nouns.
-
-> [!info] Example
-> このレストラン==にしました==。
-> I've decided on this restaurant.
-
-### Make something
-
-<div class="usage">
-<div class="left">
-	<p><span class="box">い-Adj + <strike>い</strike> + く</span></p>
-	<p><span class="box">な-Adj + に</span></p>
-</div>
-	<p class="right">+ なる</p>
-</div>
-
-Means to "make something more".
-
-> [!info] Example
-> ストーブを{点|つ}けて{部屋|へや}を{暑|あつ}==くする==。
-> Turn on the heater to make the room hotter.
-
-## ようになる
-
-Means "to reach a point". Used with verbs.
-
-> [!info] Example
-> この本{全部|ぜんぶ}{分|わ}かる==ようになった==。
-> I've come to understand all of this book.
-
-## に気がつく
-
-<div class="usage">
-<div class="left">
-	<p><span class="box">V + こと</span></p>
-	<p><span class="box">N</span></p>
-</div>
-	<p class="right">+ に気がつく</p>
-</div>
-
-に{気|き}がつく means "to notice", "to realize".
-
-> [!info] Example
-> {新|あたら}しいレストランが{開店|かい|てん}==に気がついた==。
-> I noticed a new restaurant opened.
-
-## と思う
-
-<div class="usage">
-<div class="left">
-	<p><span class="box">V</span></p>
-	<p><span class="box">い-Adj</span></p>
-	<p><span class="box">な-Adj + だ</span></p>
-	<p><span class="box">N + だ</span></p>
-</div>
-	<p class="right">+ と思う</p>
-</div>
-
-と{思|おも}う means "to think".
-
-> [!info] Example
-> {変|へん}だ==と思わない==か。
-> Don't you think it's strange?
-> 
-> 今日は{公園|こう|えん}に行く==と思います==。
-> I think I'll go to the park today.
-
-## すぎる
-
-<div class="usage">
-<div class="left">
-	<p><span class="box">V <strike>ます</strike></span></p>
-	<p><span class="box">い-Adj <strike>い</strike></span></p>
-	<p><span class="box">な-Adj</span></p>
-</div>
-	<p class="right">+ すぎる</p>
-</div>
-
-Means "too much", "exceeding".
-
-> [!info] Example
-> {昨晩|さく|ばん}に{飲|の}み==すぎて=={頭|あたま}が{痛|いた}い。
-> I drank too much last night and my head hurts.
-
-## Try to
-
-### ようにする
-
-Means "to try to", "to make sure to". It's more of an assertion than ようとする.
-Used with a verb.
-
-> [!info] Example
-> 毎日に{朝|あさ}ご{飯|はん}を食べる==ようにします==。
-> I'll try to eat a breakfast everyday.
-
-### ようとする・ようとしない
-
-Means "try to", "attempt to" (or not, in the negative form). It's more of an attempt than with ようにする. Can also mean "just as I was about to".
-Used with the volitional form of verbs (よう).
-
-> [!info] Example
-> 出かけ==ようとした==時、電話が{鳴|な}ってた。
-> At the time I was trying to go out, the phone rang.
-> 
-> さっき店に{入|はい}==ろうとしたら==が、ドアが{閉|し}まってしまいました。
-> I tried to enter the shop earlier, but the door was closed...
-> 
-> 彼は{運動|うんどう}し==ようとしない==。
-> He doesn't try to exercise.
-
-⚠ Not used in negative form to talk about oneself.
+# Actions
+
+## になる
+
+<div class="usage">
+<div class="left">
+	<p><span class="box">い-Adj + <strike>い</strike> + く</span></p>
+	<p><span class="box">な-Adj + に</span></p>
+	<p><span class="box">N + に</span></p>
+</div>
+	<p class="right">+ なる</p>
+</div>
+
+Means "to become".
+
+> [!info] Example
+> {新幹線|しんかんせん}==になりたい==！
+> I want to become a bullet train!
+
+## にする
+
+### To decide
+
+Means "to decide".
+Used with nouns.
+
+> [!info] Example
+> このレストラン==にしました==。
+> I've decided on this restaurant.
+
+### Make something
+
+<div class="usage">
+<div class="left">
+	<p><span class="box">い-Adj + <strike>い</strike> + く</span></p>
+	<p><span class="box">な-Adj + に</span></p>
+</div>
+	<p class="right">+ なる</p>
+</div>
+
+Means to "make something more".
+
+> [!info] Example
+> ストーブを{点|つ}けて{部屋|へや}を{暑|あつ}==くする==。
+> Turn on the heater to make the room hotter.
+
+## ようになる
+
+Means "to reach a point". Used with verbs.
+
+> [!info] Example
+> この本{全部|ぜんぶ}{分|わ}かる==ようになった==。
+> I've come to understand all of this book.
+
+## に気がつく
+
+<div class="usage">
+<div class="left">
+	<p><span class="box">V + こと</span></p>
+	<p><span class="box">N</span></p>
+</div>
+	<p class="right">+ に気がつく</p>
+</div>
+
+に{気|き}がつく means "to notice", "to realize".
+
+> [!info] Example
+> {新|あたら}しいレストランが{開店|かい|てん}==に気がついた==。
+> I noticed a new restaurant opened.
+
+## と思う
+
+<div class="usage">
+<div class="left">
+	<p><span class="box">V</span></p>
+	<p><span class="box">い-Adj</span></p>
+	<p><span class="box">な-Adj + だ</span></p>
+	<p><span class="box">N + だ</span></p>
+</div>
+	<p class="right">+ と思う</p>
+</div>
+
+と{思|おも}う means "to think".
+
+> [!info] Example
+> {変|へん}だ==と思わない==か。
+> Don't you think it's strange?
+> 
+> 今日は{公園|こう|えん}に行く==と思います==。
+> I think I'll go to the park today.
+
+## すぎる
+
+<div class="usage">
+<div class="left">
+	<p><span class="box">V <strike>ます</strike></span></p>
+	<p><span class="box">い-Adj <strike>い</strike></span></p>
+	<p><span class="box">な-Adj</span></p>
+</div>
+	<p class="right">+ すぎる</p>
+</div>
+
+Means "too much", "exceeding".
+
+> [!info] Example
+> {昨晩|さく|ばん}に{飲|の}み==すぎて=={頭|あたま}が{痛|いた}い。
+> I drank too much last night and my head hurts.
+
+## Try to
+
+### ようにする
+
+Means "to try to", "to make sure to". It's more of an assertion than ようとする.
+Used with a verb.
+
+> [!info] Example
+> 毎日に{朝|あさ}ご{飯|はん}を食べる==ようにします==。
+> I'll try to eat a breakfast everyday.
+
+### ようとする・ようとしない
+
+Means "try to", "attempt to" (or not, in the negative form). It's more of an attempt than with ようにする. Can also mean "just as I was about to".
+Used with the volitional form of verbs (よう).
+
+> [!info] Example
+> 出かけ==ようとした==時、電話が{鳴|な}ってた。
+> At the time I was trying to go out, the phone rang.
+> 
+> さっき店に{入|はい}==ろうとしたら==が、ドアが{閉|し}まってしまいました。
+> I tried to enter the shop earlier, but the door was closed...
+> 
+> 彼は{運動|うんどう}し==ようとしない==。
+> He doesn't try to exercise.
+
+⚠ Not used in negative form to talk about oneself.

🔰 Grammar/Adverbs.md

@@ -1,107 +1,107 @@
-# Adverbs
-
-## さすが
-
-<div class="usage">
-<div class="">
-	<p><span class="box">さすが</span></p>
-</div>
-	<p class="r">+ に + V</p>
-</div>
-<div class="usage">
-<div class="">
-	<p><span class="box">さすが</span></p>
-</div>
-	<p class="r">+ の + N</p>
-</div>
-
-Means "as expected".
-
-> [!info] Example
-> ==さすが==のオランダ人、{自転車|じてんしゃ}で{通|かよ}う。
-> As expected of a Dutch, they commute by bicycle.
-
-## そんなに
-
-Means "so much" or "like that".
-Not used with nouns.
-
-⚠ It is applied to the following word, not the preceding one.
-
-> [!info] Example
-> {僕|ぼく}は{卵|たまご}が==そんなに==好きじゃない。
-> I don't like eggs that much.
-
-## なかなか～ない
-
-This form means that an effort has been made, but no outcome happens. Can be translated as "not easy to", "not able to", "hardly", "not at all".
-This form is used with a verb in the negative form (ない).
-
-> [!info] Example
-> 雨だから、==なかなか==タクシーが来てい==ません==。
-> Because of the rain, it's not easy to get a taxi.
-> 
-> ==なかなか==お{酒|さけ}止めるでき==ない==。
-> It is not easy to stop drinking.
-
-## 一体
-
-{一体|いったい} is used to make an emphasis when something is surprising, confusing, etc.
-
-> [!info] Example
-> ==いったい=={誰|だれ}がそんなことをしたか。
-> Who in the world would do something like this?
-
-## まるで
-
-<div class="usage">
-	<p class="iright">まるで + </p>
-<div class="ileft">
-	<p><span class="box">V + よう・みたい</span></p>
-	<p><span class="box">N + のよう・みたい</span></p>
-</div>
-</div>
-
-Means "as if".
-
-> [!info] Example
-> え、{中古|ちゅうこ}ですね。==まるで=={新規|しんき}の==よう==です。
-> Eh, it's second-hand? It looks like new.
-
-## もう
-
-Means "already".
-
-> [!info] Example
-> ==もう==出ちゃった。
-> They already left.
-
-## すでに
-
-Means "already". More formal than もう, implies that something is too late and cannot be changed.
-
-> [!info] Example
-> {遅|おそ}く{起|お}きたので==すでに==バスは{出発|しゅっぱつ}してしまった。
-> I woke up late, so the bus already left.
-
-## どうせ
-
-Means "anyhow", "at any rate".
-
-> [!info] Example
-> ==どうせ==、{僕|ぼく}のアドバイスを{聞|き}かないんでしょう。
-> Anyhow, you won't listen to advice, right?
-
-## なお
-
-Means "more", "in addition". Used in writing.
-Can be used:
-- in a similar way as もっと;
-- to add information to a previous sentence.
-
-> [!info] Example
-> ==なお=={考|かんが}えるせんいけない。
-> I still have to think about it.
-> 
-> {今日|きょう}はたくみさんが{休|やす}みです。==なお==、{彼|かれ}は{仕事|しごと}を{終|お}わりなかった。
-> Takumi-san is not there today. In addition, he did not finish his work.
+# Adverbs
+
+## さすが
+
+<div class="usage">
+<div class="">
+	<p><span class="box">さすが</span></p>
+</div>
+	<p class="r">+ に + V</p>
+</div>
+<div class="usage">
+<div class="">
+	<p><span class="box">さすが</span></p>
+</div>
+	<p class="r">+ の + N</p>
+</div>
+
+Means "as expected".
+
+> [!info] Example
+> ==さすが==のオランダ人、{自転車|じてんしゃ}で{通|かよ}う。
+> As expected of a Dutch, they commute by bicycle.
+
+## そんなに
+
+Means "so much" or "like that".
+Not used with nouns.
+
+⚠ It is applied to the following word, not the preceding one.
+
+> [!info] Example
+> {僕|ぼく}は{卵|たまご}が==そんなに==好きじゃない。
+> I don't like eggs that much.
+
+## なかなか～ない
+
+This form means that an effort has been made, but no outcome happens. Can be translated as "not easy to", "not able to", "hardly", "not at all".
+This form is used with a verb in the negative form (ない).
+
+> [!info] Example
+> 雨だから、==なかなか==タクシーが来てい==ません==。
+> Because of the rain, it's not easy to get a taxi.
+> 
+> ==なかなか==お{酒|さけ}止めるでき==ない==。
+> It is not easy to stop drinking.
+
+## 一体
+
+{一体|いったい} is used to make an emphasis when something is surprising, confusing, etc.
+
+> [!info] Example
+> ==いったい=={誰|だれ}がそんなことをしたか。
+> Who in the world would do something like this?
+
+## まるで
+
+<div class="usage">
+	<p class="iright">まるで + </p>
+<div class="ileft">
+	<p><span class="box">V + よう・みたい</span></p>
+	<p><span class="box">N + のよう・みたい</span></p>
+</div>
+</div>
+
+Means "as if".
+
+> [!info] Example
+> え、{中古|ちゅうこ}ですね。==まるで=={新規|しんき}の==よう==です。
+> Eh, it's second-hand? It looks like new.
+
+## もう
+
+Means "already".
+
+> [!info] Example
+> ==もう==出ちゃった。
+> They already left.
+
+## すでに
+
+Means "already". More formal than もう, implies that something is too late and cannot be changed.
+
+> [!info] Example
+> {遅|おそ}く{起|お}きたので==すでに==バスは{出発|しゅっぱつ}してしまった。
+> I woke up late, so the bus already left.
+
+## どうせ (NEW!)
+
+Means "anyhow", "at any rate".
+
+> [!info] Example
+> ==どうせ==、{僕|ぼく}のアドバイスを{聞|き}かないんでしょう。
+> Anyhow, you won't listen to advice, right?
+
+## なお (NEW!)
+
+Means "more", "in addition". Used in writing.
+Can be used:
+- in a similar way as もっと;
+- to add information to a previous sentence.
+
+> [!info] Example
+> ==なお=={考|かんが}えるせんいけない。
+> I still have to think about it.
+> 
+> {今日|きょう}はたくみさんが{休|やす}みです。==なお==、{彼|かれ}は{仕事|しごと}を{終|お}わりなかった。
+> Takumi-san is not there today. In addition, he did not finish his work.

🔰 Grammar/Advice - Guidance - Proposition.md

@@ -1,36 +1,36 @@
-# Advice, guidance, proposition
-
-## たらどう
-
-Used to ask about a situation, usually to give advice. Translates to "why don't you" or "how about".
-Used with the たら form of verbs.
-
-> [!info] Example
-> ゲームをし==たらどう==か。
-> How about you play a game?
-
-## たらいいですか
-
-Used to ask about an advice or instructions. Translates to "what should I do".
-Used with the たら form of verbs.
-
-> [!info] Example
-> 何を{飲|の}ん==だらいいですか==。
-> What should I drink?
-
-## ことだ
-
-Means "should do". It is used for suggestion or giving advice in spoken language.
-Used after verbs with a る or ない ending.
-
-> [!info] Example
-> {砂糖|さとう}が{多|おお}すぎる{食|た}べ{物|もの}を{食|た}べない==ことだ==。
-> You shouldn't eat food that is too high in sugar.
-
-## ようではないか
-
-Means "why don't we", "shall we", "let's do". Used with a verb in the volitional form (おう). ではないか can be replaced by じゃないか.
-
-> [!info] Examples
-> {一緒|いっしょ}に{飲|の}==もうではないか==。
-> Why don't we have drinks together?
+# Advice, guidance, proposition
+
+## たらどう
+
+Used to ask about a situation, usually to give advice. Translates to "why don't you" or "how about".
+Used with the たら form of verbs.
+
+> [!info] Example
+> ゲームをし==たらどう==か。
+> How about you play a game?
+
+## たらいいですか
+
+Used to ask about an advice or instructions. Translates to "what should I do".
+Used with the たら form of verbs.
+
+> [!info] Example
+> 何を{飲|の}ん==だらいいですか==。
+> What should I drink?
+
+## ことだ (NEW!)
+
+Means "should do". It is used for suggestion or giving advice in spoken language.
+Used after verbs with a る or ない ending.
+
+> [!info] Example
+> {砂糖|さとう}が{多|おお}すぎる{食|た}べ{物|もの}を{食|た}べない==ことだ==。
+> You shouldn't eat food that is too high in sugar.
+
+## ようではないか (NEW!)
+
+Means "why don't we", "shall we", "let's do". Used with a verb in the volitional form (おう). ではないか can be replaced by じゃないか.
+
+> [!info] Examples
+> {一緒|いっしょ}に{飲|の}==もうではないか==。
+> Why don't we have drinks together?

🔰 Grammar/Amounts - frequency.md

@@ -1,6 +1,6 @@
 # Amounts of frequency
 
-## 再び
+## 再び (NEW!)
 
 {再|ふたた}び means "again", "once more".
 
@@ -22,7 +22,7 @@
 </div>
 </div>
 
-{決|けっ}して～ない means "never". Used with negative verbs.
+{決|けっ}して~ない means "never". Used with negative verbs.
 
 > [!info] Examples
 > 私は==決して=={夢|ゆめ}を{覚|おぼ}えません。

🔰 Grammar/Amounts - quantification.md

@@ -43,7 +43,7 @@ Used with words in negative form.
 > どうしてエアコンを{付|つ}きましたか。{今|いま}は==別に=={暑|あつ}==くない==よ。
 > Why did you turn on the AC? It's not that hot right now.
 
-## わずかに
+## わずかに (NEW!)
 
 Means "slightly", "only", "a little". Used at the beginning of a phrase to indicate a particularly small amount of something.
 
@@ -65,7 +65,7 @@ Means "slightly", "only", "a little". Used at the beginning of a phrase to indic
 </div>
 </div>
 
-Means "no matter how much". Also used as いくら～ても.
+Means "no matter how much". Also used as いくら~ても.
 
 > [!info] Example
 > ==どんなに=={練習|れんしゅう}し==ても==、マラソンを{走|はし}れない。
@@ -81,7 +81,7 @@ Means "no matter what".
 
 ## At least
 
-### 少なくとも
+### 少なくとも (NEW!)
 
 {少|すく}なくとも means "at least". Implies an obligation.
 
@@ -89,7 +89,7 @@ Means "no matter what".
 > ==少なくとも==もっと{三人|さんにん}が{必要|ひつよう}です。
 > At least three more people are required.
 
-### せめて
+### せめて (NEW!)
 
 Means "at least". Implies a request.
 
@@ -97,7 +97,7 @@ Means "at least". Implies a request.
 > ==せめて=={週|しゅう}に{一度|いちど}{勉強|べんきょう}してください。
 > Please study at least once a week.
 
-## だけましだ
+## だけましだ (NEW!)
 
 <div class="usage">
 <div class="left">
@@ -190,7 +190,7 @@ Means "as much as possible". なるべく is a bit softer than できるだけ.
 </div>
 
 Means "so much... that".
-Nominalized adjectives can be used as nouns. See [[Transformation#～さ adjective as noun]] and [[Transformation#～み adjective as noun]].
+Adjectives nominalized can be used as nouns. See [[Transformation#~さ adjective as noun]] and [[Transformation#~み adjective as noun]].
 
 > [!info] Example
 > おいしさの==あまり==、このレストラン{毎日|まいにち}行きたい。
@@ -221,7 +221,7 @@ Means "so much... that". A version of あまり that can also be used with adjec
 
 ## Not at all
 
-### ちっとも～ない
+### ちっとも~ない (NEW!)
 
 Means "not at all". Has a nuance of perhaps happening once or twice. It is casual.
 Used with a verb in the negative (ない) form.
@@ -230,7 +230,7 @@ Used with a verb in the negative (ない) form.
 > ==ちっとも=={学校|がっこう}を{休|やす}まない。
 > I never miss school.
 
-### 少しも～ない
+### 少しも~ない (NEW!)
 
 <div class="usage">
 	<p class="iright">少しも + </p>
@@ -242,22 +242,22 @@ Used with a verb in the negative (ない) form.
 </div>
 </div>
 
-{少|すこ}しも～ない means "not at all". Has a nuance of perhaps happening once or twice. Mostly used in writing.
+{少|すこ}しも~ない means "not at all". Has a nuance of perhaps happening once or twice. Mostly used in writing.
 
 > [!info] Example
 > そのアパートは==少しも==大きくなかった。
 > That appartment was really not big.
 
-### 全く～ない
+### 全く~ない (NEW!)
 
-{全|まった}く～ない means "not at all". Has a nuance of absolutely never happening.
+{全|まった}く~ない means "not at all". Has a nuance of absolutely never happening.
 Used with a verb in the negative (ない) form.
 
 > [!info] Example
 > ==全く=={信|しん}じられない。
 > That is absolutely unbelievable.
 
-### として～ない
+### として~ない (NEW!)
 
 Means "not at all". Has a nuance of absolutely never happening.
 Insists more on the duration: "not even".
@@ -267,7 +267,7 @@ Used before a a duration, a number, etc.
 > {彼女|かのじょ}は{一日|いちにち}==として=={仕事|しごと}を{遅|おく}れなかった。
 > She has never missed a day of work, not even one day.
 
-### 全然
+### 全然 (NEW!)
 
 {全然|ぜんぜん} means "not at all".
 

🔰 Grammar/Amounts.md

@@ -1,99 +1,99 @@
-# Amounts
-
-## くらい・ぐらい
-
-<div class="usage">
-<div class="left">
-	<p><span class="box">V (ない)</span></p>
-	<p><span class="box">い-Adj</span></p>
-	<p><span class="box">な-Adj + な</span></p>
-	<p><span class="box">N + の</span></p>
-</div>
-	<p class="right">+ くらい・ぐらい</p>
-</div>
-
-Means "about" or "approximately" when talking about numbers or counter words. Focuses on the uncertainty of the number.
-ぐらい is more common than くらい in conversations, but can change depending on the preceding word.
-
-> [!info] Example
-> {電車|でんしゃ}はどの==くらい==で{到着|とうちゃく}しますか。
-> About how much time will the train take to arrive?
-> 
-> {医者|いしゃ}に１時間==ぐらい==を{待|ま}ってました。
-> I waited approximately an hour for the doctor.
-
-Also used to compare things as being similar.
-
-> [!info] Example
-> {友達|ともだち}と{試験|しけん}の{結果|けっか}は{同|おな}じ==ぐらい==です。
-> My friend and I have about the same results at the test.
-
-Also means "to the extent of".
-
-> [!info] Example
-> 食べなくて{寝|ね}たい==ぐらい=={疲|つか}れています。
-> I'm tired to the extent of not eating and going to sleep.
-
-## ばかり
-
-Means "about" or "approximately", when used with nouns indicating time or distance. Has the same meaning as ぐらい or ほど, but only in written form.
-
-> [!info] Example
-> {薬屋|くすりや}まで１０分==ばかり==かかる。
-> It takes about 10 minutes to get to the pharmacy.
-
-## は particle
-
-See [[🔰 Particles (1)#は]].
-
-## ほど
-
-<div class="usage">
-<div class="left">
-	<p><span class="box">V (non-past)</span></p>
-	<p><span class="box">い-Adj</span></p>
-	<p><span class="box">な-Adj + な</span></p>
-	<p><span class="box">N</span></p>
-</div>
-	<p class="right">+ 程</p>
-</div>
-
-{程|ほど}, like くらい, it describes an approximate amount. It focuses on a limit being reached. It translates to "about" or "to the extent".
-
-> [!info] Example
-> {地下鉄|ちかてつ}を{乗|の}るために、{死|し}ぬ==程=={走|はし}った。
-> In order to catch the subway, I ran to death.
-
-## 一応
-
-{一応|いちおう} means "more or less", "roughly".
-Can also mean "just in case". Used to tell the minimum required amount is done.
-
-> [!info] Examples
-> ==一応=={終|お}わりましたけど。
-> I more or less finished, but...
-
-## 一度に
-
-{一度|いち|ど}に means "all at once".
-
-> [!info] Example
-> バスは==一度に==１００{人|にん}を{乗|の}せることができる。
-> A bus can carry 100 persons at a time.
-
-## ずつ
-
-Used with nouns that express a number or a counter, meaning "each", "at time".
-Used with {少|すこ}し, means "little by little".
-
-> [!info] Example
-> ２{個|こ}==ずつ==ください。
-> I'll take two of each please.
-
-## ろくに～ない
-
-Means "not enough, improperly, insufficiently". Used with a negative phrase.
-
-> [!info] Examples
-> ５{年|ねん}{中国語|ちゅうごくご}を{勉強|べんきょう}したのに、==ろくに=={喋|しゃべ}ら==ない==。
-> Even tough I studied Chinese for 5 years, I cannot speak it really well.
+# Amounts
+
+## くらい・ぐらい
+
+<div class="usage">
+<div class="left">
+	<p><span class="box">V (ない)</span></p>
+	<p><span class="box">い-Adj</span></p>
+	<p><span class="box">な-Adj + な</span></p>
+	<p><span class="box">N + の</span></p>
+</div>
+	<p class="right">+ くらい・ぐらい</p>
+</div>
+
+Means "about" or "approximately" when talking about numbers or counter words. Focuses on the uncertainty of the number.
+ぐらい is more common than くらい in conversations, but can change depending on the preceding word.
+
+> [!info] Example
+> {電車|でんしゃ}はどの==くらい==で{到着|とうちゃく}しますか。
+> About how much time will the train take to arrive?
+> 
+> {医者|いしゃ}に１時間==ぐらい==を{待|ま}ってました。
+> I waited approximately an hour for the doctor.
+
+Also used to compare things as being similar.
+
+> [!info] Example
+> {友達|ともだち}と{試験|しけん}の{結果|けっか}は{同|おな}じ==ぐらい==です。
+> My friend and I have about the same results at the test.
+
+Also means "to the extent of".
+
+> [!info] Example
+> 食べなくて{寝|ね}たい==ぐらい=={疲|つか}れています。
+> I'm tired to the extent of not eating and going to sleep.
+
+## ばかり (NEW!)
+
+Means "about" or "approximately", when used with nouns indicating time or distance. Has the same meaning as ぐらい or ほど, but only in written form.
+
+> [!info] Example
+> {薬屋|くすりや}まで１０分==ばかり==かかる。
+> It takes about 10 minutes to get to the pharmacy.
+
+## は particle
+
+See [[🔰 Particles (1)#は]].
+
+## ほど
+
+<div class="usage">
+<div class="left">
+	<p><span class="box">V (non-past)</span></p>
+	<p><span class="box">い-Adj</span></p>
+	<p><span class="box">な-Adj + な</span></p>
+	<p><span class="box">N</span></p>
+</div>
+	<p class="right">+ 程</p>
+</div>
+
+Like くらい, it describes an approximate amount. It focuses on a limit being reached. It translates to "about" or "to the extent".
+
+> [!info] Example
+> {地下鉄|ちかてつ}を{乗|の}るために、{死|し}ぬ==程=={走|はし}った。
+> In order to catch the subway, I ran to death.
+
+## 一応 (NEW!)
+
+{一応|いちおう} means "more or less", "roughly".
+Can also mean "just in case". Used to tell the minimum required amount is done.
+
+> [!info] Examples
+> ==一応=={終|お}わりましたけど。
+> I more or less finished, but...
+
+## 一度に
+
+{一度|いち|ど}に means "all at once".
+
+> [!info] Example
+> バスは==一度に==１００{人|にん}を{乗|の}せることができる。
+> A bus can carry 100 persons at a time.
+
+## ずつ
+
+Used with nouns that express a number or a counter, meaning "each", "at time".
+Used with {少|すこ}し, means "little by little".
+
+> [!info] Example
+> ２{個|こ}==ずつ==ください。
+> I'll take two of each please.
+
+## ろくに～ない (NEW!)
+
+Means "not enough, improperly, insufficiently". Used with a negative phrase.
+
+> [!info] Examples
+> ５{年|ねん}{中国語|ちゅうごくご}を{勉強|べんきょう}したのに、==ろくに=={喋|しゃべ}ら==ない==。
+> Even tough I studied Chinese for 5 years, I cannot speak it really well.

🔰 Grammar/Based on.md

@@ -1,6 +1,6 @@
 # Based on
 
-## からして
+## からして (NEW!)
 
 Means "based on", "judging from". Extracts a conclusion from an observation.
 Used with nouns.
@@ -14,7 +14,7 @@ Also used to present an extreme example where if A is true, then of course B wil
 > もちろん{親|おや}さんはうるさい==からしたら==、{子供|こども}もうるさいです。
 > Of course if the parents are noisy, the kids will also be.
 
-## をもとに・に沿って
+## をもとに・に沿って (NEW!)
 
 をもとに and に{沿|そ}って mean "based on", "in accordance with". Use a source to do something, following it.
 Used with nouns.
@@ -23,7 +23,7 @@ Used with nouns.
 > この{教科書|きょうかしょ}==をもとに==、{練習問題|れんしゅうもんだい}を{作|つく}った。
 > Based on this text textbook, I made practice questions.
 
-## に基づいて
+## に基づいて (NEW!)
 
 に{基|もと}づいて means "based on". It is more formal than をもとに and に沿って.
 Used with nouns.
@@ -32,7 +32,7 @@ Used with nouns.
 > この{映画|えいが}は{漫画|まんが}==に基づいた==。
 > This movie was based on a manga.
 
-## に応えて
+## に応えて (NEW!)
 
 に{応|こた}えて means "in response to". Implies a change depending on what is necessary, suitable, etc.
 Used with nouns.
@@ -41,7 +41,7 @@ Used with nouns.
 > {社長|しゃちょう}の{願|ねが}う==に応えて==、{残業|ざんぎょう}をしました。
 > In reponse to my boss's request, I worked overtime.
 
-## に応じて
+## に応じて (NEW!)
 
 に{応|おう}じて means "in accordance with". It is less direct than に応えて.
 Used with nouns.
@@ -50,7 +50,7 @@ Used with nouns.
 > {社長|しゃちょう}の{願|ねが}う==に応じて==、{残業|ざんぎょう}をしました。
 > In response to my boss's request, I worked overtime. (the request might have been implicit, and not asked directly)
 
-## の下で・のもとに
+## の下で・のもとに (NEW!)
 
 の{下|もと}で・の{下|もと}に means "under", "on the basis of".
 Used with nouns.

🔰 Grammar/Can't help - doesn't matter.md

@@ -24,7 +24,7 @@ Made with a verb in the negative form (ない) without the ない ending and add
 > {悲|かな}しいのでアイスクリーム食べ==ずには入れれない==。
 > I'm sad so I can't help but eat ice cream.
 
-## ないではいられない
+## ないではいられない (NEW!)
 
 This means "cannot help doing something". Has the same nuance as ずにはいられない。
 Made with a verb in the negative form (ない) without the ない ending and adding ではいられない.
@@ -33,7 +33,7 @@ Made with a verb in the negative form (ない) without the ない ending and add
 > ゲームをし==ないではいられない==。
 > I can't help but play games.
 
-## ざるを得ない
+## ざるを得ない (NEW!)
 
 ざるを{得|え}ない means "can't help doing". Implies that it is not the first choice, but that there is no other option available.
 Made with a verb in the negative form (ない) and adding ざるを得ない.
@@ -57,7 +57,7 @@ Exception: する becomes せ.
 	<p class="right">+ もかまわない・もかまいません</p>
 </div>
 
-ても{構|かま}わない means "it doesn't matter if", "I don't mind".
+Means "it doesn't matter if", "I don't mind".
 
 > [!info] Example
 > ここで{座|すわ}==っても構いません==か。

🔰 Grammar/Certainty.md

@@ -2,7 +2,7 @@
 
 ## Certain
 
-### に決まっている
+### に決まっている (NEW!)
 
 に{決|き}まっている means "certain that". It is casual.
 
@@ -18,7 +18,7 @@
 > {絶対|ぜったい}に来る==に違いない==。
 > He's definitely coming.
 
-### に相違ない
+### に相違ない (NEW!)
 
 に{相|そう}{違|い}ない means "certain that". It is very formal.
 
@@ -26,7 +26,7 @@
 > 彼女は{必|かなら}ず{悲|かな}しい==に相違ない==。
 > I'm certain that she's sad.
 
-## Uncertain: というものではない
+## Uncertain: というものではない (NEW!)
 
 Means "there is no guarantee that", "not necessarily".
 
@@ -74,8 +74,8 @@ It can also mean that the will to do is not present, especially with する.
 
 ### ようがない・ようもない
 
-～{様|よう}がない means that there is no way, "impossible".
-Works by removing ～ます from a verb and adding ようがない・ようもない.
+~{様|よう}がない means that there is no way, "impossible".
+Works by removing ~ます from a verb and adding ようがない・ようもない.
 The nuance it that it is impossible in general. With する, it can mean the same as わけがない, i.e. "I don't know how to".
 
 > [!info] Example 

🔰 Grammar/Combination actions.md

@@ -11,7 +11,7 @@ Those rules combine a verb and an adjective to make a new meaning.
 
 ## Difficulty
 
-### ～やすい: easy
+### ~やすい: easy
 
 Means: 
 * easy to do
@@ -25,7 +25,7 @@ Means:
 > {泣|な}き==やすい==。
 > Prone to crying.
 
-### ～にくい・～づらい: difficult
+### ~にくい・~づらい: difficult
 
 Means that something is difficult to do.
 While にくい is the broader form, づらい is used in a more subjective manner, for actions that are intentional.
@@ -36,14 +36,14 @@ While にくい is the broader form, づらい is used in a more subjective mann
 
 ### ～がたい: very difficult
 
-～がたい means that something is very difficult to do.
-It is more extreme than ～にくい.
+~がたい means that something is very difficult to do.
+It is more extreme than ~にくい.
 
 > [!info] Example
 > それは{信|しん}じ==がたい==な。
 > That's hard to believe...
 
-## ～始める
+## ~始める
 
 ～{始|はじ}める means that something starts or has started. Expresses intentionality.
 
@@ -51,7 +51,7 @@ It is more extreme than ～にくい.
 > {飲|の}み==始める==。
 > To start to drink.
 
-## ～出す
+## ~出す
 
 ～{出|だ}す means that something suddenly started. Has the nuance of being unintentional, or cannot be avoided.
 
@@ -59,7 +59,7 @@ It is more extreme than ～にくい.
 > 雨が降り==出した==。
 > It suddenly started raining.
 
-## ～続く
+## ~続く
 
 ～{続|つづ}く means that something continues.
 
@@ -67,7 +67,7 @@ It is more extreme than ～にくい.
 > {飲|の}み==続ける==。
 > To continue to drink.
 
-## ～終わる
+## ~終わる
 
 ～{終|お}わる means that something ends.
 
@@ -95,8 +95,8 @@ This can be used both as:
 
 ## ～切る・～切れる・～切れない
 
-～{切|き}る means "to do completely" and ～切れる means "able to do completely".
-The negative form ～切れない means "unable to do", "too much to complete".
+~{切|き}る means "to do completely" and ~切れる means "able to do completely".
+The negative form ~切れない means "unable to do", "too much to complete".
 It focuses on the end of the action rather than the process.
 
 > [!info] Example
@@ -108,7 +108,7 @@ It focuses on the end of the action rather than the process.
 
 ## ～通す
 
-～{通|とお}す means "to do something until the end", "continually" or "through". It focuses on the process of the action, rather than its ending.
+~{通|とお}す means "to do something until the end", "continually" or "through". It focuses on the process of the action, rather than its ending.
 
 > [!info] Example
 > マラソンの{全部|ぜんぶ}を{走|はし}り==通した==。
@@ -116,7 +116,7 @@ It focuses on the end of the action rather than the process.
 
 ## ～直す
 
-～{直|なお}す means to do something again.
+~{直|なお}す means to do something again.
 
 > [!info] Example
 > {今年|ことし}をやり==直す==てほしい。
@@ -124,55 +124,55 @@ It focuses on the end of the action rather than the process.
 
 ## ～っぱなし
 
-～っぱなし means leaving something as it is.
+~っぱなし means leaving something as it is.
 
 > [!info] Example
 > この１３時間{飛行|ひこう}で{座|すわ}り==っぱなし==でした。
 > I sat the entire time on this 13 hours flight.
 
-## ～かねる
+## ~かねる (NEW!)
 
-～かねる means "unable to do", due to an external circumstance. It is polite.
+~かねる means "unable to do", due to an external circumstance. It is polite.
 
 > [!info] Example
 > ごめんなさい、それをでき==かねます==。
 > I'm sorry, I cannot do that.
 
-## ～っこない
+## ~っこない (NEW!)
 
-～っこない means that something is not possible.
+~っこない means that something is not possible.
 
 > [!info] Example
 > {全然|ぜんぜん}{勉強|べんきょう}しなかった。。。{合格|ごうかく}し==っこない==よ。
 > I did not study at all... There's no way I'll pass.
 
-## ～抜く
+## ~抜く (NEW!)
 
-～{抜|ぬ}く means to do something to the end, or completely. The nuance is that someone tried hard and has made an effort to achieve this result.
+~{抜|ぬく}く means to do something to the end, or completely. The nuance is that someone tried hard and has made an effort to achieve this result.
 
 > [!info] Example
 > それは{毎日|まいにち}やり==抜く=={無理|むり}ですよ。
 > You cannot do this every day.
 
-## ～給え
+## ~給え (NEW!)
 
-～{給|たま}え is used for a light order. It is used by someone of higher rank to someone of lower rank.
+~{給|たま}え is used for a light order. It is used by someone of higher rank to someone of lower rank.
 
 > [!info] Example
 > ここに{座|すわ}り==給え==。
 > Seat here.
 
-## ～つつ(も)
+## ~つつ(も) (NEW!)
 
-～つつ means that something happens at the same time as another action. Adding も adds the meaning of "even": "even while doing".
+~つつ means that something happens at the same time as another action. Adding も adds the meaning of "even": "even while doing".
 
 > [!info] Example
 > 食べ==つつ==、飲みましょう。
 > While eating, let's drink.
 
-## ～つつある
+## ~つつある (NEW!)
 
-～つつある means that something is in an ongoing process or action, in a similar manner as てくる.
+~つつある means that something is in an ongoing process or action, in a similar manner as てくる.
 
 > [!info] Example
 > {雪|ゆき}が{降|ふ}り==つつある==。
@@ -180,7 +180,7 @@ It focuses on the end of the action rather than the process.
 
 ## ～込む
 
-～{込|こ}む has multiple meanings depending on the verb. Sometimes it is idiomatic and so it cannot exactly be guessed. However, there are some broad categories.
+~{込|こ}む has multiple meanings depending on the verb. Sometimes it is idiomatic and so it cannot exactly be guessed. However, there are some broad categories.
 
 ⚠ Depending on the context, verbs can fall into multiple categories!
 

🔰 Grammar/Comparison.md

@@ -2,7 +2,7 @@
 
 ## より
 
-With the following pattern, it means that A is "more" something "than" B.
+With the following pattern, it means that A is "more" Adj "than" B.
 
 <div class="usage">
 	<p class="r">AはB +</p>
@@ -16,7 +16,7 @@ With the following pattern, it means that A is "more" something "than" B.
 > 電車は車==より=={速|はや}いです。
 > Trains are faster than cars.
 
-Do not confuse with [[🔰 Particles (2)#より]].
+Do not confuse with [[🔰 Particles (2)#より (NEW!)]].
 
 ## より(も)
 
@@ -120,7 +120,7 @@ See also [[Amounts#ほど]].
 > {中国|ちゅうごく}{料理|りょうり}は{韓国|かんこく}{料理|りょうり}==ほど=={辛|から}く==ない==です。
 > Korean food is spicier than Chinese food.
 
-## ならまだしも
+## ならまだしも (NEW!)
 
 Means that A is okay, but B is not. "Rather", "instead".
 
@@ -128,18 +128,18 @@ Means that A is okay, but B is not. "Rather", "instead".
 > {寒|さむ}いだけ==ならまだしも==、{雨|あめ}が{降|ふ}ているから行きたくない。
 > It would be fine if it was just cold, but since it's raining I don't want to go.
 
-## に限る
+## に限る (NEW!)
 
-に{限|かぎ}る means "the best is".
+Means "the best is".
 Used with verbs and nouns.
 
 > [!info] Example
 > パンなら、フランス==に限る==。
 > Bread is best in France.
 
-## に越したことはない
+## に越したことはない (NEW!)
 
-に{越|こし}したことはない means "there's nothing better than...". Implies that it is nice to reach it.
+に{越|こし}したことはない means "there's nothing better than...". Implies that is nice to reach it.
 
 > [!info] Example
 > {健康|けんこう}のために{早|はや}く{寝|ね}る==に越したことはない==。

🔰 Grammar/Connectors - in order to.md

@@ -3,7 +3,7 @@
 ## のに
 
 Means "to do", "in order to".
-See [[Connectors#In order to]].
+See [[Connectors#のに#In order to]].
 
 ## ために
 

🔰 Grammar/Connectors.md

@@ -58,7 +58,7 @@ Used to introduce a new topic of conversation. Translates to "by the way".
 > ==ところで==、車の{修理|しゅうり}はどう。
 > By the way, how are the repairs for your car?
 
-## By the way: ちなみに
+## By the way: ちなみに (NEW!)
 
 Used to provide a new information on the current topic of conversation. Translates to "by the way".
 
@@ -66,7 +66,7 @@ Used to provide a new information on the current topic of conversation. Translat
 > {駅|えき}に行くつもりです。==ちなみに==、駅の{前|まえ}には{新|あたら}しいレストランが{開|あけた}けたと言われた。
 > I'm going to the train station. By the way, I heard that a new restaurant has opened in front of the station.
 
-## Come to think of it: そう言えば
+## Come to think of it: そう言えば (NEW!)
 
 Used to talk about a topic connected to the previous one, as something that is remembered.
 

🔰 Grammar/Consequence.md

@@ -1,68 +1,68 @@
-# Consequence
-
-## に関わる
-
-に{関|かか}わる means "to affect", "to be involved". Used with nouns that express something influential.
-Used with nouns.
-
-> [!info] Examples
-> {命|いのち}==に関わる=={事故|じこ}がありました。
-> There was a life-threatening incident.
-
-## がきっかけで・をきっかけに
-
-<div class="usage">
-<div class="left">
-	<p><span class="box">V + の・こと</span></p>
-	<p><span class="box">N</span></p>
-</div>
-	<p class="right">+ がきっかけで・をきっかけに</p>
-</div>
-
-Means "to take advantage of", "because of", "as an opportunity to". It is a common form.
-
-> [!info] Examples
-> {彼女|かのじょ}と{出会|であ}ったの==がきっかけで==、ポップ{音楽|おんがく}が{好|す}き{始|はじ}まった。
-> After meeting her, I started liking pop music.
-
-## を契機に 
-
-<div class="usage">
-<div class="left">
-	<p><span class="box">V + の・こと</span></p>
-	<p><span class="box">N</span></p>
-</div>
-	<p class="right">+ を契機に</p>
-</div>
-
-を{契機|けいき}に means "lead to", "as a result of", "as a good opportunity to". It is used for an important change, in formal situations.
-
-> [!info] Examples
-> {戦争|せんそう}==を契機に==、{人々|ひとびと}は{家|いえ}を{失|うしな}った。
-> As a result of the war, people lost their homes.
-
-## そうすると
-
-Means "having done that". Used for something where there is no control, or to confirm an information.
-Used at the beginning of a phrase.
-
-> [!info] Example
-> ゆっくり{食|た}べてみて。==そうすると==、おいしくなる。
-> Try eating slower. Doing that, it will taste better.
-
-## 甲斐がある
-
-<div class="usage">
-<div class="left">
-	<p><span class="box">V (た)</span></p>
-	<p><span class="box">V (ます)</span></p>
-	<p><span class="box">N + の</span></p>
-</div>
-	<p class="right">+ かいがある</p>
-</div>
-
-{甲斐|かい}がある means "to be worth". 甲斐がない means "to not be worth".
-
-> [!info] Examples
-> １００{点|てん}{持|も}ったから{朝|あさ}まで{勉強|べんきょう}した==かいがあった==。
-> I got 100 points, so it was worth it studying until morning.
+# Consequence
+
+## に関わる (NEW!)
+
+に{関|かか}わる means "to affect", "to be involved". Used with nouns that express something influential.
+Used with nouns.
+
+> [!info] Examples
+> {命|いのち}==に関わる=={事故|じこ}がありました。
+> There was a life-threatening incident.
+
+## がきっかけで・をきっかけに (NEW!)
+
+<div class="usage">
+<div class="left">
+	<p><span class="box">V + の・こと</span></p>
+	<p><span class="box">N</span></p>
+</div>
+	<p class="right">+ がきっかけで・をきっかけに</p>
+</div>
+
+Means "to take advantage of", "because of", "as an opportunity to". It is a common form.
+
+> [!info] Examples
+> {彼女|かのじょ}と{出会|であ}ったの==がきっかけで==、ポップ{音楽|おんがく}が{好|す}き{始|はじ}まった。
+> After meeting her, I started liking pop music.
+
+## を契機に (NEW!)
+
+<div class="usage">
+<div class="left">
+	<p><span class="box">V + の・こと</span></p>
+	<p><span class="box">N</span></p>
+</div>
+	<p class="right">+ を契機に</p>
+</div>
+
+を{契機|けいき}に means "lead to", "as a result of", "as a good opportunity to". It is used for an important change, in formal situations.
+
+> [!info] Examples
+> {戦争|せんそう}==を契機に==、{人々|ひとびと}は{家|いえ}を{失|うしな}った。
+> As a result of the war, people lost their homes.
+
+## そうすると (NEW!)
+
+Means "having done that". Used for something where there is no control, or to confirm an information.
+Used at the beginning of a phrase.
+
+> [!info] Example
+> ゆっくり{食|た}べてみて。==そうすると==、おいしくなる。
+> Try eating slower. Doing that, it will taste better.
+
+## 甲斐がある (NEW!)
+
+<div class="usage">
+<div class="left">
+	<p><span class="box">V (た)</span></p>
+	<p><span class="box">V (ます)</span></p>
+	<p><span class="box">N + の</span></p>
+</div>
+	<p class="right">+ かいがある</p>
+</div>
+
+{甲斐|かい}がある means "to be worth". 甲斐がない means "to not be worth".
+
+> [!info] Examples
+> １００{点|てん}{持|も}ったから{朝|あさ}まで{勉強|べんきょう}した==かいがあった==。
+> I got 100 points, so it was worth it studying until morning.

🔰 Grammar/Considering - for - as.md

@@ -21,7 +21,7 @@ Used with verbs and nouns.
 
 ## としても
 
-Means "assuming", "even if". It has the same meaning as [[TeF (4) - even if#Even if ても・でも|Even if: ても・でも]], but bolder.
+Means "assuming", "even if". It has the same meaning as [[TeF (4) - even if#Even if ても・でも]], but bolder.
 
 > [!info] Example
 > 私==としても==出来ます。

🔰 Grammar/Description.md

@@ -16,7 +16,7 @@ Means "named", "called".
 > {台風|たいふう}が来る==という==ニュース。
 > A news that a typhoon is coming.
 
-## いわゆる
+## いわゆる (NEW!)
 
 Means "called".
 Used with nouns.
@@ -54,7 +54,7 @@ Means "made from".
 
 ## のが「好き・上手・下手」
 
-のが「{好|すき}き・{上手|じょうず}・{下手|へた}」 means "to like/be good/be bad" at an action.
+のが({好|すき}き・{上手|じょうず}・{下手|へた}) means "to (like/be good/be bad)" at an action.
 Used with a verb in dictionary form.
 
 > [!info] Example
@@ -98,7 +98,7 @@ Means that something is "full of" or "covered with" something undesirable.
 	<p class="right">+ で有名</p>
 </div>
 
-は～で{有名|ゆうめい} means "famous for". Used to describe why people, places or things are famous.
+は~で{有名|ゆうめい} means "famous for". Used to describe why people, places or things are famous.
 
 > [!info] Example
 > パリ==は==エッフェル{塔|とう}==で有名==です。

🔰 Grammar/Emphasis.md

@@ -1,43 +1,43 @@
-# Emphasis
-
-## に限って
-
-に{限|かぎ}って means "particularly when", "only when".
-Used with nouns.
-
-> [!info] Example
-> このレストランは{金曜日|きんようび}==に限って==、{特別|とくべつ}な{食|た}べ{物|もの}を{作|つく}る。
-> This restaurant only makes special food on Fridays.
-
-## ことに
-
-<div class="usage">
-<div class="left">
-	<p><span class="box">V</span></p>
-	<p><span class="box">い-Adj</span></p>
-	<p><span class="box">な-Adj + な</span></p>
-</div>
-	<p class="right">+ ことに</p>
-</div>
-
-Means "particularly", "especially". Used to describe and emphasize the speaker's feelings.
-
-> [!info] Examples
-> こんなに{長|なが}い{間|あいだ}{彼|かれ}から{連絡|れんらく}があった==ことに=={驚|おどろ}きました。
-> I was surprised to hear from him after such a long time.
-
-## それなら
-
-Means "if that's the case". Highlights the previous statement.
-
-> [!info] Examples
-> {今週|こんしゅう}{忙|いそが}しいんでしょうか。==それなら==、{来週|らいしゅう}はどうですか。
-> You're busy this week, right? Then, what about the next one?
-
-## だって
-
-Means "even someone". It is informal.
-
-> [!info] Examples
-> それはこども==だって=={知|し}っている。
-> Even kids know that.
+# Emphasis
+
+## に限って (NEW!)
+
+に{限|かぎ}って means "particularly when", "only when".
+Used with nouns.
+
+> [!info] Example
+> このレストランは{金曜日|きにょうび==に限って==、{特別|とくべつな{食|た}べ{物|もの}を{作|つ}る。
+> This restaurant only makes special food on Fridays.
+
+## ことに (NEW!)
+
+<div class="usage">
+<div class="left">
+	<p><span class="box">V</span></p>
+	<p><span class="box">い-Adj</span></p>
+	<p><span class="box">な-Adj + な</span></p>
+</div>
+	<p class="right">+ ことに</p>
+</div>
+
+Means "particularly", "especially". Used to describe and emphasize the speaker's feelings.
+
+> [!info] Examples
+> こんなに{長|なが}い{間|あいだ}{彼|かれ}から{連絡|れんらく}があった==ことに=={驚|おどろ}きました。
+> I was surprised to hear from him after such a long time.
+
+## それなら (NEW!)
+
+Means "if that's the case". Highlights the previous statement.
+
+> [!info] Examples
+> {今週|こんしゅう}{忙|いそが}しいんでしょうか。==それなら==、{来週|らいしゅう}はどうですか。
+> You're busy this week, right? Then, what about the next one?
+
+## だって (NEW!)
+
+Means "even someone". It is informal.
+
+> [!info] Examples
+> それはこども==だって=={知|し}っている。
+> Even kids know that.

🔰 Grammar/Exception.md

@@ -1,41 +1,41 @@
-# Exception
-
-## は別として
-
-は{別|べつ}として means "aside from", "whether or not".
-Used with nouns.
-
-> [!info] Example
-> {虫|むし}==は別として==、{今日|きょう}は{楽|たの}しかった。
-> Aside from the insects, today was fun.
-
-With verbs and adjectives, かどうか is placed before.
-
-> [!info] Example
-> {勝|かつ}かどうか==は別として==、{試合|しあい}をやってみたい。
-> Whether we win or not, I want to play the game.
-
-## を除いて
-
-<div class="usage">
-<div class="">
-	<p><span class="box">N</span></p>
-</div>
-	<p class="r">+ を除いて</p>
-</div>
-<div class="usage">
-<div class="">
-	<p><span class="box">N</span></p>
-</div>
-	<p class="r">+ を除く + </p>
-	<div class="">
-	<p><span class="box">N</span></p>
-</div>
-</div>
-
-を{除|のぞ}いて means "except".
-Used with nouns.
-
-> [!info] Example
-> 私==を除いて==、{皆|みな}さんが{合格|ごうかく}しました。
+# Exception
+
+## は別として
+
+は{別|べつ}として means "aside from", "whether or not".
+Used with nouns.
+
+> [!info] Example
+> {虫|むし}==は別として==、{今日|きょう}は{楽|たの}しかった。
+> Aside from the insects, today was fun.
+
+With verbs and adjectives, かどうか is placed before.
+
+> [!info] Example
+> {勝|かつ}かどうか==は別として==、{試合|しあい}をやってみたい。
+> Whether we win or not, I want to play the game.
+
+## を除いて (NEW!)
+
+<div class="usage">
+<div class="">
+	<p><span class="box">N</span></p>
+</div>
+	<p class="r">+ を除いて</p>
+</div>
+<div class="usage">
+<div class="">
+	<p><span class="box">N</span></p>
+</div>
+	<p class="r">+ を除く + </p>
+	<div class="">
+	<p><span class="box">N</span></p>
+</div>
+</div>
+
+を{除|のぞ}いて means "except".
+Used with nouns.
+
+> [!info] Example
+> 私==を除いて==、{皆|みな}さんが{合格|ごうかく}しました。
 > Everyone except me passed.

🔰 Grammar/Instead.md

@@ -1,39 +1,39 @@
-# Instead
-
-## むしろ
-
-Means "instead" or "rather".
-
-> [!info] Example
-> ==むしろ=={自転車|じてんしゃ}で行こうと思います。
-> I think I'd rather go by bike.
-
-## 代わりに
-
-<div class="usage">
-<div class="left">
-	<p><span class="box">V</span></p>
-	<p><span class="box">い-Adj</span></p>
-	<p><span class="box">な-Adj + な</span></p>
-	<p><span class="box">N + の</span></p>
-</div>
-	<p class="right">+ 代わりに</p>
-</div>
-
-{代|か}わりに means "instead of", "in exchange for". Generally used to talk about things.
-Does not have a notion of replacing in a temporal transition, more like a one off occurrence.
-
-> [!info] Examples
-> {今朝|けさ}{自転車|じてんしゃ}の==代わりに=={地下鉄|ちかてつ}で行きました。
-> I took the train this morning instead of biking.
-
-## にかわって・にかわり
-
-Means "instead of". Generally used about persons.
-Also has a notion of "taking over" as in replacing in a temporal transition.
-にかわり is more formal than にかわって.
-Used with nouns.
-
-> [!info] Examples
-> {私|わたし}==に代わって=={妹|いもうと}が{行|い}った。
-> My sister went in my behalf.
+# Instead
+
+## むしろ
+
+Means "instead" or "rather".
+
+> [!info] Example
+> ==むしろ=={自転車|じてんしゃ}で行こうと思います。
+> I think I'd rather go by bike.
+
+## 代わりに
+
+<div class="usage">
+<div class="left">
+	<p><span class="box">V</span></p>
+	<p><span class="box">い-Adj</span></p>
+	<p><span class="box">な-Adj + な</span></p>
+	<p><span class="box">N + の</span></p>
+</div>
+	<p class="right">+ 代わりに</p>
+</div>
+
+{代|か}わりに means "instead of", "in exchange for". Generally used about things.
+Does not have a notion of replacing in a temporal transition, more like a one off occurrence.
+
+> [!info] Examples
+> {今朝|けさ}{自転車|じてんしゃ}の==代わりに=={地下鉄|ちかてつ}で行きました。
+> I took the train this morning instead of biking.
+
+## にかわって・にかわり
+
+Means "instead of". Generally used about persons.
+Also has a notion of "taking over" as in replacing in a temporal transition.
+にかわり is more formal than にかわって.
+Used with nouns.
+
+> [!info] Examples
+> {私|わたし}==に代わって=={妹|いもうと}が{行|い}った。
+> My sister went in my behalf.

🔰 Grammar/Listing.md

@@ -47,7 +47,7 @@ This particles means "and" or "with". Used for a list that is exhaustive. Connec
 > フランス語==と==スペイン語を習っています。
 > I am learning French and Spanish.
 
-### 及び
+### 及び (NEW!)
 
 {及|およ}び means "and", like と. Used in formal settings.
 Used with nouns.
@@ -81,7 +81,7 @@ Used with nouns.
 > お金がないのでカフェ**や**レストラン==など=={払|はら}えない。
 > I can't pay things like cafes or restaurant (etc.) because I have no money.
 
-### といった
+### といった (NEW!)
 
 Used to describe typical examples: "things as", "like", "such as". It is casual. It has the same meaning as など.
 Used with nouns.
@@ -145,7 +145,7 @@ It can be used to emphasize something when used at the end of a sentence.
 > 言ってない==し==！
 > I never said that!
 
-### やら～やら
+### やら~やら (NEW!)
 
 <div class="usage">
 <div class="left">

🔰 Grammar/Means.md

@@ -2,7 +2,7 @@
 
 ## つい
 
-Means "accidentally", "unintentionally". Can be combined with [[TeF (2) - manner of doing#てしまう・ちゃう・じゃう|てしまう]].
+Means "accidentally", "unintentionally". Can be combined with [[TeF (2) - manner of doing## てしまう・ちゃう・じゃう|てしまう]].
 
 > [!info] Example
 > {歩|ある}きながら{携帯|けいたい}を見ていました、==つい=={誰|だれ}かとぶつきました。
@@ -66,7 +66,7 @@ Used with a noun.
 > 台風==により==、出かけられない。
 > Because of the typhoon, I cannot go out.
 
-## 次第で
+## 次第で (NEW!)
 
 {次第|しだい}で means "depending on". The difference with によって is that the options are limited and quantifiable.
 Used with nouns.
@@ -96,7 +96,7 @@ Means "just as", "precisely". Can be written as 通り.
 > {計画|けいかく}==どおり=={間|ま}に{合|あ}った。
 > We arrived on time as planned.
 
-## だけは
+## だけは (NEW!)
 
 <div class="usage">
 <div class="">

🔰 Grammar/Natural - expected.md

@@ -1,6 +1,6 @@
 # Natural, expected
 
-## 当然だ
+## 当然だ (NEW!)
 
 <div class="usage">
 <div class="">
@@ -27,13 +27,13 @@
 	<p class="r">+ は・も + 当然だ</p>
 </div>
 
-{当然|とうぜん}だ means "it is only natural", "no wonder".
+も{当然|とうぜん}だ means "it is only natural", "no wonder".
 
 > [!info] Examples
 > {彼女|かのじょ}に{負|ま}けた==のは当然だ==、プロだから。
 > It's no wonder I lost to her, she's a pro.
 
-## のももっともだ
+## のももっともだ (NEW!)
 
 <div class="usage">
 <div class="left">
@@ -51,7 +51,7 @@ Means "no wonder", "is only natural".
 > {超自然的|ちょうしぜんてき}があるから、その{話|はなし}は{信|しん}じられない==のはもっともだ==。
 > There's supernatural elements, so it's only natural that this story is hard to believe.
 
-## ものだ
+## ものだ (NEW!)
 
 <div class="usage">
 <div class="left">
@@ -68,7 +68,7 @@ Means "normally" or "should". Used to describe conventions, common sense, or wha
 > {毎日|まいにち}２{回|かい}{歯|は}を{磨|みが}く==ものだ==。
 > You're supposed to brush your teeth twice a day.
 
-## だけのことはある
+## だけのことはある (NEW!)
 
 <div class="usage">
 <div class="left">
@@ -86,7 +86,7 @@ Means "as expected", "not surprising". Often used with [[Adverbs#さすが|さ
 > {彼女|かのじょ}は{上手|じょうず}ですね。さすが{毎日|まいにち}{練習|れんしゅう}==だけのことはある==なあ。
 > She's very good. As expected from someone who trains everyday.
 
-## と考えられる
+## と考えられる (NEW!)
 
 と{考|かんが}えられる means "is thought to be", "can be considered as". Used to convey an objective or widely spread opinion, contrary to と思われる.
 
@@ -94,7 +94,7 @@ Means "as expected", "not surprising". Often used with [[Adverbs#さすが|さ
 > タバコは{健康|けんこう}に{悪|わる}い==と考えられています==。
 > Tobacco is considered bad for one's health.
 
-## だけに
+## だけに (NEW!)
 
 <div class="usage">
 <div class="left">

🔰 Grammar/Obligation - なければ・ないと.md

@@ -1,77 +1,77 @@
-# Obligation: なければ・ないと
-
-## Must
-
-### なくちゃ・なきゃ
-
-Only used on casual spoken conversations.
-This form is used with the negative form of a verb (ない), and adding なくちゃ and optionally one of the following ending: だめ, いけない, いけません, ならない, なりません.
-
-なくちゃ is the shortened form of なくては.
-なきゃ is the shortened form of なければ.
-
-> [!info] Example
-> {歯|は}を{磨|みが}か==なくちゃいけない==。
-> I must brush my teeth.
-
-### なくては「いけない・ならない」
-
-Also formed with the negative form of a verb.
-
-> [!info] Example
-> 今{遅|おそ}いね。{寝|ね}に行か==なくてはいけない==。
-> It's late now. I have to go to sleep.
-
-### なければ「いけない・ならない」
-
-Also formed with the negative form of a verb.
-
-> [!info] Example
-> {事務所|じむしょ}では{静|しず}かにし==なければならない==。
-> You have to be quiet in the office.
-
-### ないといけない
-
-Also formed with the negative form of a verb.
-In casual contexts, can be shortened as ないと.
-
-> [!info] Example
-> 今日は{勉強|べんきょう}し==ないといけない==。
-> I have to study today.
-
-## Must not
-
-#### 「ちゃ・じゃ」「だめ・いけない・いけません」
-
-Only used on casual spoken conversations. いけません is a bit more formal.
-This form is used with a V-て, depending on the ending:
-* with て, ちゃ is used.
-* with で, じゃ is used.
-
-> [!info] Examples
-> その{花|はな}を食べ==ちゃだめ==。
-> Don't eat those flowers.
-> 
-> {花瓶|か|びん}の水を{飲|の}ん==じゃいけない==。
-> Don't drink the water of the flower vase.
-
-### てはいけない
-
-Used in a more formal or written manner. Used with a V-て.
-てはならない is a stronger form.
-
-> [!info] Example
-> {鉄道|てつ|どう}に{歩|ある}い==てはいけません==。
-> Do not walk on the railroad.
-
-## Comparing いけない and ならない
-
-* ==いけない== is the standardly used form. It implies a subjective view, that it would be better to do something, to avoid negative consequences (eg: brushing one's teeth, eating well, etc).
-* ==ならない== is usually more formal or in written form. It implies a is more objective view, something that has to be done because there's no other way (eg: respecting the law, paying taxes, etc).
-
-## Comparing なくては, なければ and ないと
-
-なくては and なければ are generally interchangeable in speech. However:
-* ==なくては== is generally used when there is _no penalty_ for not complying.
-* ==なければ== is generally used when there _is a penalty_ for not complying.
-* ==ないと== is lighter and does not imply that there can or cannot be penalty. Its construction is based on the [[Conditional#と]] particle, and should be based on knowledge or experience.
+# Obligation: なければ・ないと
+
+## Must
+
+### なくちゃ・なきゃ
+
+Only used on casual spoken conversations.
+This form is used with the negative form of a verb (ない), and adding なくちゃ and optionally one of the following ending: だめ, いけない, いけません, ならない, なりません.
+
+なくちゃ is the shortened form of なくては.
+なきゃ is the shortened form of なければ.
+
+> [!info] Example
+> {歯|は}を{磨|みが}か==なくちゃいけない==。
+> I must brush my teeth.
+
+### なくては「いけない・ならない」
+
+Also formed with the negative form of a verb.
+
+> [!info] Example
+> 今{遅|おそ}いね。{寝|ね}に行か==なくてはいけない==。
+> It's late now. I have to go to sleep.
+
+### なければ「いけない・ならない」
+
+Also formed with the negative form of a verb.
+
+> [!info] Example
+> {事務所|じむしょ}では{静|しず}かにし==なければならない==。
+> You have to be quiet in the office.
+
+### ないといけない
+
+Also formed with the negative form of a verb.
+In casual contexts, can be shortened as ないと.
+
+> [!info] Example
+> 今日は{勉強|べんきょう}し==ないといけない==。
+> I have to study today.
+
+## Must not
+
+#### 「ちゃ・じゃ」「だめ・いけない・いけません」
+
+Only used on casual spoken conversations. いけません is a bit more formal.
+This form is used with a V-て, depending on the ending:
+* with て, ちゃ is used.
+* with で, じゃ is used.
+
+> [!info] Examples
+> その{花|はな}を食べ==ちゃだめ==。
+> Don't eat those flowers.
+> 
+> {花瓶|か|びん}の水を{飲|の}ん==じゃいけない==。
+> Don't drink the water of the flower vase.
+
+### てはいけない
+
+Used in a more formal or written manner. Used with a V-て.
+てはならない is a stronger form.
+
+> [!info] Example
+> {鉄道|てつ|どう}に{歩|ある}い==てはいけません==。
+> Do not walk on the railroad.
+
+## Comparing いけない and ならない
+
+* ==いけない== is the standardly used form. It implies a subjective view, that it would be better to do something, to avoid negative consequences (eg: brushing one's teeth, eating well, etc).
+* ==ならない== is usually more formal or in written form. It implies a is more objective view, something that has to be done because there's no other way (eg: respecting the law, paying taxes, etc).
+
+## Comparing なくては, なければ and ないと
+
+なくては and なければ are generally interchangeable in speech. However:
+* ==なくては== is generally used when there is _no penalty_ for not complying.
+* ==なければ== is generally used when there _is a penalty_ for not complying.
+* ==ないと== is lighter and does not imply that there can or cannot be penalty. Its construction is based on the [[Conditional#と]] particle, and should be based on knowledge or experience.

🔰 Grammar/Obligation.md

@@ -50,7 +50,7 @@ Used with a verb in て form, with からでないと or からでないけれ
 
 <div class="usage">
 <div class="left">
-	<p><span class="box">V (dictionary)</span></p>
+	<p><span class="box">V (る)</span></p>
 	<p><span class="box">V (ない)</span></p>
 </div>
 	<p class="right">+ こと</p>
@@ -95,7 +95,7 @@ Used with a verb in the dictionary form.
 
 ### べきだ
 
-Means "should do", "must do". Compared to the [[Obligation - must (not)]] forms and 必ず, it has a nuance of being less universally logical. It is defined by the speaker's own logic.
+Means "should do", "must do". Compared to the [[Obligation - なければ・ないと]] forms and 必ず, it has a nuance of being less universally logical. It is defined by the speaker's own logic.
 Used with verbs.
 する can be used as するべき or すべき.
 
@@ -131,3 +131,13 @@ The contrary of べきだ is べきではない・べきじゃない.
 > 
 > そんあ==はずがありません==。
 > This cannot be true.
+
+## ねばならない (NEW!)
+
+Means "must", "have to". Made by removing the ない verb ending and replacing it by ねばならない. It is a formal and literary structure.
+
+⚠ する becomes せねばらない.
+
+> [!info] Examples
+> ゴミを{捨|す}て==ねばならない==。
+> I have to throw out the trash.

🔰 Grammar/Observation - hearsay.md

@@ -1,107 +1,107 @@
-# Observation: hearsay
-
-## んだって
-
-<div class="usage">
-<div class="left">
-	<p><span class="box">V</span></p>
-	<p><span class="box">い-Adj</span></p>
-	<p><span class="box">な-Adj + な</span></p>
-	<p><span class="box">N + な</span></p>
-</div>
-	<p class="right">+ んだって・んですって</p>
-</div>
-
-Used to quote something that you heard in a casual conversation.
-Similar in the quotation sense to [[Description#って・って言う・と言う|って]], but here the nuance is that the information is new or unexpected.
-
-> [!info] Example
-> ワールドカップでアルゼンチンが{勝|か}した==んだって==!
-> Argentina won the world cup! (you just saw it on TV but you were doing something else and are surprised)
-
-## と聞いた
-
-と{聞|きい}いた is used for something you heard by someone identifiable: for example, you were told by someone.
-Mostly used formally.
-
-> [!info] Example
-> 彼はバカ==と聞いた==。
-> They say he's an idiot (I've heard that he's an idiot).
-
-## と言われている
-
-と{言|い}われている is used when you heard something, but not from someone specifically identifiable: general knowledge, a rumour, etc.
-For nouns, だ is placed before.
-Mostly used formally.
-
-> [!info] Example
-> このレストランのカレーはおいしいだ==と言われています==。
-> They say the curry of this restaurant is good.
-
-## そうだ
-
-<div class="usage">
-<div class="left">
-	<p><span class="box">V (casual)</span></p>
-	<p><span class="box">い-Adj</span></p>
-	<p><span class="box">な-Adj + だ</span></p>
-	<p><span class="box">N + だ</span></p>
-</div>
-	<p class="right">+ そうだ</p>
-</div>
-
-Means "I heard that".
-Do not confuse with [[Observation - looking like#そうだ]] (no stem modification).
-It is casual.
-
-> [!info] Examples
-> テストは{難|むず}しいだ==そうだ==。
-> The exam is said to be difficult.
-
-## ということだ
-
-It is used for hearsay. Has a nuance of being sure of the validity.
-Can also be used for a meaning close to "this means".
-More formal than そうだ.
-Can be used as ==ということだ== or ==とのことだ==. A more casual version is ==ってことだ==.
-
-> [!info] Examples
-> {専門家|せん|もん|か}によると、{今年|ことし}の{夏|なつ}は{最高|さいこう}{暑|あつ}くなる==ということです==。
-> According to the experts, this summer will be the hottest ever.
-
-## Summing up
-
-* ==んだって== used for quotation, similar to って, when the information is new.
-* ==と聞いた== is used for something you heard from an identifiable speaker. Is mostly formal.
-* ==と言われている== is used for something for something you heard from an unspecified speaker. Is mostly formal.
-* ==そうだ== is used for hearsay and is casual.
-* ==ということだ== is used for hearsay, when the validity of the information is certain. More formal than そうだ.
-
-## によると・によれば
- 
-Means "according to".
-Used with nouns. With verbs, ところ is added before.
-
-> [!info] Examples
-> {天気予報|てんきよほう}==によると=={今日|きょう}は{雪|ゆき}が{降|ふ}るようだ。
-> According to the weather forecast, it's supposed to snow today.
-
-## とか(で)
-
-<div class="usage">
-<div class="left">
-	<p><span class="box">V</span></p>
-	<p><span class="box">い-Adj</span></p>
-	<p><span class="box">な-Adj + だ</span></p>
-	<p><span class="box">N + だ</span></p>
-</div>
-	<p class="right">+ とか(で)</p>
-</div>
-
-Used to tell information heard via rumour. "I heard that..."
-
-> [!info] Examples
-> {目黒|めぐろ}に{住|す}んでいる==とか==。
-> Apparently they live in Meguro.
-
-Do not confuse with [[Listing#とか～とか]].
+# Observation: hearsay
+
+## んだって
+
+<div class="usage">
+<div class="left">
+	<p><span class="box">V</span></p>
+	<p><span class="box">い-Adj</span></p>
+	<p><span class="box">な-Adj + な</span></p>
+	<p><span class="box">N + な</span></p>
+</div>
+	<p class="right">+ んだって・んですって</p>
+</div>
+
+Used to quote something that you heard in a casual conversation.
+Similar in the quotation sense to [[Description#って・って言う・と言う|って]], but here the nuance is that the information is new or unexpected.
+
+> [!info] Example
+> ワールドカップでアルゼンチンが{勝|か}した==んだって==!
+> Argentina won the world cup! (you just saw it on TV but you were doing something else and are surprised)
+
+## と聞いた
+
+Used for something you heard by someone identifiable: for example, you were told by someone.
+Mostly used formally.
+
+> [!info] Example
+> 彼はバカ==と聞いた==。
+> They say he's an idiot (I've heard that he's an idiot).
+
+## と言われている
+
+Used when you heard something, but not from someone specifically identifiable: general knowledge, a rumour, etc.
+For nouns, だ is placed before.
+Mostly used formally.
+
+> [!info] Example
+> このレストランのカレーはおいしいだ==と言われています==。
+> They say the curry of this restaurant is good.
+
+## そうだ
+
+<div class="usage">
+<div class="left">
+	<p><span class="box">V (casual)</span></p>
+	<p><span class="box">い-Adj</span></p>
+	<p><span class="box">な-Adj + だ</span></p>
+	<p><span class="box">N + だ</span></p>
+</div>
+	<p class="right">+ そうだ</p>
+</div>
+
+Means "I heard that".
+Do not confuse with [[Observation - looking like#そうだ]] (no stem modification).
+It is casual.
+
+> [!info] Examples
+> テストは{難|むず}しいだ==そうだ==。
+> The exam is said to be difficult.
+
+## ということだ
+
+It is used for hearsay. Has a nuance of being sure of the validity.
+Can also be used for a meaning close to "this means".
+More formal than そうだ.
+Can be used as ==ということだ== or ==とのことだ==. A more casual version is ==ってことだ==.
+
+> [!info] Examples
+> {専門家|せん|もん|か}によると、{今年|ことし}の{夏|なつ}は{最高|さいこう}{暑|あつ}くなる==ということです==。
+> According to the experts, this summer will be the hottest ever.
+
+## Summing up
+
+* ==んだって== used for quotation, similar to って, when the information is new.
+* ==と聞いた== is used for something you heard from an identifiable speaker. Is mostly formal.
+* ==と言われている== is used for something for something you heard from an unspecified speaker. Is mostly formal.
+* ==そうだ== is used for hearsay and is casual.
+* ==ということだ== is used for hearsay, when the validity of the information is certain. More formal than そうだ.
+
+## によると・によれば
+ 
+Means "according to".
+Used with nouns. With verbs, ところ is added before.
+
+> [!info] Examples
+> {天気予報|てんきよほう}==によると=={今日|きょう}は{雪|ゆき}が{降|ふ}るようだ。
+> According to the weather forecast, it's supposed to snow today.
+
+## とか(で) (NEW!)
+
+<div class="usage">
+<div class="left">
+	<p><span class="box">V</span></p>
+	<p><span class="box">い-Adj</span></p>
+	<p><span class="box">な-Adj + だ</span></p>
+	<p><span class="box">N + だ</span></p>
+</div>
+	<p class="right">+ とか(で)</p>
+</div>
+
+Used to tell information heard via rumour. "I heard that..."
+
+> [!info] Examples
+> {目黒|めぐろ}に{住|す}んでいる==とか==。
+> Apparently they live in Meguro.
+
+Do not confuse with [[Listing#とか～とか]].

🔰 Grammar/Observation - looking like.md

@@ -1,249 +1,249 @@
-# Observation: looking like
-
-## よう
-
-Means that it looks like. Used from direct knowledge or experience, with a high degree of confidence.
-
-It has two meanings:
-* Looks like something: visual observation. Similar to みたい, but more polite.
-* Perhaps it is. Might be something else, but it look like it is.
-
-Contrary to そう, focuses on the more logical aspect of things.
-
-### ようだ
-
-<div class="usage">
-<div class="left">
-	<p><span class="box">V (casual)</span></p>
-	<p><span class="box">い-Adj</span></p>
-	<p><span class="box">な-Adj + な</span></p>
-	<p><span class="box">N + の</span></p>
-</div>
-	<p class="right">+ ようだ</p>
-</div>
-
-Means that it looks like, appears like, seems like.
-
-> [!info] Example
-> {子供|こども}が{嬉|うれ}しい==ようだ==。
-> The kids look happy (= I can see them laughing and smiling).
-
-### ように・ような
-
-<div class="usage">
-<div class="left">
-	<p><span class="box">V (casual)</span></p>
-	<p><span class="box">N + の</span></p>
-</div>
-	<p class="right">+ [ように + V] ・ [ような + N]</p>
-</div>
-
-Expresses "in the manner of".
-
-> [!info] Examples
-> {新幹線|しんかんせん}の==ような=={速度|そく|ど}。
-> Speed like a Shinkansen.
-> 
-> アヒルの==ように==食べる。
-> To eat like a duck.
-
-## そう
-
-Contrary to よう, focuses on a more subjective feeling.
-
-### そうだ
-
-<div class="usage">
-<div class="left">
-	<p><span class="box">V <strike>ます</strike></span></p>
-	<p><span class="box">い-Adj <strike>い</strike></span></p>
-	<p><span class="box">な-Adj + だ</span></p>
-</div>
-	<p class="right">+ そうだ</p>
-</div>
-
-Means that it looks like.
-Do not confuse with [[Observation - hearsay#そうだ]].
-
-> [!info] Examples 
-> おいし==そうだ==。
-> lt looks like it is delicious.
-
-### そうに・そうな
-
-<div class="usage">
-<div class="left">
-	<p><span class="box">V <strike>ます</strike></span></p>
-	<p><span class="box">い-Adj <strike>い</strike></span></p>
-	<p><span class="box">な-Adj + だ</span></p>
-</div>
-	<p class="right">+ 「そうに・そうな」 + N・V</p>
-</div>
-
-Also means that it looks like, but connecting to nouns and verbs.
-
-> [!info] Example
-> 面白==そうに==人です。
-> He seems like an interesting person.
-
-## みたい
-
-みたい means similar to, like. Used for direct observation, with a high degree of certainty in consequence. Usually used for visual observation.
-It is a less polite form of ようだ.
-
-### みたいだ
-
-The basic form, used with all forms of words.
-
-> [!info] Example
-> 今日は暑いですね。夏==みたいだ==な。
-> It's hot today, isn't it. It looks like it's summer.
-
-### みたいに
-
-<div class="usage">
-<div class="left">
-	<p><span class="box">V (casual)</span></p>
-	<p><span class="box">N</span></p>
-</div>
-	<p class="right">+ みたいに + V / Adj</p>
-</div>
-
-The adverbial form.
-
-> [!info] Example
-> 犬==みたいに==食べた。
-> I ate like a dog.
-
-### みたいな
-
-<div class="usage">
-<div class="left">
-	<p><span class="box">V (casual)</span></p>
-	<p><span class="box">N</span></p>
-</div>
-	<p class="right">+ みたいな + N</p>
-</div>
-
-Similar to the precedent form, but when using with nouns.
-
-> [!info] Example
-> {故郷|ふる|さと}==みたいな==町だ。
-> A city like my hometown.
-
-## らしい
-
-Expresses an information based on hearsay, or based on the situation, or ressemblance. This is always used based on a source that is unknown or ambiguous. It can be similar to a guess. Similar to the "perhaps" meaning of ようだ.
-Also used for something typical, expected, characteristic.
-
-> [!info] Examples
-> 男==らしい==。
-> Typical of a man (befitting of a man).
-> 
-> 今日は{君|きみ}==らしくない==。
-> You aren't yourself today.
-
-## っぽい
-
-<div class="usage">
-<div class="left">
-	<p><span class="box">V <strike>ます</strike></span></p>
-	<p><span class="box">い-Adj <strike>い</strike></span></p>
-	<p><span class="box">N</span></p>
-</div>
-	<p class="right">+ っぽい</p>
-</div>
-
-This has the meaning of like, easy to, _-ish_. Makes a direct comparison with certainty, from the point of view of the person saying it. Close to an even more casual meaning of みたい, with a focus on attitude or gesture.
-
-> [!info] Examples
-> {子供|こ|ども}==っぽい==。
-> Childish.
-> 
-> {忘|わす}れ==っぽい==。
-> Easy to forget.
-
-## 気味
-
-<div class="usage">
-<div class="left">
-	<p><span class="box">V <strike>ます</strike></span></p>
-	<p><span class="box">N</span></p>
-</div>
-	<p class="right">+ 気味</p>
-</div>
-
-{気味|ぎみ} means that it shows sign of. It talks about a condition (tiredness, sickness, lateness, etc).
-
-> [!info] Example
-> 今日、{君|きみ}はちょっと{病気|びょうき}==気味==です。
-> You look a bit sick today.
-
-## Summing up
-
-* ==ようだ== is a formal way to say that it looks like, usually from direct observation. Used for logical assumptions.
-* ==そうだ== is used for things that are on the more subjective side.
-* ==みたい== is a less formal way, used in a casual conversation. Focused on visual information.
-* ==っぽい== is even more casual. Usually used for attitude or gesture.
-* ==らしい== is usually used when something is typical or expected.
-* ==気味== is used for condition (tiredness, sickness, lateness, etc).
-
-## に見える
-
-<div class="usage">
-<div class="left">
-	<p><span class="box">V (て)</span></p>
-	<p><span class="box">V (casual) + ように</span></p>
-	<p><span class="box">い-Adj + <strike>い</strike>く</span></p>
-	<p><span class="box">な-Adj + に</span></p>
-	<p><span class="box">N + (のよう) + に</span></p>
-</div>
-	<p class="right">+ 見える</p>
-</div>
-
-This is used (unlike other forms that can apply to abstract similarities) exclusively for visual resemblance.
-
-> [!info] Example
-> {彼女|かのじょ}はフランス人==に見える==。
-> She looks like she is French.
-
-## かのよう「だ・に・な」
-
-Means "as if", "just like".
-Use かのうようだ if it is ending the sentence, かのうように before a verb, かのような before a noun.
-
-> [!info] Examples
-> このゲームは{現実|げんじつ}==かのようだ==。
-> This game is just like reality.
-
-## どうやら
-
-Means "it seems like", used with notions like ようだ or らしい.
-Used at the beginning of a phrase.
-
-> [!info] Examples
-> ==どうやら=={離婚|りこん}したようだ。
-> Apparently they got divorced.
-
-## げ
-
-<div class="usage">
-<div class="left">
-	<p><span class="box">V <strike>ます</strike></span></p>
-	<p><span class="box">V な<strike>い</strike></span></p>
-	<p><span class="box">V た<strike>い</strike></span></p>
-	<p><span class="box">い-Adj + <strike>い</strike></span></p>
-	<p><span class="box">な-Adj + <strike>な</strike></span></p>
-	<p><span class="box">N (limited)</span></p>
-</div>
-	<p class="right">+ げ</p>
-</div>
-
-Means that something or someone looks like, appears to. Cannot be used for yourself.
-It is used in a similar manner as そう, but only to describe the feelings of someone.
-
-⚠ Irregular form: いい => よい => よさげ
-
-> [!info] Examples
-> {新|あたら}しい{部長|ぶちょう}{不安|ふあん}==げ==です。
-> The new manager seems anxious.
+# Observation: looking like
+
+## よう
+
+Means that it looks like. Used from direct knowledge or experience, with a high degree of confidence.
+
+It has two meanings:
+* Looks like something: visual observation. Similar to みたい, but more polite.
+* Perhaps it is. Might be something else, but it look like it is.
+
+Contrary to そう, focuses on the more logical aspect of things.
+
+### ようだ
+
+<div class="usage">
+<div class="left">
+	<p><span class="box">V (casual)</span></p>
+	<p><span class="box">い-Adj</span></p>
+	<p><span class="box">な-Adj + な</span></p>
+	<p><span class="box">N + の</span></p>
+</div>
+	<p class="right">+ ようだ</p>
+</div>
+
+Means that it looks like, appears like, seems like.
+
+> [!info] Example
+> {子供|こども}が{嬉|うれ}しい==ようだ==。
+> The kids look happy (= I can see them laughing and smiling).
+
+### ように・ような
+
+<div class="usage">
+<div class="left">
+	<p><span class="box">V (casual)</span></p>
+	<p><span class="box">N + の</span></p>
+</div>
+	<p class="right">+ [ように + V] ・ [ような + N]</p>
+</div>
+
+Expresses "in the manner of".
+
+> [!info] Examples
+> {新幹線|しんかんせん}の==ような=={速度|そく|ど}。
+> Speed like a Shinkansen.
+> 
+> アヒルの==ように==食べる。
+> To eat like a duck.
+
+## そう
+
+Contrary to よう, focuses on a more subjective feeling.
+
+### そうだ
+
+<div class="usage">
+<div class="left">
+	<p><span class="box">V <strike>ます</strike></span></p>
+	<p><span class="box">い-Adj <strike>い</strike></span></p>
+	<p><span class="box">な-Adj + だ</span></p>
+</div>
+	<p class="right">+ そうだ</p>
+</div>
+
+Means that it looks like.
+Do not confuse with [[Observation - hearsay#そうだ]].
+
+> [!info] Examples 
+> おいし==そうだ==。
+> lt looks like it is delicious.
+
+### そうに・そうな
+
+<div class="usage">
+<div class="left">
+	<p><span class="box">V <strike>ます</strike></span></p>
+	<p><span class="box">い-Adj <strike>い</strike></span></p>
+	<p><span class="box">な-Adj + だ</span></p>
+</div>
+	<p class="right">+ 「そうに・そうな」 + N・V</p>
+</div>
+
+Also means that it looks like, but connecting to nouns and verbs.
+
+> [!info] Example
+> 面白==そうに==人です。
+> He seems like an interesting person.
+
+## みたい
+
+みたい means similar to, like. Used for direct observation, with a high degree of certainty in consequence. Usually used for visual observation.
+It is a less polite form of ようだ.
+
+### みたいだ
+
+The basic form, used with all forms of words.
+
+> [!info] Example
+> 今日は暑いですね。夏==みたいだ==な。
+> It's hot today, isn't it. It looks like it's summer.
+
+### みたいに
+
+<div class="usage">
+<div class="left">
+	<p><span class="box">V (casual)</span></p>
+	<p><span class="box">N</span></p>
+</div>
+	<p class="right">+ みたいに + V / Adj</p>
+</div>
+
+The adverbial form.
+
+> [!info] Example
+> 犬==みたいに==食べた。
+> I ate like a dog.
+
+### みたいな
+
+<div class="usage">
+<div class="left">
+	<p><span class="box">V (casual)</span></p>
+	<p><span class="box">N</span></p>
+</div>
+	<p class="right">+ みたいな + N</p>
+</div>
+
+Similar to the precedent form, but when using with nouns.
+
+> [!info] Example
+> {故郷|ふる|さと}==みたいな==町だ。
+> A city like my hometown.
+
+## らしい
+
+Expresses an information based on hearsay, or based on the situation, or ressemblance. This is always used based on a source that is unknown or ambiguous. It can be similar to a guess. Similar to the "perhaps" meaning of ようだ.
+Also used for something typical, expected, characteristic.
+
+> [!info] Examples
+> 男==らしい==。
+> Typical of a man (befitting of a man).
+> 
+> 今日は{君|きみ}==らしくない==。
+> You aren't yourself today.
+
+## っぽい
+
+<div class="usage">
+<div class="left">
+	<p><span class="box">V <strike>ます</strike></span></p>
+	<p><span class="box">い-Adj <strike>い</strike></span></p>
+	<p><span class="box">N</span></p>
+</div>
+	<p class="right">+ っぽい</p>
+</div>
+
+This has the meaning of like, easy to, _-ish_. Makes a direct comparison with certainty, from the point of view of the person saying it. Close to an even more casual meaning of みたい, with a focus on attitude or gesture.
+
+> [!info] Examples
+> {子供|こ|ども}==っぽい==。
+> Childish.
+> 
+> {忘|わす}れ==っぽい==。
+> Easy to forget.
+
+## 気味
+
+<div class="usage">
+<div class="left">
+	<p><span class="box">V <strike>ます</strike></span></p>
+	<p><span class="box">N</span></p>
+</div>
+	<p class="right">+ 気味</p>
+</div>
+
+{気味|ぎみ} means that it shows sign of. It talks about a condition (tiredness, sickness, lateness, etc).
+
+> [!info] Example
+> 今日、{君|きみ}はちょっと{病気|びょうき}==気味==です。
+> You look a bit sick today.
+
+## Summing up
+
+* ==ようだ== is a formal way to say that it looks like, usually from direct observation. Used for logical assumptions.
+* ==そうだ== is used for things that are on the more subjective side.
+* ==みたい== is a less formal way, used in a casual conversation. Focused on visual information.
+* ==っぽい== is even more casual. Usually used for attitude or gesture.
+* ==らしい== is usually used when something is typical or expected.
+* ==気味== is used for condition (tiredness, sickness, lateness, etc).
+
+## に見える
+
+<div class="usage">
+<div class="left">
+	<p><span class="box">V (て)</span></p>
+	<p><span class="box">V (casual) + ように</span></p>
+	<p><span class="box">い-Adj + <strike>い</strike>く</span></p>
+	<p><span class="box">な-Adj + に</span></p>
+	<p><span class="box">N + (のよう) + に</span></p>
+</div>
+	<p class="right">+ 見える</p>
+</div>
+
+This is used (unlike other forms that can apply to abstract similarities) exclusively for visual resemblance.
+
+> [!info] Example
+> {彼女|かのじょ}はフランス人==に見える==。
+> She looks like she is French.
+
+## かのよう{だ・に・な} (NEW!)
+
+Means "as if", "just like".
+Use かのうようだ if it is ending the sentence, かのうように before a verb, かのような before a noun.
+
+> [!info] Examples
+> このゲームは{現実|げんじつ}==かのようだ==。
+> This game is just like reality.
+
+## どうやら (NEW!)
+
+Means "it seems like", used with notions like ようだ or らしい.
+Used at the beginning of a phrase.
+
+> [!info] Examples
+> ==どうやら=={離婚|りこん}したようだ。
+> Apparently they got divorced.
+
+## げ (NEW!)
+
+<div class="usage">
+<div class="left">
+	<p><span class="box">V <strike>ます</strike></span></p>
+	<p><span class="box">V な<strike>い</strike></span></p>
+	<p><span class="box">V た<strike>い</strike></span></p>
+	<p><span class="box">い-Adj + <strike>い</strike></span></p>
+	<p><span class="box">な-Adj + <strike>な</strike></span></p>
+	<p><span class="box">N (limited)</span></p>
+</div>
+	<p class="right">+ げ</p>
+</div>
+
+Means that something or someone looks like, appears to. Cannot be used for yourself.
+It is used in a similar manner as そう, but only to describe the feelings of someone.
+
+⚠ Irregular form: いい => よい => よさげ
+
+> [!info] Examples
+> {新|あたら}しい{部長|ぶちょう}{不安|ふあん}==げ==です。
+> The new manager seems anxious.

🔰 Grammar/Observation.md

@@ -1,19 +1,19 @@
-# Observation
-
-## ところを見ると
-
-ところを{見|み}ると means "judging from".
-Used with verbs.
-
-> [!info] Examples
-> ヘルメットを{被|かぶ}ている==ところを見ると==、{自転車|じてんしゃ}で{来|き}ました。
-> Judging from the fact that he's wearing a helmet, he must have come by bicycle.
-
-## からすると・からすれば
-
-Means "judging from", "considering". 
-Used with nouns.
-
-> [!info] Examples
-> {服|ふく}を´{着|き}る==からすると==、{今日|きょう}は{面接|めんせつ}に{行|い}くでしょう。
-> Judging from the clothes you're wearing, I guess you're going to pass an interview today.
+# Observation
+
+## ところを見ると (NEW!)
+
+ところを{見|み}ると means "judging from".
+Used with verbs.
+
+> [!info] Examples
+> ヘルメットを{被|かぶ}ている==ところを見ると==、{自転車|じてんしゃ}で{来|き}ました。
+> Judging from the fact that he's wearing a helmet, he must have come by bicycle.
+
+## からすると・からすれば (NEW!)
+
+Means "judging from", "considering". 
+Used with nouns.
+
+> [!info] Examples
+> {服|ふく}を´{着|き}る==からすると==、{今日|きょう}は{面接|めんせつ}に{行|い}くでしょう。
+> Judging from the clothes you're wearing, I guess you're going to pass an interview today.

🔰 Grammar/Only - just.md

@@ -27,7 +27,7 @@ Can also be used as だけではなく.
 > この{都市|とし}は大きい==だけでなく==、きれいでもある。
 > This city is not only big, it's also pretty.
 
-## のみ
+## のみ (NEW!)
 
 It is a more formal, written version of だけ. It is only used with nouns.
 
@@ -113,7 +113,7 @@ Can also be used as ばかりか, for a slightly stronger effect.
 > 彼女は{綺麗|きれい}==ばかりでなく=={天才|てんさい}もあるです。
 > She's not only beautiful, she's also a genius.
 
-## に限らず
+## に限らず (NEW!)
 
 に{限|かぎ}らず means "not only A, but also B".
 Used with nouns.
@@ -122,7 +122,7 @@ Used with nouns.
 > この{店|みせ}は{平日|へいじつ}==に限らず==、{週末|しゅうまつ}も{営業|えいぎょう}している。
 > This store is open not only on weekdays but also on weekends.
 
-## のみならず
+## のみならず (NEW!)
 
 Means "not only, but also".
 
@@ -139,7 +139,7 @@ Used with a verb in て form.
 > {僕|ぼく}の{犬|いぬ}は{鳴|な}け==てばかりいる==。
 > My dog is always barking.
 
-## でしかない
+## でしかない (NEW!)
 
 Means "nothing but" or "no more than". More often than not conveys a negative nuance.
 Used with nouns.
@@ -148,7 +148,7 @@ Used with nouns.
 > {彼|かれ}は{子供|こども}==でしかない==。
 > He nothing more than a child.
 
-## に過ぎない
+## に過ぎない (NEW!)
 
 に{過|す}ぎない means "just", "no more than". Used for something that is not of great quality, quantity or level.
 

🔰 Grammar/Opposition - although.md

@@ -1,102 +1,102 @@
-# Opposition: although
-
-## 割に
-
-<div class="usage">
-<div class="left">
-	<p><span class="box">V</span></p>
-	<p><span class="box">い-Adj</span></p>
-	<p><span class="box">な-Adj + な</span></p>
-	<p><span class="box">N + の</span></p>
-</div>
-	<p class="right">+ 割に</p>
-</div>
-
-{割|わり}に means "considering A, B", "although".
-
-> [!info] Example
-> このマンションは{古|ふる}い==割に=={高|たか}いです。
-> This apartment is expensive considering how old it is.
-
-## ことは～が
-
-<div class="usage">
-<div class="">
-	<p><span class="box">V</span></p>
-</div>
-	<p class="r">+ ことは + </p>
-<div class="">
-	<p><span class="box">V</span></p>
-</div>
-	<p class="r">+ が</p>
-</div>
-<div class="usage">
-<div class="">
-	<p><span class="box">い-Adj</span></p>
-</div>
-	<p class="r">+ ことは + </p>
-<div class="">
-	<p><span class="box">い-Adj</span></p>
-</div>
-	<p class="r">+ が</p>
-</div>
-<div class="usage">
-<div class="">
-	<p><span class="box">な-Adj + な</span></p>
-</div>
-	<p class="r">+ ことは + </p>
-<div class="">
-	<p><span class="box">な-Adj</span></p>
-</div>
-	<p class="r">+ が</p>
-</div>
-
-⚠ It must be the same verb or adjective at both end!
-
-Means "although".
-
-> [!info] Example
-> {勉強|べんきょう}する==ことは==する==が==、まだ{下手|へた}です。
-> Although I study everyday, I'm still bad at it.
-
-## といっても
-
-Means "although". Puts a nuance to the first statement describing that it is not as much as imagined, and adds a complimentary information.
-
-> [!info] Example
-> {彼|かれ}は{医者|いしゃ}==といっても==、あまり{頭|あたま}が{良|よ}くない。
-> He may be a doctor, but he is not very smart.
-
-## にも関わらず
-
-にも{関|かか}わらず means "regardless", "despite".
-
-> [!info] Example
-> {危険|きけん}==にもかかわらず==、{彼|かれ}はまだそれをやった。
-> Despite the danger, he still did it.
-
-## ものの
-
-<div class="usage">
-<div class="left">
-	<p><span class="box">V</span></p>
-	<p><span class="box">い-Adj</span></p>
-	<p><span class="box">な-Adj + な</span></p>
-	<p><span class="box">N + である</span></p>
-</div>
-	<p class="right">+ ものの</p>
-</div>
-
-Means "although", "even though". It is formal. Similar to のに. The first part is positive, and the second one is negative.
-
-> [!info] Example
-> {今日|きょう}は{晴|は}れた==ものの==とても{寒|さむ}い。
-> It is sunny today, but very cold.
-
-## もっとも
-
-Means "although", "but". Connects two phrases. Used in literature.
-
-> [!info] Example
-> 帰国するつもりです。==もっとも==時間がある場合だけど。
-> I plan to return to my country. But only if I had the time...
+# Opposition: although
+
+## 割に
+
+<div class="usage">
+<div class="left">
+	<p><span class="box">V</span></p>
+	<p><span class="box">い-Adj</span></p>
+	<p><span class="box">な-Adj + な</span></p>
+	<p><span class="box">N + の</span></p>
+</div>
+	<p class="right">+ 割に</p>
+</div>
+
+{割|わり}に means "considering A, B", "although".
+
+> [!info] Example
+> このマンションは{古|ふる}い==割に=={高|たか}いです。
+> This apartment is expensive considering how old it is.
+
+## ことは～が
+
+<div class="usage">
+<div class="">
+	<p><span class="box">V</span></p>
+</div>
+	<p class="r">+ ことは + </p>
+<div class="">
+	<p><span class="box">V</span></p>
+</div>
+	<p class="r">+ が</p>
+</div>
+<div class="usage">
+<div class="">
+	<p><span class="box">い-Adj</span></p>
+</div>
+	<p class="r">+ ことは + </p>
+<div class="">
+	<p><span class="box">い-Adj</span></p>
+</div>
+	<p class="r">+ が</p>
+</div>
+<div class="usage">
+<div class="">
+	<p><span class="box">な-Adj + な</span></p>
+</div>
+	<p class="r">+ ことは + </p>
+<div class="">
+	<p><span class="box">な-Adj</span></p>
+</div>
+	<p class="r">+ が</p>
+</div>
+
+⚠ It must be the same verb or adjective at both end!
+
+Means "although".
+
+> [!info] Example
+> {勉強|べんきょう}する==ことは==する==が==、まだ{下手|へた}です。
+> Although I study everyday, I'm still bad at it.
+
+## といっても
+
+Means "although". Puts a nuance to the first statement describing that it is not as much as imagined, and adds a complimentary information.
+
+> [!info] Example
+> {彼|かれ}は{医者|いしゃ}==といっても==、あまり{頭|あたま}が{良|よ}くない。
+> He may be a doctor, but he is not very smart.
+
+## にも関わらず (NEW!)
+
+にも{関|かか}わらず means "regardless", "despite".
+
+> [!info] Example
+> {危険|きけん}==にもかかわらず==、{彼|かれ}はまだそれをやった。
+> Despite the danger, he still did it.
+
+## ものの (NEW!)
+
+<div class="usage">
+<div class="left">
+	<p><span class="box">V</span></p>
+	<p><span class="box">い-Adj</span></p>
+	<p><span class="box">な-Adj + な</span></p>
+	<p><span class="box">N + である</span></p>
+</div>
+	<p class="right">+ ものの</p>
+</div>
+
+Means "although", "even though". It is formal. Similar to のに. The first part is positive, and the second one is negative.
+
+> [!info] Example
+> {今日|きょう}は{晴|は}れた==ものの==とても{寒|さむ}い。
+> It is sunny today, but very cold.
+
+## もっとも (NEW!)
+
+Means "although", "but". Connects two phrases. Used in literature.
+
+> [!info] Example
+> 帰国するつもりです。==もっとも==時間がある場合だけど。
+> I plan to return to my country. But only if I had the time...

🔰 Grammar/Opposition - but - however.md

@@ -16,7 +16,7 @@ This is the basic way to say "but".
 > コンビニに行きました。==でも==、何も買わなかった。
 > I went to the convenience store. But I didn't buy anything.
 
-⚠ Do not confuse with [[TeF (4) - even if#Even if ても・でも|Even if: ても・でも]].
+⚠ Do not confuse with [[TeF (4) - even if#Even if ても・でも]].
 
 ## しかし
 

🔰 Grammar/Opposition - even if.md

@@ -21,7 +21,7 @@ See [[Considering - for - as#にしても]].
 	<p class="right">+ って</p>
 </div>
 
-Means "even if", "even though". It has the same meaning as [[#て-form even if|て-form: even if]].
+Means "even if", "even though". It has the same meaning as [[#て-form even if]].
 
 > [!info] Example
 > {今|いま}で行==ったって==、{間|ま}に{合|あ}わない。
@@ -38,7 +38,7 @@ Means "but still", "even so", "anyway".
 ## のに
 
 Means "although", "even tough". Cannot be an hypothesis, must be a confirmed fact. This, it works with past tense.
-See [[Connectors#Even tough]].
+See [[Connectors#のに#Even tough]].
 
 ## くせに・くせして
 
@@ -65,7 +65,7 @@ Means "despite", "even tough". Has a negative connotation when a situation is no
 ## ながらも
 
 Means "even while", "despite". It is used to express that while something is one state, something else. Cannot be used for an hypothesis: it is something that is happening right now.
-See also [[Time - during#ながら]].
+See also [[Time#ながら]].
 
 > [!info] Example
 > {病気|びょうき}==ながらも==、パーティーに行くつもりです。
@@ -126,7 +126,7 @@ It is used to talk about an unexpected result, that is contradictory to the prec
 > {自転車|じてんしゃ}の{乗|の}り{方|かた}を{忘|わす}れるはありえないと{思|おも}っていた。==ところが==すっかり{忘|わす}れた。
 > I thought it was impossible to forget how to ride a bike. However, I completely forgot.
 
-## からと言って
+## からと言って (NEW!)
 
 <div class="usage">
 <div class="left">
@@ -144,7 +144,7 @@ It is used to talk about an unexpected result, that is contradictory to the prec
 > {年上|としうえ}だ==からといって=={正|ただ}しいとは{限|かぎ}りません。
 > Just because you're older doesn't mean you're right.
 
-## ことにはならない
+## ことにはならない (NEW!)
 
 <div class="usage">
 <div class="left">
@@ -161,7 +161,7 @@ Means "just because... doesn't mean that". Used at the end of a sentence.
 > {卒業|そつぎょう}だからといって今すぐ{就職|しゅうしょく}できます==ことにはならい==。
 > Just because you graduated doesn't mean you can get a job right away.
 
-## とも
+## とも (NEW!)
 
 <div class="usage">
 <div class="left">
@@ -178,7 +178,7 @@ Means "even if", "no matter". Similar to ても ([[TeF (4) - even if]]). Used in
 > {辛|から}く==とも==、{全部|ぜんぶ}{食|た}べるつもりであった。
 > Even if it was spicy, I planned to eat it all.
 
-## にせよ・にしろ
+## にせよ・にしろ (NEW!)
 
 <div class="usage">
 <div class="left">

🔰 Grammar/Opposition.md

@@ -1,136 +1,136 @@
-# Opposition
-
-## に反して
-
-に{反|はん}して means "contrary to". Opposes the first noun to the rest of the sentence.
-
-> [!info] Example
-> {常識|じょうしき}==に反して==、彼は{勉強|べんきょう}しなかった。
-> Contrary to common sense, he did not study.
-
-## に対して
-
-に{対|たい}して.
-See [[Towards#In contrast to]].
-
-## 逆に
-
-{逆|ぎゃく}に means "on the contrary". Means that it is the opposite of something else.
-
-> [!info] Example
-> {人|ひと}が{大体|だいたい}ウサギが{好|す}き==逆に=={彼|かれ}は{嫌|きら}い。
-> Most people like rabbits, but on the contrary he hates them.
-
-## かえって
-
-Means "on the contrary", "rather". Used for bad results, contrary to what was expected.
-
-> [!info] Example
-> {薬|くすり}を{飲|の}んだら==却って=={調子|ちょうし}が{悪|わる}くなった。
-> Despite drinking medicine, on the contrary my condition got worse.
-
-## 反面
-
-<div class="usage">
-<div class="left">
-	<p><span class="box">V</span></p>
-	<p><span class="box">い-Adj</span></p>
-	<p><span class="box">な-Adj + な・である</span></p>
-	<p><span class="box">N + である</span></p>
-</div>
-	<p class="right">+ 反面</p>
-</div>
-
-{反面|はんめん} means "on the other hand", "however". Has the same meaning as かえって.
-Also used between two phrases as その反面.
-
-> [!info] Example
-> スープはおいしい==反面==、ちょっと{冷|つめ}たい。
-> The soup is good but a bit cold.
-
-## 一方で
-
-<div class="usage">
-<div class="left">
-	<p><span class="box">V</span></p>
-	<p><span class="box">い-Adj</span></p>
-	<p><span class="box">な-Adj + である</span></p>
-	<p><span class="box">N + である</span></p>
-</div>
-	<p class="right">+ 一方(で)</p>
-</div>
-
-{一方|いっぽう}で means "on the other hand", "on another note".
-
-> [!info] Example
-> その{犬|いぬ}は{大|おお}きい==一方で==、とても{穏|おだ}やかと{親切|しんせつ}です。
-> The dog is big, but on the other hand he is very calm and kind.
-
-## に関わらず
-
-に{関|かか}わらず means "regardless", "no matter".
-
-> [!info] Example
-> ここは{年齢|ねんれい}==に関わらず==、{誰|だれ}でも{歓迎|かんげい}します。
-> Everyone is welcome here, regardless of age.
-
-## を問わず
-
-を{問|と}わず means "regardless of".
-Used with nouns.
-
-> [!info] Examples
-> {年齢|ねんれい}==を問わず==、{誰|だれ}でも{歓迎|かんげい}する。
-> Everyone is welcome, regardless of age.
-
-## それなのに
-
-Means "and yet".
-Used to combine two sentences, appearing at the start of the second one.
-
-> [!info] Example
-> {同僚|どうりょ}が{風邪|かぜ}をひいた。==それなのに==、{事務所|じむしょ}に{行|い}くつもりです。
-> My colleague has a cold. And yet, he plans to go to the office.
-
-## それにしても
-
-Means "even so", "nevertheless".
-
-> [!info] Example
-> {毎日|まいにち}{頑張|がんば}る、==それにしても==まだ{下手|へた}です。
-> I try my best every day, but I'm still not very good.
-
-## はともかく
-
-Means "setting aside", "apart from". Can be completed by として.
-Used with nouns.
-
-> [!info] Example
-> この服は値段==はともかく==、完璧です。
-> These clothes are perfect, regardless of their price.
-
-## どころか
-
-<div class="usage">
-<div class="left">
-	<p><span class="box">V</span></p>
-	<p><span class="box">い-Adj</span></p>
-	<p><span class="box">な-Adj + な</span></p>
-	<p><span class="box">N</span></p>
-</div>
-	<p class="right">+ どころか</p>
-</div>
-
-Means "far from", "anything but". Negates what comes before and emphases what comes after.
-
-> [!info] Examples
-> {好|す}きな==どころか==、{事実|じじつ}は{嫌|きら}いだった。
-> Far from liking it, truth is that I hated it.
-
-## どころではない
-
-Means "not the time for", "far from", "out of the question". Means that something is not ideal.
-
-> [!info] Examples
-> {今|いま}は{電車|でんしゃ}の{中|なか}だから、{歌|うた}う==どころではない==。
-> We're on a train right now, so it's not the time to sing.
+# Opposition
+
+## に反して
+
+に{反|はん}して means "contrary to". Opposes the first noun to the rest of the sentence.
+
+> [!info] Example
+> {常識|じょうしき}==に反して==、彼は{勉強|べんきょう}しなかった。
+> Contrary to common sense, he did not study.
+
+## に対して
+
+に{対|たい}して.
+See [[Towards#In contrast to]].
+
+## 逆に (NEW!)
+
+{逆|ぎゃく}に means "on the contrary". Means that it is the opposite of something else.
+
+> [!info] Example
+> {人|ひと}が{大体|だいたい}ウサギが{好|す}き==逆に=={彼|かれ}は{嫌|きら}い。
+> Most people like rabbits, but on the contrary he hates them.
+
+## かえって (NEW!)
+
+Means "on the contrary", "rather". Used for bad results, contrary to what was expected.
+
+> [!info] Example
+> {薬|くすり}を{飲|の}んだら==却って=={調子|ちょうし}が{悪|わる}くなった。
+> Despite drinking medicine, on the contrary my condition got worse.
+
+## 反面 (NEW!)
+
+<div class="usage">
+<div class="left">
+	<p><span class="box">V</span></p>
+	<p><span class="box">い-Adj</span></p>
+	<p><span class="box">な-Adj + な・である</span></p>
+	<p><span class="box">N + である</span></p>
+</div>
+	<p class="right">+ 反面</p>
+</div>
+
+{反面|はんめん} means "on the other hand", "however". Has the same meaning as かえって.
+Also used between two phrases as その反面.
+
+> [!info] Example
+> スープはおいしい==反面==、ちょっと{冷|つめ}たい。
+> The soup is good but a bit cold.
+
+## 一方で (NEW!)
+
+<div class="usage">
+<div class="left">
+	<p><span class="box">V</span></p>
+	<p><span class="box">い-Adj</span></p>
+	<p><span class="box">な-Adj + である</span></p>
+	<p><span class="box">N + である</span></p>
+</div>
+	<p class="right">+ 一方(で)</p>
+</div>
+
+{一方|いっぽう}で means "on the other hand", "on another note".
+
+> [!info] Example
+> その{犬|いぬ}は{大|おお}きい==一方で==、とても{穏|おだ}やかと{親切|しんせつ}です。
+> The dog is big, but on the other hand he is very calm and kind.
+
+## に関わらず (NEW!)
+
+に{関|かか}わらず means "regardless", "no matter".
+
+> [!info] Example
+> ここは{年齢|ねんれい}==に関わらず==、{誰|だれ}でも{歓迎|かんげい}します。
+> Everyone is welcome here, regardless of age.
+
+## を問わず (NEW!)
+
+を{問|と}わず means "regardless of".
+Used with nouns.
+
+> [!info] Examples
+> {年齢|ねんれい}==を問わず==、{誰|だれ}でも{歓迎|かんげい}する。
+> Everyone is welcome, regardless of age.
+
+## それなのに (NEW!)
+
+Means "and yet".
+Used to combine two sentences, appearing at the start of the second one.
+
+> [!info] Example
+> {同僚|どうりょ}が{風邪|かぜ}をひいた。==それなのに==、{事務所|じむしょ}に{行|い}くつもりです。
+> My colleague has a cold. And yet, he plans to go to the office.
+
+## それにしても (NEW!)
+
+Means "even so", "nevertheless".
+
+> [!info] Example
+> {毎日|まいにち}{頑張|がんば}る、==それにしても==まだ{下手|へた}です。
+> I try my best every day, but I'm still not very good.
+
+## はともかく (NEW!)
+
+Means "setting aside", "apart from". Can be completed by として.
+Used with nouns.
+
+> [!info] Example
+> この服は値段==はともかく==、完璧です。
+> These clothes are perfect, regardless of their price.
+
+## どころか (NEW!)
+
+<div class="usage">
+<div class="left">
+	<p><span class="box">V</span></p>
+	<p><span class="box">い-Adj</span></p>
+	<p><span class="box">な-Adj + な</span></p>
+	<p><span class="box">N</span></p>
+</div>
+	<p class="right">+ どころか</p>
+</div>
+
+Means "far from", "anything but". Negates what comes before and emphases what comes after.
+
+> [!info] Examples
+> {好|す}きな==どころか==、{事実|じじつ}は{嫌|きら}いだった。
+> Far from liking it, truth is that I hated it.
+
+## どころではない (NEW!)
+
+Means "not the time for", "far from", "out of the question". Means that something is not ideal.
+
+> [!info] Examples
+> {今|いま}は{電車|でんしゃ}の{中|なか}だから、{歌|うた}う==どころではない==。
+> We're on a train right now, so it's not the time to sing.

🔰 Grammar/Point of view.md

@@ -1,71 +1,71 @@
-# Point of view
-
-## にしたら・にすれば
-
-Means "from the point of view of", "from the perspective of".
-Used with nouns.
-
-> [!info] Example
-> {観光客|かんこうきゃく}==にしたら==、その{食|た}べ{物|もの}は{多分|たぶん}{不思議|ふしぎ}すぎる。
-> For tourists, this food is probably too strange.
-
-## にとって
-
-Means "concerning", "regarding". Focuses on the standpoint of the preceding part. It is used for general opinions that are shared with the majority.
-Used with nouns.
-
-> [!info] Example
-> 猫==にとって=={睡眠|すい|みん}は{大切|たいせつ}です。
-> Sleeping is important for cats.
-
-## の上で・上の
-
-の{上|うえ}で・{上|うえ}の means "according to", "from the point of view of". Used for rules, information, data, etc.
-Used with nouns.
-
-> [!info] Example
-> {規則|きそく}==の上で==はタバコを{吸|す}うは{禁止|きんし}です。
-> According to the rules, smoking is prohibited.
-
-## 上: from the standpoint of
-
-Attached to a noun, {上|じょう} means "from the standpoint of".
-
-> [!info] Example
-> {法律|ほうりつ}==上==、それは{禁止|きんし}です。
-> Legally, that is prohibited.
-
-## ものがある
-
-<div class="usage">
-<div class="left">
-	<p><span class="box">V</span></p>
-	<p><span class="box">い-Adj</span></p>
-	<p><span class="box">な-Adj + な</span></p>
-</div>
-	<p class="right">+ ものがある</p>
-</div>
-
-Means "there is something". Used to express subjective opinion.
-
-> [!info] Examples
-> この{車|くるま}には{怪|あや}しい==ものがある==。
-> There's something suspicious about this car.
-
-## から見ると
-
-から{見|み}ると means "from the point of view of", "by the look of". Used for objective judgment, based on a situation.
-Also used as から見れば, からみて or からみたら.
-
-> [!info] Examples
-> {先生|せんせい}==からみると==、{学生|がくせい}は{怠|なま}け{者|もの}すぎる。
-> From the teacher's point of view, the students are too lazy.
-
-## から言うと
-
-から{言|い}うと means "from the point of view of", "by the look of". Used for more subjective judgment, so cannot be used with people.
-Also used as から言えば or から言って.
-
-> [!info] Examples
-> {状況|じょうきょう}==から言うと==、{経済|けいざい}はよくない。
-> Given the situation, the economy is no good.
+# Point of view
+
+## にしたら・にすれば (NEW!)
+
+Means "from the point of view of", "from the perspective of".
+Used with nouns.
+
+> [!info] Example
+> {観光客|かんこうきゃく}==にしたら==、その{食|た}べ{物|もの}は{多分|たぶん}{不思議|ふしぎ}すぎる。
+> For tourists, this food is probably too strange.
+
+## にとって
+
+Means "concerning", "regarding". Focuses on the standpoint of the preceding part. It is used for general opinions that are shared with the majority.
+Used with nouns.
+
+> [!info] Example
+> 猫==にとって=={睡眠|すい|みん}は{大切|たいせつ}です。
+> Sleeping is important for cats.
+
+## の上で・上の (NEW!)
+
+の{上|うえ}で・{上|うえ}の means "according to", "from the point of view of". Used for rules, information, data, etc.
+Used with nouns.
+
+> [!info] Example
+> {規則|きそく}==の上で==はタバコを{吸|す}うは{禁止|きんし}です。
+> According to the rules, smoking is prohibited.
+
+## 上: from the standpoint of (NEW!)
+
+Attached to a noun, {上|じょう} means "from the standpoint of".
+
+> [!info] Example
+> {法律|ほうりつ}==上==、それは{禁止|きんし}です。
+> Legally, that is prohibited.
+
+## ものがある (NEW!)
+
+<div class="usage">
+<div class="left">
+	<p><span class="box">V</span></p>
+	<p><span class="box">い-Adj</span></p>
+	<p><span class="box">な-Adj + な</span></p>
+</div>
+	<p class="right">+ ものがある</p>
+</div>
+
+Means "there is something". Used to express subjective opinion.
+
+> [!info] Examples
+> この{車|くるま}には{怪|あや}しい==ものがある==。
+> There's something suspicious about this car.
+
+## から見ると (NEW!)
+
+から{見|み}ると means "from the point of view of", "by the look of". Used for objective judgment, based on a situation.
+Also used as から見れば, からみて or からみたら.
+
+> [!info] Examples
+> {先生|せんせい}==からみると==、{学生|がくせい}は{怠|なま}け{者|もの}すぎる。
+> From the teacher's point of view, the students are too lazy.
+
+## から言うと (NEW!)
+
+から{言|い}うと means "from the point of view of", "by the look of". Used for more subjective judgment, so cannot be used with people.
+Also used as から言えば or から言って.
+
+> [!info] Examples
+> {状況|じょうきょう}==から言うと==、{経済|けいざい}はよくない。
+> Given the situation, the economy is no good.

🔰 Grammar/Possibility - impossibility.md

@@ -1,27 +1,27 @@
-# Possibility: impossibility
-
-### とても～ない
-
-Means "cannot". This form implies a strong impossibility. Used with negative verbs, often in potential form.
-
-> [!info] Examples
-> {苦|にが}い{食|たべ}べ{物|もの}は==とても==食べられ==ない==。
-> I cannot eat bitter food.
-
-## ものか・もんか
-
-<div class="usage">
-<div class="left">
-	<p><span class="box">V (る)</span></p>
-	<p><span class="box">い-Adj </span></p>
-	<p><span class="box">な-Adj + な</span></p>
-	<p><span class="box">N + な</span></p>
-</div>
-	<p class="right">+ ものか・もんか</p>
-</div>
-
-Means "there's no way it will happen", "absolutely not", "as if". Expresses disagreement or disbelief.
-
-> [!info] Example
-> こんなたくさん{家事|かじ}をする==ものか==。。。{無理|むり}です。
-> There's no way I could do so much housework... It's impossible.
+# Possibility: impossibility
+
+### とても～ない
+
+Means "cannot". This form implies a strong impossibility. Used with negative verbs, often in potential form.
+
+> [!info] Examples
+> {苦|にが}い{食|たべ}べ{物|もの}は==とても==食べられ==ない==。
+> I cannot eat bitter food.
+
+## ものか・もんか (NEW!)
+
+<div class="usage">
+<div class="left">
+	<p><span class="box">V (る)</span></p>
+	<p><span class="box">い-Adj </span></p>
+	<p><span class="box">な-Adj + な</span></p>
+	<p><span class="box">N + な</span></p>
+</div>
+	<p class="right">+ ものか・もんか</p>
+</div>
+
+Means "there's no way it will happen", "absolutely not", "as if". Expresses disagreement or disbelief.
+
+> [!info] Example
+> こんなたくさん{家事|かじ}をする==ものか==。。。{無理|むり}です。
+> There's no way I could do so much housework... It's impossible.

🔰 Grammar/Possibility - no choice.md

@@ -1,31 +1,31 @@
-# Possibility: no choice
-
-## しかない
-
-Means "have no choice but".
-Used with verbs in dictionary form.
-
-> [!info] Example
-> {説明書|せつめいしょ}を{読|よ}む==しかない==な。
-> I guess I have no choice but to read to manual.
-
-## よりほかない・にほかならない
-
-<div class="usage">
-<div class="">
-	<p><span class="box">V</span></p>
-</div>
-	<p class="r">+ よりほかない</p>
-</div>
-<div class="usage">
-<div class="">
-	<p><span class="box">N</span></p>
-</div>
-	<p class="r">+ にほかならない</p>
-</div>
-
-Means "nothing but", "simply". This form puts more emphasis than しかない.
-
-> [!info] Example
-> {携帯|けいたい}は{壊|こわ}れていったので、{新|あたら}しいのを{買|か}う==よりほかない==。
-> My phone broke, so I have no choice but to buy a new one.
+# Possibility: no choice
+
+## しかない
+
+Means "have no choice but".
+Used with verbs in dictionary form.
+
+> [!info] Example
+> {説明書|せつめいしょ}を{読|よ}む==しかない==な。
+> I guess I have no choice but to read to manual.
+
+## よりほかない・にほかならない (NEW!)
+
+<div class="usage">
+<div class="">
+	<p><span class="box">V</span></p>
+</div>
+	<p class="r">+ よりほかない</p>
+</div>
+<div class="usage">
+<div class="">
+	<p><span class="box">N</span></p>
+</div>
+	<p class="r">+ にほかならない</p>
+</div>
+
+Means "nothing but", "simply". This form puts more emphasis than しかない.
+
+> [!info] Example
+> {携帯|けいたい}は{壊|こわ}れていったので、{新|あたら}しいのを{買|か}う==よりほかない==。
+> My phone broke, so I have no choice but to buy a new one.

🔰 Grammar/Possibility - options.md

@@ -8,7 +8,7 @@ Used to list one or more possible options.
 > ジュース==でも==お茶==でも==飲もうか。
 > Shall we drink something like a juice or tea?
 
-⚠ Do not confuse with [[TeF (4) - even if#Even if ても・でも|Even if: ても・でも]].
+⚠ Do not confuse with [[TeF (4) - even if#Even if ても・でも]].
 
 ## かどうか
 
@@ -27,7 +27,7 @@ Used with nouns.
 > ジュース==か何か=={飲|の}もうか。
 > Shall we drink something like a juice?
 
-## ようか～まいか
+## ようか~まいか (NEW!)
 
 <div class="usage">
 <div class="">
@@ -77,7 +77,7 @@ This is used to give a choice between a limited set of two options. It is casual
 > 何が食べたい。ラーメン==それとも==カレーか。
 > What do you want to eat? Ramen or curry?
 
-## あるいは
+## あるいは (NEW!)
 
 Means "or", "perhaps". Mostly used in written form. Can be used orally, if the difference between the two options is large.
 

🔰 Grammar/Possibility.md

@@ -18,7 +18,7 @@ Can be used as もしかしたら, もしかすると and もしかして.
 > ==もしかして=={今日|きょう}も{郵便局員|ゆうびんきょくいん}が来ません==かもしれない==。
 > Perhaps the postman will not come today either.
 
-## かねない
+## かねない (NEW!)
 
 <div class="usage">
 <div class="left">
@@ -34,7 +34,7 @@ Means "possibly", "might", "could be". Usually used for negative outcomes. Mostl
 > この{道|みち}は{危|あぶ}ないので{事故|じこ}が{起|お}き==かねない==。
 > This road is dangerous, so an accident might happen.
 
-## 恐らく
+## 恐らく (NEW!)
 
 {恐|おそ}らく means "probably", "perhaps". Placed at the beginning of a phrase. Implies a high probability.
 
@@ -70,7 +70,7 @@ Means "not impossible to", "it is not that". Used with negative forms.
 > 本を{読|よ}ま==ないことはない==ですが、{最近|さいきん}は{暇|ひま}がない。
 > It's not that I don't read books, it's just that I don't have free time these days.
 
-## 恐れがある
+## 恐れがある (NEW!)
 
 <div class="usage">
 <div class="left">
@@ -88,7 +88,7 @@ Means "not impossible to", "it is not that". Used with negative forms.
 > また{地震|じしん}の==恐らくがある==。{気|き}を{付|つ}けて。
 > There will probably be another earthquake. Please be careful.
 
-## ようでは
+## ようでは (NEW!)
 
 Means "if". Used when the result would be bad.
 Used with verbs.
@@ -97,7 +97,7 @@ Used with verbs.
 > {化|ば}け{物|もの}が{来|く}る==ようでは==、あなたを{食|た}べちゃうよ。
 > If a monster comes, it will eat you.
 
-## ものなら
+## ものなら (NEW!)
 
 <div class="usage">
 <div class="">
@@ -112,7 +112,7 @@ Means "if A were possible, then B". Implies that A is either impossible or unlik
 > {合格|ごうかく}できる==ものなら==、{世界中|せかいじゅう}{一番|いちばん}うれしいなあ。
 > If I could pass, I would be the happiest in the world (but it is unlikely I'll pass).
 
-## ないことには～ない
+## ないことには～ない (NEW!)
 
 <div class="usage">
 <div class="left">
@@ -131,7 +131,7 @@ Means "unless you do something".
 > {運転|うんてん}{免許|めんきょ}を{持|も}った==ないことには=={運転|うんてん}できない。
 > You can't drive unless you have a driving licence.
 
-## にしろ～にしろ
+## にしろ~にしろ (NEW!)
 
 <div class="usage">
 <div class="">
@@ -174,13 +174,13 @@ Means "unless you do something".
 	<p class="r">+ にしろ</p>
 </div>
 
-Means "whether... or". Can be used as にせろ～にせろ or にしても～にしても, which is more formal.
+Means "whether... or". Can be used as にせろ~にせろ or にしても~にしても, which is more formal.
 
 > [!info] Example
 > {動物|どうぶつ}==にしろ=={植物|しょくぶつ}==にしろ==、その{物質|ぶっしつ}は{危険|きけん}です。
 > Whether animals or plants, the substance is dangerous.
 
-## なくはない・なくもない
+## なくはない・なくもない (NEW!)
 
 <div class="usage">
 <div class="left">

🔰 Grammar/Question.md

@@ -1,108 +1,108 @@
-# Question
-
-## か
-
-At the end of a sentence, this particle asks a question, like a question mark.
-
-> [!info] Example
-> {猫|ねこ}が好きです==か==。
-> Do you like cats?
-
-It can also be used when there is uncertainty between two or more choices. It can be used once or multiple times.
-
-> [!info] Example
-> 犬==か==猫==か==、どちら{選|えら}んでますかな。
-> Which should I chose, a dog or a cat?
-> 
-> 雨==か=={分|わ}かりません。
-> I don't know if it will rain.
-
-## かな・かしら
-
-Means "I wonder", "should I?". かな is a neutral form, while かしら sounds feminine.
-
-> [!info] Example
-> この{帽子|ぼうし}を{被|かぶ}ろう==かな==。
-> Should I wear this hat?
-
-## かい
-
-Using this particle, the sentences becomes a yes/no question. Very casual, masculine connotation.
-
-> [!info] Example
-> 来るの==かい==。
-> Are you coming?
-
-## どうやって
-
-Means "how", "in what way".
-
-> [!info] Example
-> これを==どうやって==作れましたか。
-> How did you make this?
-
-## Probably - right - isn't it?
-
-### でしょう
-
-Means "probably", "right?". The polite version of だろう.
-
-> [!info] Example
-> この{服|}はきれい==でしょう==。
-> These clothes are beautiful, aren't they? (It's probably what you also think?)
-
-### だろう
-
-Means "probably", "right?". The casual version of でしょう.
-
-> [!info] Example
-> 今日また雨==だろう==。
-> It will probably rain again.
-
-### ではないか
-
-Means "isn't it?". The polite version of じゃないか.
-
-> [!info] Example
-> 今の{揺|ゆ}れは{地震|じ|しん}==ではないか==。
-> That shaking is an earthquake, isn't it?
-
-### じゃないか
-
-Means "isn't it?". The casual version of ではないか.
-
-> [!info] Example
-> アイスクリームを食べよう==じゃないか==。
-> Let's have some ice cream, shall we?
-
-### ね
-
-This particle when added to the end of a sentence meaning "right?".
-
-> [!info] Example
-> 今日は{寒|さむ}いです==ね==。
-> It's cold today, right?
-
-### Summing up
-
-* ==でしょう==・==だろう== expresses a probability or an assumption.
-* ==ではないか==・==じゃないか== invites or suggests an action.
-* ==ね== asks an agreement or a confirmation.
-
-## ことか
-
-<div class="usage">
-<div class="left">
-	<p><span class="box">V</span></p>
-	<p><span class="box">い-Adj</span></p>
-	<p><span class="box">な-Adj + な</span></p>
-	<p><span class="box">N + である</span></p>
-</div>
-	<p class="right">+ ことか</p>
-</div>
-
-Means "how" or "what". Used to describe an extent that is unusual or unbelievable. It is mostly used in written contexts, as it is a bit dramatic.
-
-> [!info] Example
-> フランスには、パン{屋|や}の{多|おお}さにどれほど{信|しん}じられない==ことか==。
-> It's incredible how many bakeries there are in France.
+# Question
+
+## か
+
+At the end of a sentence, this particle asks a question, like a question mark.
+
+> [!info] Example
+> {猫|ねこ}が好きです==か==。
+> Do you like cats?
+
+It can also be used when there is uncertainty between two or more choices. It can be used once or multiple times.
+
+> [!info] Example
+> 犬==か==猫==か==、どちら{選|えら}んでますかな。
+> Which should I chose, a dog or a cat?
+> 
+> 雨==か=={分|わ}かりません。
+> I don't know if it will rain.
+
+## かな・かしら
+
+Means "I wonder", "should I?". かな is a neutral form, while かしら sounds feminine.
+
+> [!info] Example
+> この{帽子|ぼうし}を{被|かぶ}ろう==かな==。
+> Should I wear this hat?
+
+## かい
+
+Using this particle, the sentences becomes a yes/no question. Very casual, masculine connotation.
+
+> [!info] Example
+> 来るの==かい==。
+> Are you coming?
+
+## どうやって
+
+Means "how", "in what way".
+
+> [!info] Example
+> これを==どうやって==作れましたか。
+> How did you make this?
+
+## Probably - right - isn't it?
+
+### でしょう
+
+Means "probably", "right?". The polite version of だろう.
+
+> [!info] Example
+> この{服|}はきれい==でしょう==。
+> These clothes are beautiful, aren't they? (It's probably what you also think?)
+
+### だろう
+
+Means "probably", "right?". The casual version of でしょう.
+
+> [!info] Example
+> 今日また雨==だろう==。
+> It will probably rain again.
+
+### ではないか
+
+Means "isn't it?". The polite version of じゃないか.
+
+> [!info] Example
+> 今の{揺|ゆ}れは{地震|じ|しん}==ではないか==。
+> That shaking is an earthquake, isn't it?
+
+### じゃないか
+
+Means "isn't it?". The casual version of ではないか.
+
+> [!info] Example
+> アイスクリームを食べよう==じゃないか==。
+> Let's have some ice cream, shall we?
+
+### ね
+
+This particle when added to the end of a sentence meaning "right?".
+
+> [!info] Example
+> 今日は{寒|さむ}いです==ね==。
+> It's cold today, right?
+
+### Summing up
+
+* ==でしょう==・==だろう== expresses a probability or an assumption.
+* ==ではないか==・==じゃないか== invites or suggests an action.
+* ==ね== asks an agreement or a confirmation.
+
+## ことか (NEW!)
+
+<div class="usage">
+<div class="left">
+	<p><span class="box">V</span></p>
+	<p><span class="box">い-Adj</span></p>
+	<p><span class="box">な-Adj + な</span></p>
+	<p><span class="box">N + である</span></p>
+</div>
+	<p class="right">+ ことか</p>
+</div>
+
+Means "how" or "what". Used to describe an extent that is unusual or unbelievable. It is mostly used in written contexts, as it is a bit dramatic.
+
+> [!info] Example
+> フランスには、パン{屋|や}の{多|おお}さにどれほど{信|しん}じられない==ことか==。
+> It's incredible how many bakeries there are in France.

🔰 Grammar/Reason.md

@@ -136,7 +136,7 @@ See also [[Connectors - in order to#ために]].
 
 See also [[Certainty#わけがない]].
 
-## からこそ
+## からこそ (NEW!)
 
 Means "precisely because". Made with the [[🔰 Particles (2)#Because|から]] and [[🔰 Particles (2)#こそ|こそ]] particles, to emphasize the reason.
 
@@ -146,7 +146,7 @@ Means "precisely because". Made with the [[🔰 Particles (2)#Because|から]] a
 
 ⚠ Uses the same rules as [[🔰 Particles (2)#Because|から]].
 
-## ことだから
+## ことだから (NEW!)
 
 Means "exactly because". Usually used to talk about something characteristic to someone.
 Used with nouns + の.
@@ -155,7 +155,7 @@ Used with nouns + の.
 > {彼女|かのじょ}==のことだから==、{必|かなら}ず{来|き}ます。
 > It's precisely because it's her that I'm sure she'll come.
 
-## につき
+## につき (NEW!)
 
 Means "due to". Used when a change happens. It is formal.
 
@@ -163,7 +163,7 @@ Means "due to". Used when a change happens. It is formal.
 > {年次|ねんじ}{休業|きゅうぎょう}==につき==、セールが{開催|かいさい}{中|ちゅう}。
 > Due to the annual closure, a sale is being held.
 
-## もの・もん
+## もの・もん (NEW!)
 
 <div class="usage">
 <div class="left">
@@ -181,7 +181,7 @@ Means "because". It is usually casual.
 > {具合|ぐあい}が{悪|わる}い。。。{臭|くさ}い==んだもの==。
 > I don't feel well... because something stinks.
 
-## ものだから
+## ものだから (NEW!)
 
 <div class="usage">
 <div class="left">
@@ -219,7 +219,7 @@ Means "because of". Used for positive contexts, like "thanks to".
 > あなたの==おかげで=={勝|か}った。
 > We won because of you.
 
-### だけあって
+### だけあって (NEW!)
 
 <div class="usage">
 <div class="left">
@@ -257,7 +257,7 @@ Means "because of". Mostly used for negative contexts, to blame, etc.
 > あなたの==せいで=={負|ま}けた。
 > We lost because of you.
 
-### ばかりに
+### ばかりに (NEW!)
 
 <div class="usage">
 <div class="left">
@@ -280,7 +280,7 @@ Means "simply because". Usually used for negative results.
 All three patterns mean "because A... obviously B". They have slight differences.
 Used when talking about things like decision, judgement, etc.
 
-### 上は
+### 上は (NEW!)
 
 {上|うえ}は is the most formal form.
 Used with verbs (る, た forms).
@@ -289,7 +289,7 @@ Used with verbs (る, た forms).
 > {先生|せんせい}が{言|い}った==上は=={必|かなら}ずする。
 > Since the teacher said it, I will definitely do it.
 
-### 以上は
+### 以上は (NEW!)
 
 <div class="usage">
 <div class="left">
@@ -308,7 +308,7 @@ Only with this form, both parts of the sentence can talk about different persons
 > {彼|かれ}がまだ{来|き}ません==以上は==、{今|いま}{帰|かえ}ります。
 > Since he still have not come, I'm going home now.
 
-### からには
+### からには (NEW!)
 
 It is used in conversations. Can only be used for talking about oneself. Generally used for positive results.
 Used with verbs.

🔰 Grammar/Request.md

@@ -1,66 +1,57 @@
-# Request
-
-## てください
-
-It is a polite request that is translated as "please do".
-In casual speech, can be shortened to て.
-
-> [!info] Example
-> {消|けし}しゴムを{貸|か}し==て==。
-> Lend me your eraser.
-
-## てもいい
-
-<div class="usage">
-<div class="left">
-	<p><span class="box">V-て</span></p>
-	<p><span class="box">い-Adj <strike>い</strike> くて</span></p>
-	<p><span class="box">な-Adj + で</span></p>
-	<p><span class="box">N + で</span></p>
-</div>
-	<p class="right">+ もいい</p>
-</div>
-
-Means "is it alright if?", "may I?".
-
-> [!info] Example
-> ここに{座|すわ}==てもいい==ですか。
-> May I sit here?
-
-A more polite way is [[Can't help - doesn't matter#ても構わない]].
-
-## ないでください
-
-Means "please don't". It is a polite request. Removing the ください makes it more casual.
-Formed by a verb in the negative form (ない) with the で particle.
-
-> [!info] Example
-> {冷蔵庫|れいぞうこ}のデザートは食べ==ないでください==。
-> Please do not eat the dessert from the fridge.
-
-## なさい
-
-This form is used when commanding an action.
-It is used with verbs by removing the ます and adding なさい. In casual conversation, it can be shortened to な.
-
-> [!info] Example
-> {質問|しつ|もん}を{答|こた}え==なさい==。
-> Answer the question.
-
-## ように言う
-
-<div class="usage">
-	<p class="r">V +</p>
-<div class="">
-	<p><span class="box">ように</span></p>
-</div>
-	<p class="r">+ V 「言う・命じる・頼む・...」</p>
-</div>
-
-It means "to tell", "to request", "to order".
-
-The verb {頼|たの}む can be used for requests, while {命|めい}じる can be used for order. The verb {言|い}う can tell the three meanings depending on the tone. Other similar verbs can be used ({注意|ちゅうい}する, {進|すす}む, etc).
-
-> [!info] Example
-> {子供|こども}にお{菓子|か|し}を食べない==ように言った==。
-> I told the kids to not eat candies.
+# Request
+
+## てください
+
+It is a polite request that is translated as "please do". See Conjugation [[Basics]] ("command").
+In casual speech, can be shortened to て.
+
+> [!info] Example
+> {消|けし}しゴムを{貸|か}し==て==。
+> Lend me your eraser.
+
+## てもいい
+
+<div class="usage">
+<div class="left">
+	<p><span class="box">V-て</span></p>
+	<p><span class="box">い-Adj <strike>い</strike> くて</span></p>
+	<p><span class="box">な-Adj + で</span></p>
+	<p><span class="box">N + で</span></p>
+</div>
+	<p class="right">+ もいい</p>
+</div>
+
+Means "is it alright if?", "may I?".
+
+> [!info] Example
+> ここに{座|すわ}==てもいい==ですか。
+> May I sit here?
+
+A more polite way is [[Can't help - doesn't matter#ても構わない]].
+
+## ないでください
+
+Means "please don't". It is a polite request. Removing the ください makes it more casual.
+Formed by a verb in the negative form (ない) with the で particle.
+
+> [!info] Example
+> {冷蔵庫|れいぞうこ}のデザートは食べ==ないでください==。
+> Please do not eat the dessert from the fridge.
+
+## なさい
+
+This form is used when commanding an action.
+It is used with verbs by removing the ます and adding なさい. In casual conversation, it can be shortened to な.
+
+> [!info] Example
+> {質問|しつ|もん}を{答|こた}え==なさい==。
+> Answer the question.
+
+## ように言う
+
+It means "to tell", "to request", "to order".
+It is form by added ように{言|い}う to a verb. The verb {頼|たの}む can be used for requests, while {命|めい}じる can be used for order. The verb {言|い}う can tell the three meanings depending on the tone. Other similar verbs can be used ({注意|ちゅうい}する, {進|すす}む, etc).
+
+> [!info] Example
+> {子供|こども}にお{菓子|か|し}を食べない==ように言った==。
+> I told the kids to not eat candies.

🔰 Grammar/State.md

@@ -1,106 +1,106 @@
-# State
-
-## まま
-
-<div class="usage">
-<div class="left">
-	<p><span class="box">V (ない)</span></p>
-	<p><span class="box">V (た)</span></p>
-	<p><span class="box">い-Adj</span></p>
-	<p><span class="box">な-Adj</span></p>
-	<p><span class="box">N + の</span></p>
-</div>
-	<p class="right">+ まま</p>
-</div>
-
-Means that something doesn't change state, stays as it is.
-
-> [!info] Examples
-> {開|あ}けた==まま==。
-> To be left open.
-> 
-> {熱|あつ}い==まま==。
-> Still hot.
-> 
-> {昔|むかし}の==まま==。
-> As it always been.
-> 
-> その==まま==でいい。
-> It is fine as it is.
-
-## さえ～ば
-
-<div class="usage">
-<div class="">
-	<p><span class="box">V <strike>ます</strike></span></p>
-</div>
-	<p class="r">+ さえ + すれば</p>
-</div>
-<div class="usage">
-<div class="">
-	<p><span class="box">V (て)</span></p>
-</div>
-	<p class="r">+ さえ + いれば</p>
-</div>
-<div class="usage">
-<div class="">
-	<p><span class="box">N</span></p>
-</div>
-	<p class="r">+ さえ + V(ば)</p>
-</div>
-
-Means "as long as", "if only". If a certain condition is met, the result will be okay.
-
-> [!info] Examples
-> {公園|こうえん}==さえ==あれ==ば==、うれしいです。
-> As long as there is a park, I am happy.
-
-## かける
-
-Means "half", "not yet finished", "in the middle of".
-Made by removing the ます stem of a verb.
-
-> [!info] Examples
-> この{本棚|ほんだな}はまだ{作|つく}り==かける==です。
-> This bookshelf is not yet finished building.
-
-## 一方だ
-
-{一方|いっぽう}だ means "to continue to", "more and more".
-Used with verbs that expresses change.
-
-> [!info] Examples
-> {禁煙|きんえん}の{場所|ばしょ}は{増|ふ}えている==一方です==。
-> The number of places where smoking is prohibited keeps increasing.
-
-## ばかりだ
-
-Means "to continue to", in a negative direction. Used with verbs in the dictionary form (る), that describe a form of change. Can also be used as ばっかり, ばっか, ばかし, and ばっかし instead of ばかり.
-
-> [!info] Examples
-> {病気|びょうき}は{悪|わる}くなる==ばかりです==。
-> The illness is only getting worse.
-
-## 結果
-
-<div class="usage">
-<div class="left">
-	<p><span class="box">V (た)</span></p>
-	<p><span class="box">N + の</span></p>
-</div>
-	<p class="right">+ 結果</p>
-</div>
-
-{結果|けっか} means "as a result of", "after".
-
-> [!info] Examples
-> {遅|おく}れた==結果==もう{全部|ぜんぶ}の{切符|きっぷ}は{売|う}り{切|き}れた。
-> As a result of being late, all the tickets were already sold out.
-
-## 結局
-
-{結局|けっきょく} means "after all", "in the end". Acts as a conclusion.
-
-> [!info] Examples
-> ==結局=={卒業|そつぎょう}した。
-> In the end, I graduated.
+# State
+
+## まま
+
+<div class="usage">
+<div class="left">
+	<p><span class="box">V (ない)</span></p>
+	<p><span class="box">V (た)</span></p>
+	<p><span class="box">い-Adj</span></p>
+	<p><span class="box">な-Adj</span></p>
+	<p><span class="box">N + の</span></p>
+</div>
+	<p class="right">+ まま</p>
+</div>
+
+Means that something doesn't change state, stays as it is.
+
+> [!info] Examples
+> {開|あ}けた==まま==。
+> To be left open.
+> 
+> {熱|あつ}い==まま==。
+> Still hot.
+> 
+> {昔|むかし}の==まま==。
+> As it always been.
+> 
+> その==まま==でいい。
+> It is fine as it is.
+
+## さえ～ば
+
+<div class="usage">
+<div class="">
+	<p><span class="box">V <strike>ます</strike></span></p>
+</div>
+	<p class="r">+ さえ + すれば</p>
+</div>
+<div class="usage">
+<div class="">
+	<p><span class="box">V (て)</span></p>
+</div>
+	<p class="r">+ さえ + いれば</p>
+</div>
+<div class="usage">
+<div class="">
+	<p><span class="box">N</span></p>
+</div>
+	<p class="r">+ さえ + V(ば)</p>
+</div>
+
+Means "as long as", "if only". If a certain condition is met, the result will be okay.
+
+> [!info] Examples
+> {公園|こうえん}==さえ==あれ==ば==、うれしいです。
+> As long as there is a park, I am happy.
+
+## かける
+
+Means "half", "not yet finished", "in the middle of".
+Made by removing the ます stem of a verb.
+
+> [!info] Examples
+> この{本棚|ほんだな}はまだ{作|つく}り==かける==です。
+> This bookshelf is not yet finished building.
+
+## 一方だ
+
+{一方|いっぽう}だ means "to continue to", "more and more".
+Used with verbs that expresses change.
+
+> [!info] Examples
+> {禁煙|きんえん}の{場所|ばしょ}は{増|ふ}えている==一方です==。
+> The number of places where smoking is prohibited keeps increasing.
+
+## ばかりだ (NEW!)
+
+Means "to continue to", in a negative direction. Used with verbs in the dictionary form (る), that describe a form of change. Can also be used as ばっかり, ばっか, ばかし, and ばっかし instead of ばかり.
+
+> [!info] Examples
+> {病気|びょうき}は{悪|わる}くなる==ばかりです==。
+> The illness is only getting worse.
+
+## 結果
+
+<div class="usage">
+<div class="left">
+	<p><span class="box">V (た)</span></p>
+	<p><span class="box">N + の</span></p>
+</div>
+	<p class="right">+ 結果</p>
+</div>
+
+{結果|けっか} means "as a result of", "after".
+
+> [!info] Examples
+> {遅|おく}れた==結果==もう{全部|ぜんぶ}の{切符|きっぷ}は{売|う}り{切|き}れた。
+> As a result of being late, all the tickets were already sold out.
+
+## 結局
+
+{結局|けっきょく} means "after all", "in the end". Acts as a conclusion.
+
+> [!info] Examples
+> ==結局=={卒業|そつぎょう}した。
+> In the end, I graduated.

🔰 Grammar/Talking about.md

@@ -1,197 +1,197 @@
-# Talking about
-
-## と言えば・と言うと
-
-と{言|い}えば・と{言|い}うと means "speaking of".
-
-> [!info] Example
-> 日本==と言えば==、富士山です。
-> Speaking of Japan, Mount Fuji comes to mind.
-
-## というのは
-
-<div class="usage">
-<div class="">
-	<p><span class="box">phrase</span></p>
-</div>
-	<p class="r"> + というのは + </p>
-<div class="">
-	<p><span class="box">definition</span></p>
-</div>
-</div>
-
-Means "this means", "known as", "because".
-
-> [!info] Example
-> 「モバゲー」==というのは==モバイルゲームのことです。
-> "Mobage" stands for mobile game.
-
-## において・における
-
-Means "in", "at", "regarding".
-Used with nouns. It is used in formal language.
-
-> [!info] Example
-> {冬|ふゆ}==において=={雪|ゆき}が{降|ふ}る。
-> Snow falls in winter.
-> 
-> 荒川==において=={花火|はなび}。
-> Fireworks held on Arakawa River.
-
-## について
-
-Means "concerning", "about".
-Used with nouns.
-
-> [!info] Example
-> {面接|めんせつ}==について==はいつがよろしいでしょうか。
-> Regarding the interview, when would be a good time?
-
-## をめぐって
-
-<div class="usage">
-<div class="">
-	<p><span class="box">N</span></p>
-</div>
-	<p class="r">+ をめぐって</p>
-</div>
-<div class="usage">
-<div class="">
-	<p><span class="box">N</span></p>
-</div>
-	<p class="r">+ をめぐる +</p>
-<div class="">
-	<p><span class="box">N</span></p>
-</div>
-</div>
-
-Means "concerning", "in regard to". It has the same meaning as について.
-
-> [!info] Example
-> 田中さん==をめぐって==、いろんな{噂|うわさ}がある。
-> There are many rumours concerning Tanaka-san.
-
-## というものだ
-
-Means "concerning", "something called". Used for explanations or morals.
-
-> [!info] Example
-> これはノートパソコン==というものだ==。
-> This is what we call a laptop.
-
-## に関する・に関して
-
-に{関|かん}する・に{関|かん}して means "related to", "about". More formal than について.
-Used with nouns.
-
-> [!info] Example
-> ロボット==に関して==ゲームがあるんです。
-> Are there any games about robots?
-
-## つまり
-
-Means "in other words". Used after a first phrase for an alternative explanation.
-
-> [!info] Example
-> この{映画|えいが}は１２０分、==つまり==２時です。
-> This movie is 120 minutes, that is to say 2 hours.
-
-## ということは
-
-Means "that is to say", "in other words". Used when the answer needs thinking. つまり is more direct.
-
-> [!info] Example
-> A: あの{人|ひと}はわたしの{父|ちち}の{妹|いもうと}んです。
-> B: ==ということは==、あなたのおばさんですね。
-> A: She's my father's sister.
-> B: That means she's your aunt, right.
-
-## すなわち
-
-Means "in other words". More formal than つまり.
-
-> [!info] Example
-> この{映画|えいが}は１２０分、==すなわち==２時です。
-> This movie is 120 minutes, that is to say 2 hours.
-
-## 要するに
-
-{要|よう}するに means "in summary". It is placed at the beginning of the sentence.
-
-> [!info] Example
-> ==要するに==、新しい仕事に就きました。
-> In summary, I got a new job.
-
-## にかけて
-
-Means "through", "concerning". It is used for something that happens over a period of time.
-Used with a noun.
-
-> [!info] Example
-> {日本|にほん}には６月から９月==にかけて==は{暑|あつ}いです。
-> It is hot in Japan from June through September.
-
-## をはじめ
-
-Means "starting with", "not only".
-Used with nouns.
-
-> [!info] Example
-> 漫画==をはじめ=={日本|にほん}の{文化|ぶんか}は{面白|おもしろ}い。
-> Japanese culture, starting with manga, is interesting.
-> 
-> フランスの文化はパン==をはじめ==、ワインも{人気|にんき}です。
-> French culture is popular not only for bread, but also for wine.
-
-## なんか・なんて
-
-Means "such as", "things like". It is used to give examples or to show emphasis.
-なんか is more informal than なんて. Both are spoken form, while [[Listing#など]] is more written.
-なんて is used with all words, while なんか is used with nouns.
-
-> [!info] Example
-> iPod==なんか=={古|ふる}いな{物|もの}です。
-> Things like iPod are old.
-
-## 例えば
-
-{例|たと}えば means "for example".
-
-> [!info] Example
-> {虫|むし}が{好|すき}きです。==例えば=={蝉|せみ}です。
-> I like insect. For example, cicadas.
-
-## ものだ・ものではない
-
-<div class="usage">
-<div class="left">
-	<p><span class="box">V (る・ない)</span></p>
-	<p><span class="box">い-Adj </span></p>
-	<p><span class="box">な-Adj</span></p>
-</div>
-	<p class="right">+ ものだ・ものではない</p>
-</div>
-
-ものだ is used when something is common knowledge, custom, etc. That it is something that is natural or expected.
-ものではない is used for something that is not expected.
-
-> [!info] Example
-> {車|くるま}はいつも{高|たか}い==ものだ==。
-> Cars are always expensive.
-
-## というふうに
-
-Means "as if to say", "in such a way that", "like". Used to describe the manner in which something is done, give examples.
-
-> [!info] Examples
-> {彼|かれ}は{泥棒|どろぼう}==というふうに=={立|た}ち{去|さ}ってしました。
-> He departed like a thief.
-
-## ふうに
-
-Means "in the way of".
-Used after words like こんな, そんな, あんな, どんな and verbs.
-
-> [!info] Examples
-> こんな==ふうに==はだめ！
-> Do not do it like this!
+# Talking about
+
+## と言えば・と言うと
+
+と{言|い}えば・と{言|い}うと means "speaking of".
+
+> [!info] Example
+> 日本==と言えば==、富士山です。
+> Speaking of Japan, Mount Fuji comes to mind.
+
+## というのは
+
+<div class="usage">
+<div class="">
+	<p><span class="box">phrase</span></p>
+</div>
+	<p class="r"> + というのは + </p>
+<div class="">
+	<p><span class="box">definition</span></p>
+</div>
+</div>
+
+Means "this means", "known as", "because".
+
+> [!info] Example
+> 「モバゲー」==というのは==モバイルゲームのことです。
+> "Mobage" stands for mobile game.
+
+## において・における
+
+Means "in", "at", "regarding".
+Used with nouns. Is used in formal language.
+
+> [!info] Example
+> {冬|ふゆ}==において=={雪|ゆき}が{降|ふ}る。
+> Snow falls in winter.
+> 
+> 荒川==において=={花火|はなび}。
+> Fireworks held on Arakawa River.
+
+## について
+
+Means "concerning", "about".
+Used with nouns.
+
+> [!info] Example
+> {面接|めんせつ}==について==はいつがよろしいでしょうか。
+> Regarding the interview, when would be a good time?
+
+## をめぐって (NEW!)
+
+<div class="usage">
+<div class="">
+	<p><span class="box">N</span></p>
+</div>
+	<p class="r">+ をめぐって</p>
+</div>
+<div class="usage">
+<div class="">
+	<p><span class="box">N</span></p>
+</div>
+	<p class="r">+ をめぐる +</p>
+<div class="">
+	<p><span class="box">N</span></p>
+</div>
+</div>
+
+Means "concerning", "in regard to". It has the same meaning as について.
+
+> [!info] Example
+> 田中さん==をめぐって==、いろんな{噂|うわさ}がある。
+> There are many rumours concerning Tanaka-san.
+
+## というものだ (NEW!)
+
+Means "concerning", "something called". Used for explanations or morals.
+
+> [!info] Example
+> これはノートパソコン==というものだ==。
+> This is what we call a laptop.
+
+## に関する・に関して
+
+に{関|かん}する・に{関|かん}して means "related to", "about". More formal than について.
+Used with nouns.
+
+> [!info] Example
+> ロボット==に関して==ゲームがあるんです。
+> Are there any games about robots?
+
+## つまり
+
+Means "in other words". Used after a first phrase for an alternative explanation.
+
+> [!info] Example
+> この{映画|えいが}は１２０分、==つまり==２時です。
+> This movie is 120 minutes, that is to say 2 hours.
+
+## ということは (NEW!)
+
+Means "that is to say", "in other words". Used when the answer needs thinking. つまり is more direct.
+
+> [!info] Example
+> A: あの{人|ひと}はわたしの{父|ちち}の{妹|いもうと}んです。
+> B: ==ということは==、あなたのおばさんですね。
+> A: She's my father's sister.
+> B: That means she's your aunt, right.
+
+## すなわち
+
+Means "in other words". More formal than つまり.
+
+> [!info] Example
+> この{映画|えいが}は１２０分、==すなわち==２時です。
+> This movie is 120 minutes, that is to say 2 hours.
+
+## 要するに (NEW!)
+
+{要|よう}するに means "in summary". It is placed at the beginning of the sentence.
+
+> [!info] Example
+> ==要するに==、新しい仕事に就きました。
+> In summary, I got a new job.
+
+## にかけて
+
+Means "through", "concerning". It is used for something that happens over a period of time.
+Used with a noun.
+
+> [!info] Example
+> {日本|にほん}には６月から９月==にかけて==は{暑|あつ}いです。
+> It is hot in Japan from June through September.
+
+## をはじめ
+
+Means "starting with", "not only".
+Used with nouns.
+
+> [!info] Example
+> 漫画==をはじめ=={日本|にほん}の{文化|ぶんか}は{面白|おもしろ}い。
+> Japanese culture, starting with manga, is interesting.
+> 
+> フランスの文化はパン==をはじめ==、ワインも{人気|にんき}です。
+> French culture is popular not only for bread, but also for wine.
+
+## なんか・なんて
+
+Means "such as", "things like". It is used to give examples or to show emphasis.
+なんか is more informal than なんて. Both are spoken form, while [[Listing#など]] is more written.
+なんて is used with all words, while なんか is used with nouns.
+
+> [!info] Example
+> iPod==なんか=={古|ふる}いな{物|もの}です。
+> Things like iPod are old.
+
+## 例えば
+
+{例|たと}えば means "for example".
+
+> [!info] Example
+> {虫|むし}が{好|すき}きです。==例えば=={蝉|せみ}です。
+> I like insect. For example, cicadas.
+
+## ものだ・ものではない (NEW!)
+
+<div class="usage">
+<div class="left">
+	<p><span class="box">V (る・ない)</span></p>
+	<p><span class="box">い-Adj </span></p>
+	<p><span class="box">な-Adj</span></p>
+</div>
+	<p class="right">+ ものだ・ものではない</p>
+</div>
+
+ものだ is used when something is common knowledge, custom, etc. That it is something that is natural or expected.
+ものではない is used for something that is not expected.
+
+> [!info] Example
+> {車|くるま}はいつも{高|たか}い==ものだ==。
+> Cars are always expensive.
+
+## というふうに (NEW!)
+
+Means "as if to say", "in such a way that", "like". Used to describe the manner in which something is done, give examples.
+
+> [!info] Examples
+> {彼|かれ}は{泥棒|どろぼう}==というふうに=={立|た}ち{去|さ}ってしました。
+> He departed like a thief.
+
+## ふうに (NEW!)
+
+Means "in the way of".
+Used after words like こんな, そんな, あんな, どんな and verbs.
+
+> [!info] Examples
+> こんな==ふうに==はだめ！
+> Do not do it like this!

🔰 Grammar/Thanks.md

@@ -1,19 +1,19 @@
-# Thanks
-
-## せっかく
-
-Means "with trouble", "thank you for the trouble", etc.
-Used at the beginning of a phrase.
-
-> [!info] Example
-> ==せっかく==ケーキを{持|も}てきてくれてありがとう。
-> Thank you for bringing the cake.
-
-## 幸い・幸いなことに
-
-{幸|さいわ}い・{幸|さいわ}いなことに means "luckily", "fortunately".
-Used at the beginning of a phrase.
-
-> [!info] Example
-> ==幸い==、{一番|いちばん}{欲|ほ}しかったガシャポンが{手|て}に{入|い}れった。
-> Luckily, I got the gashapon I wanted the most.
+# Thanks
+
+## せっかく (NEW!)
+
+Means "with trouble", "thank you for the trouble", etc.
+Used at the beginning of a phrase.
+
+> [!info] Example
+> ==せっかく==ケーキを{持|も}てきてくれてありがとう。
+> Thank you for bringing the cake.
+
+## 幸い・幸いなことに (NEW!)
+
+{幸|さいわ}い・{幸|さいわ}いなことに means "luckily", "fortunately".
+Used at the beginning of a phrase.
+
+> [!info] Example
+> ==幸い==、{一番|いちばん}{欲|ほ}しかったガシャポンが{手|て}に{入|い}れった。
+> Luckily, I got the gashapon I wanted the most.

🔰 Grammar/Time - close.md

@@ -9,7 +9,7 @@ Used by combining to a verb.
 > 今ご{飯|はん}を作る==ところ==です。
 > I'm about to make dinner.
 
-## かと思ったら
+## かと思ったら (NEW!)
 
 かと{思|おも}ったら means "just when".
 Can also be used as かと思うと and かと思えば.
@@ -19,7 +19,7 @@ Used with a verb in the past (た) form.
 > スーパーに{行|い}った==かと思ったら==、{雪|ゆき}が{降|ふ}り{出|だ}した。
 > Just as I went to the supermarket, it started snowing.
 
-## か～ないかのうちに
+## か~ないかのうちに (NEW!)
 
 <div class="usage">
 <div class="">
@@ -32,13 +32,13 @@ Used with a verb in the past (た) form.
 	<p class="r">+ か + のちに</p>
 </div>
 
-か～ないかのうちに means "right after", "as soon as". It is formal.
+か~ないかのうちに means "right after", "as soon as". It is formal.
 
 > [!info] Examples
 > {彼|かれ}は{電車|でんしゃ}が{駅|えき}に{着|つ}く==か=={着|つ}かない==かのうちに=={走|はし}り{始|はじ}めた。
 > He started running as soon as the train arrived at the station.
 
-## 次第
+## 次第 (NEW!)
 
 {次第|しだい} means "as soon as". Made by removing the ます stem of a verb.
 
@@ -52,7 +52,7 @@ With に at the end, it means "gradually".
 > {彼|かれ}は==次第に=={上手|じょうず}になってきた。
 > He's gradually gotten better.
 
-## 直ちに
+## 直ちに (NEW!)
 
 {直|ただ}ちに means "immediately", "at once". 
 
@@ -60,7 +60,7 @@ With に at the end, it means "gradually".
 > ==直ちに=={出|で}かけなきゃ！
 > I need to get going right now!
 
-## ところに
+## ところに (NEW!)
 
 Means "at the time", "when", "while", "just as". Used with verbs in the ている form.
 Focuses on the scene or situation rather than the action.
@@ -69,7 +69,7 @@ Focuses on the scene or situation rather than the action.
 > ばかばかしいことをしていた==ところに==、{先輩|せんぱい}{入|はい}りました。
 > While I was doing something stupid, my senior came in.
 
-## 一気に
+## 一気に (NEW!)
 
 {一気|いっき}に means "at once", "all at once" and "instantly", "right away".
 

🔰 Grammar/Time - during.md

@@ -1,193 +1,193 @@
-# Time: during
-
-## 間
-
-<div class="usage">
-<div class="left">
-	<p><span class="box">V (dictionary)</span></p>
-	<p><span class="box">N + の</span></p>
-</div>
-	<p class="right">+ 間</p>
-</div>
-
-{間|あいだ} means "while" or "during". Used to express something that is done for the whole period of time.
-
-> [!info] Example
-> 電車に{乗|の}っている==間==、ゲームをしてた。
-> While I was on the train, I was playing a game.
-
-Can also be used to talk about a distance between two physical places or the time between two things.
-
-> [!info] Example
-> １時から９じまでの==間==、{寝|ね}ます。
-> I sleep between 1AM and 9AM.
-
-## 間に
-
-<div class="usage">
-<div class="left">
-	<p><span class="box">V (casual, non-past)</span></p>
-	<p><span class="box">い-Adj</span></p>
-	<p><span class="box">な-Adj + な</span></p>
-	<p><span class="box">N + の</span></p>
-</div>
-	<p class="right">+ 間に</p>
-</div>
-
-A first meaning is similar to {間|あいだ} (while), but with intentionality.
-
-> [!info] Example
-> 電車に{乗|の}っている==間に==、本を読みました。
-> While I was on the train, I read a book.
-
-A second meaning is a statement of something that happened during a time period, independently of your actions.
-Contrary to 間, it doesn't include the whole time period. So 間に means that at a point during the time period, something happened.
-
-> [!info] Example
-> {夜|よる}の==間に==、{隣|となり}の木が{落|お}ちていた。
-> During the night, the tree next door fell.
-
-## ながら
-
-<div class="usage">
-<div class="">
-	<p><span class="box">V-<strike>ます</strike></span></p>
-</div>
-	<p class="r"> + ながら + ...</p>
-</div>
-
-Means "while", "simultaneously". The difference with ついでに is that here the main action is the second one. Happens at the same time.
-
-> [!info] Example
-> {歩|ある}き==ながら=={電話|でん|わ}を見ています。
-> While walking, I'm looking at my phone.
-
-## ついでに
-
-<div class="usage">
-<div class="left">
-	<p><span class="box">V (dictionary)</span></p>
-	<p><span class="box">V (た)</span></p>
-	<p><span class="box">N + の</span></p>
-</div>
-	<p class="right">+ ついでに</p>
-</div>
-
-Means "while", "at the same time". The difference with ながら is that here the main action is the first one. An opportunity of doing something during the occurrence of the first one (but not for the entire time).
-
-> [!info] Example
-> スーパーに行く==ついでに==、おにぎりを{買|か}ってくれませんか。
-> While you're going to the supermarket, could you bring onigiri?
-
-## と同時に
-
-<div class="usage">
-<div class="left">
-	<p><span class="box">V (る)</span></p>
-	<p><span class="box">い-Adj</span></p>
-	<p><span class="box">な-Adj + である</span></p>
-	<p><span class="box">N</span></p>
-</div>
-	<p class="right">+ と同時に</p>
-</div>
-
-と{同時|どうじ}に means "at the same time as", "while". Contrary to ながら, it is used for something that happens at a precise moment, not during the whole time.
-
-> [!info] Example
-> {電車|でんしゃ}に{乗|の}っている==と同時に==、おじいさんが{落|お}ちた。
-> While on the train, an old man fell off.
-
-## 中
-
-{中|ちゅう}・{中|じゅう} means different things depending on its pronunciation:
-* ちゅう is used when pointing a specific time: "during", "at some point".
-* じゅう is used for the entire time or area: "through", "within", "before it ends".
-
-> [!info] Example
-> {午後|ごご}==中==に{会議|かいぎ}がある。
-> There is a meeting in the afternoon (ちゅう).
-> 
-> {今年|ことし}==中==にスウェーデンに行きたい。
-> I want to go to Sweden before the end of this year (じゅう).
-
-## うちに
-
-<div class="usage">
-<div class="left">
-	<p><span class="box">V (casual)</span></p>
-	<p><span class="box">い-Adj</span></p>
-	<p><span class="box">な-Adj + な</span></p>
-	<p><span class="box">N + の</span></p>
-</div>
-	<p class="right">+ うちに</p>
-</div>
-
-Means "while". The nuance is that the time is optimal and should be taken advantage of.
-
-> [!info] Example
-> {晴|は}れる==うちに=={散歩|さんぽ}しましょう。
-> Let's take a walk while the weather is nice.
-
-## 限り
-
-<div class="usage">
-<div class="left">
-	<p><span class="box">V (る・た・ない・ている・)</span></p>
-	<p><span class="box">N + である</span></p>
-</div>
-	<p class="right">+ 限り</p>
-</div>
-
-{限|かぎ}り means "as long as", "while". Also means "limited to".
-
-> [!info] Example
-> この{映画|えいが}は{来週|らいしゅう}==限り=={劇場|げきじょう}で{上映|じょうえい}されます。
-> This movie will be in theaters the next week only.
-> 
-> {仕事|しごと}を{真面目|まじめ}にする==限り==、{大丈夫|だいじょうぶ}。
-> As long as you're serious doing your job, it will be fine.
-
-## 途中で・途中に
-
-<div class="usage">
-<div class="left">
-	<p><span class="box">V (dictionary)</span></p>
-	<p><span class="box">N + の</span></p>
-</div>
-	<p class="right">+ 途中で・途中に</p>
-</div>
-
-{途中|とちゅう}で・{途中|とちゅう}に means "in the middle of", "on the way".
-
-> [!info] Example
-> {帰|かえ}る==途中で=={自動販売機|じ|どう|はん|ばい|き}で{飲|のみ}み{物|もの}を{買|か}った。
-> On the way home, I bought a drink from the vending machine.
-
-## ているところ
-
-Means "in the process/middle of doing".
-See [[TeF (2) - manner of doing#ているところ]].
-
-## 最中に
-
-<div class="usage">
-<div class="left">
-	<p><span class="box">V (ている)</span></p>
-	<p><span class="box">N + の</span></p>
-</div>
-	<p class="right">+ 最中に</p>
-</div>
-
-{最中|さいちゅう}に means "in the middle of". Happens during something else, interrupting or disturbing it.
-
-> [!info] Example
-> {運転|うんてん}していた==最中に=={鹿|しか}が{現|あらわ}れた。
-> While I was driving, a deer appeared.
-
-## しばらく
-
-Means "for a while", "for now".
-
-> [!info] Example
-> ==しばらく==お{待|ま}ちください。
-> Please wait for a moment.
+# Time: during
+
+## 間
+
+<div class="usage">
+<div class="left">
+	<p><span class="box">V (dictionary)</span></p>
+	<p><span class="box">N + の</span></p>
+</div>
+	<p class="right">+ 間</p>
+</div>
+
+{間|あいだ} means "while" or "during". Used to express something that is done for the whole period of time.
+
+> [!info] Example
+> 電車に{乗|の}っている==間==、ゲームをしてた。
+> While I was on the train, I was playing a game.
+
+Can also be used to talk about a distance between two physical places or the time between two things.
+
+> [!info] Example
+> １時から９じまでの==間==、{寝|ね}ます。
+> I sleep between 1AM and 9AM.
+
+## 間に
+
+<div class="usage">
+<div class="left">
+	<p><span class="box">V (casual, non-past)</span></p>
+	<p><span class="box">い-Adj</span></p>
+	<p><span class="box">な-Adj + な</span></p>
+	<p><span class="box">N + の</span></p>
+</div>
+	<p class="right">+ 間に</p>
+</div>
+
+A first meaning is similar to {間|あいだ} (while), but with intentionality.
+
+> [!info] Example
+> 電車に{乗|の}っている==間に==、本を読みました。
+> While I was on the train, I read a book.
+
+A second meaning is a statement of something that happened during a time period, independently of your actions.
+Contrary to 間, it doesn't include the whole time period. So 間に means that at a point during the time period, something happened.
+
+> [!info] Example
+> {夜|よる}の==間に==、{隣|となり}の木が{落|お}ちていた。
+> During the night, the tree next door fell.
+
+## ながら
+
+<div class="usage">
+<div class="">
+	<p><span class="box">V-<strike>ます</strike></span></p>
+</div>
+	<p class="r"> + ながら + ...</p>
+</div>
+
+Means "while", "simultaneously". The difference with ついでに is that here the main action is the second one. Happens at the same time.
+
+> [!info] Example
+> {歩|ある}き==ながら=={電話|でん|わ}を見ています。
+> While walking, I'm looking at my phone.
+
+## ついでに
+
+<div class="usage">
+<div class="left">
+	<p><span class="box">V (dictionary)</span></p>
+	<p><span class="box">V (た)</span></p>
+	<p><span class="box">N + の</span></p>
+</div>
+	<p class="right">+ ついでに</p>
+</div>
+
+Means "while", "at the same time". The difference with ながら is that here the main action is the first one. An opportunity of doing something during the occurrence of the first one (but not for the entire time).
+
+> [!info] Example
+> スーパーに行く==ついでに==、おにぎりを{買|か}ってくれませんか。
+> While you're going to the supermarket, could you bring onigiri?
+
+## と同時に (NEW!)
+
+<div class="usage">
+<div class="left">
+	<p><span class="box">V (る)</span></p>
+	<p><span class="box">い-Adj</span></p>
+	<p><span class="box">な-Adj + である</span></p>
+	<p><span class="box">N</span></p>
+</div>
+	<p class="right">+ と同時に</p>
+</div>
+
+と{同時|どうじ}に means "at the same time as", "while". Contrary to ながら, it is used for something that happens at a precise moment, not during the whole time.
+
+> [!info] Example
+> {電車|でんしゃ}に{乗|の}っている==と同時に==、おじいさんが{落|お}ちた。
+> While on the train, an old man fell off.
+
+## 中
+
+{中|ちゅう}・{中|じゅう} means different things depending on its pronunciation:
+* ちゅう is used when pointing a specific time: "during", "at some point".
+* じゅう is used for the entire time or area: "through", "within", "before it ends".
+
+> [!info] Example
+> {午後|ごご}==中==に{会議|かいぎ}がある。
+> There is a meeting in the afternoon (ちゅう).
+> 
+> {今年|ことし}==中==にスウェーデンに行きたい。
+> I want to go to Sweden before the end of this year (じゅう).
+
+## うちに
+
+<div class="usage">
+<div class="left">
+	<p><span class="box">V (casual)</span></p>
+	<p><span class="box">い-Adj</span></p>
+	<p><span class="box">な-Adj + な</span></p>
+	<p><span class="box">N + の</span></p>
+</div>
+	<p class="right">+ うちに</p>
+</div>
+
+Means "while". The nuance is that the time is optimal and should be taken advantage of.
+
+> [!info] Example
+> {晴|は}れる==うちに=={散歩|さんぽ}しましょう。
+> Let's take a walk while the weather is nice.
+
+## 限り (NEW!)
+
+<div class="usage">
+<div class="left">
+	<p><span class="box">V (る・た・ない・ている・)</span></p>
+	<p><span class="box">N + である</span></p>
+</div>
+	<p class="right">+ 限り</p>
+</div>
+
+{限|かぎ}り means "as long as", "while". Also means "limited to".
+
+> [!info] Example
+> この{映画|えいが}は{来週|らいしゅう}==限り=={劇場|げきじょう}で{上映|じょうえい}されます。
+> This movie will be in theaters the next week only.
+> 
+> {仕事|しごと}を{真面目|まじめ}にする==限り==、{大丈夫|だいじょうぶ}。
+> As long as you're serious doing your job, it will be fine.
+
+## 途中で・途中に
+
+<div class="usage">
+<div class="left">
+	<p><span class="box">V (dictionary)</span></p>
+	<p><span class="box">N + の</span></p>
+</div>
+	<p class="right">+ 途中で・途中に</p>
+</div>
+
+{途中|とちゅう}で・{途中|とちゅう}に means "in the middle of", "on the way".
+
+> [!info] Example
+> {帰|かえ}る==途中で=={自動販売機|じ|どう|はん|ばい|き}で{飲|のみ}み{物|もの}を{買|か}った。
+> On the way home, I bought a drink from the vending machine.
+
+## ているところ
+
+Means "in the process/middle of doing".
+See [[TeF (2) - manner of doing#ているところ]].
+
+## 最中に
+
+<div class="usage">
+<div class="left">
+	<p><span class="box">V (ている)</span></p>
+	<p><span class="box">N + の</span></p>
+</div>
+	<p class="right">+ 最中に</p>
+</div>
+
+{最中|さいちゅう}に means "in the middle of". Happens during something else, interrupting or disturbing it.
+
+> [!info] Example
+> {運転|うんてん}していた==最中に=={鹿|しか}が{現|あらわ}れた。
+> While I was driving, a deer appeared.
+
+## しばらく
+
+Means "for a while", "for now".
+
+> [!info] Example
+> ==しばらく==お{待|ま}ちください。
+> Please wait for a moment.

🔰 Grammar/Time - finally.md

@@ -1,60 +1,60 @@
-# Time: finally
-
-## やっと
-
-Means that something happened at last, with efforts. More rarely means "barely".
-Used at the beginning of a phrase.
-
-> [!info] Example
-> ==やっと=={論文|ろん|ぶん}を書き{終|お}わった。
-> I finally finished writing my thesis.
-
-## ついに
-
-Means "finally", "at last". Something happened after working to accomplish the goal. Positive implications.
-Used at the beginning of a phrase.
-
-> [!info] Example
-> ==ついに== {新|あたら}しい{地下鉄|ちかてつ}が{出来上|で|き|あ}がった。
-> At last, the new subway was completed.
-
-## あげく
-
-<div class="usage">
-<div class="left">
-	<p><span class="box">V (た)</span></p>
-	<p><span class="box">N + の</span></p>
-</div>
-	<p class="right">+ あげく</p>
-</div>
-
-Means "in the end", "finally". Implies a negative result, despite effort given.
-
-> [!info] Examples
-> {一緒|いっしょ}に{暮|く}らした==あげく==、{別|わか}れることに{決|き}めました。
-> After living together, we decided to break up.
-
-## いよいよ
-
-Means "finally". Explains that something finally happened (after preparation, waiting, etc).
-Used at the beginning of a phrase.
-
-> [!info] Examples
-> ==いよいよ=={作|つく}り{終|お}わりました。
-> I finally finished it.
-
-## 末に
-
-<div class="usage">
-<div class="left">
-	<p><span class="box">V (た)</span></p>
-	<p><span class="box">N + の</span></p>
-</div>
-	<p class="right">+ 末に</p>
-</div>
-
-{末|すえ}に means "finally". Focuses on the end of the preparation.
-
-> [!info] Examples
-> ==末に=={準備|じゅんび}を{終|お}わりました。
-> Finally, I finished the preparations.
+# Time: finally
+
+## やっと
+
+Means that something happened at last, with efforts. More rarely means "barely".
+Used at the beginning of a phrase.
+
+> [!info] Example
+> ==やっと=={論文|ろん|ぶん}を書き{終|お}わった。
+> I finally finished writing my thesis.
+
+## ついに
+
+Means "finally", "at last". Something happened after working to accomplish the goal. Positive implications.
+Used at the beginning of a phrase.
+
+> [!info] Example
+> ==ついに== {新|あたら}しい{地下鉄|ちかてつ}が{出来上|で|き|あ}がった。
+> At last, the new subway was completed.
+
+## あげく (NEW!)
+
+<div class="usage">
+<div class="left">
+	<p><span class="box">V (た)</span></p>
+	<p><span class="box">N + の</span></p>
+</div>
+	<p class="right">+ あげく</p>
+</div>
+
+Means "in the end", "finally". Implies a negative result, despite effort given.
+
+> [!info] Examples
+> {一緒|いっしょ}に{暮|く}らした==あげく==、{別|わか}れることに{決|き}めました。
+> After living together, we decided to break up.
+
+## いよいよ (NEW!)
+
+Means "finally". Explains that something finally happened (after preparation, waiting, etc).
+Used at the beginning of a phrase.
+
+> [!info] Examples
+> ==いよいよ=={作|つく}り{終|お}わりました。
+> I finally finished it.
+
+## 末に (NEW!)
+
+<div class="usage">
+<div class="left">
+	<p><span class="box">V (た)</span></p>
+	<p><span class="box">N + の</span></p>
+</div>
+	<p class="right">+ 末に</p>
+</div>
+
+{末|すえ}に means "finally". Focuses on the end of the preparation.
+
+> [!info] Examples
+> ==末に=={準備|じゅんび}を{終|お}わりました。
+> Finally, I finished the preparations.

🔰 Grammar/Time - regularity.md

@@ -1,70 +1,70 @@
-# Time: regularity
-
-## たびに
-
-<div class="usage">
-<div class="left">
-	<p><span class="box">V (dictionary)</span></p>
-	<p><span class="box">N + の</span></p>
-</div>
-	<p class="right">+ たびに</p>
-</div>
-
-Means "whenever", "every time".
-
-> [!info] Example
-> {犬|いぬ}を{見|み}る==たびに=={幸|しあわ}せになる。
-> Whenever I see a dog, I feel happy.
-
-## おきに
-
-Means "every other". This is used for repeated intervals, after a noun indicating something measurable.
-
-> [!info] Example
-> この電車は４分==おきに=={出発|しゅ|っぱつ}します。
-> This train leaves every four minutes.
-
-## ごとに
-
-<div class="usage">
-<div class="left">
-	<p><span class="box">V (dictionary)</span></p>
-	<p><span class="box">N</span></p>
-</div>
-	<p class="right">+ ごとに</p>
-</div>
-
-Means "each", "every". Used for intervals.
-
-> [!info] Example
-> {彼女|かのじょ}に{会|あ}う==ごとに==、{心|こころ}がドキドキする。
-> Every time I see her, my heart pounds.
-
-## おきに vs ごとに
-
-The way the intervals are counted between these two grammar structure is different.
-* おきに refers to what is _inside_ the interval.
-* ごとに refers to the interval _per se_.
-
-> [!info] Example
-> １日==おきに== =２日==ごとに== = every other day = every second day
-> ●○●○●○●
->
-> ２日==おきに== =３日==ごとに== = every three days = every third day
-> ●○○●○○●○○●
-
-## につけ
-
-<div class="usage">
-<div class="left">
-	<p><span class="box">V (る)</span></p>
-	<p><span class="box">N</span></p>
-</div>
-	<p class="right">+ につけ・につけて</p>
-</div>
-
-Means "every time", "whenever". Formal and rarely used nowadays.
-
-> [!info] Examples
-> 私が{掃除機|そうじき}を{使|つか}う==につけ==、うちの{犬|いぬ}が{怖|こわ}がります。
-> Every time I use the vacuum cleaner, my dog is scared.
+# Time: regularity
+
+## たびに
+
+<div class="usage">
+<div class="left">
+	<p><span class="box">V (dictionary)</span></p>
+	<p><span class="box">N + の</span></p>
+</div>
+	<p class="right">+ たびに</p>
+</div>
+
+Means "whenever", "every time".
+
+> [!info] Example
+> {犬|いぬ}を{見|み}る==たびに=={幸|しあわ}せになる。
+> Whenever I see a dog, I feel happy.
+
+## おきに
+
+Means "every other". This is used for repeated intervals, after a noun indicating something measurable.
+
+> [!info] Example
+> この電車は４分==おきに=={出発|しゅ|っぱつ}します。
+> This train leaves every four minutes.
+
+## ごとに
+
+<div class="usage">
+<div class="left">
+	<p><span class="box">V (dictionary)</span></p>
+	<p><span class="box">N</span></p>
+</div>
+	<p class="right">+ ごとに</p>
+</div>
+
+Means "each", "every". Used for intervals.
+
+> [!info] Example
+> {彼女|かのじょ}に{会|あ}う==ごとに==、{心|こころ}がドキドキする。
+> Every time I see her, my heart pounds.
+
+## おきに vs ごとに
+
+The way the intervals are counted between these two grammar structure is different.
+* おきに refers to what is _inside_ the interval.
+* ごとに refers to the interval _per se_.
+
+> [!info] Example
+> １日==おきに== =２日==ごとに== = every other day = every second day
+> ●○●○●○●
+>
+> ２日==おきに== =３日==ごとに== = every three days = every third day
+> ●○○●○○●○○●
+
+## につけ (NEW!)
+
+<div class="usage">
+<div class="left">
+	<p><span class="box">V (る)</span></p>
+	<p><span class="box">N</span></p>
+</div>
+	<p class="right">+ につけ・につけて</p>
+</div>
+
+Means "every time", "whenever". Formal and rarely used nowadays.
+
+> [!info] Examples
+> 私が{掃除機|そうじき}を{使|つか}う==につけ==、うちの{犬|いぬ}が{怖|こわ}がります。
+> Every time I use the vacuum cleaner, my dog is scared.

🔰 Grammar/Time - surprise.md

@@ -1,34 +1,34 @@
-# Time: surprise
-
-## 急に
-
-{急|きゅう}に means that something happened unexpectedly or quickly.
-
-> [!info] Example
-> ==急に==電車が{現|あらわ}れた。
-> A train suddenly appeared.
-
-## ふと
-
-This means "suddenly", "unexpectedly", "unintentionally". Emphasis is on the lack of intention.
-
-> [!info] Example
-> ==ふと=={通|とお}りに１０００円を{見|み}つけた。
-> I found 1000 yen on the street by chance.
-
-## いきなり
-
-Means "suddenly". Used before a phrase containing an action. It implies something that is more surprising than with 急に, puts more emotion into it.
-
-> [!info] Examples
-> ==いきなり=={雨|あめ}が{降|ふ}ってきた。
-> It suddenly started raining.
-
-## たとたん
-
-Means "just as". Used for an action that happens just at the moment something else occurs. Can convey a nuance of something unexpected or surprising.
-Used with verbs in the past form (た).
-
-> [!info] Example
-> {部屋|へや}を{掃除|そうじ}し==たとたん==、うちの{猫|ねこ}が{吐|は}いてしまった。
-> As soon as I cleaned my room, my cat vomited.
+# Time: surprise
+
+## 急に
+
+{急|きゅう}に means that something happened unexpectedly or quickly.
+
+> [!info] Example
+> ==急に==電車が{現|あらわ}れた。
+> A train suddenly appeared.
+
+## ふと
+
+This means "suddenly", "unexpectedly", "unintentionally". Emphasis is on the lack of intention.
+
+> [!info] Example
+> ==ふと=={通|とお}りに１０００円を{見|み}つけた。
+> I found 1000 yen on the street by chance.
+
+## いきなり (NEW!)
+
+Means "suddenly". Used before a phrase containing an action. It implies something that is more surprising than with 急に, puts more emotion into it.
+
+> [!info] Examples
+> ==いきなり=={雨|あめ}が{降|ふ}ってきた。
+> It suddenly started raining.
+
+## たとたん
+
+Means "just as". Used for an action that happens just at the moment something else occurs. Can convey a nuance of something unexpected or surprising.
+Used with verbs in the past form (た).
+
+> [!info] Example
+> {部屋|へや}を{掃除|そうじ}し==たとたん==、うちの{猫|ねこ}が{吐|は}いてしまった。
+> As soon as I cleaned my room, my cat vomited.

🔰 Grammar/Time - throughout.md

@@ -1,18 +1,18 @@
-# Time - throughout
-
-## から〜にかけて
-
-Means "through", "from... until". Indicates that something happens over a period of time.
-
-> [!info] Example
-> {朝|あさ}==から=={夜|よる}==にかかて==ゲームしたい。
-> I want to play games from morning to night.
-
-## にわたって
-
-Means "throughout", "over (a period)". It is formal.
-Used with nouns.
-
-> [!info] Example
-> {今日|きょう}==にわたって=={不運|ふうん}だった。
-> I've had bad luck throughout the day.
+# Time - throughout
+
+## から〜にかけて
+
+Means "through", "from... until". Indicates that something happens over a period of time.
+
+> [!info] Example
+> {朝|あさ}==から=={夜|よる}==にかかて==ゲームしたい。
+> I want to play games from morning to night.
+
+## にわたって (NEW!)
+
+Means "throughout", "over (a period)". It is formal.
+Used with nouns.
+
+> [!info] Example
+> {今日|きょう}==にわたって=={不運|ふうん}だった。
+> I've had bad luck throughout the day.

🔰 Grammar/Time.md

@@ -130,13 +130,13 @@ This indicates a time limit for the action, similar to "by".
 <div class="">
 	<p><span class="box">N (time)</span></p>
 </div>
-	<p class="r">+ ぶりに～する</p>
+	<p class="r">+ ぶりに~する</p>
 </div>
 <div class="usage">
 <div class="">
 	<p><span class="box">N (time)</span></p>
 </div>
-	<p class="r">+ ぶり + の + </p>
+	<p class="r">+ ぶり + の</p>
 <div class="">
 	<p><span class="box">N</span></p>
 </div>
@@ -149,7 +149,7 @@ Used with nouns measuring time.
 > ３{年|ねん}==ぶりに==ブラジルを{戻|もど}ります。
 > For the first time in 3 years, I'm returning to Brazil.
 
-## に先立ち
+## に先立ち (NEW!)
 
 <div class="usage">
 <div class="left">
@@ -182,7 +182,7 @@ Also used as に先立つ when a second noun follows a first one.
 > {面接|めんせつ}の==上で==、{連絡|れんらく}します。
 > We will contact you after the interview.
 
-## にあたって
+## にあたって (NEW!)
 
 <div class="usage">
 <div class="left">
@@ -200,7 +200,7 @@ Used with verbs and nouns.
 > {試験|しけん}を{受|う}ける==にあたって==、{鉛筆|えんぴつ}と{消|け}しゴムを{持|も}ってきてください。
 > Please bring a pencil and an eraser in preparation for the test.
 
-## に際して
+## に際して (NEW!)
 
 <div class="usage">
 <div class="left">
@@ -216,7 +216,7 @@ Used with verbs and nouns.
 > {試験|しけん}を{受|う}ける==に際して==、{静|しず}かにしてください。
 > During the test, please be quiet.
 
-## とっくに
+## とっくに (NEW!)
 
 Means "long ago", "a long time ago".
 
@@ -224,7 +224,7 @@ Means "long ago", "a long time ago".
 > {彼女|かのじょ}は==とっくに=={帰|かえ}ってしまった。
 > She went home long ago.
 
-## やがて
+## やがて (NEW!)
 
 Means "before long", "eventually".
 
@@ -232,10 +232,10 @@ Means "before long", "eventually".
 > ==やがて==この{新|あたら}しいゲームは{売|う}り{出|だ}すはずです。
 > This new game should be put on sale soon.
 
-## ところだった
+## ところだった (NEW!)
 
-Means "almost", "about to", "almost happened". Used with a dictionary form verb (る) by adding ところだった.
+Means "almost", "about to", "almost happened". Used with a verb (る) by adding ところだった.
 
 > [!info] Examples
-> {車|くるま}の{事故|じこ}が{起|お}こる==ところだった==。{無事|ぶじ}よかった。
+> {車|くるま}の{事故|じこ}が{起|お}==こるところだった==。{無事|ぶじ}よかった。
 > A car accident almost happened. Thankfully we're safe.

🔰 Grammar/Towards.md

@@ -1,69 +1,69 @@
-# Towards
-
-## 向け
-
-{向|む}け means "intended for", "aimed at".
-Used with nouns.
-
-> [!info] Example
-> この本は{子供|こども}==向け==です。
-> The book is for children.
-
-## 向き
-
-{向|む}き means "suitable for". Close to 向け, but intended doesn't exactly means suitable.
-Also means "facing".
-Used with nouns.
-
-> [!info] Example
-> この{建物|たてもの}は{南|みなみ}==向き==です。
-> This building is facing south.
-
-## に向かって・に向けて
-
-に{向|む}かって means "to face", "towards".
-
-> [!info] Example
-> {今|いま}{名古屋|なごや}==に向かっています==。
-> I'm heading towards Nagoya now.
-
-## を中心に
-
-を{中心|ちゅう|しん}に means "mainly", "focused on".
-Used with nouns.
-
-> [!info] Example
-> ポケモンはポケモン==を中心にする==ゲームです。
-> Pokémon is a game centered around on Pokémon battles.
-> 
-> この{授業|じゅぎょう}は{漢字|かんじ}==を中心に=={習|なら}います。
-> This class focuses on learning kanjis.
-
-## に対して
-
-### Towards
-
-The first meaning of に{対|たい}して is "towards", "regarding". Focuses on action, attitude, feelings, etc.
-Used with a noun.
-
-> [!info] Example
-> {彼|かれ}は{子供|こども}==に対して=={優|やさ}しいです。
-> He is kind towards children.
-
-### In contrast to
-
-<div class="usage">
-<div class="left">
-	<p><span class="box">V + の</span></p>
-	<p><span class="box">い-Adj</span></p>
-	<p><span class="box">な-Adj + (な + の)</span></p>
-	<p><span class="box">N + な + の</span></p>
-</div>
-	<p class="right">+ に対して</p>
-</div>
-
-The second meaning is "in contrast to".
-
-> [!info] Example
-> {弟|おとうと}は{漢字|かんじ}を{読|よ}むこと==に対して==、{私|わたし}が{読|よ}みません。
-> My little brother can read kanji, whereas I can't.
+# Towards
+
+## 向け
+
+{向|む}け means "intended for", "aimed at".
+Used with nouns.
+
+> [!info] Example
+> この本は{子供|こども}==向け==です。
+> The book is for children.
+
+## 向き
+
+{向|む}き means "suitable for". Close to 向け, but intended doesn't exactly means suitable.
+Also means "facing".
+Used with nouns.
+
+> [!info] Example
+> この{建物|たてもの}は{南|みなみ}==向き==です。
+> This building is facing south.
+
+## に向かって・に向けて (NEW!)
+
+に{向|む}かって means "to face", "towards".
+
+> [!info] Example
+> {今|いま}{名古屋|なごや}==に向かっています==。
+> I'm heading towards Nagoya now.
+
+## を中心に
+
+を{中心|ちゅう|しん}に means "mainly", "focused on".
+Used with nouns.
+
+> [!info] Example
+> ポケモンはポケモン==を中心にする==ゲームです。
+> Pokémon is a game centered around on Pokémon battles.
+> 
+> この{授業|じゅぎょう}は{漢字|かんじ}==を中心に=={習|なら}います。
+> This class focuses on learning kanjis.
+
+## に対して
+
+### Towards
+
+The first meaning of に{対|たい}して is "towards", "regarding". Focuses on action, attitude, feelings, etc.
+Used with a noun.
+
+> [!info] Example
+> {彼|かれ}は{子供|こども}==に対して=={優|やさ}しいです。
+> He is kind towards children.
+
+### In contrast to
+
+<div class="usage">
+<div class="left">
+	<p><span class="box">V + の</span></p>
+	<p><span class="box">い-Adj</span></p>
+	<p><span class="box">な-Adj + (な + の)</span></p>
+	<p><span class="box">N + な + の</span></p>
+</div>
+	<p class="right">+ に対して</p>
+</div>
+
+The second meaning is "in contrast to".
+
+> [!info] Example
+> {弟|おとうと}は{漢字|かんじ}を{読|よ}むこと==に対して==、{私|わたし}が{読|よ}みません。
+> My little brother can read kanji, whereas I can't.

🔰 Grammar/Transformation.md

@@ -9,7 +9,7 @@ V+こと => 食べること. The verbs are never conjugated.
 > {音楽|おん|がく}を聞く==こと==が好きです。
 > I like to listen to music (listening to music is something I like).
 
-## ～さ: adjective as noun
+## ~さ: adjective as noun
 
 <div class="usage">
 <div class="left">
@@ -28,7 +28,7 @@ This allows to transform an adjective into a noun (adjective nominalizer). Used
 > やさし==さ==。
 > Kindness.
 
-## ～み: adjective as noun
+## ~み: adjective as noun
 
 <div class="usage">
 <div class="left">

🔰 Grammar/Without.md

@@ -1,86 +1,86 @@
-# Without
-
-## ないで
-
-Means "without doing". Formed with a verb in the negative tense (ない).
-It is a bit more casual than ずに.
-
-> [!info] Example
-> {勉強|べんきょう}し==ないで=={卒業|そつぎょう}した。
-> I graduated without studying.
-
-## ず(に)
-
-Means "without doing". Formed with a verb in the negative tense (ない) by removing the -ない stem and adding ず(に).
-する transforms to せずに.
-It is a bit more formal than ないで. Used more often in written form than ないで.
-
-> [!info] Example
-> 毎日食べ==ずに==出かける。
-> Everyday, I go out without eating.
-
-## ずに済む・なくて済む
-
-<div class="usage">
-<div class="">
-	<p><span class="box">V-<strike>ない</strike></span></p>
-</div>
-	<p class="r">+ ずに済む</p>
-</div>
-<div class="usage">
-<div class="">
-	<p><span class="box">V-ない</span></p>
-</div>
-	<p class="r">+ なくて済む</p>
-</div>
-<div class="usage">
-<div class="">
-	<p><span class="box">V-ない</span></p>
-</div>
-	<p class="r">+ で済む</p>
-</div>
-
-ずに{済|す}む and なくて{済|す}む mean "get by without doing". Used with a negative verb.
-
-> [!info] Example
-> {天才|てんさい}ので、彼は{勉強|べんきょう}==せずに済んだ=={合格|ごうかく}できました。
-> He passed the exam without having to study, since he's a genius.
-
-## ことなく
-
-Means "without doing". Implies that it is regretful that it happened.
-Used with a verb (dictionary form).
-
-> [!info] Example
-> {私|わたし}が{作|つく}ったケーキを{食|た}べる==ことなく=={友達|ともだち}は{帰|かえ}ってしまた。
-> My friend went home without eating the cake I made.
-
-## 抜きで・抜きにして
-
-{抜|ぬ}きにして・{抜|ぬ}きで means "without".
-Used with nouns.
-
-> [!info] Example
-> {彼女|かのじょ}==抜きで==何もできない。
-> I can't do anything without her.
-
-## もかまわず
-
-<div class="usage">
-<div class="">
-	<p><span class="box">V + の</span></p>
-</div>
-	<p class="r">+ も構わず</p>
-</div>
-<div class="usage">
-<div class="">
-	<p><span class="box">N</span></p>
-</div>
-	<p class="r">+ も構わず</p>
-</div>
-
-も{構|かま}わず means "without worrying about".
-
-> [!info] Example
-> {未来|みらい}==も構わず==、{全然|ぜんぜん}{勉強|べんきょう}した。
-> Without worrying about the future, I didn't studied at all.
+# Without
+
+## ないで
+
+Means "without doing". Formed with a verb in the negative tense (ない).
+It is a bit more casual than ずに.
+
+> [!info] Example
+> {勉強|べんきょう}し==ないで=={卒業|そつぎょう}した。
+> I graduated without studying.
+
+## ず(に)
+
+Means "without doing". Formed with a verb in the negative tense (ない) by removing the -ない stem and adding ず(に).
+する transforms to せずに.
+It is a bit more formal than ないで. Used more often in written form than ないで.
+
+> [!info] Example
+> 毎日食べ==ずに==出かける。
+> Everyday, I go out without eating.
+
+## ずに済む・なくて済む (NEW!)
+
+<div class="usage">
+<div class="">
+	<p><span class="box">V-<strike>ない</strike></span></p>
+</div>
+	<p class="r">+ ずに済む</p>
+</div>
+<div class="usage">
+<div class="">
+	<p><span class="box">V-ない</span></p>
+</div>
+	<p class="r">+ なくて済む</p>
+</div>
+<div class="usage">
+<div class="">
+	<p><span class="box">V-ない</span></p>
+</div>
+	<p class="r">+ で済む</p>
+</div>
+
+ずに{済|す}む and なくて{済|す}む mean "get by without doing". Used with a negative verb.
+
+> [!info] Example
+> {天才|てんさい}ので、彼は{勉強|べんきょう}==せずに済んだ=={合格|ごうかく}できました。
+> He passed the exam without having to study, since he's a genius.
+
+## ことなく (NEW!)
+
+Means "without doing". Implies that it is regretful that it happened.
+Used with a verb (dictionary form).
+
+> [!info] Example
+> {私|わたし}が{作|つく}ったケーキを{食|た}べる==ことなく=={友達|ともだち}は{帰|かえ}ってしまた。
+> My friend went home without eating the cake I made.
+
+## 抜きで・抜きにして (NEW!)
+
+{抜|ぬ}きにして・{抜|ぬ}きで means "without".
+Used with nouns.
+
+> [!info] Example
+> {彼女|かのじょ}==抜きで==何もできない。
+> I can't do anything without her.
+
+## もかまわず (NEW!)
+
+<div class="usage">
+<div class="">
+	<p><span class="box">V + の</span></p>
+</div>
+	<p class="r">+ も構わず</p>
+</div>
+<div class="usage">
+<div class="">
+	<p><span class="box">N</span></p>
+</div>
+	<p class="r">+ も構わず</p>
+</div>
+
+も{構|かま}わず means "without worrying about".
+
+> [!info] Example
+> {未来|みらい}==も構わず==、{全然|ぜんぜん}{勉強|べんきょう}した。
+> Without worrying about the future, I didn't studied at all.

🔰 Grammar/🔰 Particles (1).md

@@ -14,7 +14,7 @@ When a sentence is negative, は is usually used instead of が and を.
 > 肉==は==食べません。
 > I don't eat meat.
 
-When used with a noun that is a number or an amount, it takes the meaning of "at least" or "around". Can be mixed with [[Amounts#くらい・ぐらい]].
+When used with a noun that is a number or an amount, it takes the meaning of "at least" or "around". Can be mixed with [[Amounts#くらい]].
 
 > [!info] Example
 > {毎週|まいしゅう}２{回|かい}==は=={映画館|えいがかん}に行きます。
@@ -37,7 +37,7 @@ It is also used for making a contrast.
 In a noun modifying clause, は becomes が.
 
 > [!info] Example
-> {彼|かれ}はラメんを{作|つく}った。
+> {彼|かれ}はラメんを{作|つく}。
 > He made ramen.
 > 
 > {彼|かれ}==が=={作|つく}ったラメんはおいしいです。
@@ -62,7 +62,7 @@ The first sentence would most likely be the answer to "where are you from?", whi
 This particle is used for the target of the action of a verb.
 
 > [!info] Examples
-> ケーキ==を=={作|つく}る。
+> ケーキ==を==作る。
 > I prepare a cake.
 
 ## に

🔰 Grammar/🔰 Particles (2).md

@@ -1,124 +1,124 @@
-# Particles (2)
-
-## から
-
-### Because
-
-<div class="usage">
-<div class="left">
-	<p><span class="box">V</span></p>
-	<p><span class="box">い-Adj</span></p>
-	<p><span class="box">な-Adj + だ</span></p>
-	<p><span class="box">N + だ</span></p>
-</div>
-	<p class="right">+ から</p>
-</div>
-
-The first meaning of から is "because".
-
-> [!info] Example
-> {疲|つか}れる==から==今ベットに行きます。
-> I'm going to bed now because I am tired.
-
-### From, since
-
-The second meaning expresses that something comes from someone/something, or the start time/location. Used by only adding から.
-
-> [!info] Example
-> お{祖母|ばあ}さん==から==もらった。
-> I got it from my grandmother.
-> 
-> ここで{子供|こども}の時==から=={家族|かぞく}と{住|す}んでいます。
-> I have lived here with my family since I'm a kid.
-
-## まで
-
-Means "until" or "to".
-
-> [!info] Example
-> {駅|えき}==まで==どのくらいですか。
-> How far is it to the station?
-
-## から～まで
-
-These two particles are frequently used together. It means "from X to Y".
-
-> [!info] Example
-> {朝|あさ}に６時==から==７時==まで=={電車|でんしゃ}で{通|かよ}うっています。
-> I commute by train from 6am to 7am.
-
-## っけ
-
-<div class="usage">
-<div class="left">
-	<p><span class="box">V</span></p>
-	<p><span class="box">い-Adj <strike>い</strike> かった</span></p>
-	<p><span class="box">な-Adj + だ・だった</span></p>
-	<p><span class="box">N + だ・だった</span></p>
-</div>
-	<p class="right">+ っけ</p>
-</div>
-
-Used when the speaker tries to remember, or confirm an information, that has been forgotten.
-
-> [!info] Example
-> {会議|かいぎ}は今日だった==っけ==。
-> Was the meeting today?
-
-## こそ
-
-Means "for sure". Used to emphasize words.
-Used with nouns.
-
-⚠ Replaces the を and が particle. It is, in a certain way, a stronger way than が to highlight information.
-
-> [!info] Example
-> {今年|ことし}==こそ=={日本|にほん}に{住|す}む。
-> This year, for sure I'll live in Japan.
-
-## さえ
-
-<div class="usage">
-<div class="left">
-	<p><span class="box">V (て)</span></p>
-	<p><span class="box">V <strike>ます</strike></p>
-	<p><span class="box">N + で</span></p>
-	<p><span class="box">N + </span></p>
-</div>
-	<p class="right">+ さえ</p>
-</div>
-
-Means "even", "not even" (with negative verbs).
-
-> [!info] Example
-> {先生|せんせい}で==さえ==、この{曲|きょく}を{弾|ひ}くことは{難|むずか}しいです。
-> Even for my teacher, this composition is difficult to play.
-
-⚠ With conditional verbs, it means "only". See [[State#さえ～ば]].
-
-## にて
-
-This particle is a formal version of [[🔰 Particles (1)#で]], and is used the same way.
-
-> [!info] Example
-> {電話|でんわ}==にて=={連絡|れんらく}ください。
-> Please contact us by phone.
-
-## より
-
-It is a more formal form of から ([[#From, since]]).
-
-> [!info] Example
-> 明日==より=={毎日|まいにち}{運動|うんどう}するつもりです。
-> Starting tomorrow, I'm going to exercise every day.
-
-Do not confuse with [[Comparison#より]].
-
-## Sentence ending
-
-At the end of a sentence, some particles can be added to put emphasis on a meaning.
-
-* ==なあ== express hope, admiration or uncertainty. Can also be used to ask for confirmation ("right?").
-* ==ね== seeks confirmation.
-* ==よ== when informing someone about something.
-* ==わ== is informal women's speech.
+# Particles (2)
+
+## から
+
+### Because
+
+<div class="usage">
+<div class="left">
+	<p><span class="box">V</span></p>
+	<p><span class="box">い-Adj</span></p>
+	<p><span class="box">な-Adj + だ</span></p>
+	<p><span class="box">N + だ</span></p>
+</div>
+	<p class="right">+ から</p>
+</div>
+
+The first meaning of から is "because".
+
+> [!info] Example
+> {疲|つか}れる==から==今ベットに行きます。
+> I'm going to bed now because I am tired.
+
+### From, since
+
+The second meaning expresses that something comes from someone/something, or the start time/location. Used by only adding から.
+
+> [!info] Example
+> お{祖母|ばあ}さん==から==もらった。
+> I got it from my grandmother.
+> 
+> ここで{子供|こども}の時==から=={家族|かぞく}と{住|す}んでいます。
+> I have lived here with my family since I'm a kid.
+
+## まで
+
+Means "until" or "to".
+
+> [!info] Example
+> {駅|えき}==まで==どのくらいですか。
+> How far is it to the station?
+
+## から～まで
+
+These two particles are frequently used together. It means "from X to Y".
+
+> [!info] Example
+> {朝|あさ}に６時==から==７時==まで==電車で{通|かよ}うっています。
+> I commute by train from 6am to 7am.
+
+## っけ
+
+<div class="usage">
+<div class="left">
+	<p><span class="box">V</span></p>
+	<p><span class="box">い-Adj <strike>い</strike> かった</span></p>
+	<p><span class="box">な-Adj + だ・だった</span></p>
+	<p><span class="box">N + だ・だった</span></p>
+</div>
+	<p class="right">+ っけ</p>
+</div>
+
+Used when the speaker tries to remember, or confirm an information, that has been forgotten.
+
+> [!info] Example
+> {会議|かいぎ}は今日だった==っけ==。
+> Was the meeting today?
+
+## こそ
+
+Means "for sure". Used to emphasize words.
+Used with nouns.
+
+⚠ Replaces the を and が particle. It is, in a certain way, a stronger way than が to highlight information.
+
+> [!info] Example
+> {今年|ことし}==こそ=={日本|にほん}に{住|す}む。
+> This year, for sure I'll live in Japan.
+
+## さえ
+
+<div class="usage">
+<div class="left">
+	<p><span class="box">V (て)</span></p>
+	<p><span class="box">V <strike>ます</strike></p>
+	<p><span class="box">N + で</span></p>
+	<p><span class="box">N + </span></p>
+</div>
+	<p class="right">+ さえ</p>
+</div>
+
+Means "even", "not even" (with negative verbs).
+
+> [!info] Example
+> {先生|せんせい}で==さえ==、この{曲|きょく}を{弾|ひ}くことは{難|むずか}しいです。
+> Even for my teacher, this composition is difficult to play.
+
+⚠ With conditional verbs, it means "only". See [[State#さえ～ば]].
+
+## にて (NEW!)
+
+This particle is a formal version of [[🔰 Particles (1)#で]], and is used the same way.
+
+> [!info] Example
+> {電話|でんわ}==にて=={連絡|れんらく}ください。
+> Please contact us by phone.
+
+## より (NEW!)
+
+It is a more formal form of から ([[#From, since]]).
+
+> [!info] Example
+> 明日==より=={毎日|まいにち}{運動|うんどう}するつもりです。
+> Starting tomorrow, I'm going to exercise every day.
+
+Do not confuse with [[Comparison#より]].
+
+## Sentence ending
+
+At the end of a sentence, some particles can be added to put emphasis on a meaning.
+
+* ==なあ== express hope, admiration or uncertainty. Can also be used to ask for confirmation ("right?").
+* ==ね== seeks confirmation.
+* ==よ== when informing someone about something.
+* ==わ== is informal women's speech.