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/app.json

@@ -1,4 +1,10 @@
 {
   "alwaysUpdateLinks": true,
-  "showInlineTitle": false
+  "showInlineTitle": false,
+  "pdfExportSettings": {
+    "pageSize": "A4",
+    "landscape": false,
+    "margin": "0",
+    "downscalePercent": 100
+  }
 }

content/.obsidian/community-plugins.json

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

content/.obsidian/core-plugins.json

@@ -1,20 +1,31 @@
-[
-  "file-explorer",
-  "global-search",
-  "switcher",
-  "graph",
-  "backlink",
-  "canvas",
-  "outgoing-link",
-  "tag-pane",
-  "page-preview",
-  "daily-notes",
-  "templates",
-  "note-composer",
-  "command-palette",
-  "editor-status",
-  "bookmarks",
-  "outline",
-  "word-count",
-  "file-recovery"
-]
+{
+  "file-explorer": true,
+  "global-search": true,
+  "switcher": true,
+  "graph": true,
+  "backlink": true,
+  "canvas": true,
+  "outgoing-link": true,
+  "tag-pane": true,
+  "properties": false,
+  "page-preview": true,
+  "daily-notes": true,
+  "templates": true,
+  "note-composer": true,
+  "command-palette": true,
+  "slash-command": false,
+  "editor-status": true,
+  "bookmarks": true,
+  "markdown-importer": false,
+  "zk-prefixer": false,
+  "random-note": false,
+  "outline": true,
+  "word-count": true,
+  "slides": false,
+  "audio-recorder": false,
+  "workspaces": false,
+  "file-recovery": true,
+  "publish": false,
+  "sync": false,
+  "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",
-	"minAppVersion": "1.4.16",
+	"version": "1.1.7",
+	"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/.obsidian/snippets/usage.css

@@ -36,4 +36,20 @@
 .usage .r {
     margin-left: 0.25rem;
     margin-right: 0.25rem;
+}
+
+.usage .ileft {
+    padding-left: 1.7rem;
+
+    background-image: linear-gradient(black, black), linear-gradient(black, black);
+    background-repeat: no-repeat;
+    background-size: 8px 2px;
+    background-position: top left, bottom left;
+
+    border-left: solid black;
+    border-width: 0 2px;
+}
+
+.usage .iright {
+    padding-right: 1rem;
 }

content/Conjugation/Conditional.md

@@ -0,0 +1,206 @@
+# Conditional
+
+## と
+
+<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 "if", "whenever". Used when a result is known or assumed to be true, aka a logical cause-effect relationship. Cannot be used if the result is uncertain. So it cannot be an intention, a request, a desire, an order, etc.
+
+> [!info] Example
+> {急|いそ}いでない==と==、{遅刻|ちこく}に{着|つ}きます。
+> If you don't hurry, you'll arrive late.
+
+## なら
+
+<div class="usage">
+<div class="left">
+	<p><span class="box">V (casual) + (の)</span></p>
+	<p><span class="box">い-Adj + (の)</span></p>
+	<p><span class="box">な-Adj + (の)</span></p>
+	<p><span class="box">N</span></p>
+</div>
+	<p class="right">+ なら</p>
+</div>
+
+Means "in the case that/of". The second part of the sentence is generally an opinion, a request or a suggestion.
+Adding の adds emphasis. ならば can be used in more formal contexts.
+
+> [!info] Example
+> {車|くるま}を{使|つか}う==なら==、{気|き}を{付|つ}けて。
+> If you're using a car, be careful.
+
+## たら
+
+<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 "if" or "when". Describes a condition (the first action must be completed before the second action). Used for hypothetical situations and certain results. It is the main word used for conditional.
+
+> [!info] Example
+> {安|やす}==かったら==、{買|か}う。
+> (If / When) it's cheap, I'll buy it.
+
+## 場合
+
+<div class="usage">
+<div class="left">
+	<p><span class="box">V (casual)</span></p>
+	<p><span class="box">い-Adj</span></p>
+	<p><span class="box">な-Adj + な</span></p>
+	<p><span class="box">N + の</span></p>
+</div>
+	<p class="right">+ 場合は</p>
+</div>
+
+{場合|ば|あい} means "in the case of". The second part explains what to do in the situation (instructions, advices, etc). More formal than たら.
+
+> [!info] Example
+> {地震|じ|しん}==の場合は==、エレベーターを使わないでください。
+> In case of an earthquake, please don't use the elevators.
+
+## ば・なければ
+
+Positive form:
+<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>
+
+Negative form:
+<div class="usage">
+<div class="left">
+	<p><span class="box">V <strike>ない</strike></span></p>
+	<p><span class="box">い-Adj <strike>ない</strike></span></p>
+	<p><span class="box">な-Adj + で</span></p>
+	<p><span class="box">N + で</span></p>
+</div>
+	<p class="right">+ なければ</p>
+</div>
+
+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.
+
+> [!info] Examples
+> 雨が止==めれば==、店に行く。
+> If it stops raining, I'll go to the store.
+> 
+> おいしい==でなければ==、食べません。
+> If it's not good, I will not eat it.
+
+### ばいい
+
+Used for hope about a result. "It would be good if".
+Can also be used to give an advice, in a meaning similar to "should".
+
+> [!info] Example
+> {宝|たから}くじが{当|あ}たれ==ばいい==ね。
+> It would be good if I win the lottery...
+> 
+> 
+
+### ばよかった
+
+Used for regret about something that would have been better if done. "It would have been good if".
+More emphasis can be added by adding のに.
+
+> [!info] Example
+> {上着|うわぎ}を{持|も}て==ばよかった==。
+> I should have brought a jacket.
+
+### ば～ほど
+
+<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 <strike>い</strike> + ければ</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>
+
+Means "the more... the more". Used by repeating the same verb.
+
+> [!info] Example
+> {自転車|じてんしゃ}をすれ==ば==する==ほど==、{上手|じょうず}になります。
+> The more you bike, the better you get.
+
+## Summing up
+
+* ==と== has a logical cause-effect relationship. Certain result.
+* ==なら== usually used for opinion, request, suggestion.
+* ==V-たら== describes a condition to be met for the result. Usually used for hypothetical situation.
+* ==場合== explains what to do in a described situation. More formal than V-たら.
+* ==V-ば== is a conditional relationship, close to V-たら. Used for hypothetical situations, generally for for one-time results.
+
+## とすれば・としたら・とすると
+
+<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 "if we assume that A, B".
+としたら is more casual than とすれば.
+とすると is used for an action that is likely to happen.
+
+> [!info] Example
+> {電車|でんしゃ}で行く==とすると==、２０{分|っぷん}かかるです。
+> If you were to go by train, it would take 20 minutes.
+
+## もし(も)
+
+Used with conditional forms ば, と, たら and ても (see [[TeF (4) - even if#Even if ても・でも|Even if: ても・でも]]).
+もしも puts more emphasis than もし.
+
+> [!info] Example
+> ==もし==ペットが{病気|びょうき}になったら、{動物|どうぶつ}{病院|びょういん}に行かなきゃ。
+> If you pet gets sick, you have to bring it to the veterinarian clinic.

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

@@ -84,3 +84,76 @@ See also [[🔰 Grammar/Time#たところ]].
 > [!info] Example
 > {現在|げんざい}、{求職|きゅうしょく}し==ているところ==です。
 > I am currently seeking a job.
+
+## てはじめて
+
+Means "not until".
+
+> [!info] Example
+> {韓国|かんこく}に{来|き}==て初めて==キムチを{知|し}らなかった。
+> Before coming to Korea, I had never heard of kimchi.
+
+## て済む
+
+て{済|す}む has different meanings:
+* that it is sufficient, enough
+* that it solves something
+
+> [!info] Example
+> {切符|きっぷ}は５００円==で済ませる==。
+> The ticket costs only 500 yen.
+> 
+> {会合|かいごう}に{遅|おく}れてしまったが、{電話|でんわ}で{謝|あやま}==って済みました==。
+> I was late for a meeting, but I was able to apologize over the phone (thus solving the situation).
+
+## ている場合じゃない
+
+ている{場合|ばあい}(じゃない・ではない) means "this is no time to be doing". Tells the listener to stop doing what they are doing.
+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

@@ -8,16 +8,16 @@ The goal of this website is to be a synthesis of useful resources for my Japanes
 
 ## Sources
 
-Of course, since I'm _learning_ the language, I need to borrow what I write from different sources. So this website uses data from the websites listed here. I don't want any recognition of what is here! It's mostly a compilation of what people who are way better in this language have made before.
+Of course, since I'm _learning_ the language, I need to get inspired from different sources. So this website partly uses information from the websites listed here. I don't want any recognition of what is here! It's mostly a compilation of what people who are way better in this language have made before.
 
 * [Bunpro](https://bunpro.jp/grammar_points)
 * [JLPT Sensei](https://jlptsensei.com/#jlpt-grammar-lists)
 * [Maggie Sensei](https://maggiesensei.com/)
-* [Try! Series of books](https://2024.ask-books.com/tag/try/)
+* [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
 
@@ -45,8 +46,12 @@ In addition to those I cited, here are other resources I find useful.
 ### Vocabulary
 
 * [Jisho](https://jisho.org/), an online dictionary
-* [Tangorin](https://tangorin.com/sentences), for its sentences database
+* [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! You can find my website in the footer of any page of this website. Thanks!
+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

@@ -52,15 +52,6 @@ Means "to reach a point". Used with verbs.
 > この本{全部|ぜんぶ}{分|わ}かる==ようになった==。
 > I've come to understand all of this book.
 
-## ようにする
-
-Means "to try to", "to make sure to".
-Used with a verb.
-
-> [!info] Example
-> 毎日に{朝|あさ}ご{飯|はん}を食べる==ようとします==。
-> I'll try to eat a breakfast everyday.
-
 ## に気がつく
 
 <div class="usage">
@@ -114,3 +105,31 @@ Means "too much", "exceeding".
 > [!info] Example
 > {昨晩|さく|ばん}に{飲|の}み==すぎて=={頭|あたま}が{痛|いた}い。
 > I drank too much last night and my head hurts.
+
+## Try to
+
+### ようにする
+
+Means "to try to", "to make sure to". It's more of an assertion than ようとする.
+Used with a verb.
+
+> [!info] Example
+> 毎日に{朝|あさ}ご{飯|はん}を食べる==ようにします==。
+> I'll try to eat a breakfast everyday.
+
+### ようとする・ようとしない
+
+Means "try to", "attempt to" (or not, in the negative form). It's more of an attempt than with ようにする. Can also mean "just as I was about to".
+Used with the volitional form of verbs (よう).
+
+> [!info] Example
+> 出かけ==ようとした==時、電話が{鳴|な}ってた。
+> At the time I was trying to go out, the phone rang.
+> 
+> さっき店に{入|はい}==ろうとしたら==が、ドアが{閉|し}まってしまいました。
+> I tried to enter the shop earlier, but the door was closed...
+> 
+> 彼は{運動|うんどう}し==ようとしない==。
+> He doesn't try to exercise.
+
+⚠ Not used in negative form to talk about oneself.

content/🔰 Grammar/Adverbs.md

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

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

@@ -0,0 +1,135 @@
+# Amounts of frequency
+
+## 再び
+
+{再|ふたた}び means "again", "once more".
+
+> [!info] Examples
+> ==再び=={来|き}ませんですね。
+> I won't be coming again.
+
+## Never
+
+### 決して～ない
+
+<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 "never". Used with negative verbs.
+
+> [!info] Examples
+> 私は==決して=={夢|ゆめ}を{覚|おぼ}えません。
+> I never remember my dreams.
+
+## Rarely
+
+### めったに～ない
+
+<div class="usage">
+	<p class="r">めったに + </p>
+<div class="">
+	<p><span class="box">V (ない)</span></p>
+</div>
+</div>
+<div class="usage">
+<div class="">
+	<p><span class="box">N + は</span></p>
+</div>
+	<p class="r">+ めったに</p>
+</div>
+
+Means "hardly", "rarely". Used with negative verbs.
+
+> [!info] Examples
+> {車|くるま}は==めったに=={運転|うんてん}し==ません==。
+> I rarely drive a car.
+
+### あまり
+
+Means "rarely".
+Used with negative verbs.
+
+> [!info] Examples
+> {最近|さいきん}{絵|え}を==あまり=={書|か}けない。
+> I haven't been able to draw much lately.
+
+## Unlikely
+
+### そうもない・そうにない
+
+Means that an action is very unlikely.
+Made by removing ます from a verb and adding そうもない・そうにない.
+
+> [!info] Examples
+> コロナので{今年|ことし}も{旅行|りょこう}し==そうもない==。
+> Because of COVID19, it's unlikely I'll travel again this year.
+
+## Sometimes
+
+### たまに
+
+Means "occasionally", "once in a while".
+
+> [!info] Examples
+> {彼女|かのじょ}は{抹茶|まっちゃ}を==たまに=={飲|の}む。
+> She occasionally drinks matcha.
+
+### 時々
+
+{時々|ときどき} means "sometimes".
+
+> [!info] Examples
+> ==時々=={遊園地|ゆうえんち}に{行|い}く。
+> I sometimes go to amusement parks.
+
+## Often
+
+### 度々
+
+{度々|たびたび} means "often", "frequently".
+
+> [!info] Examples
+> {私|わたし}の{彼女|かのじょ}は==度々=={遅|おく}れてきます。
+> My girlfriend is often late.
+
+### よく
+
+Means "often".
+
+> [!info] Examples
+> {最近|さいきん}、{数学|すうがく}の{練習|れんしゅう}{問題|もんだい}を==よく==やっています。
+> I have been doing a lot of math exercises lately.
+
+## Always
+
+### いつも
+
+Means "always", "every time".
+
+> [!info] Examples
+> {夏|なつ}の{時|とき}==いつも==アイスクリームを食べます。
+> I always eat ice cream in the summer.
+
+### ずっと
+
+Means "always", "continuously".
+
+> [!info] Examples
+> {蛇|へび}が==ずっと=={好|す}きだった。
+> I've always loved snakes.
+
+### たものだ
+
+Used to talk about a past situation where something used to frequently occur.
+Used with a verb in the past tense (た) by adding ものだ.
+
+> [!info] Examples
+> {子供|こども}のころはいつも{森|もり}で{遊|あそ}==んだものだ==。
+> I always played in the woods when I was a kid.

content/🔰 Grammar/Amounts - quantification.md

@@ -0,0 +1,278 @@
+# Amounts of quantification
+
+## 以 prefix
+
+{以上|い|じょう} means "above", "exceeding".
+{以下|い|か} means "below", "not exceeding".
+{以外|い|がい} means "excepting".
+{以内|い|ない} means "within".
+
+Used with nouns.
+
+> [!info] Example
+> １{時間|じかん}==以内=={終|お}わります。
+> It will be finished within an hour.
+
+## せいぜい
+
+Means "at the most".
+Used before a noun of time or a verb.
+
+> [!info] Example
+> ==せいぜい=={頑張|がんば}ります。
+> I'll do my best.
+> 
+> この木は==せいぜい==３{年|ねん}です。
+> This tree is at most 3 years old.
+
+## さらに
+
+{更|さら}に means "even more", "more and more", "in addition to".
+Used with time, quantity, etc.
+
+> [!info] Example
+> {新|あたら}しい{仕事|しごと}を{始|はじめ}めて==さらに==うれしいになりました。
+> I've become even happier with my new job.
+
+## 別に～ない
+
+{別|べつ}に means "not really", "not particularly".
+Used with words in negative form.
+
+> [!info] Example
+> どうしてエアコンを{付|つ}きましたか。{今|いま}は==別に=={暑|あつ}==くない==よ。
+> 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
+
+### どんなに～ても
+
+<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 "no matter how much". Also used as いくら~ても.
+
+> [!info] Example
+> ==どんなに=={練習|れんしゅう}し==ても==、マラソンを{走|はし}れない。
+> No matter how much I train, I cannot run a marathon.
+
+### どうしても
+
+Means "no matter what".
+
+> [!info] Example
+> ==どうしても=={花火|はなび}に行きたい。
+> 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
+
+### てしょうがない・てしかたがない
+
+<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 + <strike>な</strike> で</span></p>
+</div>
+	<p class="right">+ しょうがない・しかたがない</p>
+</div>
+
+Means both "extremely" and "can't be helped".
+See [[Can't help - doesn't matter#てしょうがない・てしかたがない]]
+
+> [!info] Example
+> {今日|きょう}は{暑|あつ}く==てしょうがない==。
+> Today is extremely hot.
+
+### なかなか
+
+<div class="usage">
+	<p class="iright">なかなか + </p>
+<div class="ileft">
+	<p><span class="box">Adj</span></p>
+	<p><span class="box">の + N</span></p>
+</div>
+</div>
+
+Means "very", "quite".
+See also [[Adverbs#なかなか～ない]].
+
+> [!info] Example
+> {今日|きょう}は==なかなか=={寒|さむ}いね。
+> It's quite cold today.
+
+### だけ
+
+<div class="usage">
+<div class="left">
+	<p><span class="box">V (dictionary)</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 much".
+See also [[Only - just#だけ]].
+
+> [!info] Example
+> 私は{払|はら}うんでだ、{飲|の}む==だけ==飲んで！
+> I'll be paying, so drink as much as you can!
+
+### なるべく・できるだけ
+
+Means "as much as possible". なるべく is a bit softer than できるだけ.
+
+> [!info] Example
+> ==なるべく=={静|しず}かにしてください。
+> Please be as quiet as possible.
+
+### あまり
+
+<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 "so much... that".
+Nominalized adjectives can be used as nouns. See [[Transformation#~さ adjective as noun]] and [[Transformation#~み adjective as noun]].
+
+> [!info] Example
+> おいしさの==あまり==、このレストラン{毎日|まいにち}行きたい。
+> The food is so delicious that I want to eat in this restaurant every day.
+
+### あまりにも
+
+<div class="usage">
+	<p class="iright">あまりに(も) + </p>
+<div class="ileft">
+	<p><span class="box">V</span></p>
+	<p><span class="box">Adj</span></p>
+</div>
+</div>
+
+<div class="usage">
+	<p class="r">あまりの + </p>
+<div class="">
+	<p><span class="box">N</span></p>
+</div>
+</div>
+
+Means "so much... that". A version of あまり that can also be used with adjectives.
+
+> [!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

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

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

@@ -0,0 +1,67 @@
+# Can't help; doesn't matter
+
+## 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". 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.
+
+## ないではいられない
+
+This means "cannot help doing something". Has the same nuance as ずにはいられない。
+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
+
+### ても構わない
+
+<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 "it doesn't matter if", "I don't mind".
+
+> [!info] Example
+> ここで{座|すわ}==っても構いません==か。
+> Would it be okay if I sit here?
+> 
+> ==かまわない==よ。
+> I don't mind.

content/🔰 Grammar/Certainty.md

@@ -0,0 +1,91 @@
+# Certainty
+
+## Certain
+
+### に決まっている
+
+に{決|き}まっている 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">
+<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 "not always", "not necessarily".
+
+> [!info] Example
+> {大人|おとな}は{正|ただ}しい==とは限らない==。
+> Adults are not always right.
+
+## Impossible
+
+### わけがない
+
+<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 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's already this late. I have no way to go back home (I don't know how).
+
+### ようがない・ようもない
+
+~{様|よう}がない 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 
+> {全部|ぜんぶ}食べられる==ようがない==よ！
+> It is impossible to eat it all!
+
+### まさか
+
+Usually at the start of a sentence, expresses surprise, about something that seemed impossible.
+
+> [!info] Example
+> ==まさか=={僕|ぼく}たちのチームが{負|ま}けた。
+> I cannot believe our team lost.

content/🔰 Grammar/Combination actions.md

@@ -9,7 +9,9 @@ Those rules combine a verb and an adjective to make a new meaning.
 	<p class="r">+ Adj</p>
 </div>
 
-## ~やすい
+## Difficulty
+
+### ~やすい: easy
 
 Means: 
 * easy to do
@@ -23,7 +25,7 @@ Means:
 > {泣|な}き==やすい==。
 > Prone to crying.
 
-## ~にくい・~づらい
+### ~にくい・~づらい: difficult
 
 Means that something is difficult to do.
 While にくい is the broader form, づらい is used in a more subjective manner, for actions that are intentional.
@@ -32,6 +34,15 @@ While にくい is the broader form, づらい is used in a more subjective mann
 > 見==にくい==。
 > Difficult to see.
 
+### ～がたい: very difficult
+
+~がたい means that something is very difficult to do.
+It is more extreme than ~にくい.
+
+> [!info] Example
+> それは{信|しん}じ==がたい==な。
+> That's hard to believe...
+
 ## ~始める
 
 ～{始|はじ}める means that something starts or has started. Expresses intentionality.
@@ -63,3 +74,137 @@ While にくい is the broader form, づらい is used in a more subjective mann
 > [!info] Example
 > {飲|の}み==終わります==。
 > To stop to drink.
+
+## ～上げる
+
+This can be used both as:
+* {上|あ}げる means "finish doing" (transitive)
+* {上|あ}がる means "was finished" (intransitive)
+
+> [!info] Example
+> {全部|ぜんぶ}の{夏休|なつ|や}みの{宿題|しゅくだい}を出来==上げった==。
+> I have finished all my summer homework.
+
+## ～合う
+
+～{合|あ}う means that the action is done with someone else.
+
+> [!info] Example
+> {妹|いもうと}と{家|いえ}へ{帰|かえ}り==会った==。
+> I went home with my sister.
+
+## ～切る・～切れる・～切れない
+
+~{切|き}る means "to do completely" and ~切れる means "able to do completely".
+The negative form ~切れない means "unable to do", "too much to complete".
+It focuses on the end of the action rather than the process.
+
+> [!info] Example
+> 父はすべての{部屋|へや}を{掃除|そうじ}し==切った==。
+> My father finished cleaning all the rooms.
+> 
+> 彼は{納豆|なっとう}を食べ==切れなかった==。
+> He could not finish all his natto.
+
+## ～通す
+
+~{通|とお}す means "to do something until the end", "continually" or "through". It focuses on the process of the action, rather than its ending.
+
+> [!info] Example
+> マラソンの{全部|ぜんぶ}を{走|はし}り==通した==。
+> He ran through the whole marathon.
+
+## ～直す
+
+~{直|なお}す means to do something again.
+
+> [!info] Example
+> {今年|ことし}をやり==直す==てほしい。
+> I want this year to start over.
+
+## ～っぱなし
+
+~っぱなし means leaving something as it is.
+
+> [!info] Example
+> この１３時間{飛行|ひこう}で{座|すわ}り==っぱなし==でした。
+> 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.
+
+⚠ Depending on the context, verbs can fall into multiple categories!
+
+### Going into
+
+* If the verb describes a movement, adding 込む add the meaning of "into" (jumping => jumping into).
+* If the verb already has a notion of "into", it put emphasis into it. It could have a meaning like "completely into".
+
+> [!info] Example
+> {海|うみ}に{飛|とび}び==込んだ==。
+> He jumped into the ocean.
+
+### Emphasis
+
+When the verb does not include physical movement, 込む can be used to put emphasis on certain verbs (deeply, a lot, etc).
+
+> [!info] Example
+> {猫|ねこ}が{眠|ねむ}り==込んでいます==。
+> The cat is fast asleep.
+
+### Repetition
+
+The last common meaning is for an action that is repeated until a point is reached. It can also be an action that is done for a long time.
+
+> [!info] Example
+> {毎朝|まいあさ}5キロ{走|かし}り==込む==。
+> Every morning I go for a 5km run (emphasis on the fact that it is a long run).

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,51 @@ 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">
+	<p class="r">V・N + </p>
+<div class="">
+	<p><span class="box">より(も)</span></p>
+</div>
+	<p class="r">+ Adj</p>
+</div>
+
+With this pattern, it just means "more".
+
+> [!info] Example
+> このビルは私のマンション==よりも=={高|たか}い。
+> This building is taller than my apartment.
+
+## というより
+
+<div class="usage">
+	<p class="r">A + </p>
+<div class="">
+	<p><span class="box">というより</span></p>
+</div>
+	<p class="r">+ B</p>
+</div>
+
+This form is similar to より(も), but with a sense closer to "rather than".
+"It is rather B than A".
+Used with verbs, adjectives and nouns.
+
+> [!info] Example
+> 彼女は{恥|は}ずかしがり==というより=={静|しず}かです。
+> She is quiet rather than shy.
+
+## ほうがいい
+
+Means "should", or "it would be better", as an advice. It's better than not doing it.
+Used with a verb.
+
+> [!info] Example
+> 毎日{練習|れんしゅう}する==ほうがいい==。
+> It's better to train everyday.
+
 ## より～ほうが
 
 <div class="usage">
@@ -46,14 +91,56 @@ With the following pattern, it means that B is more than A:
 > 昨日==より==今日の==ほうが==寒いです。
 > Today is colder than yesterday.
 
-## ほうがいい
+## に比べて
 
-Means "should", or "it would be better", as an advice. It's better than not doing it.
-Used with a verb.
+に{比|くら}べて is used for comparison.
+Used with nouns.
 
 > [!info] Example
-> 毎日{練習|れんしゅう}する==ほうがいい==。
-> It's better to train everyday.
+> 昨日==に比べて==、今日は晴れるです。
+> Compared to yesterday, it is sunny today.
 
+## ほど～ない
 
+<div class="usage">
+	<p class="r">N + </p>
+<div class="">
+	<p><span class="box">ほど</span></p>
+</div>
+	<p class="r">+ V・Adj (ない)</p>
+</div>
 
+Means that the extent has not been reached, so it is not as much.
+See also [[Amounts#ほど]].
+
+> [!info] Example
+> {韓国|かんこく}==ほど=={辛|から}いの食べ{物|もの}は==ない==。
+> There's no food as spicy as Korean food.
+> 
+> {中国|ちゅうごく}{料理|りょうり}は{韓国|かんこく}{料理|りょうり}==ほど=={辛|から}く==ない==です。
+> 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/Conditional.md

@@ -1,109 +0,0 @@
-# Conditional
-
-## と
-
-<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 "if" when a result is known or assumed to be true, aka a logical cause-effect relationship. Cannot be used if the result is uncertain. So it cannot be an intention, a request, a desire, an order, etc.
-
-> [!info] Example
-> {急|いそ}いでない==と==、{遅刻|ちこく}に{着|つ}きます。
-> If you don't hurry, you'll arrive late.
-
-## なら
-
-<div class="usage">
-<div class="left">
-	<p><span class="box">V (casual) + (の)</span></p>
-	<p><span class="box">い-Adj + (の)</span></p>
-	<p><span class="box">な-Adj + (の)</span></p>
-	<p><span class="box">N</span></p>
-</div>
-	<p class="right">+ なら</p>
-</div>
-
-Means "in the case that/of". The second part of the sentence is generally an opinion, a request or a suggestion.
-Adding の adds emphasis.
-
-> [!info] Example
-> 車を使う==なら==、気を{付|つ}けて。
-> If you're using a car, be careful.
-
-## えば・なければ
-
-Positive form:
-<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>
-
-Negative form:
-<div class="usage">
-<div class="left">
-	<p><span class="box">V <strike>ない</strike></span></p>
-	<p><span class="box">い-Adj <strike>ない</strike></span></p>
-	<p><span class="box">な-Adj + で</span></p>
-	<p><span class="box">N + で</span></p>
-</div>
-	<p class="right">+ なければ</p>
-</div>
-
-See Conjugation [[Basics]] for verbs (the う sound transforms the the corresponding え sound).
-
-Means "if". A conditional relationship without the cause-effect relationship of と.
-
-> [!info] Examples
-> 雨が止==めれば==、店に行く。
-> If it stops raining, I'll go to the store.
-> 
-> おいしい==でなければ==、食べません。
-> If it's not good, I will not eat it.
-
-## たら
-
-<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 "if" or "when". Describes a condition (the first action must be completed before the second action). Usually used for hypothetical situations. It is the main word used for conditional.
-
-> [!info] Example
-> 安==かったら==、買う。
-> (If / When) it's cheap, I'll buy it.
-
-## 場合
-
-<div class="usage">
-<div class="left">
-	<p><span class="box">V (casual)</span></p>
-	<p><span class="box">い-Adj</span></p>
-	<p><span class="box">な-Adj + な</span></p>
-	<p><span class="box">N + の</span></p>
-</div>
-	<p class="right">+ 場合は</p>
-</div>
-
-{場合|ば|あい} means "in the case of". The second part explains what to do in the situation (instructions, advices, etc). More formal than たら.
-
-> [!info] Example
-> {地震|じ|しん}==の場合は==、エレベーターを使わないでください。
-> In case of an earthquake, please don't use the elevators.

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

@@ -0,0 +1,69 @@
+# Connectors: in order to
+
+## のに
+
+Means "to do", "in order to".
+See [[Connectors#のに#In order to]].
+
+## ために
+
+<div class="usage">
+<div class="left">
+	<p><span class="box">V</span></p>
+	<p><span class="box">い-Adj</span></p>
+	<p><span class="box">な-Adj + な</span></p>
+	<p><span class="box">N + の</span></p>
+</div>
+	<p class="right">+ ため(に)</p>
+</div>
+
+Means "in order to". Mostly used in writing, rarely used with negative.
+
+> [!info] Examples
+> {面接|めんせつ}の==ために==ヒゲを{剃|そ}らなきゃ。
+> I have to shave for the interview.
+
+Can also mean "as a result of". Verbs are generally used in past tense.
+
+> [!info] Examples
+> {雨|あめ}の==ために==、{動物|どうぶつ}が{見|み}えません。
+> Due to the rain, I cannot see any animals.
+
+## には
+
+Means "in order to", "for", "to". Implies a implicit second part (in order to A... but not B).
+Used with verbs and nouns.
+
+> [!info] Examples
+> {日本|にほん}を{住|す}んでいる==には==、ビザがひつようです。
+> A visa is required to live in Japan.
+
+Can also mean "as for", "regarding".
+
+> [!info] Examples
+> 私==には==行けない。
+> As for me, I won't go.
+
+## ように
+
+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
+> １００メートルを{泳|およ}げる==ように==、毎週練習しなきゃ。
+> In order to swim 100m, I have to train every week.
+
+## Summing up
+
+* ==のに== and ==ために== have the same meaning, but ために is usually more written than のに.
+* ==には== implies an implicit second part.
+* ==ように== implies an effort or an objective.
+
+## てはいけないから・とはいけないから
+
+Means "in order not to". Used to avoid a negative situation.
+Used with both a verb in て-form, and a verb in dictionary (る) with いけないから.
+
+> [!info] Examples
+> {遅|おく}れる==とはいけないから==、ちょっと{急|いそ}いでください。
+> In order not to be late, please hurry up a bit.

content/🔰 Grammar/Connectors.md

@@ -1,18 +1,6 @@
 # Connectors (conjunctions)
 
-## ばかり
-
-Means "only" or "nothing but", and can convey surprise or negative judgment depending on the context.
-Used with nouns and verbs.
-
-> [!info] Examples
-> この{国|くに}の{春|はる}は雨==ばかり==だ！
-> In this country, there's nothing but rain in spring.
-> 
-> うちの{子供|こども}はテレビ==ばかり==見てる。
-> My child does nothing but watching TV.
-
-## だけで
+## Just by: だけで
 
 Means "just by doing".
 Used with nouns and verbs.
@@ -21,24 +9,6 @@ Used with nouns and verbs.
 > 会う==だけで=={幸|しあわ}せになる。
 > Just by meeting you, I get happy.
 
-## 又は
-
-{又|また}は can be used for two things:
-* choosing between two options ("or")
-* listing two options ("both")
-
-> [!info] Example
-> 日本語==又は==英語でしゃべれます。
-> I can speak both Japanese and English.
-
-## それでも
-
-Means "but still", "even so", "anyway".
-
-> [!info] Example
-> 雨が{降|ふ}っていた、==それでも==出かけていた。
-> It was raining, but I still went out.
-
 ## のに
 
 ### Even tough
@@ -53,7 +23,7 @@ Means "but still", "even so", "anyway".
 	<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
 > 食べたばかり==なのに==、まだお{腹|なか}が{空|す}いた。
@@ -70,4 +40,47 @@ Used with a verb (dictionary).
 
 ## And: そして, それから, それに, それで
 
-See [[Listing#Connecting sentences]].
+See [[Listing#Connecting sentences]].
+
+## Well then: さて
+
+Used to change to topic of the conversation, or to a new element. Translates to "well (then)" or "now".
+
+> [!info] Example
+> ==さて==、食べようか。
+> Well then, shall we eat?
+
+## By the way: ところで
+
+Used to introduce a new topic of conversation. Translates to "by the way".
+
+> [!info] Example
+> ==ところで==、車の{修理|しゅうり}はどう。
+> 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".
+
+> [!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

@@ -0,0 +1,113 @@
+# Considering - for - as
+
+## としては
+
+Means "as", "in the role of". The と particle implies a result.
+Used with nouns.
+
+> [!info] Example
+> 彼はカメラマン==としては==いい{仕事|しごと}をする。
+> As a cameraman, he does a good job.
+
+## にしては
+
+Means "considering", "for". The に particle implies a simultaneous existence.
+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 
+> このカバンは安い==にしては==悪くない。
+> This bag might be cheap, it is not bad.
+
+## としても
+
+Means "assuming", "even if". It has the same meaning as [[TeF (4) - even if#Even if ても・でも]], but bolder.
+
+> [!info] Example
+> 私==としても==出来ます。
+> I can do it as well.
+
+## にしても
+
+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 としても.
+
+> [!info] Example
+> フランス{語|ご}==にしても=={英語|えいご}==にしても=={彼|かれ}はとても{上手|じょうず}です。
+> He is very good at both French and English.
+
+## "As": Gradual change
+
+<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>
+
+The four following forms have the same meaning of a gradual change:
+* につれて
+* にしたがって
+* と{共|とも}に
+* に{伴|とも}って
+
+It means that when when the first part of the sentence changes, the second part changes gradually as well.
+
+> [!info] Example
+> {年|とし}をとる==につれて=={髪|かみ}を{抜|ぬ}けます。
+> As we get older, we lose hair.
+
+This example works with all forms.
+
+### につれて 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.
+
+> [!info] Example
+> {冬|ふゆ}が{地|ちか}づく==にしたがって・につれて=={気温|きおん}が{下|さ}がってきた。
+> 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.
+
+> [!info] Example
+> {歯医者|はいしゃ}==にしたがって=={毎日|まいにち}２{回|かい}{歯|は}を{磨|みが}く。
+> 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.
+
+> [!info] Example
+> オリンピックがある==に伴って=={交通費|こうつうひ}がねあが{値上|ねあ}がりしてしまった。
+> As the Olympics are held, transportations cost have increased.
+
+### と共に
+
+と{共|とも}に has 3 other meanings.
+
+#### 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.
+
+> [!info] Example
+> {鳥|とり}は{鳴|な}き{声|ごえ}をする==と共に=={風|かぜ}が{吹|ふ}く。
+> The bird sings and the wind blows.
+
+#### Together with
+
+It can also mean "together with". It is much more formal than {一緒|いっしょ}に.
+
+> [!info] Example
+> {妻|つま}==と共に=={新|あたら}しい{人生|じんせい}を{始|はじ}めります。
+> I am starting a new life with my wife.
+
+#### As well as, also
+
+It can also mean "as well as", "also".
+
+> [!info] Example
+> パンはチーズ==と共に==フランスに{人気|にんき}{食料|しょくりょう}です。
+> Bread, along with cheese, is a popular food in France.

content/🔰 Grammar/Description.md

@@ -16,40 +16,22 @@ 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".
 
 > [!info] Examples
 > サッカーは{彼|かれ}の{得意|とくい}です。ほとんどサッカーのプロ==と言ってもいい==。
-
-## まま
-
-<div class="usage">
-<div class="left">
-	<p><span class="box">V (ない)</span></p>
-	<p><span class="box">V (た)</span></p>
-	<p><span class="box">い-Adj</span></p>
-	<p><span class="box">な-Adj</span></p>
-	<p><span class="box">N + の</span></p>
-</div>
-	<p class="right">+ まま</p>
-</div>
-
-Means that something doesn't change state, stays as it is.
-
-> [!info] Examples
-> {開|あ}けた==まま==。
-> To be left open.
-> 
-> {熱|あつ}い==まま==。
-> Still hot.
-> 
-> {昔|むかし}の==まま==。
-> As it always been.
-> 
-> その==まま==でいい。
-> It is fine as it is.
+> Soccer is his strong point. You could almost say he's a pro.
 
 ## がする
 
@@ -85,35 +67,39 @@ Used with a verb in dictionary form.
 > {絵|え}を{塗|ぬる}る==のが下手==です。
 > I'm not good at painting.
 
-## くらい・ぐらい
+## だらけ
+
+Means that something is "full of" or "covered with" something undesirable.
+
+> [!info] Example
+> {子供|こども}のズボンは{泥|どろ}==だらけ==です。
+> The child's pants are covered in mud.
+
+## を込めて
+
+を{込|こ}めて means that something is "full of" or "filled with". Used with positive feelings.
+
+> [!info] Example
+> この{映画|えいが}は{監督|かんとく}から{愛|あい}==を込めて=={作|つく}った。
+> That movie was made with love from the director.
+
+## は～で有名
 
 <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>
+	<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>
+	<p class="right">+ で有名</p>
 </div>
 
-Means "about" or "approximately" when talking about numbers or counter words. ぐらい is more common in conversations, but can change depending on the preceding word.
+は~で{有名|ゆうめい} means "famous for". Used to describe why people, places or things are famous.
 
 > [!info] Example
-> {電車|でんしゃ}はどの==くらい==で{到着|とうちゃく}しますか。
-> About how much time will the train take to arrive?
-> 
-> {医者|いしゃ}に１時間==ぐらい==を{待|ま}ってました。
-> I waited approximately an hour for the doctor.
-
-Also used to compare things as being similar.
-
-> [!info] Example
-> {友達|ともだち}と{試験|しけん}の{結果|けっか}は{同|おな}じ==ぐらい==です。
-> My friend and I have about the same results at the test.
-
-Also means "to the extent of".
-
-> [!info] Example
-> 食べなくて{寝|ね}たい==ぐらい=={疲|つか}れています。
-> I'm tired to the extent of not eating and going to sleep.
+> パリ==は==エッフェル{塔|とう}==で有名==です。
+> Paris is famous for its Eiffel Tower.

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

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

content/🔰 Grammar/Experience.md

@@ -7,3 +7,12 @@ Used with past verbs to talk about things experienced before.
 > [!info] Example
 > 日本に行==ったことがあるですか==。
 > Have you ever been to Japan?
+
+## に慣れる
+
+に{慣|な}れる means "to be used to".
+Used with nouns.
+
+> [!info] Example
+> {自転車|じてんしゃ}{通勤|つうきん}==に慣れました==。
+> I got used to commute by bicycle.

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

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

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.
@@ -57,7 +66,7 @@ See [[TeF (1) - basics#て sequence]].
 ### や
 
 Used for a list that is unexhaustive. Translates to "among other things". Formal.
-Used only with nouns. Cannot be repeated!
+Used only with nouns.
 
 > [!info] Example
 > フランス==や==スペインに{旅行|りょこう}しました。
@@ -66,16 +75,25 @@ Used only with nouns. Cannot be repeated!
 ### など
 
 Means "things as". Can be used with や for a meaning like "etc".
-Used with nouns. Cannot be repeated!
+Used with nouns.
 
 > [!info] Example
 > お金がないのでカフェ**や**レストラン==など=={払|はら}えない。
 > 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 "among other things". More casual than や or たり～たり. Ending a sentence with とか can soften the meaning. Can also be used to quote someone.
-Only used with verbs and nouns. Can be repeated.
+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.
+Only used with verbs and nouns.
 
 > [!info] Examples
 > {果物|くだもの}はバナナ==とか==リンゴ==とか==が好きです。
@@ -94,13 +112,12 @@ Only used with verbs and nouns. Can be repeated.
 	<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>
+	<p class="right">+ り...します</p>
 </div>
 
-This is used to list things that are related, in an unexhaustive way. Translates to "do things such as".
-Usually used to talk about things like hobbies, explaining liked things, activities done, etc.
+This is used to list things that are related, in an unexhaustive way. Translates to "or", "do things such as".
+Usually used to talk about things like hobbies, explaining liked things, activities done, etc. Not used for usual things like a routine. It is not an ordered or chronological list like [[#て connecting]].
 
 > [!info] Example
 > {週末|しゅうまつ}に{泳|およ}い==だり==、{散歩|さんぽ}し==たり==、{買|か}い{物|もの}し==たり==します。
@@ -118,7 +135,7 @@ Usually used to talk about things like hobbies, explaining liked things, activit
 	<p class="right">+ し</p>
 </div>
 
-Used for a list that is unexhaustive, going in the same direction: for example reasons, causes, qualities, etc.
+Used for a list that is unexhaustive, going in the same direction: for example reasons, causes, qualities, etc. Gives an opinion, a review.
 It can be used to emphasize something when used at the end of a sentence.
 
 > [!info] Examples
@@ -128,11 +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
 
-🛠 To do: finish.
-
-* ==や== is formal and cannot be repeated (nouns only). Can be completed by ==など==.
-* ==とか== is casual and can be repeated.
-* ==たり==
-* ==し==
+* ==や== 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.

content/🔰 Grammar/Means.md

@@ -0,0 +1,115 @@
+# Means
+
+## つい
+
+Means "accidentally", "unintentionally". Can be combined with [[TeF (2) - manner of doing## てしまう・ちゃう・じゃう|てしまう]].
+
+> [!info] Example
+> {歩|ある}きながら{携帯|けいたい}を見ていました、==つい=={誰|だれ}かとぶつきました。
+> I was looking at my phone while walking, when I accidentally bumped into someone.
+
+## わざと
+
+Means "on purpose".
+
+> [!info] Example
+> 彼女は==わざと=={学校|がっこ}を{休|やす}んだ。
+> She missed school on purpose.
+
+## わざわざ
+
+Expresses that someone has made a great effort to reach a certain result.
+Can be used for example for gratitude when someone made something for you.
+
+> [!info] Example
+> ==わざわざ==私のために{作|つく}った。
+> Thank you for going the trouble of making this for me.
+
+## ふりをする
+
+<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>
+
+This means "to pretend", "to act as if".
+
+> [!info] Example
+> うちの{子|こ}は{病気|びょうき}の==ふりをする==。
+> My child pretends to be sick.
+
+## を通じて・を通して
+
+を{通|つう}じて・を{通|とお}して mean "through" or "by". Indicates a method or a location. 
+を{通|とお}して is the most widely used, the other one being more formal.
+Used with a noun.
+
+> [!info] Example
+> {写真|しゃしん}を{撮|と}る==を通して==、私の{見方|みかた}は{変|か}わりました。
+> Through photography, my perspective has changed.
+
+## によって・による・による
+
+Means "depending on", "by means of", or "because of".
+による will most likely be found at the end of a sentence, highlighting a statement.
+Used with a noun.
+
+> [!info] Example
+> {国|くに}==によって==、{法律|ほうりつ}は{違|ちが}います。
+> Depending on the country, the laws are different.
+> 
+> 台風==により==、出かけられない。
+> 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">
+<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 "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

@@ -1,17 +1,4 @@
-# Must & must Not
-
-## が必要・必要がある
-
-Means "needed" or "necessary".
-が{必要|ひつよう} is used mainly with nouns (can be used with verbs by appending こと before).
-{必要|ひつよう}がある is used with verbs.
-
-> [!info] Example
-> {今時|いまどき}、{携帯電話|けいたいでんわ}==が必要です==。
-> Nowadays, a cell phone is necessary.
-> 
-> 今日はパン{屋|や}に行く==必要がない==。
-> No need to go to the bakery today.
+# Obligation: なければ・ないと
 
 ## Must
 
@@ -52,18 +39,6 @@ In casual contexts, can be shortened as ないと.
 > 今日は{勉強|べんきょう}し==ないといけない==。
 > I have to study today.
 
-### Comparing いけない and ならない
-
-* ==いけない== is the standardly used form. It implies a subjective view, that it would be better to do something, to avoid negative consequences (eg: brushing one's teeth, eating well, etc).
-* ==ならない== is usually more formal or in written form. It implies a is more objective view, something that has to be done because there's no other way (eg: respecting the law, paying taxes, etc).
-
-### Comparing なくては, なければ and ないと
-
-なくては and なければ are generally interchangeable in speech. However:
-* ==なくては== is generally used when there is _no penalty_ for not complying.
-* ==なければ== is generally used when there _is a penalty_ for not complying.
-* ==ないと== is lighter and does not imply that there can or cannot be penalty. Its construction is based on the [[Conditional#と]] particle, and should be based on knowledge or experience.
-
 ## Must not
 
 #### 「ちゃ・じゃ」「だめ・いけない・いけません」
@@ -83,16 +58,20 @@ 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
 > {鉄道|てつ|どう}に{歩|ある}い==てはいけません==。
 > Do not walk on the railroad.
 
-### なくてもいい
+## Comparing いけない and ならない
 
-Means "don't have to". Used with a verb in the negative form (ない), appending なくてもいい.
-Can also be used as なくていい.
+* ==いけない== is the standardly used form. It implies a subjective view, that it would be better to do something, to avoid negative consequences (eg: brushing one's teeth, eating well, etc).
+* ==ならない== is usually more formal or in written form. It implies a is more objective view, something that has to be done because there's no other way (eg: respecting the law, paying taxes, etc).
 
-> [!info] Example
-> 今日はレストランで{手伝|て|つ}わ==なくてもいい==。
-> You don't have to help out at the restaurant today (it's okay if you don't help at the restaurant today).
+## Comparing なくては, なければ and ないと
+
+なくては and なければ are generally interchangeable in speech. However:
+* ==なくては== is generally used when there is _no penalty_ for not complying.
+* ==なければ== is generally used when there _is a penalty_ for not complying.
+* ==ないと== is lighter and does not imply that there can or cannot be penalty. Its construction is based on the [[Conditional#と]] particle, and should be based on knowledge or experience.

content/🔰 Grammar/Obligation.md

@@ -0,0 +1,133 @@
+# Obligation
+
+## が必要・必要がある
+
+Means "needed" or "necessary".
+が{必要|ひつよう} is used mainly with nouns (can be used with verbs by appending こと before).
+{必要|ひつよう}がある is used with verbs.
+
+> [!info] Example
+> {今時|いまどき}、{携帯電話|けいたいでんわ}==が必要です==。
+> Nowadays, a cell phone is necessary.
+> 
+> 今日はパン{屋|や}に行く==必要がない==。
+> No need to go to the bakery today.
+
+## わけにはいかない
+
+Used with verbs for a meaning of "cannot do" (which cannot be your inability, but an external factor).
+Used with verbs in negative form (ない) for a meaning of "cannot be avoided".
+Can be used as わけはいかない or わけにはいきません.
+
+> [!info] Example
+> {今日|きょう}の{弟|おとうと}の{誕生日|たんじょうび}に行か==ないわけにはいかない==だから、{飲|の}み{会|かい}に行かない。
+> There's no way I don't go to my younger brother's birthday today, so I won't go to the afterwork.
+> 
+> {本当|ほんとう}に飲み会に行く==わけにはいかない==よ。
+> There's really no way I can go to the afterwork.
+
+## なくてもいい
+
+Means "don't have to". Used with a verb in the negative form (ない), appending なくてもいい.
+Can also be used as なくていい.
+
+> [!info] Example
+> 今日はレストランで{手伝|て|つ}わ==なくてもいい==。
+> You don't have to help out at the restaurant today (it's okay if you don't help at the restaurant today).
+
+## てからでないと
+
+Means "must first do". The second part becomes possible after the first one.
+Used with a verb in て form, with からでないと or からでないければ.
+
+> [!info] Example
+> {払|はら}==ってからでないと=={入|はい}るができること。
+> You can enter only after paying.
+
+## こと as "should do"
+
+### こと
+
+<div class="usage">
+<div class="left">
+	<p><span class="box">V (dictionary)</span></p>
+	<p><span class="box">V (ない)</span></p>
+</div>
+	<p class="right">+ こと</p>
+</div>
+
+Means "should do". Mostly used to set rules.
+
+> [!info] Example
+> ここに{車|くるま}を{止|と}めない==こと==です。
+> Don't park your car here.
+
+### ことになっている
+
+This form is used to express rules or expectations.
+Used with dictionary (る) and negative (ない) form of verbs.
+
+> [!info] Examples
+> {指|ゆび}で食べない==ことになっている==。
+> You're not supposed to eat with your fingers.
+
+### ことはない
+
+This has two meanings:
+* it is not necessary to
+* it never happens
+
+Used with a verb in the dictionary form.
+
+> [!info] Example
+> {走|はし}る==ことはない==。まだ{時間|じかん}がある。
+> There's no need to run. There's still time.
+
+## 必ず
+
+{必|かなら}ず means certainly, definitely. Expresses an obligation.
+
+> [!info] Example
+> 明日の{授業|じゅ|ぎょう}==必ず==来てください。
+> Please be sure to attend tomorrow's class.
+
+## べき
+
+### べきだ
+
+Means "should do", "must do". Compared to the [[Obligation - なければ・ないと]] forms and 必ず, it has a nuance of being less universally logical. It is defined by the speaker's own logic.
+Used with verbs.
+する can be used as するべき or すべき.
+
+> [!info] Example
+> {来週|らいしゅう}{試験|しけん}があるので{勉強|べんきょう}す==べきです==。
+> There is an exam next week, so I should study.
+
+### べきではない・べきじゃない
+
+The contrary of べきだ is べきではない・べきじゃない.
+
+> [!info] Example
+> {泥|どろ}を食べる==べきではない==。
+> You should not eat mud.
+
+## はずだ・はずがない
+
+<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 "it must/should be", while はずがない means "it cannot be". Has a nuance of being sure that it is something possible (or impossible).
+
+> [!info] Examples
+> {彼|かれ}は今日来る==はずだ==。
+> He should be coming today.
+> 
+> そんあ==はずがありません==。
+> This cannot be true.

content/🔰 Grammar/Observation - hearsay.md

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

content/🔰 Grammar/Observation - looking like.md

@@ -1,45 +1,16 @@
-# Observation & description
+# Observation: looking like
 
-## がる・がっている
+## よう
 
-<div class="usage">
-<div class="left">
-	<p><span class="box">い-Adj <strike>い</strike></span></p>
-	<p><span class="box">な-Adj</span></p>
-</div>
-	<p class="right">+ がる ・ がっている</p>
-</div>
+Means that it looks like. Used from direct knowledge or experience, with a high degree of confidence.
 
-This transforms adjective into verbs, and means "to show signs of", "to appear like".
-Can be conjugated: がっている means to currently show signs, がていた means to have shown signs.
+It has two meanings:
+* Looks like something: visual observation. Similar to みたい, but more polite.
+* Perhaps it is. Might be something else, but it look like it is.
 
-> [!info] Example
-> {彼女|かのじょ}は虫を{怖|ごわ}==がる==。
-> She seems afraid of insects.
+Contrary to そう, focuses on the more logical aspect of things.
 
-## がり
-
-<div class="usage">
-<div class="left">
-	<p><span class="box">い-Adj <strike>い</strike></span></p>
-	<p><span class="box">な-Adj</span></p>
-</div>
-	<p class="right">+ がり</p>
-</div>
-
-Expresses a personality trait (tendency to, sensitivity towards).
-
-> [!info] Example
-> {彼|かれ}はを{怖|ごわ}==がり==。
-> He has a tendency of being scared.
-
-## Looks like
-
-### よう
-
-Means that it looks like. Used from direct knowledge or experience, with a high degree of confidence. It is a more polite form of みたい.
-
-#### ようだ
+### ようだ
 
 <div class="usage">
 <div class="left">
@@ -57,7 +28,7 @@ Means that it looks like, appears like, seems like.
 > {子供|こども}が{嬉|うれ}しい==ようだ==。
 > The kids look happy (= I can see them laughing and smiling).
 
-#### ように・ような
+### ように・ような
 
 <div class="usage">
 <div class="left">
@@ -76,98 +47,11 @@ Expresses "in the manner of".
 > アヒルの==ように==食べる。
 > To eat like a duck.
 
-### みたい
+## そう
 
-みたい means similar to, like. Used for direct observation, with a high degree of certainty in consequence.
-It is a less polite form of ようだ.
+Contrary to よう, focuses on a more subjective feeling.
 
-#### みたいだ
-
-The basic form, used with all forms of words.
-
-> [!info] Example
-> 今日は暑いですね。夏==みたいだ==な。
-> It's hot today, isn't it. It looks like it's summer.
-
-#### みたいに
-
-<div class="usage">
-<div class="left">
-	<p><span class="box">V (casual)</span></p>
-	<p><span class="box">N</span></p>
-</div>
-	<p class="right">+ みたいに + V / Adj</p>
-</div>
-
-The adverbial form.
-
-> [!info] Example
-> 犬==みたいに==食べた。
-> I ate like a dog.
-
-#### みたいな
-
-<div class="usage">
-<div class="left">
-	<p><span class="box">V (casual)</span></p>
-	<p><span class="box">N</span></p>
-</div>
-	<p class="right">+ みたいな + N</p>
-</div>
-
-Similar to the precedent form, but when using with nouns.
-
-> [!info] Example
-> {故郷|ふる|さと}==みたいな==町だ。
-> A city like my hometown.
-
-### っぽい
-
-<div class="usage">
-<div class="left">
-	<p><span class="box">V <strike>ます</strike></span></p>
-	<p><span class="box">い-Adj <strike>い</strike></span></p>
-	<p><span class="box">N</span></p>
-</div>
-	<p class="right">+ っぽい</p>
-</div>
-
-This has the meaning of like, easy to, _-ish_. Makes a direct comparison with certainty, from the point of view of the person saying it. Close to an even more casual meaning of みたい.
-
-> [!info] Examples
-> {子供|こ|ども}==っぽい==。
-> Childish.
-> 
-> {忘|わす}れ==っぽい==。
-> Easy to forget.
-
-### らしい
-
-Expresses an information based on hearsay, or based on the situation, or ressemblance. This is always used bases on a source that is unknown or ambiguous. It can be similar to a guess.
-Also used for something typical.
-
-> [!info] Examples
-> 男==らしい==。
-> Typical of a man (befitting of a man).
-> 
-> 今日は{君|きみ}==らしくない==。
-> You aren't yourself today.
-
-### そう
-
-#### そうだ
-
-<div class="usage">
-<div class="left">
-	<p><span class="box">V (casual)</span></p>
-	<p><span class="box">い-Adj</span></p>
-	<p><span class="box">な-Adj + だ</span></p>
-	<p><span class="box">N + だ</span></p>
-</div>
-	<p class="right">+ そうだ</p>
-</div>
-
-Means "I heard that".
+### そうだ
 
 <div class="usage">
 <div class="left">
@@ -179,15 +63,13 @@ Means "I heard that".
 </div>
 
 Means that it looks like.
+Do not confuse with [[Observation - hearsay#そうだ]].
 
-> [!info] Examples
-> テストは{難|むず}しい==だそうだ==。
-> The exam is said to be difficult.
-> 
+> [!info] Examples 
 > おいし==そうだ==。
 > lt looks like it is delicious.
 
-#### そうに・そうな
+### そうに・そうな
 
 <div class="usage">
 <div class="left">
@@ -204,15 +86,107 @@ Also means that it looks like, but connecting to nouns and verbs.
 > 面白==そうに==人です。
 > He seems like an interesting person.
 
-### Summing it up
+## みたい
 
-🛠 To do: check validity.
+みたい means similar to, like. Used for direct observation, with a high degree of certainty in consequence. Usually used for visual observation.
+It is a less polite form of ようだ.
 
-* ==ようだ== is a formal way to say that it looks like, usually from direct observation.
-* ==みたい== is a less formal way, used in a casual conversation.
-* ==っぽい== is even more casual. A girl trying to be masculine would be 男っぽい.
-* ==らしい== is usually used when something is typical or expected. The same girl wouldn't be either 女らしい or 男っぽい because it's not what is expected from her.
-* ==そうだ== is used for something that is hearsay or not directly observation, more as a guess.
+### みたいだ
+
+The basic form, used with all forms of words.
+
+> [!info] Example
+> 今日は暑いですね。夏==みたいだ==な。
+> It's hot today, isn't it. It looks like it's summer.
+
+### みたいに
+
+<div class="usage">
+<div class="left">
+	<p><span class="box">V (casual)</span></p>
+	<p><span class="box">N</span></p>
+</div>
+	<p class="right">+ みたいに + V / Adj</p>
+</div>
+
+The adverbial form.
+
+> [!info] Example
+> 犬==みたいに==食べた。
+> I ate like a dog.
+
+### みたいな
+
+<div class="usage">
+<div class="left">
+	<p><span class="box">V (casual)</span></p>
+	<p><span class="box">N</span></p>
+</div>
+	<p class="right">+ みたいな + N</p>
+</div>
+
+Similar to the precedent form, but when using with nouns.
+
+> [!info] Example
+> {故郷|ふる|さと}==みたいな==町だ。
+> A city like my hometown.
+
+## らしい
+
+Expresses an information based on hearsay, or based on the situation, or ressemblance. This is always used based on a source that is unknown or ambiguous. It can be similar to a guess. Similar to the "perhaps" meaning of ようだ.
+Also used for something typical, expected, characteristic.
+
+> [!info] Examples
+> 男==らしい==。
+> Typical of a man (befitting of a man).
+> 
+> 今日は{君|きみ}==らしくない==。
+> You aren't yourself today.
+
+## っぽい
+
+<div class="usage">
+<div class="left">
+	<p><span class="box">V <strike>ます</strike></span></p>
+	<p><span class="box">い-Adj <strike>い</strike></span></p>
+	<p><span class="box">N</span></p>
+</div>
+	<p class="right">+ っぽい</p>
+</div>
+
+This has the meaning of like, easy to, _-ish_. Makes a direct comparison with certainty, from the point of view of the person saying it. Close to an even more casual meaning of みたい, with a focus on attitude or gesture.
+
+> [!info] Examples
+> {子供|こ|ども}==っぽい==。
+> Childish.
+> 
+> {忘|わす}れ==っぽい==。
+> Easy to forget.
+
+## 気味
+
+<div class="usage">
+<div class="left">
+	<p><span class="box">V <strike>ます</strike></span></p>
+	<p><span class="box">N</span></p>
+</div>
+	<p class="right">+ 気味</p>
+</div>
+
+{気味|ぎみ} means that it shows sign of. It talks about a condition (tiredness, sickness, lateness, etc).
+
+> [!info] Example
+> 今日、{君|きみ}はちょっと{病気|びょうき}==気味==です。
+> You look a bit sick today.
+
+## Summing up
+
+* ==ようだ== is a formal way to say that it looks like, usually from direct observation. Used for logical assumptions.
+* ==そうだ== is used for things that are on the more subjective side.
+* ==みたい== is a less formal way, used in a casual conversation. Focused on visual information.
+* ==っぽい== is even more casual. Usually used for attitude or gesture.
+* ==らしい== is usually used when something is typical or expected.
+* ==気味== is used for condition (tiredness, sickness, lateness, etc).
 
 ## に見える
 
@@ -233,21 +207,43 @@ This is used (unlike other forms that can apply to abstract similarities) exclus
 > {彼女|かのじょ}はフランス人==に見える==。
 > She looks like she is French.
 
-## I heard that...
+## かのよう「だ・に・な」
 
-### と言われている
+Means "as if", "just like".
+Use かのうようだ if it is ending the sentence, かのうように before a verb, かのような before a noun.
 
-Used for something you heard by someone identifiable: for example, you were told by someone.
-For nouns, だ is placed before.
+> [!info] Examples
+> このゲームは{現実|げんじつ}==かのようだ==。
+> This game is just like reality.
 
-> [!info] Example
-> このレストランのカレーはおいしいだ==と言われています==。
-> The curry of this restaurant is good (someone told me).
+## どうやら
 
-### と聞いた
+Means "it seems like", used with notions like ようだ or らしい.
+Used at the beginning of a phrase.
 
-Used when you heard something, but not from someone specifically identifiable: general knowledge, a rumour, etc.
+> [!info] Examples
+> ==どうやら=={離婚|りこん}したようだ。
+> Apparently they got divorced.
 
-> [!info] Example
-> 彼はバカ==と聞いた==。
-> They say he's an idiot (I've heard that he's an idiot).
+## げ
+
+<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 - tendency - feelings.md

@@ -0,0 +1,87 @@
+# Observation: tendency & feelings
+
+## がる・がっている
+
+<div class="usage">
+<div class="left">
+	<p><span class="box">い-Adj <strike>い</strike></span></p>
+	<p><span class="box">な-Adj</span></p>
+</div>
+	<p class="right">+ がる ・ がっている</p>
+</div>
+
+This transforms adjective into verbs, and means "to show signs of", "to appear like".
+Can be conjugated: がっている means to currently show signs, がていた means to have shown signs.
+
+> [!info] Example
+> {彼女|かのじょ}は虫を{怖|ごわ}==がる==。
+> She seems afraid of insects.
+
+## がり
+
+<div class="usage">
+<div class="left">
+	<p><span class="box">い-Adj <strike>い</strike></span></p>
+	<p><span class="box">な-Adj</span></p>
+</div>
+	<p class="right">+ がり</p>
+</div>
+
+Expresses a personality trait (tendency to, sensitivity towards).
+
+> [!info] Example
+> {彼|かれ}はを{怖|ごわ}==がり==。
+> He has a tendency of being scared.
+
+## がち
+
+<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>
+
+Used to describe a tendency, something that happens often. Usually used for something negative.
+
+> [!info] Example
+> ドイツの{電車|でんしゃ}は{遅|おく}れ==がち==。
+> Trains in Germany tend to be late.
+
+## とみえる・とみえて
+
+<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 "it seems that". Used for something that the speaker concludes, being reasonably confident.
+
+> [!info] Example
+> {通|とお}りにはゴミがない。{清掃車|せいそうしゃ}が{通|とお}り{過|す}ぎた==と見える==。
+> There's no garbage in the streets. It seems the garbage truck has passed by.
+
+## ような気がする
+
+<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 "have a feeling". Has a degree of uncertainty.
+See also [[Description#がする]].
+
+> [!info] Example
+> {今年|ことし}は{恋人|こいびと}を{見|み}つかる==ような気がする==。
+> I have a feeling I will find a lover this year.

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

@@ -0,0 +1,157 @@
+# Only, just
+
+## だけ
+
+Means "only", "just".
+
+> [!info] Example
+> {一|ひと}つ==だけ==ください。
+> Only one, please.
+
+## だけでなく
+
+<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 "not only A but also B".
+Can also be used as だけではなく.
+
+> [!info] Example
+> この{都市|とし}は大きい==だけでなく==、きれいでもある。
+> 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">
+<div class="left">
+	<p><span class="box">V (た)</span></p>
+	<p><span class="box">N</span></p>
+</div>
+	<p class="right">+ きり・っきり</p>
+</div>
+
+Used with verbs and nouns, it indicates a cutting off point.
+
+> [!info] Example
+> {一人|ひとり}==きり==で{住|す}んでいます。
+> I live alone.
+
+Used with a noun, it means "only".
+
+> [!info] Example
+> このバスで{一度|いちど}==きり=={乗|の}った。
+> I only rode this bus once.
+
+Used with a verb, it means "since", "after", "even since".
+
+> [!info] Example
+> {彼|かれ}は{卒業|そつぎょう}した==きり=={見|み}なかった。
+> I haven't seen him since we graduated.
+
+Using it as っきり is more casual.
+
+## ばかり
+
+Means "only" or "nothing but", and can convey surprise or negative judgment depending on the context.
+Used with nouns and verbs.
+
+> [!info] Examples
+> この{国|くに}の{春|はる}は雨==ばかり==だ！
+> In this country, there's nothing but rain in spring.
+> 
+> うちの{子供|こども}はテレビ==ばかり==見てる。
+> My child does nothing but watching TV.
+
+## ばかりで
+
+<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>
+
+Used to say "only" with a negative meaning.
+
+> [!info] Examples
+> 彼は{有名|ゆうめい}な==ばかりで=={面白|おもしろ}くない。
+> He's only famous but not interesting.
+
+## ばかりでなく
+
+<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 "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".
+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

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

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

@@ -0,0 +1,51 @@
+# Opposition: but, however
+
+## が
+
+Between two sentences, it has the meaning of "but".
+
+> [!info] Example
+> この{建物|たてもの}は大きいです==が==、トイレは{一|ひと}つだけあります。
+> This building is huge but has only one toilet.
+
+## でも
+
+This is the basic way to say "but".
+
+> [!info] Example
+> コンビニに行きました。==でも==、何も買わなかった。
+> I went to the convenience store. But I didn't buy anything.
+
+⚠ Do not confuse with [[TeF (4) - even if#Even if ても・でも]].
+
+## しかし
+
+This is similar to でも, meaning "however", but usually more formal and most commonly found in written form.
+
+> [!info] Example
+> {戦争|せん|そう}は{悪|わる}いこと。==しかし==、{人類|じん|るい}はいつも{戦|たたか}っています
+> War is bad. However, humanity is always fighting.
+
+## けど・けれども
+
+Means "but". Contrary to でも (which is more stand-alone), this links two clauses. The second clause can also be implicit and not said.
+けれども is more formal than けど. 
+
+> [!info] Example
+> {外|そと}は{暑|あつ}い==けど==行きたい。
+> It's hot outside but I'd still like to go.
+
+It can also be used to soften your assertion.
+
+> [!info] Example
+> {明日|あした}に行きたい==けど==。
+> I'd like to go tomorrow... (but I don't want to cause any inconvenience).
+
+## 「ん・の」「だけど・ですけど」
+
+Means "but", "however". 
+の is more formal than ん, and ですけど is more formal than だけど.
+
+> [!info] Example
+> {手伝|てつだ}いたい==んですけど=={暇|ひま}はない。
+> I'd like to help but I don't have time.

content/🔰 Grammar/Opposition - even if.md

@@ -0,0 +1,197 @@
+# Opposition: even if, even though
+
+## て-form: even if
+
+See [[TeF (4) - even if]].
+
+## 「と・に」しても
+
+See [[Considering - for - as#としても]].
+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.
+
+## それでも
+
+Means "but still", "even so", "anyway".
+
+> [!info] Example
+> 雨が{降|ふ}っていた、==それでも==出かけていた。
+> 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">
+	<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 "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.
+
+## たとえ～ても
+
+<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 "even if X is the case". Used to present possibilities.
+
+> [!info] Example
+> ==たとえ=={疲|つか}れ==ても==、もうちょっと{起|お}きている。
+> Even if I'm tired, I'll stay up a little longer.
+
+## ても始まらない
+
+ても{始|はじ}まらない means "there's no point, even if you..."
+Used with a verb in て form.
+
+> [!info] Example
+> もう{遅|おく}れているから、行==っても始まらない==。
+> I'm already late, so it's no use going now.
+
+## ところが
+
+<div class="usage">
+<div class="">
+	<p><span class="box">expectation</span></p>
+</div>
+	<p class="r"> + ところが + </p>
+<div class="">
+	<p><span class="box">result</span></p>
+</div>
+</div>
+
+Means "however", "even though".
+It is used to talk about an unexpected result, that is contradictory to the precedent statement.
+
+> [!info] Example
+> {自転車|じてんしゃ}の{乗|の}り{方|かた}を{忘|わす}れるはありえないと{思|おも}っていた。==ところが==すっかり{忘|わす}れた。
+> I thought it was impossible to forget how to ride a bike. However, I completely forgot.
+
+## からと言って
+
+<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 "just because", "even if".
+
+> [!info] Example
+> {年上|としうえ}だ==からといって=={正|ただ}しいとは{限|かぎ}りません。
+> Just because you're older doesn't mean you're right.
+
+## ことにはならない
+
+<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 "just because... doesn't mean that". Used at the end of a sentence.
+
+> [!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

@@ -1,39 +1,136 @@
 # Opposition
 
-## が
+## に反して
 
-Between two sentences, it has the meaning of "but".
+に{反|はん}して means "contrary to". Opposes the first noun to the rest of the sentence.
 
 > [!info] Example
-> この{建物|たてもの}は大きいです==が==、トイレは{一|ひと}つだけあります。
-> This building is huge but has only one toilet.
+> {常識|じょうしき}==に反して==、彼は{勉強|べんきょう}しなかった。
+> Contrary to common sense, he did not study.
 
-## でも
+## に対して
 
-This is the basic way to say "but".
+に{対|たい}して.
+See [[Towards#In contrast to]].
+
+## 逆に
+
+{逆|ぎゃく}に means "on the contrary". Means that it is the opposite of something else.
 
 > [!info] Example
-> コンビニに行きました。==でも==、何も買わなかった。
-> I went to the convenience store. But I didn't buy anything.
+> {人|ひと}が{大体|だいたい}ウサギが{好|す}き==逆に=={彼|かれ}は{嫌|きら}い。
+> Most people like rabbits, but on the contrary he hates them.
 
-## しかし
+## かえって
 
-This is similar to でも, meaning "however", but usually more formal and most commonly found in written form.
+Means "on the contrary", "rather". Used for bad results, contrary to what was expected.
 
 > [!info] Example
-> {戦争|せん|そう}は{悪|わる}いこと。==しかし==、{人類|じん|るい}はいつも{戦|たたか}っています
-> War is bad. However, humanity is always fighting.
+> {薬|くすり}を{飲|の}んだら==却って=={調子|ちょうし}が{悪|わる}くなった。
+> Despite drinking medicine, on the contrary my condition got worse.
 
-## けど・けれども
+## 反面
 
-けれども is more formal than けど. Contrary to でも (which is more stand-alone), this links two clauses. The second clause can also be implicit and not said.
+<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
-> {外|そと}は{暑|あつ}い==けど==行きたい。
-> It's hot outside but I'd still like to go.
+> スープはおいしい==反面==、ちょっと{冷|つめ}たい。
+> The soup is good but a bit cold.
 
-It can also be used to soften your assertion.
+## 一方で
+
+<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
-> {明日|あした}に行きたい==けど==。
-> I'd like to go tomorrow... (but I don't want to cause any inconvenience).
+> その{犬|いぬ}は{大|おお}きい==一方で==、とても{穏|おだ}やかと{親切|しんせつ}です。
+> 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/Planning - Wishing.md

@@ -1,35 +0,0 @@
-# Planning & wishing
-
-## ようと思う
-
-ようと{思|おも}う means "thinking of doing".
-Used with a verb in the volitional form (よう).
-
-> [!info] Example
-> レストランへ行こ==うと思います==。
-> I'm thinking of going to the restaurant.
-
-## つもり
-
-Means "intend to".
-
-> [!info] Example
-> 明日ゲームセンターに行く==つもり==はない。
-> I don't plan to go to the arcade tomorrow.
-
-## よてい
-
-<div class="usage">
-<div class="left">
-	<p><span class="box">V (dictionary)</span></p>
-	<p><span class="box">N + の</span></p>
-</div>
-	<p class="right">+ 予定だ</p>
-</div>
-
-It means "plan to".
-This form is stronger than つもり. For a same sentence, the nuance could be a strong intention for つもり, while with よてい the plan has already been booked.
-
-> [!info] Example
-> 来年日本へ行く==予定==です。
-> I'm planning to go to Japan next year (I have my tickets).

content/🔰 Grammar/Planning.md

@@ -0,0 +1,68 @@
+# Planning
+
+## ようと思う
+
+ようと{思|おも}う means "thinking of doing".
+Used with a verb in the volitional form (よう).
+
+> [!info] Example
+> レストランへ行こ==うと思います==。
+> I'm thinking of going to the restaurant.
+
+## つもり
+
+Means "intend to".
+
+> [!info] Example
+> 明日ゲームセンターに行く==つもり==はない。
+> I don't plan to go to the arcade tomorrow.
+
+### つもりだった・つもりなのに
+
+Used to express that someone thought they did something.
+
+> [!info] Example
+> リンゴを買った==つもりだった==けど。
+> I'm sure I bought apples... (that was my intention, but apparently I did not)
+> 
+> リンゴを買う==つもりだった==けど。
+> I was planning to buy apples... (it was my intention, but I changed my mind)
+
+### つもりで
+
+<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 "with the intention of doing".
+
+> [!info] Example
+> {旅行|りょこう}に行く==つもりで==、{旅行|りょこう}本を読んでいる。
+> With the intention of traveling, I'm reading a travel book.
+
+## よてい
+
+<div class="usage">
+<div class="left">
+	<p><span class="box">V (dictionary)</span></p>
+	<p><span class="box">N + の</span></p>
+</div>
+	<p class="right">+ 予定だ</p>
+</div>
+
+It means "plan to".
+This form is stronger than つもり. For a same sentence, the nuance could be a strong intention for つもり, while with よてい the plan has already been booked.
+
+> [!info] Example
+> 来年日本へ行く==予定==です。
+> I'm planning to go to Japan next year (I have my tickets).
+
+## Summing up
+
+* ==ようとおもう== expresses a thought about doing.
+* ==つもり== expresses an intention.
+* ==予定== expresses a plan.

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 - Obligation.md

@@ -1,81 +0,0 @@
-# Possibility and obligation
-
-## でも
-
-Used to list one or more possible options.
-
-> [!info] Example
-> ジュース==でも==お茶==でも==飲もうか。
-> Shall we drink something like a juice or tea?
-
-## かもしれない
-
-Express a possibility, like "perhaps".
-By order of politeness: かもしれません > かもしれない > かも.
-
-> [!info] Example
-> 今日も来る==かもしれない==。
-> He might come today too.
-
-## かどうか
-
-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</span></p>
-	<p><span class="box">な-Adj + な</span></p>
-	<p><span class="box">N + の</span></p>
-</div>
-	<p class="right">+ はずだ ・ はずがない</p>
-</div>
-
-はずだ means "it must/should be", while はずがない means "it cannot be".
-
-> [!info] Examples
-> {彼|かれ}は今日来る==はずだ==。
-> He should be coming today.
-> 
-> そんあ==はずがありません==。
-> This cannot be true.
-
-## ぜひ
-
-Means certainly, definitely. Expresses a wish.
-
-> [!info] Example
-> この{映画|えい|が}==ぜひ==見ます。
-> I'll watch this movie for sure.
-
-## きっと
-
-Means surely, almost certainly. Express an expectation.
-
-> [!info] Example
-> ==きっと==雨でしょう。
-> It will surely rain.
-
-## 必ず
-
-{必|かなら}ず means certainly, definitely. Expresses an obligation.
-
-> [!info] Example
-> 明日の{授業|じゅ|ぎょう}==必ず==来てください。
-> Please be sure to attend tomorrow's class.
-
-## ことができる
-
-Means "can", "able to".
-It has the same meaning as the potential form (see Conjugation [[Basics]]).
-食べる => 食べられる = 食べることができる.
-
-> [!info] Example
-> {英語|えいご}を{話|はな}す==ことが出来ない==。
-> I cannot speak English.

content/🔰 Grammar/Possibility - expectation.md

@@ -0,0 +1,9 @@
+# Possibility: expectation
+
+## きっと
+
+Means surely, almost certainly. Express an expectation.
+
+> [!info] Example
+> ==きっと==雨でしょう。
+> It will surely rain.

content/🔰 Grammar/Possibility - impossibility.md

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

content/🔰 Grammar/Possibility - no choice.md

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

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 - wish.md

@@ -0,0 +1,9 @@
+# Possibility: wish
+
+## ぜひ
+
+Means certainly, definitely. Expresses a wish.
+
+> [!info] Example
+> この{映画|えい|が}==ぜひ==見ます。
+> I'll watch this movie for sure.

content/🔰 Grammar/Possibility.md

@@ -0,0 +1,200 @@
+# Possibility
+
+## かもしれない
+
+Express a possibility, like "perhaps".
+By order of politeness: かもしれません > かもしれない > かも.
+
+> [!info] Example
+> 今日も来る==かもしれない==。
+> He might come today too.
+
+## もしかしたら
+
+Means "perhaps", "maybe". Usually completed by [[#かもしれない]].
+Can be used as もしかしたら, もしかすると and もしかして. 
+
+> [!info] Example
+> ==もしかして=={今日|きょう}も{郵便局員|ゆうびんきょくいん}が来ません==かもしれない==。
+> 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".
+It has the same meaning as the potential form (see Conjugation [[Basics]]).
+食べる => 食べられる = 食べることができる.
+
+> [!info] Example
+> {英語|えいご}を{話|はな}す==ことが出来ない==。
+> I cannot speak English.
+
+## ないことはない
+
+<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 "not impossible to", "it is not that". Used with negative forms.
+
+> [!info] Example
+> 本を{読|よ}ま==ないことはない==ですが、{最近|さいきん}は{暇|ひま}がない。
+> It's not that I don't read books, it's just that I don't have free time these days.
+
+## 恐れがある
+
+<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 is a risk that". Used when something bad could happen.
+
+> [!info] Example
+> また{地震|じしん}の==恐らくがある==。{気|き}を{付|つ}けて。
+> There will probably be another earthquake. Please be careful.
+
+## ようでは
+
+Means "if". Used when the result would be bad.
+Used with verbs.
+
+> [!info] Example
+> {化|ば}け{物|もの}が{来|く}る==ようでは==、あなたを{食|た}べちゃうよ。
+> 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

@@ -17,6 +17,30 @@ It can also be used when there is uncertainty between two or more choices. It ca
 > 雨==か=={分|わ}かりません。
 > I don't know if it will rain.
 
+## かな・かしら
+
+Means "I wonder", "should I?". かな is a neutral form, while かしら sounds feminine.
+
+> [!info] Example
+> この{帽子|ぼうし}を{被|かぶ}ろう==かな==。
+> Should I wear this hat?
+
+## かい
+
+Using this particle, the sentences becomes a yes/no question. Very casual, masculine connotation.
+
+> [!info] Example
+> 来るの==かい==。
+> Are you coming?
+
+## どうやって
+
+Means "how", "in what way".
+
+> [!info] Example
+> これを==どうやって==作れましたか。
+> How did you make this?
+
 ## Probably - right - isn't it?
 
 ### でしょう
@@ -65,26 +89,20 @@ This particle when added to the end of a sentence meaning "right?".
 * ==ではないか==・==じゃないか== invites or suggests an action.
 * ==ね== asks an agreement or a confirmation.
 
-## かな・かしら
+## ことか
 
-Means "I wonder", "should I?". かな is a neutral form, while かしら sounds feminine.
+<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
-> この{帽子|ぼうし}を{被|かぶ}ろう==かな==。
-
-## かい
-
-Using this particle, the sentences becomes a yes/no question. Very casual, masculine connotation.
-
-> [!info] Example
-> 来るの==かい==。
-> Are you coming?
-
-## どうやって
-
-Means "how", "in what way".
-
-> [!info] Example
-> これを==どうやって==作れましたか。
-> How did you make this?
-
+> フランスには、パン{屋|や}の{多|おお}さにどれほど{信|しん}じられない==ことか==。
+> It's incredible how many bakeries there are in France.

content/🔰 Grammar/Reason.md

@@ -24,6 +24,24 @@ It is more objective than から: it expresses a situation that exists, and that
 See [[🔰 Particles (2)#Because]].
 It is more subjective than ので: it expresses more personal needs/actions/opinions.
 
+## ことから
+
+<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 "based on the fact that". Most formal than から, and puts an emphasis on it being true (objective information).
+
+> [!info] Example
+> {部屋|へや}から{音|おと}がある==ことから==、{誰|だれ}かいるはずです。
+> From the fact that there is sound coming from the room, someone must be there.
+
 ## んです・のです
 
 <div class="usage">
@@ -49,8 +67,252 @@ It is only used with nouns when asking questions.
 
 ## のは・のが
 
+Means "the reason for A is B", "doing A is B".
 See [[Transformation#のは・のが sentence as noun]].
 
-## のに
+## なぜなら～から
 
-See [[Connectors#のに]].
+<div class="usage">
+<div class="">
+	<p><span class="box">result</span></p>
+</div>
+	<p class="r"> + なぜなら + </p>
+<div class="">
+	<p><span class="box">reason</span></p>
+</div>
+	<p class="r">+ から</p>
+</div>
+
+Means "the reason is".
+There are three variations:
+* なぜなら(ば)
+* なぜかというと
+* どうしてかというと
+
+> [!info] Example
+> それを{言|い}えない！==どうしてかというと=={秘密|ひみつ}だ==から==。
+> I cannot tell you that! Why, because it's a secret.
+
+## そのために
+
+<div class="usage">
+<div class="">
+	<p><span class="box">goal</span></p>
+</div>
+	<p class="r"> + そのため(に) + </p>
+<div class="">
+	<p><span class="box">action</span></p>
+</div>
+</div>
+
+Means "for that reason", "because of".
+See also [[Connectors - in order to#ために]].
+
+> [!info] Example
+> {丸|まる}い{日|にち}{働|はたら}いていた、==そのために=={今|いま}{寝|ね}に行きます。
+> I worked the whole day. For that reason, I'm going to bed.
+> 
+> {日本|にほん}に行きたい。==そのために==、{日本語|にほんご}をちゃんと{勉強|べんきょう}しています。
+> 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 "for that reason", "as you'd expect".
+わけではない・わけじゃない means "it doesn't mean that".
+
+> [!info] Example
+> {毎日|まいにち}{料理|りょうり}を{作|つく}るからうまくになった==わけだ==。
+> I got good at cooking because I cook every day.
+
+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
@@ -27,6 +27,8 @@ Means "is it alright if?", "may I?".
 > ここに{座|すわ}==てもいい==ですか。
 > May I sit here?
 
+A more polite way is [[Can't help - doesn't matter#ても構わない]].
+
 ## ないでください
 
 Means "please don't". It is a polite request. Removing the ください makes it more casual.
@@ -47,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

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

content/🔰 Grammar/Talking about.md

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

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

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

content/🔰 Grammar/Time - finally.md

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

content/🔰 Grammar/Time - recently.md

@@ -0,0 +1,51 @@
+# Time: recently
+
+## さっき
+
+Means that something happened recently, either just now, or a little while ago.
+
+> [!info] Example
+> ==さっき==家に出てきた。
+> I just left home.
+
+## たところ
+
+Combined with a verb in the past tense, it express that something just occurred (something just ended, just started, etc).
+
+> [!info] Example
+> 今食べた==ところ==だ。
+> I just finished to eat right now.
+
+## たばかり
+
+Combined with a verb in the past tense, it express that something just occurred (something just ended, just started, etc). It is more subjective than ところ. It doesn't have to be something that literally just happened, but something that feels like it just happened. 
+
+> [!info] Example
+> 今食べた==ばかり==だ。
+> I just finished to eat right now.
+
+When comparing the two examples, the meaning is different depending on the context. Imagine a friend asking you to go eat with him. When using ところ, it means you just finished your meal this instant. When using ばかり, it means that it feels too soon to eat again just yet from your point of view, independently of how much time has really passed.
+
+## たて
+
+<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 <strike>ます</strike></span></p>
+</div>
+	<p class="r">+ たて + </p>
+<div class="">
+	<p><span class="box">の + N</span></p>
+</div>
+</div>
+
+Means that something has just been finished. It cannot be used with all verbs. It has a meaning of something fresh, that changes after completion (fresh food that degrades, etc).
+
+> [!info] Example
+> {炊|たき}き==たて==のお{好|この}み{焼|やき}きを食べるべきです。
+> You should eat freshly cooked okonomiyaki.

content/🔰 Grammar/Time - regularity.md

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

content/🔰 Grammar/Time - surprise.md

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

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

@@ -18,14 +18,22 @@ Means "time". When used like this, means "at the time of".
 > 行った==とき==、{誰|だれ}もいなかった。
 > When I went, no one was there.
 
-## ところ
+## 際に
 
-Means "just about to". Used when describing what we're about to do.
-Used by combining to a verb.
+<div class="usage">
+<div class="left">
+	<p><span class="box">V (dictionary)</span></p>
+	<p><span class="box">V (た)</span></p>
+	<p><span class="box">N + の</span></p>
+</div>
+	<p class="right">+ 際に・際は</p>
+</div>
+
+{際|さい}に means "time", "when". More formal than とき.
 
 > [!info] Example
-> 今ご{飯|はん}を作る==ところ==です。
-> I'm about to make dinner.
+> {家|いえ}で{入|はい}る==際に=={靴|くつ}を{脱|ぬ}いでください。
+> Please take off your shoes when entering the house.
 
 ## ことがある
 
@@ -36,73 +44,11 @@ Used by combining to a verb.
 > {時々|とき|どき}パリへ行く==ことがある==。
 > I sometimes go to Paris.
 
-## ながら
+## から～まで
 
-<div class="usage">
-<div class="">
-	<p><span class="box">V-<strike>ます</strike></span></p>
-</div>
-	<p class="r"> + ながら + ...</p>
-</div>
-
-Means "while", "simultaneously".
-
-> [!info] Example
-> {歩|ある}き==ながら=={電話|でん|わ}を見ています。
-> While walking, I'm looking at my phone.
-
-## 間
-
-<div class="usage">
-<div class="left">
-	<p><span class="box">V (dictionary)</span></p>
-	<p><span class="box">N + の</span></p>
-</div>
-	<p class="right">+ 間</p>
-</div>
-
-{間|あいだ} means "while" or "during". Used to express something that is done for the whole period of time.
-
-> [!info] Example
-> 電車に{乗|の}っている==間==、ゲームをしてた。
-> While I was on the train, I was playing a game.
-
-Can also be used to talk about a distance between two physical places or the time between two things.
-
-> [!info] Example
-> １時から９じまでの==間==、{寝|ね}ます。
-> I sleep between 1AM and 9AM.
-
-## 間に
-
-<div class="usage">
-<div class="left">
-	<p><span class="box">V (casual, non-past)</span></p>
-	<p><span class="box">い-Adj</span></p>
-	<p><span class="box">な-Adj + な</span></p>
-	<p><span class="box">N + の</span></p>
-</div>
-	<p class="right">+ 間に</p>
-</div>
-
-A first meaning is similar to {間|あいだ} (while), but with intentionality.
-
-> [!info] Example
-> 電車に{乗|の}った==間に==、本を読みました。
-> While I was on the train, I read a book.
-
-A second meaning is a statement of something that happened during a time period, independently of your actions.
-Contrary to 間, it doesn't include the whole time period. So 間に means that at a point during the time period, something happened.
-
-> [!info] Example
-> {夜|よる}の==間に==、{隣|となり}の木が{落|お}ちていた。
-> During the night, the tree next door fell.
-
-# から～まで
-
-See から: [[🔰 Particles (2)#From, since]].
-See まで: [[🔰 Particles (2)#まで]].
-See から～まで: [[🔰 Particles (2)#から～まで]].
+See から: [[🔰 Particles (2)#From, since]] (from).
+See まで: [[🔰 Particles (2)#まで]] (until).
+See から～まで: [[🔰 Particles (2)#から～まで]] (from... until).
 
 ## 前に
 
@@ -140,75 +86,13 @@ See から～まで: [[🔰 Particles (2)#から～まで]].
 > 食べた==後で==、寝ます。
 > After eating, I'll go to sleep.
 
-## さっき
-
-Means that something happened recently, either just now, or a little while ago.
-
-> [!info] Example
-> ==さっき==家に出てきた。
-> I just left home.
-
-## たところ
-
-Combined with a verb in the past tense, it express that something just occurred (something just ended, just started, etc).
-
-> [!info] Example
-> 今食べた==ところ==だ。
-> I just finished to eat right now.
-
-## ているところ
-
-See [[TeF (2) - manner of doing#ているところ]].
-
-## たばかり
-
-Combined with a verb in the past tense, it express that something just occurred (something just ended, just started, etc). It is more subjective than ところ. It doesn't have to be something that literally just happened, but something that feels like it just happened. 
-
-> [!info] Example
-> 今食べた==ばかり==だ。
-> I just finished to eat right now.
-
-When comparing the two examples, the meaning is different depending on the context. Imagine a friend asking you to go eat with him. When using ところ, it means you just finished your meal this instant. When using ばかり, it means that it feels too soon to eat again just yet from your point of view, independently of how much time has really passed.
-
-## 急に
-
-{急|きゅう}に means that something happened unexpectedly or quickly.
-
-> [!info] Example
-> ==急に==電車が{現|あらわ}れた。
-> A train suddenly appeared.
-
-## やっと
-
-Means that something happened at last. More rarely means "barely".
-
-> [!info] Example
-> ==やっと=={論文|ろん|ぶん}を書き{終|お}わった。
-> I finally finished writing my thesis.
- 
-## までに
-
-This indicates a time limit for the action, similar to "by".
-
-> [!info] Example
-> {来週|らい|しゅう}==までに=={終|お}わってください。
-> Please finish by next week.
-
-## おきに
-
-This is used for repeated intervals, after a noun indicating something measurable.
-
-> [!info] Example
-> この電車は４分==おきに=={出発|しゅ|っぱつ}します。
-> This train leaves every four minutes.
-
 ## ころ・ごろ
 
 <div class="usage">
-<div class="left">
+<div class="">
 	<p><span class="box">N (time)</span></p>
 </div>
-	<p class="right">+ ごろ</p>
+	<p class="r">+ ごろ</p>
 </div>
 
 Means "around" or "about".
@@ -229,5 +113,129 @@ Means "around" or "about".
 Means "when".
 
 > [!info] Example
-> 子供の==ころ==、毎日{公園|こうえん}で{遊|あそ}んだ。
+> {子供|こども}の==ころ==、毎日{公園|こうえん}で{遊|あそ}んだ。
 > When I was a kid, I played every day at the park.
+
+## までに
+
+This indicates a time limit for the action, similar to "by".
+
+> [!info] Example
+> {来週|らい|しゅう}==までに=={終|お}わってください。
+> Please finish by next week.
+
+## ぶりに
+
+<div class="usage">
+<div class="">
+	<p><span class="box">N (time)</span></p>
+</div>
+	<p class="r">+ ぶりに~する</p>
+</div>
+<div class="usage">
+<div class="">
+	<p><span class="box">N (time)</span></p>
+</div>
+	<p class="r">+ ぶり + の</p>
+<div class="">
+	<p><span class="box">N</span></p>
+</div>
+</div>
+
+Means "for the first time in duration". Used for long times (can be a psychologically perceived one).
+Used with nouns measuring time.
+
+> [!info] Example
+> ３{年|ねん}==ぶりに==ブラジルを{戻|もど}ります。
+> For the first time in 3 years, I'm returning to Brazil.
+
+## に先立ち
+
+<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 "before", "prior to". It is formal.
+Also used as に先立つ when a second noun follows a first one.
+
+> [!info] Examples
+> {初|はじ}める==に先立って==、{準備|じゅんび}しないといけない。
+> Before starting, you need to prepare.
+
+## 上で
+
+<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 "after", "upon". Shows a logical progression. Mostly used in formal situations.
+
+> [!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

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

content/🔰 Grammar/Transformation.md

@@ -11,16 +11,16 @@ V+こと => 食べること. The verbs are never conjugated.
 
 ## ~さ: adjective as noun
 
-This allows to transform an adjective into a noun (adjective nominalizer).
-
 <div class="usage">
 <div class="left">
-	<p><span class="box">な-Adj</span></p>
 	<p><span class="box">い-Adj <strike>い</strike></span></p>
+	<p><span class="box">な-Adj</span></p>
 </div>
 	<p class="right">+ さ</p>
 </div>
 
+This allows to transform an adjective into a noun (adjective nominalizer). Used to talk about the degree of the adjective. Generally objective.
+
 > [!info] Example
 > やさしい。
 > Kind.
@@ -28,6 +28,28 @@ This allows to transform an adjective into a noun (adjective nominalizer).
 > やさし==さ==。
 > Kindness.
 
+## ~み: adjective as noun
+
+<div class="usage">
+<div class="left">
+	<p><span class="box">い-Adj <strike>い</strike></span></p>
+	<p><span class="box">な-Adj</span></p>
+</div>
+	<p class="right">+ み</p>
+</div>
+
+This allows to transform an adjective into a noun (adjective nominalizer). Similar to さ, but it is used in specific contexts. Rather than a degree, it talks about a quality. Generally subjective. Can be used with less adjectives than さ.
+
+> [!info] Example
+> 甘い。
+> Sweet.
+> 
+> 甘さ。
+> Amount of sweetness.
+> 
+> 甘==味==。
+> Quality of sweetness.
+
 ## ということ: phrase as noun
 
 This allows to transform a phrase into a noun.
@@ -68,7 +90,7 @@ Also means "the reason for A is B", "doing A is B".
 > このレストランで{一番|いち|ばん}{人気|にん|き}がある==のは=={寿司|すし}です。
 > The most popular dish in the restaurant is sushi.
 
-## くする: い-adjectives as adverbs
+## くする: い-adjective as adverb
 
 Replacing the い in a い-Adj by くする transforms it into an adverb.
 大きい (big) => 大きくする (make big).
@@ -77,7 +99,7 @@ Replacing the い in a い-Adj by くする transforms it into an adverb.
 > エアコンを{点|つ}けると{空気|くう|き}が{寒|さむ}==くなる==。
 > When turning on the AC, the air becomes cold.
 
-## にする: な-adjectives as adverbs
+## にする: な-adjective as adverb
 
 Appending にする to a な-Adj transforms it into an adverb.
 {静|しず}かな (quiet) => 静かにする (make quiet).
@@ -86,6 +108,22 @@ Appending にする to a な-Adj transforms it into an adverb.
 > {部屋|へや}をきれい==にして==ください。
 > Please clean the room (make the room cleaner).
 
-## がる・がっている: adjectives as verbs
+## がる・がっている: adjective as verb
 
-See [[Observation - Description#がる・がっている]].
+See [[Observation - tendency - feelings#がる・がっている]].
+
+## 的: noun as な-Adj / Adverb
+
+This allows to change a noun into:
+* ~{的|てき} な for a な-Adj
+* ~{的|てき} に for an Adverb
+
+> [!info] Example
+> {感情|かんじょう}。
+> Emotion.
+> 
+> {感情|かん|じょう}==的==。
+> Emotional.
+> 
+> 彼女のスピーチはとても{感情|かん|じょう}==的==だった。
+> Her speech was very emotional.

content/🔰 Grammar/Wanting.md

@@ -25,7 +25,7 @@ This form is used for yourself when you want to do something. It can be conjugat
 </div>
 
 This form is used to express that someone else wants to do something.
-See also [[Observation - Description#がる・がっている]].
+See also [[Observation - tendency - feelings#がる・がっている]].
 
 > [!info] Examples
 > {彼女|かのじょ}は毎日{練習|れんしゅう}し==たがった==。

content/🔰 Grammar/Without.md

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

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

@@ -14,6 +14,12 @@ When a sentence is negative, は is usually used instead of が and を.
 > 肉==は==食べません。
 > I don't eat meat.
 
+When used with a noun that is a number or an amount, it takes the meaning of "at least" or "around". Can be mixed with [[Amounts#くらい・ぐらい]].
+
+> [!info] Example
+> {毎週|まいしゅう}２{回|かい}==は=={映画館|えいがかん}に行きます。
+> I go to the cinema at least twice a week.
+
 ## が
 
 The が particle indicates the subject of a sentence.
@@ -31,7 +37,7 @@ It is also used for making a contrast.
 In a noun modifying clause, は becomes が.
 
 > [!info] Example
-> {彼|かれ}はラメんを{作|つく}。
+> {彼|かれ}はラメんを{作|つく}った。
 > He made ramen.
 > 
 > {彼|かれ}==が=={作|つく}ったラメんはおいしいです。
@@ -56,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,24 +44,75 @@ 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.
 
-## だけ
+## っけ
 
-Means "only", "just".
+<div class="usage">
+<div class="left">
+	<p><span class="box">V</span></p>
+	<p><span class="box">い-Adj <strike>い</strike> かった</span></p>
+	<p><span class="box">な-Adj + だ・だった</span></p>
+	<p><span class="box">N + だ・だった</span></p>
+</div>
+	<p class="right">+ っけ</p>
+</div>
+
+Used when the speaker tries to remember, or confirm an information, that has been forgotten.
 
 > [!info] Example
-> {一|ひと}つ==だけ==ください。
-> Only one, please.
+> {会議|かいぎ}は今日だった==っけ==。
+> Was the meeting today?
 
-### だけで
+## こそ
 
-Means "just by doing". 
+Means "for sure". Used to emphasize words.
+Used with nouns.
+
+⚠ Replaces the を and が particle. It is, in a certain way, a stronger way than が to highlight information.
 
 > [!info] Example
-> 見る==だけ==で{楽|たの}しいですね。
-> Just looking at it is fun, isn't it.
+> {今年|ことし}==こそ=={日本|にほん}に{住|す}む。
+> This year, for sure I'll live in Japan.
+
+## さえ
+
+<div class="usage">
+<div class="left">
+	<p><span class="box">V (て)</span></p>
+	<p><span class="box">V <strike>ます</strike></p>
+	<p><span class="box">N + で</span></p>
+	<p><span class="box">N + </span></p>
+</div>
+	<p class="right">+ さえ</p>
+</div>
+
+Means "even", "not even" (with negative verbs).
+
+> [!info] Example
+> {先生|せんせい}で==さえ==、この{曲|きょく}を{弾|ひ}くことは{難|むずか}しいです。
+> Even for my teacher, this composition is difficult to play.
+
+⚠ With conditional verbs, it means "only". See [[State#さえ～ば]].
+
+## にて
+
+This particle is a formal version of [[🔰 Particles (1)#で]], and is used the same way.
+
+> [!info] Example
+> {電話|でんわ}==にて=={連絡|れんらく}ください。
+> Please contact us by phone.
+
+## より
+
+It is a more formal form of から ([[#From, since]]).
+
+> [!info] Example
+> 明日==より=={毎日|まいにち}{運動|うんどう}するつもりです。
+> Starting tomorrow, I'm going to exercise every day.
+
+Do not confuse with [[Comparison#より]].
 
 ## Sentence ending
 

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/advanced/paths.md

@@ -48,4 +48,4 @@ Here are the main types of slugs with a rough description of each type of path:
 - `SimpleSlug`: cannot be relative and shouldn't have `/index` as an ending or a file extension. It _can_ however have a trailing slash to indicate a folder path.
 - `RelativeURL`: must start with `.` or `..` to indicate it's a relative URL. Shouldn't have `/index` as an ending or a file extension but can contain a trailing slash.
 
-To get a clearer picture of how these relate to each other, take a look at the path tests in `quartz/path.test.ts`.
+To get a clearer picture of how these relate to each other, take a look at the path tests in `quartz/util/path.test.ts`.

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.