Small adjustments for responsiveness

8cd58e1 Added all N2 notions
fd602b3 Misc. meaning and typo fixes
83627ff Update Opposition - even if.md
06f8a41 Update Considering - for - as.md
a0c7751 Update Connectors.md
629ced5 Update Connectors - in order to.md
892f855 Update Certainty.md

git-subtree-dir: content
git-subtree-split: 8cd58e1395d691d753385f8e01ff88b291b0177f

.dockerignore

@@ -0,0 +1,2 @@
+.*
+*/.*

.github/dependabot.yml

@@ -1,11 +1,20 @@
-# To get started with Dependabot version updates, you'll need to specify which
-# package ecosystems to update and where the package manifests are located.
-# Please see the documentation for all configuration options:
-# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
-
 version: 2
 updates:
   - package-ecosystem: "npm"
     directory: "/"
     schedule:
       interval: "weekly"
+    groups:
+      production-dependencies:
+        applies-to: "version-updates"
+        patterns:
+          - "*"
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    groups:
+      ci-dependencies:
+        applies-to: "version-updates"
+        patterns:
+          - "*"

.github/workflows/build-preview.yaml

@@ -0,0 +1,43 @@
+name: Build Preview Deployment
+
+on:
+  pull_request:
+    types: [opened, synchronize]
+  workflow_dispatch:
+
+jobs:
+  build-preview:
+    if: ${{ github.repository == 'jackyzha0/quartz' }}
+    runs-on: ubuntu-latest
+    name: Build Preview
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Setup Node
+        uses: actions/setup-node@v4
+        with:
+          node-version: 22
+
+      - name: Cache dependencies
+        uses: actions/cache@v4
+        with:
+          path: ~/.npm
+          key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
+          restore-keys: |
+            ${{ runner.os }}-node-
+
+      - run: npm ci
+
+      - name: Check types and style
+        run: npm run check
+
+      - name: Build Quartz
+        run: npx quartz build -d docs -v
+
+      - name: Upload build artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: preview-build
+          path: public

.github/workflows/ci.yaml

@@ -7,6 +7,7 @@ on:
   push:
     branches:
       - v4
+  workflow_dispatch:
 
 jobs:
   build-and-test:
@@ -18,17 +19,17 @@ jobs:
     permissions:
       contents: write
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
       - name: Setup Node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 22
 
       - name: Cache dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.npm
           key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
@@ -44,25 +45,25 @@ jobs:
         run: npm test
 
       - name: Ensure Quartz builds, check bundle info
-        run: npx quartz build --bundleInfo
+        run: npx quartz build --bundleInfo -d docs
 
   publish-tag:
-    if: ${{ github.repository == 'jackyzha0/quartz' }}
+    if: ${{ github.repository == 'jackyzha0/quartz' && github.ref == 'refs/heads/v4' }}
     runs-on: ubuntu-latest
     permissions:
       contents: write
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Setup Node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 22
       - name: Get package version
         run: node -p -e '`PACKAGE_VERSION=${require("./package.json").version}`' >> $GITHUB_ENV
       - name: Create release tag
-        uses: pkgdeps/git-tag-action@v2
+        uses: pkgdeps/git-tag-action@v3
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           github_repo: ${{ github.repository }}

.github/workflows/deploy-preview.yaml

@@ -0,0 +1,37 @@
+name: Upload Preview Deployment
+on:
+  workflow_run:
+    workflows: ["Build Preview Deployment"]
+    types:
+      - completed
+
+permissions:
+  actions: read
+  deployments: write
+  contents: read
+  pull-requests: write
+
+jobs:
+  deploy-preview:
+    if: ${{ github.repository == 'jackyzha0/quartz' && github.event.workflow_run.conclusion == 'success' }}
+    runs-on: ubuntu-latest
+    name: Deploy Preview to Cloudflare Pages
+    steps:
+      - name: Download build artifact
+        uses: actions/download-artifact@v4
+        id: preview-build-artifact
+        with:
+          name: preview-build
+          path: build
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          run-id: ${{ github.event.workflow_run.id }}
+
+      - name: Deploy to Cloudflare Pages
+        uses: AdrianGonz97/refined-cf-pages-action@v1
+        with:
+          apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
+          accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
+          githubToken: ${{ secrets.GITHUB_TOKEN }}
+          projectName: quartz
+          deploymentName: Branch Preview
+          directory: ${{ steps.preview-build-artifact.outputs.download-path }}

.github/workflows/docker-build-push.yaml

@@ -0,0 +1,88 @@
+name: Docker build & push image
+
+on:
+  push:
+    branches: [v4]
+    tags: ["v*"]
+  pull_request:
+    branches: [v4]
+    paths:
+      - .github/workflows/docker-build-push.yaml
+      - quartz/**
+  workflow_dispatch:
+
+jobs:
+  build:
+    if: ${{ github.repository == 'jackyzha0/quartz' }} # Comment this out if you want to publish your own images on a fork!
+    runs-on: ubuntu-latest
+    steps:
+      - name: Set lowercase repository owner environment variable
+        run: |
+          echo "OWNER_LOWERCASE=${OWNER,,}" >> ${GITHUB_ENV}
+        env:
+          OWNER: "${{ github.repository_owner }}"
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 1
+      - name: Inject slug/short variables
+        uses: rlespinasse/github-slug-action@v5.1.0
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+        with:
+          install: true
+          driver-opts: |
+            image=moby/buildkit:master
+            network=host
+      - name: Install cosign
+        if: github.event_name != 'pull_request'
+        uses: sigstore/cosign-installer@v3.8.2
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v3
+        if: github.event_name != 'pull_request'
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Extract metadata tags and labels on PRs
+        if: github.event_name == 'pull_request'
+        id: meta-pr
+        uses: docker/metadata-action@v5
+        with:
+          images: ghcr.io/${{ env.OWNER_LOWERCASE }}/quartz
+          tags: |
+            type=raw,value=sha-${{ env.GITHUB_SHA_SHORT }}
+          labels: |
+            org.opencontainers.image.source="https://github.com/${{ github.repository_owner }}/quartz"
+      - name: Extract metadata tags and labels for main, release or tag
+        if: github.event_name != 'pull_request'
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          flavor: |
+            latest=auto
+          images: ghcr.io/${{ env.OWNER_LOWERCASE }}/quartz
+          tags: |
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
+            type=semver,pattern={{major}}.{{minor}}.{{patch}}
+            type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', github.event.repository.default_branch) }}
+            type=raw,value=sha-${{ env.GITHUB_SHA_SHORT }}
+          labels: |
+            maintainer=${{ github.repository_owner }}
+            org.opencontainers.image.source="https://github.com/${{ github.repository_owner }}/quartz"
+
+      - name: Build and push Docker image
+        id: build-and-push
+        uses: docker/build-push-action@v6
+        with:
+          push: ${{ github.event_name != 'pull_request' }}
+          build-args: |
+            GIT_SHA=${{ env.GITHUB_SHA }}
+            DOCKER_LABEL=sha-${{ env.GITHUB_SHA_SHORT }}
+          tags: ${{ steps.meta.outputs.tags || steps.meta-pr.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels || steps.meta-pr.outputs.labels }}
+          cache-from: type=gha
+          cache-to: type=gha

.node-version

@@ -0,0 +1 @@
+v22.16.0

Dockerfile

@@ -1,4 +1,4 @@
-FROM python:latest as convert
+FROM python:latest AS convert
 WORKDIR /usr/src/app
 COPY content/ ./
 COPY custom/convert-furigana/program/convert-furigana.py ./
@@ -9,15 +9,21 @@ RUN python -m pip install beautifulsoup4
 RUN python convert-furigana.py .
 RUN python convert-usage.py .
 
-FROM node:20-slim as builder
+FROM node:22-slim AS builder
 WORKDIR /usr/src/app
 COPY package.json .
 COPY package-lock.json* .
 RUN npm ci
 
-FROM node:20-slim
+FROM node:22-slim AS quartz
 WORKDIR /usr/src/app
 COPY --from=builder /usr/src/app/ /usr/src/app/
 COPY . .
 COPY --from=convert /usr/src/app/ /usr/src/app/content/
-CMD ["npx", "quartz", "build", "--serve"]
+RUN npx quartz build
+
+FROM nginx:latest
+WORKDIR /usr/share/nginx/html
+COPY --from=quartz /usr/src/app/public/ /usr/share/nginx/html/
+WORKDIR /etc/nginx/
+COPY custom/nginx/default.conf /etc/nginx/conf.d/

content/.obsidian/community-plugins.json

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

content/.obsidian/core-plugins.json

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

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

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

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

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

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

@@ -1,3 +1,105 @@
 .brat-modal .modal-button-container {
   margin-top: 5px !important;
 }
+
+.brat-modal .disabled-setting {
+  opacity: 0.5;
+}
+
+.brat-modal .disabled-setting:hover {
+  cursor: not-allowed;
+}
+
+/* Input validation styles */
+.brat-settings .valid-input,
+.brat-modal .valid-repository {
+  border-color: var(--color-green) !important;
+}
+.brat-settings .invalid-input,
+.brat-modal .invalid-repository {
+  border-color: var(--color-red) !important;
+}
+.brat-settings .validation-error,
+.brat-modal .validation-error {
+  border-color: var(--color-orange) !important;
+}
+
+/* Version selector */
+.brat-version-selector {
+  width: 100%;
+  max-width: 400px;
+  justify-content: left;
+}
+
+.brat-token-input {
+  min-width: 33%;
+}
+
+/* Token info container styles */
+.brat-token-info {
+  margin-top: 8px;
+  font-size: 0.8em;
+  padding: 8px;
+  border-radius: 4px;
+  background-color: var(--background-secondary);
+}
+
+/* Token status indicators */
+.brat-token-info.valid,
+.brat-token-status.valid {
+  color: var(--color-green);
+}
+
+.brat-token-info.invalid,
+.brat-token-status.invalid {
+  color: var(--color-red);
+}
+
+.brat-token-info.valid {
+  border-left: 3px solid var(--color-green);
+}
+
+.brat-token-info.invalid {
+  border-left: 3px solid var(--color-red);
+}
+
+/* Token details and status */
+.brat-token-status {
+  margin-bottom: 4px;
+}
+
+.brat-token-details {
+  margin-top: 4px;
+  color: var(--text-muted);
+}
+
+/* Token warnings */
+.brat-token-warning {
+  color: var(--color-orange);
+  margin-top: 4px;
+}
+
+/* Token additional info */
+.brat-token-scopes,
+.brat-token-rate {
+  color: var(--text-muted);
+  margin-top: 2px;
+}
+
+/* Flex break utility */
+.brat-modal .break {
+  flex-basis: 100%;
+  height: 0;
+}
+
+/* Validation status */
+.brat-modal .validation-status-error {
+  color: var(--text-error);
+}
+
+.brat-modal .validation-status {
+  margin-top: 0.5em;
+  margin-bottom: 0.5em;
+  font-size: 0.8em;
+  text-align: left;
+}

content/Conjugation/Conditional.md

@@ -97,7 +97,7 @@ Negative form:
 	<p class="right">+ なければ</p>
 </div>
 
-See Conjugation [[Basics]] for verbs (the う sound transforms the the corresponding え sound).
+See Conjugation [[Basics]] for verbs (the う sound transforms to 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 ても・でも]]).
+Used with conditional forms ば, と, たら and ても (see [[TeF (4) - even if#Even if ても・でも|Even if: ても・でも]]).
 もしも puts more emphasis than もし.
 
 > [!info] Example

content/Conjugation/Misc.md

@@ -0,0 +1,38 @@
+# Misc.
+
+## ~まい
+
+~まい 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.
+
+## ~得る・~得ない
+
+{得|え}る means "able to", "possible". Can be conjugated: えない, えた, えなかった.
+Made by:
+* adding まい to a V-る (dictionary form)
+* removing the ます stem from a verb and adding まい
+
+> [!info] Example
+> それはあり==得ない==。
+> That is impossible.
+
+⚠ Can also be read うる (on this tense only).
+
+## ぬ
+
+It is the traditional negative form of verbs: ぬ instead of ない.
+Exceptions:
+する -> せぬ
+くる -> こぬ
+いる -> あらぬ
+
+> [!info] Examples
+> {彼女|かのじょ}はここにはあら==ぬ==。
+> She is not here.

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

@@ -114,3 +114,46 @@ Used with verbs in て form.
 > [!info] Example
 > {夜|よる}ので、{歌|うた}え==ている場合じゃない==！
 > It's night, so it's no time to be singing!
+
+## てばかりはいられない
+
+Means "can't keep doing". Can also be used as てばかりもいられない.
+
+> [!info] Example
+> {走|は}==ってばかりはいられない==。
+> I can't keep running.
+
+## ていては
+
+Means "if something continues". Used generally for negative outcomes.
+Only used for verbs.
+
+> [!info] Example
+> {酒|さけ}しかを{飲|の}ん==でいては==、{健康|けんこう}が{悪|わる}くなる。
+> If you only drink alcool, your health will worsen.
+
+## てならない
+
+Means "extremely", "can't help but to do". Usually used for natural things occuring that cannot be controlled, like feeling.
+
+> [!info] Example
+> この{町|まち}には{寒|さむ}く==てならない==。
+> It's extremely cold in this town.
+
+## てたまらない
+
+With verbs conjugated in the たい form, this means "can't help but want to".
+With other forms, this means "extremely".
+
+> [!info] Example
+>  {留学|りゅうがく}に{行|い}きたく==てたまらない==。
+> I can't help but want to go abroad.
+
+## てはいられない
+
+Means "unable to", "cannot afford to". 
+
+> [!info] Example
+> お{金|かね}がないから、レストランに{食|た}べ==てはいられない==。
+> I can't afford to eat at a restaurant because I don't have any money.
+

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

@@ -13,7 +13,7 @@ Only for **verbs**.
 > I bought a cake for my mother.
 > 
 
-For casual language, ==てやる== can be used.
+For casual language, てやる can be used.
 
 ## てくれる
 

content/Conjugation/TeF (4) - even if.md

@@ -67,3 +67,11 @@ Used to make a supposition. Would translate to something like "even if... is the
 > [!info] Example
 > ==たとえ=={新幹線|しん|かん|せん}==でも==、１時間かかる。
 > Even if you take the Shinkansen, it will take one hour.
+
+### てでも
+
+Means "even if I have to". Expresses a strong determination to do something.
+
+> [!info] Example
+> {午前|ごぜん}４{時|じ}に{起|お}きれ==てでも==、{遅刻|ちこく}するつもりはない。
+> Even if it means waking up at 4am, I don't intend to be late.

content/Conjugation/TeF (5) - Misc.md

@@ -0,0 +1,51 @@
+# Te-Form (5) - Misc
+
+## て以来
+
+て{以来|いらい} means "since". Not used for recent events.
+
+> [!info] Example
+> {日本|にほん}に{引|ひ}っ{越|こき}し==て以来==、{帰国|きこく}していませんでした。
+> Ever since I moved to Japan, I haven't been back to my own country.
+
+## てこそ
+
+Means "since", "only if", "unless", "until". Emphasizes on the relationship between the two parts of the sentence.
+
+> [!info] Example
+> {先生|せんせい}にな==ってこそ==、{観点|かんてん}が{変|か}わる。
+> Only by becoming a teacher, your perspective changes.
+
+## てまで
+
+Means "to go as far as", "to do excessive effort".
+
+> [!info] Example
+> カードゲームが{好|す}きですけど、{全部|ぜんぶ}の{給料|きゅうりょう}を{費|つい}やし==てまで==と{思|おも}わない。
+> I like card games, but I don't want to spend my entire salary on them.
+
+## て当然だ
+
+て{当然|とうぜん}だ means that something is natural, expected.
+
+> [!info] Example
+> 私が{作|つく}ったから、{完璧|かんぺき}==で当然だ==！
+> I made it, so obviously it's perfect!
+
+## ては・では
+
+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.
+
+> [!info] Example
+> {授業|じゅぎょう}に{来|こ}なく==ては=={卒業|そつぎょう}できない。
+> If you don't come to class, you will not be able to graduate.
+
+## ては~ては
+
+Same structure as [[TeF (5) - Misc#ては・では]], 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
+> {働|はたら}い==ては=={寝|ね}、{寝|ね}==ては=={働|はたら}くばかりの{生活|せいかつ}はずるいと{思|おも}います。
+> I think a life of only working and sleeping, sleeping and working is unfair.

content/index.md

@@ -13,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://2024.ask-books.com/tag/try/)
+* [Try! Series of books](https://ask-books.com/tag/try/)
+* [A Handbook of Japanese Grammar](https://www.9640.jp/nihongo/en/detail/?678)
 * [Hedgehog Japanese](https://hedgehog-japanese.com/category/grammar/)
 * [Wasabi](https://www.wasabi-jpn.com/category/japanese-grammar/)
 * [Japanese StackExchange](https://japanese.stackexchange.com/)
-* [Guide du Japonais](https://guidedujaponais.fr/)
 * [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/)
@@ -36,6 +36,7 @@ In addition to those I cited, here are other resources I find useful.
 
 * [Sakubun](https://sakubun.xyz/)
 * [NHK News Web Easy](https://www3.nhk.or.jp/news/easy/)
+* [Natively](https://learnnatively.com/browse/jpn/)
 
 ### Grammar
 
@@ -47,6 +48,10 @@ 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!

content/🔰 Grammar/Actions.md

@@ -114,12 +114,12 @@ 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 ようにする.
+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

content/🔰 Grammar/Adverbs.md

@@ -49,7 +49,7 @@ This form is used with a verb in the negative form (ない).
 {一体|いったい} is used to make an emphasis when something is surprising, confusing, etc.
 
 > [!info] Example
-> ==いったい=={誰|だれ}がそんあことをしたか。
+> ==いったい=={誰|だれ}がそんなことをしたか。
 > Who in the world would do something like this?
 
 ## まるで
@@ -83,3 +83,25 @@ Means "already". More formal than もう, implies that something is too late and
 > [!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.

content/🔰 Grammar/Advice - Guidance - Proposition.md

@@ -0,0 +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?

content/🔰 Grammar/Advice - Guidance.md

@@ -1,19 +0,0 @@
-# Advice & guidance
-
-## たらどう
-
-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?

content/🔰 Grammar/Amounts - frequency.md

@@ -1,11 +1,19 @@
 # Amounts of frequency
 
+## 再び
+
+{再|ふたた}び means "again", "once more".
+
+> [!info] Examples
+> ==再び=={来|き}ませんですね。
+> I won't be coming again.
+
 ## Never
 
 ### 決して～ない
 
 <div class="usage">
-	<p class="iright">消して + </p>
+	<p class="iright">決して + </p>
 <div class="ileft">
 	<p><span class="box">V (ない)</span></p>
 	<p><span class="box">い-Adj <strike>い</strike> くない</span></p>
@@ -14,7 +22,7 @@
 </div>
 </div>
 
-{決|け}して~ない means "never". Used with negative verbs.
+{決|けっ}して~ない means "never". Used with negative verbs.
 
 > [!info] Examples
 > 私は==決して=={夢|ゆめ}を{覚|おぼ}えません。

content/🔰 Grammar/Amounts - quantification.md

@@ -43,6 +43,14 @@ Used with words in negative form.
 > どうしてエアコンを{付|つ}きましたか。{今|いま}は==別に=={暑|あつ}==くない==よ。
 > Why did you turn on the AC? It's not that hot right now.
 
+## わずかに
+
+Means "slightly", "only", "a little". Used at the beginning of a phrase to indicate a particularly small amount of something.
+
+> [!info] Example
+> いつでも{隣|となり}の{人|ひと}の{音|おと}が==わずかに=={聞|き}こえます。
+> You can always hear the neighbours a little bit.
+
 ## No matter how
 
 ### どんなに～ても
@@ -71,6 +79,42 @@ Means "no matter what".
 > ==どうしても=={花火|はなび}に行きたい。
 > No matter what, I want to go see the fireworks.
 
+## At least
+
+### 少なくとも
+
+{少|すく}なくとも means "at least". Implies an obligation.
+
+> [!info] Example
+> ==少なくとも==もっと{三人|さんにん}が{必要|ひつよう}です。
+> At least three more people are required.
+
+### せめて
+
+Means "at least". Implies a request.
+
+> [!info] Example
+> ==せめて=={週|しゅう}に{一度|いちど}{勉強|べんきょう}してください。
+> Please study at least once a week.
+
+## だけましだ
+
+<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 "should be grateful for", "at least", "better than". Means that while something is not good, or not as good as one wishes, it's still better than nothing or an alternative.
+
+> [!info] Examples
+> {給料|きゅうりょう}がちょっとすくない、{就職|しゅうしょく}==だけましだ==。
+> The salary is a little low, but at least I found a job.
+
 ## Very
 
 ### てしょうがない・てしかたがない
@@ -85,13 +129,11 @@ Means "no matter what".
 </div>
 
 Means both "extremely" and "can't be helped".
+See [[Can't help - doesn't matter#てしょうがない・てしかたがない]]
 
 > [!info] Example
 > {今日|きょう}は{暑|あつ}く==てしょうがない==。
 > Today is extremely hot.
-> 
-> {隣|となり}の{会話|かいわ}は{聞|き}き==ってしょうがない==。
-> I can't help but to listen to the conversion next door.
 
 ### なかなか
 
@@ -148,7 +190,7 @@ Means "as much as possible". なるべく is a bit softer than できるだけ.
 </div>
 
 Means "so much... that".
-Adjectives nominalized can be used as nouns. See [[Transformation#~さ adjective as noun]] and [[Transformation#~み adjective as noun]].
+Nominalized adjectives can be used as nouns. See [[Transformation#~さ adjective as noun]] and [[Transformation#~み adjective as noun]].
 
 > [!info] Example
 > おいしさの==あまり==、このレストラン{毎日|まいにち}行きたい。
@@ -176,3 +218,61 @@ Means "so much... that". A version of あまり that can also be used with adjec
 > [!info] Example
 > {先生|せんせい}が==あまりに=={厳|きび}しくて、{私|わたし}は{泣|な}き{始|はじ}めった。
 > The teacher was so strict that I started to cry.
+
+## Not at all
+
+### ちっとも~ない
+
+Means "not at all". Has a nuance of perhaps happening once or twice. It is casual.
+Used with a verb in the negative (ない) form.
+
+> [!info] Example
+> ==ちっとも=={学校|がっこう}を{休|やす}まない。
+> I never miss school.
+
+### 少しも~ない
+
+<div class="usage">
+	<p class="iright">少しも + </p>
+<div class="ileft">
+	<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>
+
+{少|すこ}しも~ない 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.
+
+### 全く~ない
+
+{全|まった}く~ない 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.
+
+### として~ない
+
+Means "not at all". Has a nuance of absolutely never happening.
+Insists more on the duration: "not even".
+Used before a a duration, a number, etc.
+
+> [!info] Example
+> {彼女|かのじょ}は{一日|いちにち}==として=={仕事|しごと}を{遅|おく}れなかった。
+> She has never missed a day of work, not even one day.
+
+### 全然
+
+{全然|ぜんぜん} means "not at all".
+
+⚠ In more casual settings, it can be used for positive meanings: "completely", "totally".
+
+> [!info] Example
+> ==全然=={知|し}らなかった。
+> I had no idea.

content/🔰 Grammar/Amounts.md

@@ -1,4 +1,4 @@
-# Amount
+# Amounts
 
 ## くらい・ぐらい
 
@@ -34,6 +34,14 @@ Also means "to the extent of".
 > 食べなくて{寝|ね}たい==ぐらい=={疲|つか}れています。
 > 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)#は]].
@@ -50,12 +58,21 @@ See [[🔰 Particles (1)#は]].
 	<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".
+{程|ほど}, 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".
@@ -72,3 +89,11 @@ 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.

content/🔰 Grammar/Based on.md

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

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

@@ -2,19 +2,46 @@
 
 ## Can't help
 
+### てしょうがない・てしかたがない
+
+Means both "extremely" and "can't be helped". Implies that it's something very much wanted.
+Also expresses strong emotion, feeling, desire that cannot be controlled.
+See [[Amounts - quantification#てしょうがない・てしかたがない]].
+
+> [!info] Example
+> ラーメンが{食|た}べ==てしょうがない==。
+> I can't help but to eat ramen.
+> 
+> {隣|となり}の{会話|かいわ}は{聞|き}き==ってしょうがない==。
+> I can't help but to listen to the conversion next door.
+
 ### ずにはいられない
 
-Means "can't help but do something".
+Means "can't help but do something". Implies that one can't stop doing it.
 Made with a verb in the negative form (ない) without the ない ending and adding ずにはいられない. 
 
 > [!info] Example
 > {悲|かな}しいのでアイスクリーム食べ==ずには入れれない==。
 > I'm sad so I can't help but eat ice cream.
 
-### てしょうがない・てしかたがない
+## ないではいられない
 
-Means can't be helped".
+This means "cannot help doing something". Has the same nuance as ずにはいられない。
-See [[Amounts - quantification#てしょうがない・てしかたがない]].
+Made with a verb in the negative form (ない) without the ない ending and adding ではいられない.
+
+> [!info] Example
+> ゲームをし==ないではいられない==。
+> I can't help but play games.
+
+## ざるを得ない
+
+ざるを{得|え}ない 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 ざるを得ない.
+Exception: する becomes せ.
+
+> [!info] Example
+> この{仕事|しごと}をせ==ざるを得ない==。
+> I have no choice but to do this job.
 
 ## Doesn't matter
 
@@ -30,7 +57,7 @@ See [[Amounts - quantification#てしょうがない・てしかたがない]].
 	<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
 > ここで{座|すわ}==っても構いません==か。

content/🔰 Grammar/Certainty.md

@@ -2,14 +2,38 @@
 
 ## Certain
 
-### に違いない
+### に決まっている
 
-に{違|ちが}いない means "I'm certain that".
+に{決|き}まっている means "certain that". It is casual.
 
 > [!info] Example
-> 私は{試験|しけん}を{合格|ごうかく}==に違いない==。
+> 私は{試験|しけん}を{合格|ごうかく}==に決まっている==。
 > I'm sure I'll pass the exam.
 
+### に違いない
+
+に{違|ちが}いない means "certain that". It is polite.
+
+> [!info] Example
+> {絶対|ぜったい}に来る==に違いない==。
+> He's definitely coming.
+
+### に相違ない
+
+に{相|そう}{違|い}ない means "certain that". It is very formal.
+
+> [!info] Example
+> 彼女は{必|かなら}ず{悲|かな}しい==に相違ない==。
+> I'm certain that she's sad.
+
+## Uncertain: というものではない
+
+Means "there is no guarantee that", "not necessarily".
+
+> [!info] Example
+> {高|}い{商品|しょうひん}を{買|か}って{良質|りょうしつ}==というものではない==。
+> Buying a product that is expensive does not guarantee that it is of good quality.
+
 ## Not always: とは限らない
 
 <div class="usage">
@@ -41,23 +65,22 @@
 	<p class="right">+ わけがない</p>
 </div>
 
-Means that there is no way, "impossible".
+Means that there is no way, "impossible". The nuance is that the way of doing is unknown, thus impossible for the subject. But someone else might know.
+It can also mean that the will to do is not present, especially with する.
 
 > [!info] Example
-> {全部|ぜんぶ}食べられる==わけがない==よ！
+> もうこんな時間。帰り==わけがない==。
-> It is impossible to eat it all!
+> It's already this late. I have no way to go back home (I don't know how).
 
 ### ようがない・ようもない
 
-🛠 Todo: understand the nuance between わけがない and ようがない.
-🛠 Todo: understand the nuance between ようがない and ようもない.
-
 ~{様|よう}がない 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
+> [!info] Example 
-> もうこんな時間。帰り==ようがない==。
+> {全部|ぜんぶ}食べられる==ようがない==よ！
-> It's already this late. I have no way to go back home.
+> It is impossible to eat it all!
 
 ### まさか
 

content/🔰 Grammar/Combination actions.md

@@ -130,6 +130,54 @@ It focuses on the end of the action rather than the process.
 > この１３時間{飛行|ひこう}で{座|すわ}り==っぱなし==でした。
 > I sat the entire time on this 13 hours flight.
 
+## ~かねる
+
+~かねる means "unable to do", due to an external circumstance. It is polite.
+
+> [!info] Example
+> ごめんなさい、それをでき==かねます==。
+> I'm sorry, I cannot do that.
+
+## ~っこない
+
+~っこない means that something is not possible.
+
+> [!info] Example
+> {全然|ぜんぜん}{勉強|べんきょう}しなかった。。。{合格|ごうかく}し==っこない==よ。
+> I did not study at all... There's no way I'll pass.
+
+## ~抜く
+
+~{抜|ぬ}く 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.
+
+## ~給え
+
+~{給|たま}え is used for a light order. It is used by someone of higher rank to someone of lower rank.
+
+> [!info] Example
+> ここに{座|すわ}り==給え==。
+> Seat here.
+
+## ~つつ(も)
+
+~つつ 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.
+
+## ~つつある
+
+~つつある means that something is in an ongoing process or action, in a similar manner as てくる.
+
+> [!info] Example
+> {雪|ゆき}が{降|ふ}り==つつある==。
+> It is snowing.
+
 ## ～込む
 
 ~{込|こ}む has multiple meanings depending on the verb. Sometimes it is idiomatic and so it cannot exactly be guessed. However, there are some broad categories.

content/🔰 Grammar/Comparison.md

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

content/🔰 Grammar/Connectors - in order to.md

@@ -17,7 +17,7 @@ See [[Connectors#のに#In order to]].
 	<p class="right">+ ため(に)</p>
 </div>
 
-Means "in order to". Mostly used in writing.
+Means "in order to". Mostly used in writing, rarely used with negative.
 
 > [!info] Examples
 > {面接|めんせつ}の==ために==ヒゲを{剃|そ}らなきゃ。
@@ -46,7 +46,7 @@ Can also mean "as for", "regarding".
 
 ## ように
 
-Means "in order to". Implies that an effort is made or a goal to obtain.
+Means "in order to". Implies that an effort is made or a goal to obtain. There is generally will implied.
 Used with verbs.
 
 > [!info] Examples

content/🔰 Grammar/Connectors.md

@@ -23,7 +23,7 @@ Used with nouns and verbs.
 	<p class="right">+ のに</p>
 </div>
 
-The first meaning is "although", "even tough".
+The first meaning is "although", "even tough". Cannot be an hypothesis, must be a confirmed fact. This, it works with past tense.
 
 > [!info] Example
 > 食べたばかり==なのに==、まだお{腹|なか}が{空|す}いた。
@@ -58,6 +58,22 @@ 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: ちなみに
+
+Used to provide a new information on the current topic of conversation. Translates to "by the way".
+
+> [!info] Example
+> {駅|えき}に行くつもりです。==ちなみに==、駅の{前|まえ}には{新|あたら}しいレストランが{開|あけた}けたと言われた。
+> 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: そう言えば
+
+Used to talk about a topic connected to the previous one, as something that is remembered.
+
+> [!info] Example
+> ==そういえば==、{今日|きょう}の{試験|しけん}はどうだったか。
+> Come to think of it, how was today's exam?
+
 ## Certainly: 確かに
 
 {確|たし}かに means "surely", "certainly".
@@ -65,3 +81,6 @@ Used to introduce a new topic of conversation. Translates to "by the way".
 > [!info] Example
 > この{歌|うた}は==確かに=={面白|おも|しろ}そうだ。
 > This song certainly sounds interesting.
+
+
+

content/🔰 Grammar/Consequence.md

@@ -0,0 +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.

content/🔰 Grammar/Considering - for - as.md

@@ -2,33 +2,26 @@
 
 ## としては
 
-🛠 Todo: nuance.
-
 Means "as", "in the role of". The と particle implies a result.
-More used for objective judgments.
 Used with nouns.
 
 > [!info] Example
-> {厳|きび}しいのに{先生|せんせい}==としては==あまり{良|よ}くない。
+> 彼はカメラマン==としては==いい{仕事|しごと}をする。
-> Because he is strict, he's not a very good teacher.
+> As a cameraman, he does a good job.
 
 ## にしては
 
-🛠 Todo: nuance.
-
 Means "considering", "for". The に particle implies a simultaneous existence.
-More used to give personal opinions.
+The difference with としては resides in the fact that this is used to make a contrast between the general image associated with something and what we're describing.
 Used with verbs and nouns.
 
-> [!info] Example
+> [!info] Example 
-> 田中さんは{父|ちち}==にしては=={最低|さいてい}です。
+> このカバンは安い==にしては==悪くない。
-> As a father, Tanaka-san is the worst.
+> This bag might be cheap, it is not bad.
 
 ## としても
 
-🛠 Todo: nuance.
+Means "assuming", "even if". It has the same meaning as [[TeF (4) - even if#Even if ても・でも]], but bolder.
-
-Means "assuming", "even if".
 
 > [!info] Example
 > 私==としても==出来ます。
@@ -36,13 +29,11 @@ Means "assuming", "even if".
 
 ## にしても
 
-🛠 Todo: nuance.
+Means "even if", "even though". It has the same meaning as [[🔰 Particles (1)#も]], but bolder. In some rare written cases, it has the same meaning as としても.
-
-Means "even if", "even though".
 
 > [!info] Example
-> それ==にしても==、{気|き}を{付|つ}けてくください。
+> フランス{語|ご}==にしても=={英語|えいご}==にしても=={彼|かれ}はとても{上手|じょうず}です。
-> Still, please be careful.
+> He is very good at both French and English.
 
 ## "As": Gradual change
 
@@ -68,7 +59,7 @@ It means that when when the first part of the sentence changes, the second part
 
 This example works with all forms.
 
-## につれて and にしたがって
+### につれて and にしたがって
 
 In both forms, the change is natural, and is not an intentional change. When the verb expresses gradual change, both can be used.
 につれて is more common and more used for personal actions.
@@ -77,7 +68,7 @@ In both forms, the change is natural, and is not an intentional change. When the
 > {冬|ふゆ}が{地|ちか}づく==にしたがって・につれて=={気温|きおん}が{下|さ}がってきた。
 > As winter approaches, the temperatures have lowered.
 
-## にしたがって
+### にしたがって
 
 This form also has the meaning of "in accordance to". It doesn't express change. It is possible to talk about intention.
 
@@ -85,7 +76,7 @@ This form also has the meaning of "in accordance to". It doesn't express change.
 > {歯医者|はいしゃ}==にしたがって=={毎日|まいにち}２{回|かい}{歯|は}を{磨|みが}く。
 > I brush my teeth twice a day as recommended by my dentist.
 
-## に伴って
+### に伴って
 
 に{伴|ともな}って also has the meaning of a an instantaneous change: when the first part changes, the second part also changes instantly. The first part is the reason of it changing.
 
@@ -93,11 +84,11 @@ This form also has the meaning of "in accordance to". It doesn't express change.
 > オリンピックがある==に伴って=={交通費|こうつうひ}がねあが{値上|ねあ}がりしてしまった。
 > As the Olympics are held, transportations cost have increased.
 
-## と共に
+### と共に
 
 と{共|とも}に has 3 other meanings.
 
-### Almost at the same time
+#### Almost at the same time
 
 It is also used for two actions that happens at approximately the same time. The two actions do not have to be related. They also don't have to be specifically about change.
 
@@ -105,7 +96,7 @@ It is also used for two actions that happens at approximately the same time. The
 > {鳥|とり}は{鳴|な}き{声|ごえ}をする==と共に=={風|かぜ}が{吹|ふ}く。
 > The bird sings and the wind blows.
 
-### Together with
+#### Together with
 
 It can also mean "together with". It is much more formal than {一緒|いっしょ}に.
 
@@ -113,7 +104,7 @@ It can also mean "together with". It is much more formal than {一緒|いっし
 > {妻|つま}==と共に=={新|あたら}しい{人生|じんせい}を{始|はじ}めります。
 > I am starting a new life with my wife.
 
-### As well as, also
+#### As well as, also
 
 It can also mean "as well as", "also".
 

content/🔰 Grammar/Description.md

@@ -16,6 +16,15 @@ Means "named", "called".
 > {台風|たいふう}が来る==という==ニュース。
 > A news that a typhoon is coming.
 
+## いわゆる
+
+Means "called".
+Used with nouns.
+
+> [!info] Examples
+> 彼は==いわゆる==オタクです。
+> He is what they call an otaku.
+
 ## と言ってもいい
 
 Means "you could say".
@@ -78,11 +87,13 @@ Means that something is "full of" or "covered with" something undesirable.
 
 <div class="usage">
 	<p class="iright">N + は + </p>
+<div class="ileft">
 <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>
 </div>
 	<p class="right">+ で有名</p>
 </div>

content/🔰 Grammar/Emphasis.md

@@ -0,0 +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.

content/🔰 Grammar/Exception.md

@@ -15,3 +15,27 @@ With verbs and adjectives, かどうか is placed before.
 > {勝|かつ}かどうか==は別として==、{試合|しあい}をやってみたい。
 > 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
+> 私==を除いて==、{皆|みな}さんが{合格|ごうかく}しました。
+> Everyone except me passed.

content/🔰 Grammar/In addition.md

@@ -0,0 +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.

content/🔰 Grammar/Instead.md

@@ -20,7 +20,7 @@ Means "instead" or "rather".
 	<p class="right">+ 代わりに</p>
 </div>
 
-{代|か}わりに means "instead of", "in exchange for". Generally used about things.
+{代|か}わりに 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

content/🔰 Grammar/Listing.md

@@ -47,6 +47,15 @@ This particles means "and" or "with". Used for a list that is exhaustive. Connec
 > フランス語==と==スペイン語を習っています。
 > I am learning French and Spanish.
 
+### 及び
+
+{及|およ}び means "and", like と. Used in formal settings.
+Used with nouns.
+
+> [!info] Examples
+> {試験|しけん}には{鉛筆|えんぴつ}==及び=={消|け}しゴムを{持|も}ってきてください。
+> Please bring a pencil and an eraser to the exam.
+
 ### て connecting
 
 Used for a list that is exhaustive. Connects verbs.
@@ -72,6 +81,15 @@ Used with nouns.
 > お金がないのでカフェ**や**レストラン==など=={払|はら}えない。
 > I can't pay things like cafes or restaurant (etc.) because I have no money.
 
+### といった
+
+Used to describe typical examples: "things as", "like", "such as". It is casual. It has the same meaning as など.
+Used with nouns.
+
+> [!info] Examples
+> フランスとカナダ==といった=={国|くに}はフランス{語|ご}を{話|はな}す。
+> Countries such as France and Canada speak French.
+
 ### とか～とか
 
 Used for a list that is unexhaustive. Translates to "and", "among other things". More casual than や. Ending a sentence with とか can soften the meaning. Can also be used to quote someone.
@@ -127,70 +145,34 @@ It can be used to emphasize something when used at the end of a sentence.
 > 言ってない==し==！
 > I never said that!
 
+### やら~やら
+
+<div class="usage">
+<div class="left">
+	<p><span class="box">V</span></p>
+	<p><span class="box">い-Adj</span></p>
+	<p><span class="box">N</span></p>
+</div>
+	<p class="right">+ やら + B + やら</p>
+</div>
+
+This form is unexhaustive and can be translated as "and", "among other things".
+It has 3 nuances:
+- Conveys a negative image
+- Among other things, in an unorganized manner
+- Conflicting feelings
+
+> [!info] Examples
+> {今日|きょう}{電車|でんしゃ}がなかった==やら==、{車|くるま}が{壊|こわ}れた==やら==、{家|いえ}に{出|で}かけられませんでした。
+> There were no trains and my car broke down, so I couldn't go out.
+> 
+> {黒|くろ}い==やら=={白|しろ}い==やら=={着物|きもの}があります。
+> There are black and white kimonos (among other things).
+> 
+
 ## Summing up
 
 * ==や== means "and", and is formal. Can be completed by ==など== (= etc).
 * ==とか== also means "and", but is casual.
 * ==たり== means "or", "things like". Used to express possibilities.
 * ==し== means "and", but with an emphasis on a review.
-
-## And also
-
-### も～ば～も
-
-<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.
-
-### 上に
-
-<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 supermarket is expensive as well as inconvenient.
-
-### はもちろん
-
-<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".
-
-> [!info] Examples
-> このゲームセンターにはゲーム==はもちろん==ボウリングもあります。
-> This game center not only has games but also bowling.

content/🔰 Grammar/Means.md

@@ -66,6 +66,15 @@ Used with a noun.
 > 台風==により==、出かけられない。
 > Because of the typhoon, I cannot go out.
 
+## 次第で
+
+{次第|しだい}で means "depending on". The difference with によって is that the options are limited and quantifiable.
+Used with nouns.
+
+> [!info] Example
+> {試験|しけん}の{結果|けっか}==次第で=={来年|らいねん}の{学校|がっこう}が{変|か}わります。
+> Depending on the results I get on this test, my school next year will not be the same.
+
 ## とおりに
 
 <div class="usage">
@@ -86,3 +95,21 @@ Means "just as", "precisely". Can be written as 通り.
 > [!info] Example
 > {計画|けいかく}==どおり=={間|ま}に{合|あ}った。
 > We arrived on time as planned.
+
+## だけは
+
+<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>
+</div>
+
+Means "to do all that one can".
+
+> [!info] Example
+> {試験|しけん}のため{勉強|べんきょう}する==だけは=={勉強|べんきょう}した。
+> I studied as much as I could for the exam.

content/🔰 Grammar/Natural - expected.md

@@ -0,0 +1,113 @@
+# Natural, expected
+
+## 当然だ
+
+<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">い-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>
+<div class="usage">
+<div class="">
+	<p><span class="box">N</span></p>
+</div>
+	<p class="r">+ は・も + 当然だ</p>
+</div>
+
+{当然|とうぜん}だ means "it is only natural", "no wonder".
+
+> [!info] Examples
+> {彼女|かのじょ}に{負|ま}けた==のは当然だ==、プロだから。
+> It's no wonder I lost to her, she's a pro.
+
+## のももっともだ
+
+<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 "no wonder", "is only natural".
+
+> [!info] Examples
+> {超自然的|ちょうしぜんてき}があるから、その{話|はなし}は{信|しん}じられない==のはもっともだ==。
+> There's supernatural elements, so it's only natural that this story is hard to believe.
+
+## ものだ
+
+<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 "normally" or "should". Used to describe conventions, common sense, or what is expected in the current situation.
+
+> [!info] Examples
+> {毎日|まいにち}２{回|かい}{歯|は}を{磨|みが}く==ものだ==。
+> You're supposed to brush your teeth twice a day.
+
+## だけのことはある
+
+<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 "as expected", "not surprising". Often used with [[Adverbs#さすが|さすが]] or やはり. Not used for negative outcomes.
+
+> [!info] Examples
+> {彼女|かのじょ}は{上手|じょうず}ですね。さすが{毎日|まいにち}{練習|れんしゅう}==だけのことはある==なあ。
+> She's very good. As expected from someone who trains everyday.
+
+## と考えられる
+
+と{考|かんが}えられる means "is thought to be", "can be considered as". Used to convey an objective or widely spread opinion, contrary to と思われる.
+
+> [!info] Examples
+> タバコは{健康|けんこう}に{悪|わる}い==と考えられています==。
+> Tobacco is considered bad for one's health.
+
+## だけに
+
+<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 "as one would expect", "it's only natural that". 
+
+> [!info] Example
+> {都市|とし}は{人口|じんこ}が{多|おお}い==だけに==、{地下鉄|ちかてつ}がある。
+> The city is so populous, so as one might expect, it has a subway.

content/🔰 Grammar/Obligation - must (not).md

@@ -58,6 +58,7 @@ This form is used with a V-て, depending on the ending:
 ### てはいけない
 
 Used in a more formal or written manner. Used with a V-て.
+てはならない is a stronger form.
 
 > [!info] Example
 > {鉄道|てつ|どう}に{歩|ある}い==てはいけません==。

content/🔰 Grammar/Observation - hearsay.md

@@ -21,7 +21,7 @@ Similar in the quotation sense to [[Description#って・って言う・と言
 
 ## と聞いた
 
-Used for something you heard by someone identifiable: for example, you were told by someone.
+と{聞|きい}いた is used for something you heard by someone identifiable: for example, you were told by someone.
 Mostly used formally.
 
 > [!info] Example
@@ -30,7 +30,7 @@ Mostly used formally.
 
 ## と言われている
 
-Used when you heard something, but not from someone specifically identifiable: general knowledge, a rumour, etc.
+と{言|い}われている 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.
 
@@ -72,7 +72,7 @@ Can be used as ==ということだ== or ==とのことだ==. A more casual vers
 ## Summing up
 
 * ==んだって== used for quotation, similar to って, when the information is new.
-* ==と聞いた== is used for something for something you heard from an identifiable speaker. Is mostly formal.
+* ==と聞いた== 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 そうだ.
@@ -85,3 +85,23 @@ 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#とか～とか]].

content/🔰 Grammar/Observation - looking like.md

@@ -206,3 +206,44 @@ This is used (unlike other forms that can apply to abstract similarities) exclus
 > [!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.

content/🔰 Grammar/Observation.md

@@ -0,0 +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.

content/🔰 Grammar/Only - just.md

@@ -27,6 +27,14 @@ Can also be used as だけではなく.
 > この{都市|とし}は大きい==だけでなく==、きれいでもある。
 > This city is not only big, it's also pretty.
 
+## のみ
+
+It is a more formal, written version of だけ. It is only used with nouns.
+
+> [!info] Example
+> この{道|みち}は{歩行者|ほこうしゃ}==のみ==です。
+> This road is pedestrian only.
+
 ## きり
 
 <div class="usage">
@@ -99,11 +107,29 @@ Used to say "only" with a negative meaning.
 </div>
 
 Means "not only A but also B".
+Can also be used as ばかりか, for a slightly stronger effect.
 
 > [!info] Examples
 > 彼女は{綺麗|きれい}==ばかりでなく=={天才|てんさい}もあるです。
 > She's not only beautiful, she's also a genius.
 
+## に限らず
+
+に{限|かぎ}らず means "not only A, but also B".
+Used with nouns.
+
+> [!info] Examples
+> この{店|みせ}は{平日|へいじつ}==に限らず==、{週末|しゅうまつ}も{営業|えいぎょう}している。
+> This store is open not only on weekdays but also on weekends.
+
+## のみならず
+
+Means "not only, but also".
+
+> [!info] Examples
+> {彼|かれ}は{優|やさ}しくない{人|ひと}==のみならず==、{口|くち}も{悪|わる}い。
+> Not only is he not kind, but he's also bad mouthed.
+
 ## てばかりいる
 
 Means "only", "nothing but".
@@ -112,3 +138,20 @@ Used with a verb in て form.
 > [!info] Examples
 > {僕|ぼく}の{犬|いぬ}は{鳴|な}け==てばかりいる==。
 > My dog is always barking.
+
+## でしかない
+
+Means "nothing but" or "no more than". More often than not conveys a negative nuance.
+Used with nouns.
+
+> [!info] Examples
+> {彼|かれ}は{子供|こども}==でしかない==。
+> He nothing more than a child.
+
+## に過ぎない
+
+に{過|す}ぎない means "just", "no more than". Used for something that is not of great quality, quantity or level.
+
+> [!info] Examples
+> 彼女はただ{初心者|しょしんしゃ}==に過ぎない==。
+> She's just a beginner.

content/🔰 Grammar/Opposition - although.md

@@ -1,13 +1,5 @@
 # Opposition: although
 
-## に反して
-
-に{反|はん}して means "contrary to". Opposes the first noun to the rest of the sentence.
-
-> [!info] Example
-> {常識|じょうしき}==に反して==、彼は{勉強|べんきょう}しなかった。
-> Contrary to common sense, he did not study.
-
 ## 割に
 
 <div class="usage">
@@ -75,7 +67,36 @@ Means "although". Puts a nuance to the first statement describing that it is not
 > {彼|かれ}は{医者|いしゃ}==といっても==、あまり{頭|あたま}が{良|よ}くない。
 > He may be a doctor, but he is not very smart.
 
-## に対して
+## にも関わらず
 
-に{対|たい}して.
+にも{関|かか}わらず means "regardless", "despite".
-See [[Towards#In contrast to]].
+
+> [!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...

content/🔰 Grammar/Opposition - but - however.md

@@ -49,7 +49,3 @@ Means "but", "however".
 > [!info] Example
 > {手伝|てつだ}いたい==んですけど=={暇|ひま}はない。
 > I'd like to help but I don't have time.
-
-## Summing up
-
-🛠 Todo.

content/🔰 Grammar/Opposition - even if.md

@@ -4,10 +4,28 @@
 
 See [[TeF (4) - even if]].
 
-## のに
+## 「と・に」しても
 
-Means "although", "even tough".
+See [[Considering - for - as#としても]].
-See [[Connectors#のに#Even tough]].
+See [[Considering - for - as#にしても]].
+
+## たって
+
+<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 "even if", "even though". It has the same meaning as [[#て-form even if]].
+
+> [!info] Example
+> {今|いま}で行==ったって==、{間|ま}に{合|あ}わない。
+> Even if you go now, you won't make it in time.
 
 ## それでも
 
@@ -17,7 +35,12 @@ Means "but still", "even so", "anyway".
 > 雨が{降|ふ}っていた、==それでも==出かけていた。
 > It was raining, but I still went out.
 
-## くせに
+## のに
+
+Means "although", "even tough". Cannot be an hypothesis, must be a confirmed fact. This, it works with past tense.
+See [[Connectors#のに#Even tough]].
+
+## くせに・くせして
 
 <div class="usage">
 <div class="left">
@@ -26,14 +49,36 @@ Means "but still", "even so", "anyway".
 	<p><span class="box">な-Adj + な</span></p>
 	<p><span class="box">N + の</span></p>
 </div>
-	<p class="right">+ くせに</p>
+	<p class="right">+ くせに・くせして</p>
 </div>
 
-Means "despite", "even tough". Has a negative connotation.
+Means "despite", "even tough". Has a negative connotation when a situation is not what was expected. Regularly used to talk about characteristics. Like のに, cannot be an hypothesis.
+くせして is more familiar than くせに.
 
 > [!info] Example
 > {掃除|そうじ}すると言った==くせに==、まだ{汚|きたな}いよ。
 > You said you would clean it up, but it's still dirty.
+> 
+> {子供|こども}の==くせに==、{数学|すうがく}が{得意|とくい}です。
+> Despite a child, he is good at math.
+
+## ながらも
+
+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#ながら]].
+
+> [!info] Example
+> {病気|びょうき}==ながらも==、パーティーに行くつもりです。
+> Although I am sick, I'm planning to go to party.
+
+## Summing up
+
+* ==ても==,  ==「と・に」しても==, ==たって== and ==それでも== have the same meaning. 
+	*  ==「と・に」しても== have a bolder meaning.
+	*  ==それでも== breaks up the phrase.
+* ==のに== cannot be used for conditional situations.
+* ==くせに== talks about disappointment or characteristics.
+* ==ながらも== talks about something happening right now.
 
 ## たとえ～ても
 
@@ -53,24 +98,6 @@ Means "even if X is the case". Used to present possibilities.
 > ==たとえ=={疲|つか}れ==ても==、もうちょっと{起|お}きている。
 > Even if I'm tired, I'll stay up a little longer.
 
-## たって
-
-<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 "even if", "even though".
-
-> [!info] Example
-> {今|いま}で行==ったって==、{間|ま}に{合|あ}わない。
-> Even if you go now, you won't make it in time.
-
 ## ても始まらない
 
 ても{始|はじ}まらない means "there's no point, even if you..."
@@ -99,20 +126,72 @@ 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.
 
-## ながらも
+## からと言って
 
-Means "even while", "despite". It is used to express that while something is one state, something else.
+<div class="usage">
-See also [[Time#ながら]].
+<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 "just because", "even if".
 
 > [!info] Example
-> {病気|びょうき}==ながらも==、パーティーに行くつもりです。
+> {年上|としうえ}だ==からといって=={正|ただ}しいとは{限|かぎ}りません。
-> Although I am sick, I'm planning to go to party.
+> Just because you're older doesn't mean you're right.
 
-## 「と・に」しても
+## ことにはならない
 
-See [[Considering - for - as#としても]].
+<div class="usage">
-See [[Considering - for - as#にしても]].
+<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>
 
-## Summing up
+Means "just because... doesn't mean that". Used at the end of a sentence.
 
-🛠 Todo.
+> [!info] Example
+> {卒業|そつぎょう}だからといって今すぐ{就職|しゅうしょく}できます==ことにはならい==。
+> Just because you graduated doesn't mean you can get a job right away.
+
+## とも
+
+<div class="usage">
+<div class="left">
+	<p><span class="box">V (おう)</span></p>
+	<p><span class="box">V (な<strike>い</strike>)く</span></p>
+	<p><span class="box">い-Adj + <strike>い</strike> + く</span></p>
+</div>
+	<p class="right">+ とも</p>
+</div>
+
+Means "even if", "no matter". Similar to ても ([[TeF (4) - even if]]). Used in writing.
+
+> [!info] Example
+> {辛|から}く==とも==、{全部|ぜんぶ}{食|た}べるつもりであった。
+> Even if it was spicy, I planned to eat it all.
+
+## にせよ・にしろ
+
+<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 "even if", "no matter". にせよ is more common in written form and にしろ is more common orally.
+
+> [!info] Example
+> {好|す}きじゃない==にしろ==、{野菜|やさい}を{食|た}べる{方|ほう}がいい。
+> Even if you don't like it, you should eat your vegetables.

content/🔰 Grammar/Opposition.md

@@ -0,0 +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.

content/🔰 Grammar/Point of view.md

@@ -0,0 +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.

content/🔰 Grammar/Possibility - impossibility.md

@@ -7,3 +7,21 @@ Means "cannot". This form implies a strong impossibility. Used with negative ver
 > [!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.

content/🔰 Grammar/Possibility - no choice.md

@@ -8,3 +8,24 @@ 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.

content/🔰 Grammar/Possibility - options.md

@@ -0,0 +1,86 @@
+# Possibility: options
+
+## でも
+
+Used to list one or more possible options.
+
+> [!info] Example
+> ジュース==でも==お茶==でも==飲もうか。
+> Shall we drink something like a juice or tea?
+
+⚠ Do not confuse with [[TeF (4) - even if#Even if ても・でも|Even if: ても・でも]].
+
+## かどうか
+
+Means "whether or not". It is the most common form used.
+
+> [!info] Example
+> 行きたい==かどうか=={分|わ}からない。
+> I'm not sure if I want to go or not.
+
+## か何か
+
+か{何|なに}か means "or something".
+Used with nouns.
+
+> [!info] Example
+> ジュース==か何か=={飲|の}もうか。
+> Shall we drink something like a juice?
+
+## ようか~まいか
+
+<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>
+
+Rules for the second verb:
+- **V-る**:
+	- dictionary (る) form + まい
+	- V (~~ます~~) + まい
+- **V-う**: dictionary (る) form + まい
+- **くる**: こまい・くるまい
+- **する**: しまい・すまい・するまい
+
+Means "whether or not". Used to consider options. Usually written, but common orally with the verb 言う.
+
+> [!info] Example
+> {雨|あめ}だ。。。行こう==か==、行く==まいか==。。。
+> It's raining... Should I go or not...
+
+## か
+
+Means "or". Can be used when there is uncertainty between two or more choices.
+See [[Question#か]].
+
+## 又は
+
+{又|また}は can be used for two things:
+* choosing between two options ("or")
+* listing two options ("both")
+
+> [!info] Example
+> 日本語==又は==英語でしゃべれます。
+> I can speak both Japanese and English.
+
+## それとも
+
+This is used to give a choice between a limited set of two options. It is casual.
+
+> [!info] Example
+> 何が食べたい。ラーメン==それとも==カレーか。
+> What do you want to eat? Ramen or curry?
+
+## あるいは
+
+Means "or", "perhaps". Mostly used in written form. Can be used orally, if the difference between the two options is large.
+
+> [!info] Example
+> {月曜日|げつようび}は{暇|ひま}ですか。==あるいは=={水曜日|すいようび}。
+> Are you free on Monday? Or Wednesday?

content/🔰 Grammar/Possibility.md

@@ -1,24 +1,5 @@
 # Possibility
 
-## でも
-
-Used to list one or more possible options.
-
-> [!info] Example
-> ジュース==でも==お茶==でも==飲もうか。
-> Shall we drink something like a juice or tea?
-
-⚠ Do not confuse with [[TeF (4) - even if#Even if ても・でも]].
-
-## か何か
-
-か{何|なに}か means "or something".
-Used with nouns.
-
-> [!info] Example
-> ジュース==か何か=={飲|の}もうか。
-> Shall we drink something like a juice?
-
 ## かもしれない
 
 Express a possibility, like "perhaps".
@@ -37,6 +18,30 @@ Can be used as もしかしたら, もしかすると and もしかして.
 > ==もしかして=={今日|きょう}も{郵便局員|ゆうびんきょくいん}が来ません==かもしれない==。
 > Perhaps the postman will not come today either.
 
+## かねない
+
+<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 "possibly", "might", "could be". Usually used for negative outcomes. Mostly used in written language.
+
+> [!info] Example
+> この{道|みち}は{危|あぶ}ないので{事故|じこ}が{起|お}き==かねない==。
+> This road is dangerous, so an accident might happen.
+
+## 恐らく
+
+{恐|おそ}らく means "probably", "perhaps". Placed at the beginning of a phrase. Implies a high probability.
+
+> [!info] Example
+> ==恐らく=={彼女|かのじょ}は{今日|きょう}も{来|こ}ない。
+> She probably won't come today either.
+
 ## ことができる
 
 Means "can", "able to".
@@ -47,20 +52,12 @@ It has the same meaning as the potential form (see Conjugation [[Basics]]).
 > {英語|えいご}を{話|はな}す==ことが出来ない==。
 > I cannot speak English.
 
-## かどうか
-
-Means "whether or not". 
-
-> [!info] Example
-> 行きたい==かどうか=={分|わ}からない。
-> I'm not sure if I want to go or not.
-
 ## ないことはない
 
 <div class="usage">
 <div class="left">
 	<p><span class="box">V (ない)</span></p>
-	<p><span class="box">い-Adj <stroke>い</stroke> くない</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>
@@ -73,25 +70,131 @@ 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.
 
-## か
+## 恐れがある
 
-Means "or". Can be used when there is uncertainty between two or more choices.
+<div class="usage">
-See [[Question#か]].
+<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 is a risk that". Used when something bad could happen.
-
-{又|また}は can be used for two things:
-* choosing between two options ("or")
-* listing two options ("both")
 
 > [!info] Example
-> 日本語==又は==英語でしゃべれます。
+> また{地震|じしん}の==恐らくがある==。{気|き}を{付|つ}けて。
-> I can speak both Japanese and English.
+> There will probably be another earthquake. Please be careful.
 
-## それとも
+## ようでは
 
-This is used to give a choice between a limited set of two options. It is casual.
+Means "if". Used when the result would be bad.
+Used with verbs.
 
 > [!info] Example
-> 何が食べたい。ラーメン==それとも==カレーか。
+> {化|ば}け{物|もの}が{来|く}る==ようでは==、あなたを{食|た}べちゃうよ。
-> What do you want to eat? Ramen or curry?
+> If a monster comes, it will eat you.
+
+## ものなら
+
+<div class="usage">
+<div class="">
+	<p><span class="box">V (potential れる)</span></p>
+</div>
+	<p class="r">+ ものなら</p>
+</div>
+
+Means "if A were possible, then B". Implies that A is either impossible or unlikely.
+
+> [!info] Example
+> {合格|ごうかく}できる==ものなら==、{世界中|せかいじゅう}{一番|いちばん}うれしいなあ。
+> If I could pass, I would be the happiest in the world (but it is unlikely I'll pass).
+
+## ないことには～ない
+
+<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>
+	<p class="box">V (ない)</p>
+</div>
+
+Means "unless you do something".
+
+> [!info] Examples
+> {運転|うんてん}{免許|めんきょ}を{持|も}った==ないことには=={運転|うんてん}できない。
+> You can't drive unless you have a driving licence.
+
+## にしろ~にしろ
+
+<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>
+<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>
+	<p class="r">+ にしろ</p>
+</div>
+
+Means "whether... or". Can be used as にせろ~にせろ or にしても~にしても, which is more formal.
+
+> [!info] Example
+> {動物|どうぶつ}==にしろ=={植物|しょくぶつ}==にしろ==、その{物質|ぶっしつ}は{危険|きけん}です。
+> Whether animals or plants, the substance is dangerous.
+
+## なくはない・なくもない
+
+<div class="usage">
+<div class="left">
+	<p><span class="box">V (なく<strike>て</strike>)</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 "it's not that".
+With potential form of verbs, means that something is possible, despite seeming not.
+
+> [!info] Examples
+> やる{気|き}==がなくはない==、{時間|じかん}は{少|すく}ないです。
+> It's not that I don't have the will, I just don't have time.

content/🔰 Grammar/Question.md

@@ -88,3 +88,21 @@ This particle when added to the end of a sentence meaning "right?".
 * ==でしょう==・==だろう== 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.

content/🔰 Grammar/Reason.md

@@ -115,60 +115,6 @@ See also [[Connectors - in order to#ために]].
 > {日本|にほん}に行きたい。==そのために==、{日本語|にほんご}をちゃんと{勉強|べんきょう}しています。
 > I want to go to Japan. In order to do so, I'm studying seriously.
 
-## せいで
-
-<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 "because of". Mostly used for negative contexts, to blame, etc.
-
-> [!info] Example
-> あなたの==せいで=={負|ま}けた。
-> We lost because of you.
-
-## おかげで
-
-<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 "because of". Used for positive contexts, like "thanks to".
-
-> [!info] Example
-> あなたの==おかげで=={勝|か}った。
-> We lost because of you.
-
-## というのは
-
-<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.
-
 ## わけだ・わけではない
 
 <div class="usage">
@@ -188,4 +134,185 @@ Means "this means", "known as", "because".
 > {毎日|まいにち}{料理|りょうり}を{作|つく}るからうまくになった==わけだ==。
 > I got good at cooking because I cook every day.
 
-See also [[Certainty#わけがない]].
+See also [[Certainty#わけがない]].
+
+## からこそ
+
+Means "precisely because". Made with the [[🔰 Particles (2)#Because|から]] and [[🔰 Particles (2)#こそ|こそ]] particles, to emphasize the reason.
+
+> [!info] Example
+> {清潔|せいけつ}==だからこそ=={快適|かいてき}です。
+> It's precisely because it's clean that it is comfortable.
+
+⚠ Uses the same rules as [[🔰 Particles (2)#Because|から]].
+
+## ことだから
+
+Means "exactly because". Usually used to talk about something characteristic to someone.
+Used with nouns + の.
+
+> [!info] Example
+> {彼女|かのじょ}==のことだから==、{必|かなら}ず{来|き}ます。
+> It's precisely because it's her that I'm sure she'll come.
+
+## につき
+
+Means "due to". Used when a change happens. It is formal.
+
+> [!info] Example
+> {年次|ねんじ}{休業|きゅうぎょう}==につき==、セールが{開催|かいさい}{中|ちゅう}。
+> Due to the annual closure, a sale is being held.
+
+## もの・もん
+
+<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 "because". It is usually casual.
+
+> [!info] Example
+> {具合|ぐあい}が{悪|わる}い。。。{臭|くさ}い==んだもの==。
+> I don't feel well... because something stinks.
+
+## ものだから
+
+<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 "because". Used to emphasize what has been said before, the reason for something, explaining something, or giving an excuse.
+
+> [!info] Example
+> {電車|でんしゃ}{事故|じこ}があった==ものだから==、{私|わたし}は{遅|おく}れてしまった。
+> There was a train accident, so I was late.
+
+## Positive
+
+### おかげで
+
+<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 "because of". Used for positive contexts, like "thanks to".
+
+> [!info] Example
+> あなたの==おかげで=={勝|か}った。
+> We won because of you.
+
+### だけあって
+
+<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 "being the case", "as expected", "precisely because". Only used for positive results.
+
+> [!info] Examples
+> {彼女|かのじょ}==だけあって==、{美|うつく}しい{服|ふく}を{着|き}た。
+> As expected of her, she wore beautiful clothes.
+
+## Negative
+
+### せいで
+
+<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 "because of". Mostly used for negative contexts, to blame, etc.
+
+> [!info] Example
+> あなたの==せいで=={負|ま}けた。
+> We lost because of you.
+
+### ばかりに
+
+<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 "simply because". Usually used for negative results.
+
+> [!info] Example
+> {彼|かれ}はたった{一|ひと}つミスをした==ばかりに=={解雇|かいこ}されました。
+> He was fired after making only one mistake.
+
+## Since... it's obvious that...
+
+All three patterns mean "because A... obviously B". They have slight differences.
+Used when talking about things like decision, judgement, etc.
+
+### 上は
+
+{上|うえ}は is the most formal form.
+Used with verbs (る, た forms).
+
+> [!info] Example
+> {先生|せんせい}が{言|い}った==上は=={必|かなら}ずする。
+> Since the teacher said it, I will definitely do 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>
+
+{以上|いじょう}は is formal.
+Only with this form, both parts of the sentence can talk about different persons.
+
+> [!info] Example
+> {彼|かれ}がまだ{来|き}ません==以上は==、{今|いま}{帰|かえ}ります。
+> Since he still have not come, I'm going home now.
+
+### からには
+
+It is used in conversations. Can only be used for talking about oneself. Generally used for positive results.
+Used with verbs.
+
+> [!info] Examples
+> お{金|かね}がある==からには==、いい{家|いえ}を{買|か}うつもりです。
+> Since I have money, I plan to buy a nice house.

content/🔰 Grammar/Request.md

@@ -2,7 +2,7 @@
 
 ## てください
 
-It is a polite request that is translated as "please do". See Conjugation [[Basics]] ("command").
+It is a polite request that is translated as "please do".
 In casual speech, can be shortened to て.
 
 > [!info] Example
@@ -49,8 +49,17 @@ It is used with verbs by removing the ます and adding なさい. In casual con
 
 ## ように言う
 
+<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".
-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.
+
+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
 > {子供|こども}にお{菓子|か|し}を食べない==ように言った==。

content/🔰 Grammar/State.md

@@ -73,6 +73,14 @@ Used with verbs that expresses change.
 > {禁煙|きんえん}の{場所|ばしょ}は{増|ふ}えている==一方です==。
 > 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">

content/🔰 Grammar/Talking about.md

@@ -8,10 +8,28 @@
 > 日本==と言えば==、富士山です。
 > 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.
+Used with nouns. It is used in formal language.
 
 > [!info] Example
 > {冬|ふゆ}==において=={雪|ゆき}が{降|ふ}る。
@@ -29,6 +47,38 @@ Used with nouns.
 > {面接|めんせつ}==について==はいつがよろしいでしょうか。
 > 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 について.
@@ -46,6 +96,16 @@ Means "in other words". Used after a first phrase for an alternative explanation
 > この{映画|えいが}は１２０分、==つまり==２時です。
 > 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 つまり.
@@ -54,6 +114,14 @@ Means "in other words". More formal than つまり.
 > この{映画|えいが}は１２０分、==すなわち==２時です。
 > 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.
@@ -75,15 +143,6 @@ Used with nouns.
 > フランスの文化はパン==をはじめ==、ワインも{人気|にんき}です。
 > French culture is popular not only for bread, but also for wine.
 
-## にとって
-
-Means "concerning", "regarding". Focuses on the standpoint of the preceding part.
-Used with nouns.
-
-> [!info] Example
-> 猫==にとって=={睡眠|すい|みん}は{大切|たいせつ}です。
-> Sleeping is important for cats.
-
 ## なんか・なんて
 
 Means "such as", "things like". It is used to give examples or to show emphasis.
@@ -101,3 +160,38 @@ Means "such as", "things like". It is used to give examples or to show emphasis.
 > [!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!

content/🔰 Grammar/Thanks.md

@@ -0,0 +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.

content/🔰 Grammar/Time - close.md

@@ -0,0 +1,81 @@
+# Time - close
+
+## ところ
+
+Means "just about to". Used when describing what we're about to do. Can also mean "just after something happened".
+Used by combining to a verb.
+
+> [!info] Example
+> 今ご{飯|はん}を作る==ところ==です。
+> I'm about to make dinner.
+
+## かと思ったら
+
+かと{思|おも}ったら means "just when".
+Can also be used as かと思うと and かと思えば.
+Used with a verb in the past (た) form.
+
+> [!info] Examples
+> スーパーに{行|い}った==かと思ったら==、{雪|ゆき}が{降|ふ}り{出|だ}した。
+> Just as I went to the supermarket, it started snowing.
+
+## か~ないかのうちに
+
+<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>
+
+か~ないかのうちに means "right after", "as soon as". It is formal.
+
+> [!info] Examples
+> {彼|かれ}は{電車|でんしゃ}が{駅|えき}に{着|つ}く==か=={着|つ}かない==かのうちに=={走|はし}り{始|はじ}めた。
+> He started running as soon as the train arrived at the station.
+
+## 次第
+
+{次第|しだい} means "as soon as". Made by removing the ます stem of a verb.
+
+> [!info] Examples
+> {食|たべ}べ==次第==、オフィスに行ってください。
+> As soon as you've eaten, please go to the office.
+
+With に at the end, it means "gradually".
+
+> [!info] Examples
+> {彼|かれ}は==次第に=={上手|じょうず}になってきた。
+> He's gradually gotten better.
+
+## 直ちに
+
+{直|ただ}ちに means "immediately", "at once". 
+
+> [!info] Examples
+> ==直ちに=={出|で}かけなきゃ！
+> I need to get going right now!
+
+## ところに
+
+Means "at the time", "when", "while", "just as". Used with verbs in the ている form.
+Focuses on the scene or situation rather than the action.
+
+> [!info] Examples
+> ばかばかしいことをしていた==ところに==、{先輩|せんぱい}{入|はい}りました。
+> While I was doing something stupid, my senior came in.
+
+## 一気に
+
+{一気|いっき}に means "at once", "all at once" and "instantly", "right away".
+
+> [!info] Examples
+> ==一気に=={全部|ぜんぶ}{食|た}べちゃった。
+> I ate it all in one go.
+> 
+> {彼|かれ}を{叱|しか}った{後|あと}で、==一気に=={止|や}めました。
+> After scolding him, he stopped right away.

content/🔰 Grammar/Time - during.md

@@ -37,7 +37,7 @@ Can also be used to talk about a distance between two physical places or the tim
 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.
@@ -56,7 +56,7 @@ Contrary to 間, it doesn't include the whole time period. So 間に means that
 	<p class="r"> + ながら + ...</p>
 </div>
 
-Means "while", "simultaneously". The difference with ついでに is that here the main action is the second one.
+Means "while", "simultaneously". The difference with ついでに is that here the main action is the second one. Happens at the same time.
 
 > [!info] Example
 > {歩|ある}き==ながら=={電話|でん|わ}を見ています。
@@ -73,12 +73,30 @@ Means "while", "simultaneously". The difference with ついでに is that here t
 	<p class="right">+ ついでに</p>
 </div>
 
-Means "while", "at the same time". The difference with ながら is that here the main action is the first one.
+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:
@@ -110,6 +128,25 @@ Means "while". The nuance is that the time is optimal and should be taken advant
 > {晴|は}れる==うちに=={散歩|さんぽ}しましょう。
 > 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">

content/🔰 Grammar/Time - finally.md

@@ -2,7 +2,8 @@
 
 ## やっと
 
-Means that something happened at last. More rarely means "barely".
+Means that something happened at last, with efforts. More rarely means "barely".
+Used at the beginning of a phrase.
 
 > [!info] Example
 > ==やっと=={論文|ろん|ぶん}を書き{終|お}わった。
@@ -10,8 +11,50 @@ Means that something happened at last. More rarely means "barely".
 
 ## ついに
 
-Means "finally", "at last". Something happened after working to accomplish the goal.
+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.

content/🔰 Grammar/Time - regularity.md

@@ -50,5 +50,21 @@ The way the intervals are counted between these two grammar structure is differe
 > １日==おきに== =２日==ごとに== = every other day = every second day
 > ●○●○●○●
 >
-> ２日==おきに== =３日==ごとに== (every three days = every third 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.

content/🔰 Grammar/Time - surprise.md

@@ -16,6 +16,14 @@ This means "suddenly", "unexpectedly", "unintentionally". Emphasis is on the lac
 > ==ふと=={通|とお}りに１０００円を{見|み}つけた。
 > 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.

content/🔰 Grammar/Time - throughout.md

@@ -0,0 +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.

content/🔰 Grammar/Time.md

@@ -44,15 +44,6 @@ Used by combining to a verb.
 > {時々|とき|どき}パリへ行く==ことがある==。
 > I sometimes go to Paris.
 
-## ところ
-
-Means "just about to". Used when describing what we're about to do.
-Used by combining to a verb.
-
-> [!info] Example
-> 今ご{飯|はん}を作る==ところ==です。
-> I'm about to make dinner.
-
 ## から～まで
 
 See から: [[🔰 Particles (2)#From, since]] (from).
@@ -158,13 +149,22 @@ Used with nouns measuring time.
 > ３{年|ねん}==ぶりに==ブラジルを{戻|もど}ります。
 > For the first time in 3 years, I'm returning to Brazil.
 
-## から〜にかけて
+## に先立ち
 
-Means "through", "from... until". Indicates that something happens over a period of time.
+<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>
 
-> [!info] Example
+に{先|さき}{立|だ}ち means "before", "prior to". It is formal.
-> {朝|あさ}==から=={夜|よる}==にかかて==ゲームしたい。
+Also used as に先立つ when a second noun follows a first one.
-> I want to play games from morning to night.
+
+> [!info] Examples
+> {初|はじ}める==に先立って==、{準備|じゅんび}しないといけない。
+> Before starting, you need to prepare.
 
 ## 上で
 
@@ -181,3 +181,61 @@ Means "through", "from... until". Indicates that something happens over a period
 > [!info] Examples
 > {面接|めんせつ}の==上で==、{連絡|れんらく}します。
 > We will contact you after the interview.
+
+## にあたって
+
+<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 "at the time of", "on the occasion of". It is formal. Used when talking about the preparation.
+Can also be used as にあたり.
+Used with verbs and nouns.
+
+> [!info] Examples
+> {試験|しけん}を{受|う}ける==にあたって==、{鉛筆|えんぴつ}と{消|け}しゴムを{持|も}ってきてください。
+> Please bring a pencil and an eraser in preparation for the test.
+
+## に際して
+
+<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 "at the time of", "on the occasion of". It is formal. Used when talking about the moment of the situation.
+
+> [!info] Examples
+> {試験|しけん}を{受|う}ける==に際して==、{静|しず}かにしてください。
+> During the test, please be quiet.
+
+## とっくに
+
+Means "long ago", "a long time ago".
+
+> [!info] Examples
+> {彼女|かのじょ}は==とっくに=={帰|かえ}ってしまった。
+> She went home long ago.
+
+## やがて
+
+Means "before long", "eventually".
+
+> [!info] Examples
+> ==やがて==この{新|あたら}しいゲームは{売|う}り{出|だ}すはずです。
+> This new game should be put on sale soon.
+
+## ところだった
+
+Means "almost", "about to", "almost happened". Used with a dictionary form verb (る) by adding ところだった.
+
+> [!info] Examples
+> {車|くるま}の{事故|じこ}が{起|お}こる==ところだった==。{無事|ぶじ}よかった。
+> A car accident almost happened. Thankfully we're safe.

content/🔰 Grammar/Towards.md

@@ -19,6 +19,14 @@ Used with nouns.
 > この{建物|たてもの}は{南|みなみ}==向き==です。
 > This building is facing south.
 
+## に向かって・に向けて
+
+に{向|む}かって means "to face", "towards".
+
+> [!info] Example
+> {今|いま}{名古屋|なごや}==に向かっています==。
+> I'm heading towards Nagoya now.
+
 ## を中心に
 
 を{中心|ちゅう|しん}に means "mainly", "focused on".
@@ -48,7 +56,7 @@ Used with a noun.
 <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">な-Adj + (な + の)</span></p>
 	<p><span class="box">N + な + の</span></p>
 </div>
 	<p class="right">+ に対して</p>

content/🔰 Grammar/Without.md

@@ -9,12 +9,78 @@ It is a bit more casual than ずに.
 > {勉強|べんきょう}し==ないで=={卒業|そつぎょう}した。
 > I graduated without studying.
 
-## ずに
+## ず(に)
 
-Means "without doing". Formed with a verb in the negative tense (ない) by removing the -ない stem and adding ずに.
+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 ないで.
+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.

content/🔰 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 [[Amount#くらい]].
+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.
 
 ## に

content/🔰 Grammar/🔰 Particles (2).md

@@ -44,7 +44,7 @@ Means "until" or "to".
 These two particles are frequently used together. It means "from X to Y".
 
 > [!info] Example
-> {朝|あさ}に６時==から==７時==まで==電車で{通|かよ}うっています。
+> {朝|あさ}に６時==から==７時==まで=={電車|でんしゃ}で{通|かよ}うっています。
 > I commute by train from 6am to 7am.
 
 ## っけ
@@ -73,7 +73,7 @@ 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.
 
 ## さえ
@@ -96,6 +96,24 @@ Means "even", "not even" (with negative verbs).
 
 ⚠ 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.

custom/compose.yaml

@@ -0,0 +1,7 @@
+services:
+
+  web:
+    image: quartz-jpg
+    container_name: quartz-jpg
+    ports:
+    - "8080:80"

custom/docker-compose.yml

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

custom/init-repos.sh

@@ -0,0 +1,3 @@
+git remote add content https://git.marchal.dev/keb/jpg-content.git
+git remote add convert-furigana https://git.marchal.dev/keb/jpg-convert-furigana.git
+git remote add convert-usage https://git.marchal.dev/keb/jpg-convert-usage.git

custom/nginx/default.conf

@@ -0,0 +1,13 @@
+server {
+    listen       80;
+    listen  [::]:80;
+    server_name  localhost;
+
+    root   /usr/share/nginx/html;
+    index  index.html
+    error_page 404 /404.html;
+
+    location / {
+        try_files $uri $uri.html $uri/ =404;
+    }
+}

docs/advanced/creating components.md

@@ -129,11 +129,11 @@ export default (() => {
     return <button id="btn">Click me</button>
   }
 
-  YourComponent.beforeDOM = `
+  YourComponent.beforeDOMLoaded = `
   console.log("hello from before the page loads!")
   `
 
-  YourComponent.afterDOM = `
+  YourComponent.afterDOMLoaded = `
   document.getElementById('btn').onclick = () => {
     alert('button clicked!')
   }
@@ -161,6 +161,18 @@ document.addEventListener("nav", () => {
 })
 ```
 
+You can also add the equivalent of a `beforeunload` event for [[SPA Routing]] via the `prenav` event.
+
+```ts
+document.addEventListener("prenav", () => {
+  // executed after an SPA navigation is triggered but
+  // before the page is replaced
+  // one usage pattern is to store things in sessionStorage
+  // in the prenav and then conditionally load then in the consequent
+  // nav
+})
+```
+
 It is best practice to track any event handlers via `window.addCleanup` to prevent memory leaks.
 This will get called on page navigation.
 
@@ -180,7 +192,7 @@ export default (() => {
     return <button id="btn">Click me</button>
   }
 
-  YourComponent.afterDOM = script
+  YourComponent.afterDOMLoaded = script
   return YourComponent
 }) satisfies QuartzComponentConstructor
 ```

docs/advanced/making plugins.md

@@ -25,10 +25,11 @@ The following sections will go into detail for what methods can be implemented f
 - `BuildCtx` is defined in `quartz/ctx.ts`. It consists of
   - `argv`: The command line arguments passed to the Quartz [[build]] command
   - `cfg`: The full Quartz [[configuration]]
-  - `allSlugs`: a list of all the valid content slugs (see [[paths]] for more information on what a `ServerSlug` is)
+  - `allSlugs`: a list of all the valid content slugs (see [[paths]] for more information on what a slug is)
 - `StaticResources` is defined in `quartz/resources.tsx`. It consists of
-  - `css`: a list of URLs for stylesheets that should be loaded
+  - `css`: a list of CSS style definitions that should be loaded. A CSS style is described with the `CSSResource` type which is also defined in `quartz/resources.tsx`. It accepts either a source URL or the inline content of the stylesheet.
   - `js`: a list of scripts that should be loaded. A script is described with the `JSResource` type which is also defined in `quartz/resources.tsx`. It allows you to define a load time (either before or after the DOM has been loaded), whether it should be a module, and either the source URL or the inline content of the script.
+  - `additionalHead`: a list of JSX elements or functions that return JSX elements to be added to the `<head>` tag of the page. Functions receive the page's data as an argument and can conditionally render elements.
 
 ## Transformers
 
@@ -37,7 +38,7 @@ Transformers **map** over content, taking a Markdown file and outputting modifie
 ```ts
 export type QuartzTransformerPluginInstance = {
   name: string
-  textTransform?: (ctx: BuildCtx, src: string | Buffer) => string | Buffer
+  textTransform?: (ctx: BuildCtx, src: string) => string
   markdownPlugins?: (ctx: BuildCtx) => PluggableList
   htmlPlugins?: (ctx: BuildCtx) => PluggableList
   externalResources?: (ctx: BuildCtx) => Partial<StaticResources>
@@ -85,8 +86,10 @@ export const Latex: QuartzTransformerPlugin<Options> = (opts?: Options) => {
       if (engine === "katex") {
         return {
           css: [
-            // base css
+            {
-            "https://cdnjs.cloudflare.com/ajax/libs/KaTeX/0.16.9/katex.min.css",
+              // base css
+              content: "https://cdnjs.cloudflare.com/ajax/libs/KaTeX/0.16.9/katex.min.css",
+            },
           ],
           js: [
             {
@@ -97,8 +100,6 @@ export const Latex: QuartzTransformerPlugin<Options> = (opts?: Options) => {
             },
           ],
         }
-      } else {
-        return {}
       }
     },
   }
@@ -220,12 +221,26 @@ export type QuartzEmitterPlugin<Options extends OptionType = undefined> = (
 
 export type QuartzEmitterPluginInstance = {
   name: string
-  emit(ctx: BuildCtx, content: ProcessedContent[], resources: StaticResources): Promise<FilePath[]>
+  emit(
+    ctx: BuildCtx,
+    content: ProcessedContent[],
+    resources: StaticResources,
+  ): Promise<FilePath[]> | AsyncGenerator<FilePath>
+  partialEmit?(
+    ctx: BuildCtx,
+    content: ProcessedContent[],
+    resources: StaticResources,
+    changeEvents: ChangeEvent[],
+  ): Promise<FilePath[]> | AsyncGenerator<FilePath> | null
   getQuartzComponents(ctx: BuildCtx): QuartzComponent[]
 }
 ```
 
-An emitter plugin must define a `name` field, an `emit` function, and a `getQuartzComponents` function. `emit` is responsible for looking at all the parsed and filtered content and then appropriately creating files and returning a list of paths to files the plugin created.
+An emitter plugin must define a `name` field, an `emit` function, and a `getQuartzComponents` function. It can optionally implement a `partialEmit` function for incremental builds.
+
+- `emit` is responsible for looking at all the parsed and filtered content and then appropriately creating files and returning a list of paths to files the plugin created.
+- `partialEmit` is an optional function that enables incremental builds. It receives information about which files have changed (`changeEvents`) and can selectively rebuild only the necessary files. This is useful for optimizing build times in development mode. If `partialEmit` is undefined, it will default to the `emit` function.
+- `getQuartzComponents` declares which Quartz components the emitter uses to construct its pages.
 
 Creating new files can be done via regular Node [fs module](https://nodejs.org/api/fs.html) (i.e. `fs.cp` or `fs.writeFile`) or via the `write` function in `quartz/plugins/emitters/helpers.ts` if you are creating files that contain text. `write` has the following signature:
 
@@ -234,7 +249,7 @@ export type WriteOptions = (data: {
   // the build context
   ctx: BuildCtx
   // the name of the file to emit (not including the file extension)
-  slug: ServerSlug
+  slug: FullSlug
   // the file extension
   ext: `.${string}` | ""
   // the file content to add
@@ -260,11 +275,11 @@ export const ContentPage: QuartzEmitterPlugin = () => {
     ...defaultContentPageLayout,
     pageBody: Content(),
   }
-  const { head, header, beforeBody, pageBody, left, right, footer } = layout
+  const { head, header, beforeBody, pageBody, afterBody, left, right, footer } = layout
   return {
     name: "ContentPage",
     getQuartzComponents() {
-      return [head, ...header, ...beforeBody, pageBody, ...left, ...right, footer]
+      return [head, ...header, ...beforeBody, pageBody, ...afterBody, ...left, ...right, footer]
     },
     async emit(ctx, content, resources, emit): Promise<FilePath[]> {
       const cfg = ctx.cfg.configuration
@@ -272,7 +287,7 @@ export const ContentPage: QuartzEmitterPlugin = () => {
       const allFiles = content.map((c) => c[1].data)
       for (const [tree, file] of content) {
         const slug = canonicalizeServer(file.data.slug!)
-        const externalResources = pageResources(slug, resources)
+        const externalResources = pageResources(slug, file.data, resources)
         const componentData: QuartzComponentProps = {
           fileData: file.data,
           externalResources,

docs/authoring content.md

@@ -29,11 +29,14 @@ Some common frontmatter fields that are natively supported by Quartz:
 
 - `title`: Title of the page. If it isn't provided, Quartz will use the name of the file as the title.
 - `description`: Description of the page used for link previews.
+- `permalink`: A custom URL for the page that will remain constant even if the path to the file changes.
 - `aliases`: Other names for this note. This is a list of strings.
 - `tags`: Tags for this note.
 - `draft`: Whether to publish the page or not. This is one way to make [[private pages|pages private]] in Quartz.
 - `date`: A string representing the day the note was published. Normally uses `YYYY-MM-DD` format.
 
+See [[Frontmatter]] for a complete list of frontmatter.
+
 ## Syncing your Content
 
 When your Quartz is at a point you're happy with, you can save your changes to GitHub.

docs/build.md

@@ -21,3 +21,7 @@ This will start a local web server to run your Quartz on your computer. Open a w
 > - `--serve`: run a local hot-reloading server to preview your Quartz
 > - `--port`: what port to run the local preview server on
 > - `--concurrency`: how many threads to use to parse notes
+
+> [!warning] Not to be used for production
+> Serve mode is intended for local previews only.
+> For production workloads, see the page on [[hosting]].

docs/configuration.md

@@ -21,16 +21,19 @@ const config: QuartzConfig = {
 This part of the configuration concerns anything that can affect the whole site. The following is a list breaking down all the things you can configure:
 
 - `pageTitle`: title of the site. This is also used when generating the [[RSS Feed]] for your site.
+- `pageTitleSuffix`: a string added to the end of the page title. This only applies to the browser tab title, not the title shown at the top of the page.
 - `enableSPA`: whether to enable [[SPA Routing]] on your site.
 - `enablePopovers`: whether to enable [[popover previews]] on your site.
 - `analytics`: what to use for analytics on your site. Values can be
   - `null`: don't use analytics;
   - `{ provider: 'google', tagId: '<your-google-tag>' }`: use Google Analytics;
-  - `{ provider: 'plausible' }` (managed) or `{ provider: 'plausible', host: '<your-plausible-host>' }` (self-hosted): use [Plausible](https://plausible.io/);
+  - `{ provider: 'plausible' }` (managed) or `{ provider: 'plausible', host: 'https://<your-plausible-host>' }` (self-hosted, make sure to include the `https://` protocol prefix): use [Plausible](https://plausible.io/);
   - `{ provider: 'umami', host: '<your-umami-host>', websiteId: '<your-umami-website-id>' }`: use [Umami](https://umami.is/);
   - `{ provider: 'goatcounter', websiteId: 'my-goatcounter-id' }` (managed) or `{ provider: 'goatcounter', websiteId: 'my-goatcounter-id', host: 'my-goatcounter-domain.com', scriptSrc: 'https://my-url.to/counter.js' }` (self-hosted) use [GoatCounter](https://goatcounter.com);
   - `{ provider: 'posthog', apiKey: '<your-posthog-project-apiKey>', host: '<your-posthog-host>' }`: use [Posthog](https://posthog.com/);
   - `{ provider: 'tinylytics', siteId: '<your-site-id>' }`: use [Tinylytics](https://tinylytics.app/);
+  - `{ provider: 'cabin' }` or `{ provider: 'cabin', host: 'https://cabin.example.com' }` (custom domain): use [Cabin](https://withcabin.com);
+  - `{provider: 'clarity', projectId: '<your-clarity-id-code' }`: use [Microsoft clarity](https://clarity.microsoft.com/). The project id can be found on top of the overview page.
 - `locale`: used for [[i18n]] and date formatting
 - `baseUrl`: this is used for sitemaps and RSS feeds that require an absolute URL to know where the canonical 'home' of your site lives. This is normally the deployed URL of your site (e.g. `quartz.jzhao.xyz` for this site). Do not include the protocol (i.e. `https://`) or any leading or trailing slashes.
   - This should also include the subpath if you are [[hosting]] on GitHub pages without a custom domain. For example, if my repository is `jackyzha0/quartz`, GitHub pages would deploy to `https://jackyzha0.github.io/quartz` and the `baseUrl` would be `jackyzha0.github.io/quartz`.
@@ -38,11 +41,12 @@ This part of the configuration concerns anything that can affect the whole site.
 - `ignorePatterns`: a list of [glob](<https://en.wikipedia.org/wiki/Glob_(programming)>) patterns that Quartz should ignore and not search through when looking for files inside the `content` folder. See [[private pages]] for more details.
 - `defaultDateType`: whether to use created, modified, or published as the default date to display on pages and page listings.
 - `theme`: configure how the site looks.
-  - `cdnCaching`: If `true` (default), use Google CDN to cache the fonts. This will generally will be faster. Disable (`false`) this if you want Quartz to download the fonts to be self-contained.
+  - `cdnCaching`: if `true` (default), use Google CDN to cache the fonts. This will generally be faster. Disable (`false`) this if you want Quartz to download the fonts to be self-contained.
   - `typography`: what fonts to use. Any font available on [Google Fonts](https://fonts.google.com/) works here.
-    - `header`: Font to use for headers
+    - `title`: font for the title of the site (optional, same as `header` by default)
-    - `code`: Font for inline and block quotes.
+    - `header`: font to use for headers
-    - `body`: Font for everything
+    - `code`: font for inline and block quotes
+    - `body`: font for everything
   - `colors`: controls the theming of the site.
     - `light`: page background
     - `lightgray`: borders
@@ -52,6 +56,7 @@ This part of the configuration concerns anything that can affect the whole site.
     - `secondary`: link colour, current [[graph view|graph]] node
     - `tertiary`: hover states and visited [[graph view|graph]] nodes
     - `highlight`: internal link background, highlighted text, [[syntax highlighting|highlighted lines of code]]
+    - `textHighlight`: markdown highlighted text background
 
 ## Plugins
 
@@ -99,8 +104,30 @@ transformers: [
 ]
 ```
 
-Some plugins are included by default in the[ `quartz.config.ts`](https://github.com/jackyzha0/quartz/blob/v4/quartz.config.ts), but there are more available.
+Some plugins are included by default in the [`quartz.config.ts`](https://github.com/jackyzha0/quartz/blob/v4/quartz.config.ts), but there are more available.
 
 You can see a list of all plugins and their configuration options [[tags/plugin|here]].
 
 If you'd like to make your own plugins, see the [[making plugins|making custom plugins]] guide.
+
+## Fonts
+
+Fonts can be specified as a `string` or a `FontSpecification`:
+
+```ts
+// string
+typography: {
+  header: "Schibsted Grotesk",
+  ...
+}
+
+// FontSpecification
+typography: {
+  header: {
+    name: "Schibsted Grotesk",
+    weights: [400, 700],
+    includeItalic: true,
+  },
+  ...
+}
+```

docs/features/Citations.md

@@ -0,0 +1,31 @@
+---
+title: Citations
+tags:
+  - feature/transformer
+---
+
+Quartz uses [rehype-citation](https://github.com/timlrx/rehype-citation) to support parsing of a BibTex bibliography file.
+
+Under the default configuration, a citation key `[@templeton2024scaling]` will be exported as `(Templeton et al., 2024)`.
+
+> [!example]- BibTex file
+>
+> ```bib title="bibliography.bib"
+> @article{templeton2024scaling,
+>   title={Scaling Monosemanticity: Extracting Interpretable Features from Claude 3 Sonnet},
+>   author={Templeton, Adly and Conerly, Tom and Marcus, Jonathan and Lindsey, Jack and Bricken, Trenton and Chen, Brian and Pearce, Adam and Citro, Craig and Ameisen, Emmanuel and Jones, Andy and Cunningham, Hoagy and Turner, Nicholas L and McDougall, Callum and MacDiarmid, Monte and Freeman, C. Daniel and Sumers, Theodore R. and Rees, Edward and Batson, Joshua and Jermyn, Adam and Carter, Shan and Olah, Chris and Henighan, Tom},
+>   year={2024},
+>   journal={Transformer Circuits Thread},
+>   url={https://transformer-circuits.pub/2024/scaling-monosemanticity/index.html}
+> }
+> ```
+
+> [!note] Behaviour of references
+>
+> By default, the references will be included at the end of the file. To control where the references to be included, uses `[^ref]`
+>
+> Refer to `rehype-citation` docs for more information.
+
+## Customization
+
+Citation parsing is a functionality of the [[plugins/Citations|Citation]] plugin. **This plugin is not enabled by default**. See the plugin page for customization options.

docs/features/Docker Support.md

@@ -3,5 +3,5 @@ Quartz comes shipped with a Docker image that will allow you to preview your Qua
 You can run the below one-liner to run Quartz in Docker.
 
 ```sh
-docker run --rm -itp 8080:8080 $(docker build -q .)
+docker run --rm -itp 8080:8080 -p 3001:3001 -v ./content:/usr/src/app/content $(docker build -q .)
 ```

docs/features/RSS Feed.md

@@ -1,5 +1,10 @@
 Quartz emits an RSS feed for all the content on your site by generating an `index.xml` file that RSS readers can subscribe to. Because of the RSS spec, this requires the `baseUrl` property in your [[configuration]] to be set properly for RSS readers to pick it up properly.
 
+> [!info]
+> After deploying, the generated RSS link will be available at `https://${baseUrl}/index.xml` by default.
+>
+> The `index.xml` path can be customized by passing the `rssSlug` option to the [[ContentIndex]] plugin.
+
 ## Configuration
 
 This functionality is provided by the [[ContentIndex]] plugin. See the plugin page for customization options.

docs/features/Roam Research compatibility.md

@@ -0,0 +1,28 @@
+---
+title: "Roam Research Compatibility"
+tags:
+  - feature/transformer
+---
+
+[Roam Research](https://roamresearch.com) is a note-taking tool that organizes your knowledge graph in a unique and interconnected way.
+
+Quartz supports transforming the special Markdown syntax from Roam Research (like `{{[[components]]}}` and other formatting) into
+regular Markdown via the [[RoamFlavoredMarkdown]] plugin.
+
+```typescript title="quartz.config.ts"
+plugins: {
+  transformers: [
+    // ...
+    Plugin.RoamFlavoredMarkdown(),
+    Plugin.ObsidianFlavoredMarkdown(),
+    // ...
+  ],
+},
+```
+
+> [!warning]
+> As seen above placement of `Plugin.RoamFlavoredMarkdown()` within `quartz.config.ts` is very important. It must come before `Plugin.ObsidianFlavoredMarkdown()`.
+
+## Customization
+
+This functionality is provided by the [[RoamFlavoredMarkdown]] plugin. See the plugin page for customization options.

docs/features/backlinks.md

@@ -9,6 +9,7 @@ A backlink for a note is a link from another note to that note. Links in the bac
 ## Customization
 
 - Removing backlinks: delete all usages of `Component.Backlinks()` from `quartz.layout.ts`.
+- Hide when empty: hide `Backlinks` if given page doesn't contain any backlinks (default to `true`). To disable this, use `Component.Backlinks({ hideWhenEmpty: false })`.
 - Component: `quartz/components/Backlinks.tsx`
 - Style: `quartz/components/styles/backlinks.scss`
 - Script: `quartz/components/scripts/search.inline.ts`

docs/features/breadcrumbs.md

@@ -19,7 +19,6 @@ Component.Breadcrumbs({
   spacerSymbol: "❯", // symbol between crumbs
   rootName: "Home", // name of first/root element
   resolveFrontmatterTitle: true, // whether to resolve folder names through frontmatter titles
-  hideOnRoot: true, // whether to hide breadcrumbs on root `index.md` page
   showCurrentPage: true, // whether to display the current page in the breadcrumbs
 })
 ```

docs/features/comments.md

@@ -0,0 +1,133 @@
+---
+title: Comments
+tags:
+  - component
+---
+
+Quartz also has the ability to hook into various providers to enable readers to leave comments on your site.
+
+![[giscus-example.png]]
+
+As of today, only [Giscus](https://giscus.app/) is supported out of the box but PRs to support other providers are welcome!
+
+## Providers
+
+### Giscus
+
+First, make sure that the [[setting up your GitHub repository|GitHub]] repository you are using for your Quartz meets the following requirements:
+
+1. The **repository is [public](https://docs.github.com/en/github/administering-a-repository/managing-repository-settings/setting-repository-visibility#making-a-repository-public)**, otherwise visitors will not be able to view the discussion.
+2. The **[giscus](https://github.com/apps/giscus) app is installed**, otherwise visitors will not be able to comment and react.
+3. The **Discussions feature is turned on** by [enabling it for your repository](https://docs.github.com/en/github/administering-a-repository/managing-repository-settings/enabling-or-disabling-github-discussions-for-a-repository).
+
+Then, use the [Giscus site](https://giscus.app/#repository) to figure out what your `repoId` and `categoryId` should be. Make sure you select `Announcements` for the Discussion category.
+
+![[giscus-repo.png]]
+
+![[giscus-discussion.png]]
+
+After entering both your repository and selecting the discussion category, Giscus will compute some IDs that you'll need to provide back to Quartz. You won't need to manually add the script yourself as Quartz will handle that part for you but will need these values in the next step!
+
+![[giscus-results.png]]
+
+Finally, in `quartz.layout.ts`, edit the `afterBody` field of `sharedPageComponents` to include the following options but with the values you got from above:
+
+```ts title="quartz.layout.ts"
+afterBody: [
+  Component.Comments({
+    provider: 'giscus',
+    options: {
+      // from data-repo
+      repo: 'jackyzha0/quartz',
+      // from data-repo-id
+      repoId: 'MDEwOlJlcG9zaXRvcnkzODcyMTMyMDg',
+      // from data-category
+      category: 'Announcements',
+      // from data-category-id
+      categoryId: 'DIC_kwDOFxRnmM4B-Xg6',
+      // from data-lang
+      lang: 'en'
+    }
+  }),
+],
+```
+
+### Customization
+
+Quartz also exposes a few of the other Giscus options as well and you can provide them the same way `repo`, `repoId`, `category`, and `categoryId` are provided.
+
+```ts
+type Options = {
+  provider: "giscus"
+  options: {
+    repo: `${string}/${string}`
+    repoId: string
+    category: string
+    categoryId: string
+
+    // Url to folder with custom themes
+    // defaults to 'https://${cfg.baseUrl}/static/giscus'
+    themeUrl?: string
+
+    // filename for light theme .css file
+    // defaults to 'light'
+    lightTheme?: string
+
+    // filename for dark theme .css file
+    // defaults to 'dark'
+    darkTheme?: string
+
+    // how to map pages -> discussions
+    // defaults to 'url'
+    mapping?: "url" | "title" | "og:title" | "specific" | "number" | "pathname"
+
+    // use strict title matching
+    // defaults to true
+    strict?: boolean
+
+    // whether to enable reactions for the main post
+    // defaults to true
+    reactionsEnabled?: boolean
+
+    // where to put the comment input box relative to the comments
+    // defaults to 'bottom'
+    inputPosition?: "top" | "bottom"
+
+    // set your preference language here
+    // defaults to 'en'
+    lang?: string
+  }
+}
+```
+
+#### Custom CSS theme
+
+Quartz supports custom theme for Giscus. To use a custom CSS theme, place the `.css` file inside the `quartz/static` folder and set the configuration values.
+
+For example, if you have a light theme `light-theme.css`, a dark theme `dark-theme.css`, and your Quartz site is hosted at `https://example.com/`:
+
+```ts
+afterBody: [
+  Component.Comments({
+    provider: 'giscus',
+    options: {
+      // Other options
+
+      themeUrl: "https://example.com/static/giscus", // corresponds to quartz/static/giscus/
+      lightTheme: "light-theme", // corresponds to light-theme.css in quartz/static/giscus/
+      darkTheme: "dark-theme", // corresponds to dark-theme.css quartz/static/giscus/
+    }
+  }),
+],
+```
+
+#### Conditionally display comments
+
+Quartz can conditionally display the comment box based on a field `comments` in the frontmatter. By default, all pages will display comments, to disable it for a specific page, set `comments` to `false`.
+
+```
+---
+title: Comments disabled here!
+comments: false
+---
+```

docs/features/explorer.md

@@ -27,12 +27,10 @@ Component.Explorer({
   folderClickBehavior: "collapse", // what happens when you click a folder ("link" to navigate to folder page on click or "collapse" to collapse folder on click)
   folderDefaultState: "collapsed", // default state of folders ("collapsed" or "open")
   useSavedState: true, // whether to use local storage to save "state" (which folders are opened) of explorer
-  // Sort order: folders first, then files. Sort folders and files alphabetically
+  // omitted but shown later
-  sortFn: (a, b) => {
+  sortFn: ...,
-    ... // default implementation shown later
+  filterFn: ...,
-  },
+  mapFn: ...,
-  filterFn: filterFn: (node) => node.name !== "tags", // filters out 'tags' folder
-  mapFn: undefined,
   // what order to apply functions in
   order: ["filter", "map", "sort"],
 })
@@ -45,26 +43,30 @@ Want to customize it even more?
 - Removing explorer: remove `Component.Explorer()` from `quartz.layout.ts`
   - (optional): After removing the explorer component, you can move the [[table of contents | Table of Contents]] component back to the `left` part of the layout
 - Changing `sort`, `filter` and `map` behavior: explained in [[#Advanced customization]]
-- Component:
+- Component: `quartz/components/Explorer.tsx`
-  - Wrapper (Outer component, generates file tree, etc): `quartz/components/Explorer.tsx`
-  - Explorer node (recursive, either a folder or a file): `quartz/components/ExplorerNode.tsx`
 - Style: `quartz/components/styles/explorer.scss`
 - Script: `quartz/components/scripts/explorer.inline.ts`
 
 ## Advanced customization
 
 This component allows you to fully customize all of its behavior. You can pass a custom `sort`, `filter` and `map` function.
-All functions you can pass work with the `FileNode` class, which has the following properties:
+All functions you can pass work with the `FileTrieNode` class, which has the following properties:
 
-```ts title="quartz/components/ExplorerNode.tsx" {2-5}
+```ts title="quartz/components/Explorer.tsx"
-export class FileNode {
+class FileTrieNode {
-  children: FileNode[]  // children of current node
+  isFolder: boolean
-  name: string  // last part of slug
+  children: Array<FileTrieNode>
-  displayName: string // what actually should be displayed in the explorer
+  data: ContentDetails | null
-  file: QuartzPluginData | null // if node is a file, this is the file's metadata. See `QuartzPluginData` for more detail
+}
-  depth: number // depth of current node
+```
 
-  ... // rest of implementation
+```ts title="quartz/plugins/emitters/contentIndex.tsx"
+export type ContentDetails = {
+  slug: FullSlug
+  title: string
+  links: SimpleSlug[]
+  tags: string[]
+  content: string
 }
 ```
 
@@ -74,15 +76,14 @@ Every function you can pass is optional. By default, only a `sort` function will
 // Sort order: folders first, then files. Sort folders and files alphabetically
 Component.Explorer({
   sortFn: (a, b) => {
-    if ((!a.file && !b.file) || (a.file && b.file)) {
+    if ((!a.isFolder && !b.isFolder) || (a.isFolder && b.isFolder)) {
-      // sensitivity: "base": Only strings that differ in base letters compare as unequal. Examples: a ≠ b, a = á, a = A
-      // numeric: true: Whether numeric collation should be used, such that "1" < "2" < "10"
       return a.displayName.localeCompare(b.displayName, undefined, {
         numeric: true,
         sensitivity: "base",
       })
     }
-    if (a.file && !b.file) {
+
+    if (!a.isFolder && b.isFolder) {
       return 1
     } else {
       return -1
@@ -100,41 +101,23 @@ For more information on how to use `sort`, `filter` and `map`, you can check [Ar
 Type definitions look like this:
 
 ```ts
-sortFn: (a: FileNode, b: FileNode) => number
+type SortFn = (a: FileTrieNode, b: FileTrieNode) => number
-filterFn: (node: FileNode) => boolean
+type FilterFn = (node: FileTrieNode) => boolean
-mapFn: (node: FileNode) => void
+type MapFn = (node: FileTrieNode) => void
 ```
 
-> [!tip]
-> You can check if a `FileNode` is a folder or a file like this:
->
-> ```ts
-> if (node.file) {
->   // node is a file
-> } else {
->   // node is a folder
-> }
-> ```
-
 ## Basic examples
 
 These examples show the basic usage of `sort`, `map` and `filter`.
 
 ### Use `sort` to put files first
 
-Using this example, the explorer will alphabetically sort everything, but put all **files** above all **folders**.
+Using this example, the explorer will alphabetically sort everything.
 
 ```ts title="quartz.layout.ts"
 Component.Explorer({
   sortFn: (a, b) => {
-    if ((!a.file && !b.file) || (a.file && b.file)) {
+    return a.displayName.localeCompare(b.displayName)
-      return a.displayName.localeCompare(b.displayName)
-    }
-    if (a.file && !b.file) {
-      return -1
-    } else {
-      return 1
-    }
   },
 })
 ```
@@ -147,42 +130,47 @@ Using this example, the display names of all `FileNodes` (folders + files) will
 Component.Explorer({
   mapFn: (node) => {
     node.displayName = node.displayName.toUpperCase()
+    return node
   },
 })
 ```
 
 ### Remove list of elements (`filter`)
 
-Using this example, you can remove elements from your explorer by providing an array of folders/files using the `omit` set.
+Using this example, you can remove elements from your explorer by providing an array of folders/files to exclude.
+Note that this example filters on the title but you can also do it via slug or any other field available on `FileTrieNode`.
 
 ```ts title="quartz.layout.ts"
 Component.Explorer({
   filterFn: (node) => {
     // set containing names of everything you want to filter out
-    const omit = new Set(["authoring content", "tags", "hosting"])
+    const omit = new Set(["authoring content", "tags", "advanced"])
-    return !omit.has(node.name.toLowerCase())
+
+    // can also use node.slug or by anything on node.data
+    // note that node.data is only present for files that exist on disk
+    // (e.g. implicit folder nodes that have no associated index.md)
+    return !omit.has(node.displayName.toLowerCase())
   },
 })
 ```
 
-You can customize this by changing the entries of the `omit` set. Simply add all folder or file names you want to remove.
-
 ### Remove files by tag
 
-You can access the frontmatter of a file by `node.file?.frontmatter?`. This allows you to filter out files based on their frontmatter, for example by their tags.
+You can access the tags of a file by `node.data.tags`.
 
 ```ts title="quartz.layout.ts"
 Component.Explorer({
   filterFn: (node) => {
     // exclude files with the tag "explorerexclude"
-    return node.file?.frontmatter?.tags?.includes("explorerexclude") !== true
+    return node.data.tags?.includes("explorerexclude") !== true
   },
 })
 ```
 
 ### Show every element in explorer
 
-To override the default filter function that removes the `tags` folder from the explorer, you can set the filter function to `undefined`.
+By default, the explorer will filter out the `tags` folder.
+To override the default filter function, you can set the filter function to `undefined`.
 
 ```ts title="quartz.layout.ts"
 Component.Explorer({
@@ -194,10 +182,12 @@ Component.Explorer({
 
 > [!tip]
 > When writing more complicated functions, the `layout` file can start to look very cramped.
-> You can fix this by defining your functions in another file.
+> You can fix this by defining your sort functions outside of the component
+> and passing it in.
+>
+> ```ts title="quartz.layout.ts"
+> import { Options } from "./quartz/components/Explorer"
 >
-> ```ts title="functions.ts"
-> import { Options } from "./quartz/components/ExplorerNode"
 > export const mapFn: Options["mapFn"] = (node) => {
 >   // implement your function here
 > }
@@ -207,16 +197,12 @@ Component.Explorer({
 > export const sortFn: Options["sortFn"] = (a, b) => {
 >   // implement your function here
 > }
-> ```
 >
-> You can then import them like this:
->
-> ```ts title="quartz.layout.ts"
-> import { mapFn, filterFn, sortFn } from "./functions.ts"
 > Component.Explorer({
->   mapFn: mapFn,
+>   // ... your other options
->   filterFn: filterFn,
+>   mapFn,
->   sortFn: sortFn,
+>   filterFn,
+>   sortFn,
 > })
 > ```
 
@@ -227,93 +213,11 @@ To add emoji prefixes (📁 for folders, 📄 for files), you could use a map fu
 ```ts title="quartz.layout.ts"
 Component.Explorer({
   mapFn: (node) => {
-    // dont change name of root node
+    if (node.isFolder) {
-    if (node.depth > 0) {
+      node.displayName = "📁 " + node.displayName
-      // set emoji for file/folder
+    } else {
-      if (node.file) {
+      node.displayName = "📄 " + node.displayName
-        node.displayName = "📄 " + node.displayName
-      } else {
-        node.displayName = "📁 " + node.displayName
-      }
     }
   },
 })
 ```
-
-### Putting it all together
-
-In this example, we're going to customize the explorer by using functions from examples above to [[#Add emoji prefix | add emoji prefixes]], [[#remove-list-of-elements-filter| filter out some folders]] and [[#use-sort-to-put-files-first | sort with files above folders]].
-
-```ts title="quartz.layout.ts"
-Component.Explorer({
-  filterFn: sampleFilterFn,
-  mapFn: sampleMapFn,
-  sortFn: sampleSortFn,
-  order: ["filter", "sort", "map"],
-})
-```
-
-Notice how we customized the `order` array here. This is done because the default order applies the `sort` function last. While this normally works well, it would cause unintended behavior here, since we changed the first characters of all display names. In our example, `sort` would be applied based off the emoji prefix instead of the first _real_ character.
-
-To fix this, we just changed around the order and apply the `sort` function before changing the display names in the `map` function.
-
-### Use `sort` with pre-defined sort order
-
-Here's another example where a map containing file/folder names (as slugs) is used to define the sort order of the explorer in quartz. All files/folders that aren't listed inside of `nameOrderMap` will appear at the top of that folders hierarchy level.
-
-It's also worth mentioning, that the smaller the number set in `nameOrderMap`, the higher up the entry will be in the explorer. Incrementing every folder/file by 100, makes ordering files in their folders a lot easier. Lastly, this example still allows you to use a `mapFn` or frontmatter titles to change display names, as it uses slugs for `nameOrderMap` (which is unaffected by display name changes).
-
-```ts title="quartz.layout.ts"
-Component.Explorer({
-  sortFn: (a, b) => {
-    const nameOrderMap: Record<string, number> = {
-      "poetry-folder": 100,
-      "essay-folder": 200,
-      "research-paper-file": 201,
-      "dinosaur-fossils-file": 300,
-      "other-folder": 400,
-    }
-
-    let orderA = 0
-    let orderB = 0
-
-    if (a.file && a.file.slug) {
-      orderA = nameOrderMap[a.file.slug] || 0
-    } else if (a.name) {
-      orderA = nameOrderMap[a.name] || 0
-    }
-
-    if (b.file && b.file.slug) {
-      orderB = nameOrderMap[b.file.slug] || 0
-    } else if (b.name) {
-      orderB = nameOrderMap[b.name] || 0
-    }
-
-    return orderA - orderB
-  },
-})
-```
-
-For reference, this is how the quartz explorer window would look like with that example:
-
-```
-📖 Poetry Folder
-📑 Essay Folder
-    ⚗️ Research Paper File
-🦴 Dinosaur Fossils File
-🔮 Other Folder
-```
-
-And this is how the file structure would look like:
-
-```
-index.md
-poetry-folder
-    index.md
-essay-folder
-    index.md
-    research-paper-file.md
-dinosaur-fossils-file.md
-other-folder
-    index.md
-```

docs/features/folder and tag listings.md

@@ -30,4 +30,4 @@ As with folder listings, you can also provide a description and title for a tag
 
 ## Customization
 
-The folder listings are a functionality of the [[FolderPage]] plugin, the tag listings of the [[TagPage]] plugin. See the plugin pages for customization options.
+Quartz allows you to define a custom sort ordering for content on both page types. The folder listings are a functionality of the [[FolderPage]] plugin, the tag listings of the [[TagPage]] plugin. See the plugin pages for customization options.

docs/features/graph view.md

@@ -36,6 +36,7 @@ Component.Graph({
     opacityScale: 1, // how quickly do we fade out the labels when zooming out?
     removeTags: [], // what tags to remove from the graph
     showTags: true, // whether to show tags in the graph
+    enableRadial: false, // whether to constrain the graph, similar to Obsidian
   },
   globalGraph: {
     drag: true,
@@ -49,6 +50,7 @@ Component.Graph({
     opacityScale: 1,
     removeTags: [], // what tags to remove from the graph
     showTags: true, // whether to show tags in the graph
+    enableRadial: true, // whether to constrain the graph, similar to Obsidian
   },
 })
 ```

docs/features/private pages.md

@@ -13,9 +13,7 @@ There may be some notes you want to avoid publishing as a website. Quartz suppor
 If you'd like to only publish a select number of notes, you can instead use [[ExplicitPublish]] which will filter out all notes except for any that have `publish: true` in the frontmatter.
 
 > [!warning]
-> Regardless of the filter plugin used, **all non-markdown files will be emitted and available publically in the final build.** This includes files such as images, voice recordings, PDFs, etc. One way to prevent this and still be able to embed local images is to create a folder specifically for public media and add the following two patterns to the ignorePatterns array.
+> Regardless of the filter plugin used, **all non-markdown files will be emitted and available publically in the final build.** This includes files such as images, voice recordings, PDFs, etc.
->
-> `"!(PublicMedia)**/!(*.md)", "!(*.md)"`
 
 ## `ignorePatterns`
 
@@ -28,7 +26,7 @@ Common examples include:
 
 - `some/folder`: exclude the entire of `some/folder`
 - `*.md`: exclude all files with a `.md` extension
-- `!*.md` exclude all files that _don't_ have a `.md` extension
+- `!(*.md)` exclude all files that _don't_ have a `.md` extension. Note that negations _must_ parenthesize the rest of the pattern!
 - `**/private`: exclude any files or folders named `private` at any level of nesting
 
 > [!warning]

docs/features/reader mode.md

@@ -0,0 +1,44 @@
+---
+title: Reader Mode
+tags:
+  - component
+---
+
+Reader Mode is a feature that allows users to focus on the content by hiding the sidebars and other UI elements. When enabled, it provides a clean, distraction-free reading experience.
+
+## Configuration
+
+Reader Mode is enabled by default. To disable it, you can remove the component from your layout configuration in `quartz.layout.ts`:
+
+```ts
+// Remove or comment out this line
+Component.ReaderMode(),
+```
+
+## Usage
+
+The Reader Mode toggle appears as a button with a book icon. When clicked:
+
+- Sidebars are hidden
+- Hovering over the content area reveals the sidebars temporarily
+
+Unlike Dark Mode, Reader Mode state is not persisted between page reloads but is maintained during SPA navigation within the site.
+
+## Customization
+
+You can customize the appearance of Reader Mode through CSS variables and styles. The component uses the following classes:
+
+- `.readermode`: The toggle button
+- `.readerIcon`: The book icon
+- `[reader-mode="on"]`: Applied to the root element when Reader Mode is active
+
+Example customization in your custom CSS:
+
+```scss
+.readermode {
+  // Customize the button
+  svg {
+    stroke: var(--custom-color);
+  }
+}
+```

docs/features/social images.md

@@ -0,0 +1,19 @@
+---
+title: "Social Media Preview Cards"
+---
+
+A lot of social media platforms can display a rich preview for your website when sharing a link (most notably, a cover image, a title and a description).
+
+Quartz can also dynamically generate and use new cover images for every page to be used in link previews on social media for you.
+
+## Showcase
+
+After enabling the [[CustomOgImages]] emitter plugin, the social media link preview for [[authoring content | Authoring Content]] looks like this:
+
+| Light                               | Dark                               |
+| ----------------------------------- | ---------------------------------- |
+| ![[social-image-preview-light.png]] | ![[social-image-preview-dark.png]] |
+
+## Configuration
+
+This functionality is provided by the [[CustomOgImages]] plugin. See the plugin page for customization options.