Compare commits

...

391 Commits

Author SHA1 Message Date
78832de162 Small adjustments for responsiveness 2025-07-02 00:13:26 +02:00
158a19d35e Change provider from npm to nginx 2025-07-01 21:57:58 +02:00
767037a66f Added dockerignore file 2025-07-01 01:43:31 +02:00
366b7f8d1f Merge commit 'f48a4df00011999eea2fbabd2e1e9d0cc26f9bfe' into jpg 2025-07-01 01:18:57 +02:00
f48a4df000 Squashed 'content/' changes from fc5c89d..8cd58e1
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
2025-07-01 01:18:56 +02:00
f5b49ccc81 Fix styling for narrow TOC 2025-07-01 00:30:09 +02:00
69f191847c Update layout to new Quartz version 2025-06-29 17:26:31 +02:00
af4b26f0e2 Merge branch 'v4' into jpg 2025-06-29 17:21:25 +02:00
52a5196f38 chore: converted Emoji version 16 (#2018) 2025-06-18 01:18:57 -04:00
cdd0be2aa8 feat(giscus): expose language option for Comments component (#2012)
* add language support for Comment

* docs: let users know they can customize their language preference
2025-06-08 11:23:01 +02:00
9de370ae14 watcher: manually ignore .git changes 2025-06-04 15:00:41 -07:00
ae0466eedb css: unapply redundant bg on section 2025-06-03 10:57:16 -07:00
499adf4a4e fix(ios): mobile explorer overscroll behavior (#2008) 2025-06-03 13:51:38 -04:00
cd13ce3c47 docs: clarify parens on ignorePatterns (closes #2009) 2025-06-02 12:39:01 -07:00
b48aa91728 fix(flex): respect DesktopOnly and MobileOnly components (#1971)
* fix(flex): respect DesktopOnly and MobileOnly components

* Use classNames util function

* fix(ofm): allow wikilink alias to be empty (#1984)

This is in line with Obsidian's behavior.

* fix(style): Katex adding scrollbars on non-overflowing content (#1989)

* feat(i18n): Bahasa Indonesia translations (#1981)

* fix(a11y): increased content-meta text contrast (#1980)

* fix(analytics): streamline posthog script loading and event capturing (#1974)

* css: adjust color blend for search bg

* feat(links): added ofm option to style unresolved or broken links differently (#1992)

* feat: add option to disable broken wikilinks

* fix(style): update hover color for broken links and introduce new class

* feat: add "disableBrokenWikilinks" option to ObsidianFlavoredMarkdown

* chore(deps): replace `chalk` and `rimraf` with builtin functions (#1879)

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* chore(deps): bump the production-dependencies group across 1 directory with 9 updates (#1996)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Node 22 (#1997)

* docs: showcase housekeeping

* docs: fix explorernode references (closes #1985)

* fix: tz-less date parse in local tz instead of utc (closes #1615)

* docs: added note to not forget to add https:// to the plausible-host (for #1337) (#2000)

* docs: added note to not forget to add https:// to the plausible-host (for #1337)

* Update docs/configuration.md

---------

Co-authored-by: Jacky Zhao <j.zhao2k19@gmail.com>

* Updated documentation

---------

Co-authored-by: Nizav <106657905+Ni-zav@users.noreply.github.com>
Co-authored-by: Aswanth <aswanth366@gmail.com>
Co-authored-by: Jacky Zhao <j.zhao2k19@gmail.com>
Co-authored-by: Keisuke ANDO <g.kei0429@gmail.com>
Co-authored-by: fl0werpowers <47599466+fl0werpowers@users.noreply.github.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Sebastian Moser <64004956+c2vi@users.noreply.github.com>
2025-06-02 18:36:57 +02:00
7b052e8844 docs: added note to not forget to add https:// to the plausible-host (for #1337) (#2000)
* docs: added note to not forget to add https:// to the plausible-host (for #1337)

* Update docs/configuration.md

---------

Co-authored-by: Jacky Zhao <j.zhao2k19@gmail.com>
2025-06-01 22:56:51 -07:00
1cfc87652c fix: tz-less date parse in local tz instead of utc (closes #1615) 2025-06-01 22:42:37 -07:00
096ef220dc docs: fix explorernode references (closes #1985) 2025-05-28 16:36:25 -07:00
bc16822d14 docs: showcase housekeeping 2025-05-28 16:27:17 -07:00
7fa9253abc Node 22 (#1997) 2025-05-28 16:20:59 -07:00
996d8d51fa chore(deps): bump the production-dependencies group across 1 directory with 9 updates (#1996)
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-05-28 09:21:56 -04:00
951d1dec24 chore(deps): replace chalk and rimraf with builtin functions (#1879)
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
2025-05-28 10:40:51 +02:00
51b43a2115 feat(links): added ofm option to style unresolved or broken links differently (#1992)
* feat: add option to disable broken wikilinks

* fix(style): update hover color for broken links and introduce new class

* feat: add "disableBrokenWikilinks" option to ObsidianFlavoredMarkdown
2025-05-27 21:26:17 +02:00
c9349457ed css: adjust color blend for search bg 2025-05-27 10:00:19 -07:00
6d49d97559 fix(analytics): streamline posthog script loading and event capturing (#1974) 2025-05-24 00:55:07 -04:00
c9741d00f3 fix(a11y): increased content-meta text contrast (#1980) 2025-05-23 22:09:48 -04:00
73983cfb0e feat(i18n): Bahasa Indonesia translations (#1981) 2025-05-23 22:07:29 -04:00
52344cd816 fix(style): Katex adding scrollbars on non-overflowing content (#1989) 2025-05-23 22:05:41 -04:00
fec0a62b74 fix(ofm): allow wikilink alias to be empty (#1984)
This is in line with Obsidian's behavior.
2025-05-19 07:58:05 +02:00
e98d97a271 feat(i18n): readermode translations and icon (#1961)
* fix(readermode): Translations and a new icon for ReaderMode

* Formatted

* Replaced icon
2025-05-07 21:56:18 +02:00
c33f96e572 chore(deps): bump sigstore/cosign-installer in the ci-dependencies group (#1953)
Bumps the ci-dependencies group with 1 update: [sigstore/cosign-installer](https://github.com/sigstore/cosign-installer).


Updates `sigstore/cosign-installer` from 3.8.1 to 3.8.2
- [Release notes](https://github.com/sigstore/cosign-installer/releases)
- [Commits](https://github.com/sigstore/cosign-installer/compare/v3.8.1...v3.8.2)

---
updated-dependencies:
- dependency-name: sigstore/cosign-installer
  dependency-version: 3.8.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: ci-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-05-07 12:46:39 -07:00
0b348a0532 chore(deps): bump the production-dependencies group with 7 updates (#1964)
Bumps the production-dependencies group with 7 updates:

| Package | From | To |
| --- | --- | --- |
| [@floating-ui/dom](https://github.com/floating-ui/floating-ui/tree/HEAD/packages/dom) | `1.6.13` | `1.7.0` |
| @myriaddreamin/rehype-typst | `0.5.4` | `0.6.0` |
| [pixi.js](https://github.com/pixijs/pixijs) | `8.9.1` | `8.9.2` |
| [pretty-bytes](https://github.com/sindresorhus/pretty-bytes) | `6.1.1` | `7.0.0` |
| [ws](https://github.com/websockets/ws) | `8.18.1` | `8.18.2` |
| [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) | `22.15.3` | `22.15.7` |
| [tsx](https://github.com/privatenumber/tsx) | `4.19.3` | `4.19.4` |


Updates `@floating-ui/dom` from 1.6.13 to 1.7.0
- [Release notes](https://github.com/floating-ui/floating-ui/releases)
- [Changelog](https://github.com/floating-ui/floating-ui/blob/master/packages/dom/CHANGELOG.md)
- [Commits](https://github.com/floating-ui/floating-ui/commits/@floating-ui/dom@1.7.0/packages/dom)

Updates `@myriaddreamin/rehype-typst` from 0.5.4 to 0.6.0

Updates `pixi.js` from 8.9.1 to 8.9.2
- [Release notes](https://github.com/pixijs/pixijs/releases)
- [Commits](https://github.com/pixijs/pixijs/compare/v8.9.1...v8.9.2)

Updates `pretty-bytes` from 6.1.1 to 7.0.0
- [Release notes](https://github.com/sindresorhus/pretty-bytes/releases)
- [Commits](https://github.com/sindresorhus/pretty-bytes/compare/v6.1.1...v7.0.0)

Updates `ws` from 8.18.1 to 8.18.2
- [Release notes](https://github.com/websockets/ws/releases)
- [Commits](https://github.com/websockets/ws/compare/8.18.1...8.18.2)

Updates `@types/node` from 22.15.3 to 22.15.7
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

Updates `tsx` from 4.19.3 to 4.19.4
- [Release notes](https://github.com/privatenumber/tsx/releases)
- [Changelog](https://github.com/privatenumber/tsx/blob/master/release.config.cjs)
- [Commits](https://github.com/privatenumber/tsx/compare/v4.19.3...v4.19.4)

---
updated-dependencies:
- dependency-name: "@floating-ui/dom"
  dependency-version: 1.7.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: production-dependencies
- dependency-name: "@myriaddreamin/rehype-typst"
  dependency-version: 0.6.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: production-dependencies
- dependency-name: pixi.js
  dependency-version: 8.9.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: production-dependencies
- dependency-name: pretty-bytes
  dependency-version: 7.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: production-dependencies
- dependency-name: ws
  dependency-version: 8.18.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: production-dependencies
- dependency-name: "@types/node"
  dependency-version: 22.15.7
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: production-dependencies
- dependency-name: tsx
  dependency-version: 4.19.4
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: production-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-05-07 12:46:23 -07:00
Dan
59d4b4eddd fix(analytics): Umami tracking pageviews properly
Update componentResources.ts to fix umami SPA tracking (#1967)

Update componentResources.ts to fix umami analytics when SPA is enabled in Quartz
2025-05-07 21:44:30 +02:00
adf442036b fix(graph): provide proper workaround for pixijs webgpu issue #1899 (#1949) 2025-04-30 09:49:41 -07:00
dc2c4dca08 docs: add fix for 'remote end hung up unexpectedly' error during initial sync (#1939) 2025-04-29 09:55:15 -07:00
6ba9c7c02a doc(favicon): add documentation of favicon plugin (#1948)
* doc(favicon): add documentation of favicon plugin

* doc(favicon): add missing link to configuration page

* fix(favicon): build on public folder don't created
2025-04-28 22:00:28 -07:00
8d5b13ee03 fix(fonts): Fixed page title fonts not downloadable to local (#1898)
* Fixed url parser regex not working for Google Fonts subset API

* Prettier no
2025-04-28 14:58:06 -07:00
4d07ac93b4 chore(deps-dev): bump the production-dependencies group with 2 updates (#1952)
Bumps the production-dependencies group with 2 updates: [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) and [esbuild](https://github.com/evanw/esbuild).


Updates `@types/node` from 22.14.1 to 22.15.3
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

Updates `esbuild` from 0.25.2 to 0.25.3
- [Release notes](https://github.com/evanw/esbuild/releases)
- [Changelog](https://github.com/evanw/esbuild/blob/main/CHANGELOG.md)
- [Commits](https://github.com/evanw/esbuild/compare/v0.25.2...v0.25.3)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 22.15.3
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: production-dependencies
- dependency-name: esbuild
  dependency-version: 0.25.3
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: production-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-04-28 14:41:04 -07:00
32d3fc0ce8 chore(ci): fix proj name 2025-04-28 14:35:51 -07:00
00e860d8e6 ci: fix fork preview 2025-04-28 13:19:29 -07:00
2acdec323f fix(explorer): Prevent html from being scrollable when mobile explorer is open (#1895)
* Fixed html page being scrollable when mobile explorer is open

* Prettier code

* Addressed comment
2025-04-26 11:13:56 -07:00
9e58857746 feat(favicon): add plugin to expose favicon from icon.png (#1942)
* feat(favicon): add plugin to expose favicon from icon.png

* chore(favicon): clean up formatting and remove unnecessary line breaks
2025-04-26 11:06:59 -07:00
4bd714b7be fix(callout): Grid-based callout collapsible animation (#1944)
* Fixed broken nested callout maxHeight calculation

* Implemented grid-based callout collapsible
2025-04-26 11:05:51 -07:00
78e13bcb40 chore: add ci to preview all prs (#1947)
* add ci to preview all prs

* only on this repo

* fmt
2025-04-26 11:04:23 -07:00
7d49dff074 fix: prefer webgl for devices with webgpu and no float32-blendable feature flag #1899 (#1933)
Co-authored-by: Tony <32993852+0xREDACTED@users.noreply.github.com>
2025-04-23 09:32:52 -07:00
cdebd05dc9 fix(wikilinks): dont default empty alias 2025-04-23 09:30:25 -07:00
2a9290b3df fix(transclude): blockref detection 2025-04-22 11:18:50 -07:00
771c05ff18 fix: dynamically detect current branch for quartz sync push (#1930) 2025-04-22 10:22:43 -07:00
6dd772bf00 fix(popover): properly clear popover on racing fetch 2025-04-21 23:55:38 -07:00
c238dd16d9 chore(deps): bump the production-dependencies group with 2 updates (#1919)
Bumps the production-dependencies group with 2 updates: [@clack/prompts](https://github.com/bombshell-dev/clack/tree/HEAD/packages/prompts) and [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node).


Updates `@clack/prompts` from 0.10.0 to 0.10.1
- [Release notes](https://github.com/bombshell-dev/clack/releases)
- [Changelog](https://github.com/bombshell-dev/clack/blob/@clack/prompts@0.10.1/packages/prompts/CHANGELOG.md)
- [Commits](https://github.com/bombshell-dev/clack/commits/@clack/prompts@0.10.1/packages/prompts)

Updates `@types/node` from 22.14.0 to 22.14.1
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@clack/prompts"
  dependency-version: 0.10.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: production-dependencies
- dependency-name: "@types/node"
  dependency-version: 22.14.1
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: production-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-04-17 19:48:08 -07:00
b34d521293 feat: reader mode 2025-04-17 19:45:17 -07:00
bfd72347cf fix(popover): clear popovers more aggressively, use href as id 2025-04-11 08:18:28 -07:00
091cc1b05e fix(search): properly show mobile layout 2025-04-10 17:43:35 -07:00
e9b60c7285 fix(popover): popover id calculation + scroll consistency 2025-04-10 16:46:30 -07:00
b1a920e5c0 fix: add proper popover hint to tag content page 2025-04-10 16:28:36 -07:00
61770d3e50 chore(deps): bump the production-dependencies group with 6 updates (#1913)
Bumps the production-dependencies group with 6 updates:

| Package | From | To |
| --- | --- | --- |
| [preact](https://github.com/preactjs/preact) | `10.26.4` | `10.26.5` |
| [remark-rehype](https://github.com/remarkjs/remark-rehype) | `11.1.1` | `11.1.2` |
| [sharp](https://github.com/lovell/sharp) | `0.33.5` | `0.34.1` |
| [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) | `22.13.14` | `22.14.0` |
| [@types/ws](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/ws) | `8.18.0` | `8.18.1` |
| [typescript](https://github.com/microsoft/TypeScript) | `5.8.2` | `5.8.3` |


Updates `preact` from 10.26.4 to 10.26.5
- [Release notes](https://github.com/preactjs/preact/releases)
- [Commits](https://github.com/preactjs/preact/compare/10.26.4...10.26.5)

Updates `remark-rehype` from 11.1.1 to 11.1.2
- [Release notes](https://github.com/remarkjs/remark-rehype/releases)
- [Commits](https://github.com/remarkjs/remark-rehype/compare/11.1.1...11.1.2)

Updates `sharp` from 0.33.5 to 0.34.1
- [Release notes](https://github.com/lovell/sharp/releases)
- [Commits](https://github.com/lovell/sharp/compare/v0.33.5...v0.34.1)

Updates `@types/node` from 22.13.14 to 22.14.0
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

Updates `@types/ws` from 8.18.0 to 8.18.1
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/ws)

Updates `typescript` from 5.8.2 to 5.8.3
- [Release notes](https://github.com/microsoft/TypeScript/releases)
- [Changelog](https://github.com/microsoft/TypeScript/blob/main/azure-pipelines.release-publish.yml)
- [Commits](https://github.com/microsoft/TypeScript/commits)

---
updated-dependencies:
- dependency-name: preact
  dependency-version: 10.26.5
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: production-dependencies
- dependency-name: remark-rehype
  dependency-version: 11.1.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: production-dependencies
- dependency-name: sharp
  dependency-version: 0.34.1
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: production-dependencies
- dependency-name: "@types/node"
  dependency-version: 22.14.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: production-dependencies
- dependency-name: "@types/ws"
  dependency-version: 8.18.1
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: production-dependencies
- dependency-name: typescript
  dependency-version: 5.8.3
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: production-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-04-10 16:17:15 -07:00
9db66d500e fix(popover): round coords remove blurred popovers (#1911) 2025-04-07 00:23:49 +02:00
ee8c1dc968 chore(css): style tweaks for overflow 2025-04-05 11:38:50 -07:00
bb24cd13c7 fix(css): styles issues with popover, overflow, and scroll overflow (#1907)
* fix(style): fix toc overflow & scrolling overflow

* fix(style): fix explorer scrolling overflow

* fix(style): fix backlinks overflow & scrolling overflow

* fix(style): resolve popover overflow issue causing incomplete display

* chore: rename function to enhance readability

* fix(popover): make the backlink's id unique & use translate() instead of translateY()
2025-04-05 10:39:28 -07:00
d61fb266c7 fix(popover): automatically position anchored links properly (#1897)
* fix(popover): automatically position heading links at heading

* Impement linking of blockreferences

* Popover fixes

* id mapping

* Remove excess regexes

* Updated blockref

* Remove linker element

* Restore the docs to their former glory

* Move the hash out of the loop

* Redundant

* Redundant

* Restore docs

* Remove log

* Let it const
2025-04-05 10:31:17 -07:00
685c06ce2e fix(RecentNotes): Prevent folder pages from always appearing first (closes #1901) (#1904)
* Fix(RecentNotes): Prevent folder pages from always appearing first

Pass prioritizeFolders=false to byDateAndAlphabetical in RecentNotes to sort strictly by date/alphabetical order, fixing issue #1901.

* refactor: split sorting functions for clarity

- Split byDateAndAlphabetical into two separate functions\n- byDateAndAlphabetical: sorts strictly by date and alphabetically\n- byDateAndAlphabeticalFolderFirst: sorts with folders first\n- Updated RecentNotes to use date-only sorting

* Fix(PageList): keep byDateAndAlphabeticalFolderFirst as the default sorting order for PageList
2025-04-04 10:36:29 -07:00
3ae89a1d16 fix(search): make closest sidebar z-index adjustment optional (closes #1905) 2025-04-04 10:17:57 -07:00
4d6e7ccba9 chore(docs): fix explorer docs on filtering by title 2025-04-04 09:50:01 -07:00
f334e78ed6 fix(style): MathJax in callouts spacing (#1892) 2025-03-31 23:14:30 +02:00
c5304b35c0 chore(deps): bump the production-dependencies group with 5 updates (#1894)
Bumps the production-dependencies group with 5 updates:

| Package | From | To |
| --- | --- | --- |
| [pixi.js](https://github.com/pixijs/pixijs) | `8.9.0` | `8.9.1` |
| [rehype-citation](https://github.com/timlrx/rehype-citation) | `2.2.2` | `2.3.1` |
| [satori](https://github.com/vercel/satori) | `0.12.1` | `0.12.2` |
| [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) | `22.13.13` | `22.13.14` |
| [esbuild](https://github.com/evanw/esbuild) | `0.25.1` | `0.25.2` |


Updates `pixi.js` from 8.9.0 to 8.9.1
- [Release notes](https://github.com/pixijs/pixijs/releases)
- [Commits](https://github.com/pixijs/pixijs/compare/v8.9.0...v8.9.1)

Updates `rehype-citation` from 2.2.2 to 2.3.1
- [Release notes](https://github.com/timlrx/rehype-citation/releases)
- [Commits](https://github.com/timlrx/rehype-citation/compare/v2.2.2...v2.3.1)

Updates `satori` from 0.12.1 to 0.12.2
- [Release notes](https://github.com/vercel/satori/releases)
- [Commits](https://github.com/vercel/satori/compare/0.12.1...0.12.2)

Updates `@types/node` from 22.13.13 to 22.13.14
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

Updates `esbuild` from 0.25.1 to 0.25.2
- [Release notes](https://github.com/evanw/esbuild/releases)
- [Changelog](https://github.com/evanw/esbuild/blob/main/CHANGELOG.md)
- [Commits](https://github.com/evanw/esbuild/compare/v0.25.1...v0.25.2)

---
updated-dependencies:
- dependency-name: pixi.js
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: production-dependencies
- dependency-name: rehype-citation
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: production-dependencies
- dependency-name: satori
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: production-dependencies
- dependency-name: "@types/node"
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: production-dependencies
- dependency-name: esbuild
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: production-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-03-31 14:08:30 -07:00
99f353968e chore(deps-dev): bump @types/node in the production-dependencies group (#1869)
Bumps the production-dependencies group with 1 update: [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node).


Updates `@types/node` from 22.13.11 to 22.13.13
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: production-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-03-30 19:12:18 -07:00
ec4700d522 Hey folder icon don't shrink please (#1872) 2025-03-30 19:08:20 -07:00
d6f69e830c fix: remove redundant log and display in parent of overflow 2025-03-30 18:15:25 -07:00
9ee6fe15fd fix: reproducible overflowlist (closes #1885) 2025-03-30 18:04:48 -07:00
a21f588c48 fix(toc): element can't fully collapse 2025-03-30 17:39:08 -07:00
2119025513 fix(toc): Fixed headers in second ToC element not highlight-able 2025-03-30 17:35:20 -07:00
f70e562432 fix: overflow list bottom gradient on toc (closes #1888) 2025-03-30 17:30:01 -07:00
9ff6c7a3f5 fix(style): MathJax non-inline formulae center (#1886) 2025-03-30 21:19:53 +02:00
7ca9dd9a70 fix: dont use cdn for twemoji, bake emojis as b64 2025-03-28 16:29:33 -07:00
b397dae951 Updating breadcrumbs docs on ConditionalRender (#1871) 2025-03-26 08:32:13 -07:00
23b691f38c fix: coerce fullslug 2025-03-23 20:43:01 -07:00
c18e6cd5bb fix(alias): resolve relative if alias is relative 2025-03-23 20:38:06 -07:00
fe2e16d937 fix: disallow user-select in popover 2025-03-23 18:08:07 -07:00
722b4321db docs: clarify transclusions 2025-03-23 18:03:52 -07:00
9d8d238912 chore(deps): bump the production-dependencies group across 1 directory with 4 updates (#1867)
Bumps the production-dependencies group with 4 updates in the / directory: [lightningcss](https://github.com/parcel-bundler/lightningcss), [pixi.js](https://github.com/pixijs/pixijs), [rehype-pretty-code](https://github.com/rehype-pretty/rehype-pretty-code/tree/HEAD/packages/core) and [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node).


Updates `lightningcss` from 1.29.2 to 1.29.3
- [Release notes](https://github.com/parcel-bundler/lightningcss/releases)
- [Commits](https://github.com/parcel-bundler/lightningcss/compare/v1.29.2...v1.29.3)

Updates `pixi.js` from 8.8.1 to 8.9.0
- [Release notes](https://github.com/pixijs/pixijs/releases)
- [Commits](https://github.com/pixijs/pixijs/compare/v8.8.1...v8.9.0)

Updates `rehype-pretty-code` from 0.14.0 to 0.14.1
- [Release notes](https://github.com/rehype-pretty/rehype-pretty-code/releases)
- [Changelog](https://github.com/rehype-pretty/rehype-pretty-code/blob/master/packages/core/CHANGELOG.md)
- [Commits](https://github.com/rehype-pretty/rehype-pretty-code/commits/rehype-pretty-code@0.14.1/packages/core)

Updates `@types/node` from 22.13.10 to 22.13.11
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: lightningcss
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: production-dependencies
- dependency-name: pixi.js
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: production-dependencies
- dependency-name: rehype-pretty-code
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: production-dependencies
- dependency-name: "@types/node"
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: production-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-03-23 17:57:45 -07:00
141f053b0d chore: format path.test.ts 2025-03-23 17:43:47 -07:00
3027eced6c chore(test): add tests for resolveRelative 2025-03-23 17:42:23 -07:00
aaa5c8e8e4 feat: conditional render component 2025-03-23 17:34:14 -07:00
4e74d11b1a fix: cleanup a href link construction, global shared trie, breadcrumbs use trie 2025-03-23 17:24:43 -07:00
457b77dd48 fix(frontmatter): prevent slug duplication through frontmatter (#1860)
* fix(frontmatter): prevent slug duplication through frontmatter

* Simplify duplicate slug checks

* Update quartz/plugins/transformers/frontmatter.ts

Co-authored-by: Jacky Zhao <j.zhao2k19@gmail.com>

* lint

---------

Co-authored-by: Jacky Zhao <j.zhao2k19@gmail.com>
2025-03-22 03:59:43 +01:00
3ce6aa49bf fix(ogImage): update socialImage path to include base URL if defined (#1858)
* fix(ogImage): update socialImage path to include base URL if defined

* feat(path): add function to check if a file path is absolute

* fix(ogImage): handle absolute paths for user defined og image paths

* docs(CustomOgImages): update socialImage property to accept full URLs

* fix(ogImage): typo

* fix(ogImage): improve user-defined OG image path handling

* Update docs/plugins/CustomOgImages.md

Co-authored-by: Jacky Zhao <j.zhao2k19@gmail.com>

* Update quartz/plugins/emitters/ogImage.tsx

Co-authored-by: Jacky Zhao <j.zhao2k19@gmail.com>

* refactor(path): remove isAbsoluteFilePath function

* fix(ogImage): update user-defined OG image path handling to support relative URLs

* feat(ogImage): enhance user-defined OG image path handling with absolute URL support

* refactor(ogImage): remove debug log for ogImagePath

* feat(path): add isAbsoluteURL function and corresponding tests

* refactor(path): remove unused URL import for isomorphic compatibility

---------

Co-authored-by: Karim H <karimh96@hotmail.com>
Co-authored-by: Jacky Zhao <j.zhao2k19@gmail.com>
2025-03-21 16:49:56 -07:00
9316ddf2f5 fix(analytics): fix the load of the analytics scripts (#1865)
* fix(analytics): fix the load of the analytics scripts

* chore(lint): fix lint issues
2025-03-21 09:58:10 -07:00
fbca56f278 fix(lastmod) Change defaultDateType to "modified" (#1862)
Making this change as per https://github.com/jackyzha0/quartz/issues/1857#issuecomment-2737098252

This is necessary for the `git` source to work properly in the CreatedModifiedDate plugin.
2025-03-19 12:47:16 -07:00
eccad3da5d fix(lastmod): fallback to ctx.arg.directory instead of empty string 2025-03-18 21:48:24 -07:00
bcde2abcb2 fix(transformer): find last modified date form commit on submodule (#1831)
* fix(transformer): find last modified date form commit on submodule

when the content folder has a submodule git, the relative path start in content folder and not root folder of quartz

* fix(transformer): use path.relative for improved path handling in last modified date calculation

* fix(transformer): keep find file from relative path of repo workdir

* fix(transformer): use variable for repository workdir

use default value if repo.workdir is undefined to user fullFp value
2025-03-18 21:47:35 -07:00
25979ab216 feat(fonts): allow PageTitle to have its own font subset (#1848)
* fix(explorer): vertically center the Explorer toggle under mobile view

* Added a separate title font configuration

* Added googleSubFontHref function

* Applied --titleFont to PageTitle

* Made googleFontHref return array of URLs

* Dealing with empty and undefined title

* Minor update

* Dealing with empty and undefined title

* Refined font inclusion logic

* Adopted the googleFontHref + googleFontSubsetHref method

* Adaptively include font subset for PageTitle

* Restored default config

* Minor changes on configuration docs

* Formatted source code
2025-03-18 21:43:32 -07:00
9818e1ad57 chore: remove unused import 2025-03-18 09:00:15 -07:00
771110a72a fix(git): deprioritize git, dont fail on non-git content folders 2025-03-18 08:56:06 -07:00
dc6a9f3b12 chore(deps): bump rlespinasse/github-slug-action (#1851)
Bumps the ci-dependencies group with 1 update: [rlespinasse/github-slug-action](https://github.com/rlespinasse/github-slug-action).


Updates `rlespinasse/github-slug-action` from 5.0.0 to 5.1.0
- [Release notes](https://github.com/rlespinasse/github-slug-action/releases)
- [Commits](https://github.com/rlespinasse/github-slug-action/compare/v5.0.0...v5.1.0)

---
updated-dependencies:
- dependency-name: rlespinasse/github-slug-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: ci-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-03-17 14:49:27 -07:00
c0b73ddaa4 fix: maybeDates will change children dates (#1843) 2025-03-17 08:27:15 -07:00
e86544064c fix: parse parallelization chunk arg, inline b64 for og image 2025-03-16 15:12:40 -07:00
a737207981 perf: incremental rebuild (--fastRebuild v2 but default) (#1841)
* checkpoint

* incremental all the things

* properly splice changes array

* smol doc update

* update docs

* make fancy logger dumb in ci
2025-03-16 14:17:31 -07:00
a72b1a4224 fix(explorer): vertically center the Explorer toggle under mobile view (#1847) 2025-03-16 12:08:45 -07:00
fbb4523853 fix(folder): use memoized trie instead of handrolled path solution (closes #1767) 2025-03-14 15:08:23 -07:00
da1b6b37fe fix(explorer): fix incorrect recursive case for folder rendering 2025-03-14 10:05:26 -07:00
e26658f4ed fix(description): calculate description properly when first sentence is longer than max 2025-03-13 14:22:11 -07:00
b579950ae5 fix(og): adjust line clamp 2025-03-13 14:05:26 -07:00
0babbdf780 fix(contentPage): dont emit folders 2025-03-13 13:57:00 -07:00
1efe2e20a4 fix(graph): avoid keeping stroke in gfx 2025-03-13 12:29:30 -07:00
5928d82a56 fix(og): search for font family properly 2025-03-13 12:11:27 -07:00
696403d3fa chore: bump version to 4.4.1 2025-03-13 10:55:37 -07:00
2c30abe457 fix(analytics): always use defer over async to account for document nav event 2025-03-13 10:48:03 -07:00
80c3196fee feat(og): add reading time to default, improve logging 2025-03-13 10:41:50 -07:00
d9159e0ac9 feat: make og images an emitter to properly await image generation (#1826)
* checkpoint

* make emitters async generators

* fix

* custom font spec

* replace spinner, use disk cache for fonts

* use readline instead

* make og images look nice
2025-03-13 10:27:46 -07:00
c005fe4408 fix(explorer): properly respect folderDefaultState (closes #1827) 2025-03-12 22:31:44 -07:00
580c1bd608 fix(typography): properly pass Google font options (#1825) 2025-03-12 11:27:41 -07:00
270a5dc14a fix(explorer): show file name instead of slug if no file data (closes #1822) 2025-03-12 11:24:28 -07:00
bfa938cc62 fix(explorer): allow setting displayName (closes #1824) 2025-03-12 10:42:07 -07:00
e3c50caf13 fix(explorer): dont invert mobile css, properly toggle .collapsed 2025-03-12 10:15:54 -07:00
ca08ec1ae7 fix(explorer): mobile explorer toggle (#1823) 2025-03-12 14:15:16 +01:00
2718ab9019 feat: flex component, document higher-order layout components 2025-03-11 14:56:43 -07:00
87b803790c fix(mermaid): themechange detector + expand simplification 2025-03-11 11:45:45 -07:00
e59181c3aa docs(explorer): update to account for new client side explorer) 2025-03-11 10:20:15 -07:00
b00198b888 fix: load mermaid as normal now that inline is safely below bundle size 2025-03-10 16:42:08 -07:00
9e3e711646 fix: mermaid script load order 2025-03-10 16:20:08 -07:00
a8001e9554 feat: support non-singleton explorer 2025-03-10 15:13:22 -07:00
dd940a007c Merge pull request #1820 from jackyzha0/dependabot/npm_and_yarn/production-dependencies-8ce87f9e70
chore(deps): bump the production-dependencies group with 5 updates
2025-03-10 17:57:39 -04:00
a71e17919b chore(deps): bump the production-dependencies group with 5 updates
Bumps the production-dependencies group with 5 updates:

| Package | From | To |
| --- | --- | --- |
| [hast-util-to-jsx-runtime](https://github.com/syntax-tree/hast-util-to-jsx-runtime) | `2.3.5` | `2.3.6` |
| [lightningcss](https://github.com/parcel-bundler/lightningcss) | `1.29.1` | `1.29.2` |
| [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) | `22.13.9` | `22.13.10` |
| [@types/ws](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/ws) | `8.5.14` | `8.18.0` |
| [esbuild](https://github.com/evanw/esbuild) | `0.25.0` | `0.25.1` |


Updates `hast-util-to-jsx-runtime` from 2.3.5 to 2.3.6
- [Release notes](https://github.com/syntax-tree/hast-util-to-jsx-runtime/releases)
- [Commits](https://github.com/syntax-tree/hast-util-to-jsx-runtime/compare/2.3.5...2.3.6)

Updates `lightningcss` from 1.29.1 to 1.29.2
- [Release notes](https://github.com/parcel-bundler/lightningcss/releases)
- [Commits](https://github.com/parcel-bundler/lightningcss/commits/v1.29.2)

Updates `@types/node` from 22.13.9 to 22.13.10
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

Updates `@types/ws` from 8.5.14 to 8.18.0
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/ws)

Updates `esbuild` from 0.25.0 to 0.25.1
- [Release notes](https://github.com/evanw/esbuild/releases)
- [Changelog](https://github.com/evanw/esbuild/blob/main/CHANGELOG.md)
- [Commits](https://github.com/evanw/esbuild/compare/v0.25.0...v0.25.1)

---
updated-dependencies:
- dependency-name: hast-util-to-jsx-runtime
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: production-dependencies
- dependency-name: lightningcss
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: production-dependencies
- dependency-name: "@types/node"
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: production-dependencies
- dependency-name: "@types/ws"
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: production-dependencies
- dependency-name: esbuild
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: production-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-03-10 20:57:05 +00:00
aca0c330e7 docs: cleanup showcase (#1818)
Signed-off-by: Aaron Pham <contact@aarnphm.xyz>
2025-03-10 11:46:49 -07:00
dcaf806190 feat: support non-singleton darkmode 2025-03-10 11:44:47 -07:00
23df17233d fix(graph): make graph non-singleton, proper cleanup, fix radial 2025-03-10 11:39:08 -07:00
8d33608808 fix(popovers): clear id to avoid anchor jumps within popover 2025-03-10 00:08:06 -07:00
d618a4e3f3 fix(explorer): dont rely on data to get slug, compute it in trie 2025-03-09 23:36:10 -07:00
9c8fec06d2 feat: support non-singleton search 2025-03-09 15:33:15 -07:00
1cd8e7f0d5 feat: support non-singleton table of contents 2025-03-09 15:06:36 -07:00
5480269d38 perf(explorer): client side explorer (#1810)
* start work on client side explorer

* fix tests

* fmt

* generic test flag

* add prenav hook

* add highlight class

* make flex more consistent, remove transition

* open folders that are prefixes of current path

* make mobile look nice

* more style fixes
2025-03-09 14:58:26 -07:00
a201105442 fix(docker): instructions + bump deps + bind mount (#1809)
* fix docker

* test with docs folder
2025-03-06 10:01:25 -08:00
cc9704becc chore(deps): bump deps, silence internal punycode deprecation 2025-03-06 09:41:26 -08:00
6d195fd40a feat: font specification flexibility 2025-03-06 09:21:50 -08:00
2213424195 docs: make role of getQuartzComponents more clear and also make it optional 2025-03-05 18:34:02 -08:00
5b13ff2199 feat: support emitters defining external resources, emit link from contentindex directly 2025-03-05 18:16:24 -08:00
5a39719898 fix(graph): set container as renderGroup to avoid redrawing multiple times (#1736)
Signed-off-by: Aaron Pham <contact@aarnphm.xyz>
2025-03-05 17:33:16 -08:00
3c8ccde624 chore(og-image): force twemoji for emoji util 2025-03-05 17:21:19 -08:00
c97fd7089a Added emoji support to Satori when generating OG images (#1593) 2025-03-05 17:14:06 -08:00
2acfa0fa23 fix(og-image): overflow ellipses in title and description 2025-03-05 17:13:19 -08:00
f6f417a505 fix: engine reqiurements 2025-03-05 16:49:43 -08:00
a3b6201365 chore(deps): bump the production-dependencies group with 6 updates (#1804)
* chore(deps): bump the production-dependencies group with 6 updates

Bumps the production-dependencies group with 6 updates:

| Package | From | To |
| --- | --- | --- |
| [hast-util-to-jsx-runtime](https://github.com/syntax-tree/hast-util-to-jsx-runtime) | `2.3.4` | `2.3.5` |
| [pixi.js](https://github.com/pixijs/pixijs) | `8.8.0` | `8.8.1` |
| [preact](https://github.com/preactjs/preact) | `10.26.2` | `10.26.4` |
| [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) | `22.13.5` | `22.13.9` |
| [prettier](https://github.com/prettier/prettier) | `3.5.2` | `3.5.3` |
| [typescript](https://github.com/microsoft/TypeScript) | `5.7.3` | `5.8.2` |


Updates `hast-util-to-jsx-runtime` from 2.3.4 to 2.3.5
- [Release notes](https://github.com/syntax-tree/hast-util-to-jsx-runtime/releases)
- [Commits](https://github.com/syntax-tree/hast-util-to-jsx-runtime/compare/2.3.4...2.3.5)

Updates `pixi.js` from 8.8.0 to 8.8.1
- [Release notes](https://github.com/pixijs/pixijs/releases)
- [Commits](https://github.com/pixijs/pixijs/compare/v8.8.0...v8.8.1)

Updates `preact` from 10.26.2 to 10.26.4
- [Release notes](https://github.com/preactjs/preact/releases)
- [Commits](https://github.com/preactjs/preact/compare/10.26.2...10.26.4)

Updates `@types/node` from 22.13.5 to 22.13.9
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

Updates `prettier` from 3.5.2 to 3.5.3
- [Release notes](https://github.com/prettier/prettier/releases)
- [Changelog](https://github.com/prettier/prettier/blob/main/CHANGELOG.md)
- [Commits](https://github.com/prettier/prettier/compare/3.5.2...3.5.3)

Updates `typescript` from 5.7.3 to 5.8.2
- [Release notes](https://github.com/microsoft/TypeScript/releases)
- [Changelog](https://github.com/microsoft/TypeScript/blob/main/azure-pipelines.release.yml)
- [Commits](https://github.com/microsoft/TypeScript/compare/v5.7.3...v5.8.2)

---
updated-dependencies:
- dependency-name: hast-util-to-jsx-runtime
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: production-dependencies
- dependency-name: pixi.js
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: production-dependencies
- dependency-name: preact
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: production-dependencies
- dependency-name: "@types/node"
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: production-dependencies
- dependency-name: prettier
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: production-dependencies
- dependency-name: typescript
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: production-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>

* type fixes

* fix more types

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Jacky Zhao <j.zhao2k19@gmail.com>
2025-03-05 16:45:02 -08:00
a1162b978a fix(analytics): spa tracking for other providers 2025-03-05 16:27:08 -08:00
c6f10b44f6 feat(rss): configurable RSS feed URL (#1806)
* feat(rss): configurable RSS feed URL

* Update docs/features/RSS Feed.md

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Update docs/features/RSS Feed.md

---------

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: Jacky Zhao <j.zhao2k19@gmail.com>
2025-03-05 15:54:11 -08:00
b050162f82 docs(frontmatter): mention dealiasing related fields (#1715)
* Added to the documentation which values of frontmatter are referenced.

* The source code I was looking at seemed to be out of date and the wrong listings were corrected.

* The list of frontmatter was moved to Frontmatter.md and a link was added.
2025-02-27 16:37:01 -05:00
6d350500f1 fix(goatcounter): properly count SPA page hits (#1718)
On the surface it seems that only google and plausible scripts handle
the SPA correctly - but I don't know if maybe others handle
window.history API themselves somehow or something like that.

However, I am trying out goatcounter and in it's docs I see that it
does no special SPA handling, so this has to be fixed.

Just doing the dynamic script thing on every nav seems to do the trick.
The script is not "spa-preserve" so they wouldn't accumulate - and when
I tried the "spa-preserve" + call goatcounter api route it didn't quite
work, they actually did accumulate
2025-02-27 16:35:19 -05:00
9b47279fe6 feat(i18n): added nb-NO (Norwegian) (#1795) 2025-02-27 16:33:15 -05:00
4901472aa8 chore(deps): bump the production-dependencies group with 8 updates (#1788)
* chore(deps): bump the production-dependencies group with 8 updates

Bumps the production-dependencies group with 8 updates:

| Package | From | To |
| --- | --- | --- |
| [hast-util-to-html](https://github.com/syntax-tree/hast-util-to-html) | `9.0.4` | `9.0.5` |
| [hast-util-to-jsx-runtime](https://github.com/syntax-tree/hast-util-to-jsx-runtime) | `2.3.2` | `2.3.4` |
| [preact](https://github.com/preactjs/preact) | `10.26.0` | `10.26.2` |
| [rehype-mathjax](https://github.com/remarkjs/remark-math) | `7.0.0` | `7.1.0` |
| [ws](https://github.com/websockets/ws) | `8.18.0` | `8.18.1` |
| [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) | `22.13.4` | `22.13.5` |
| [prettier](https://github.com/prettier/prettier) | `3.5.1` | `3.5.2` |
| [tsx](https://github.com/privatenumber/tsx) | `4.19.2` | `4.19.3` |


Updates `hast-util-to-html` from 9.0.4 to 9.0.5
- [Release notes](https://github.com/syntax-tree/hast-util-to-html/releases)
- [Commits](https://github.com/syntax-tree/hast-util-to-html/compare/9.0.4...9.0.5)

Updates `hast-util-to-jsx-runtime` from 2.3.2 to 2.3.4
- [Release notes](https://github.com/syntax-tree/hast-util-to-jsx-runtime/releases)
- [Commits](https://github.com/syntax-tree/hast-util-to-jsx-runtime/compare/2.3.2...2.3.4)

Updates `preact` from 10.26.0 to 10.26.2
- [Release notes](https://github.com/preactjs/preact/releases)
- [Commits](https://github.com/preactjs/preact/compare/10.26.0...10.26.2)

Updates `rehype-mathjax` from 7.0.0 to 7.1.0
- [Release notes](https://github.com/remarkjs/remark-math/releases)
- [Commits](https://github.com/remarkjs/remark-math/compare/rehype-mathjax@7.0.0...rehype-mathjax@7.1.0)

Updates `ws` from 8.18.0 to 8.18.1
- [Release notes](https://github.com/websockets/ws/releases)
- [Commits](https://github.com/websockets/ws/compare/8.18.0...8.18.1)

Updates `@types/node` from 22.13.4 to 22.13.5
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

Updates `prettier` from 3.5.1 to 3.5.2
- [Release notes](https://github.com/prettier/prettier/releases)
- [Changelog](https://github.com/prettier/prettier/blob/main/CHANGELOG.md)
- [Commits](https://github.com/prettier/prettier/compare/3.5.1...3.5.2)

Updates `tsx` from 4.19.2 to 4.19.3
- [Release notes](https://github.com/privatenumber/tsx/releases)
- [Changelog](https://github.com/privatenumber/tsx/blob/master/release.config.cjs)
- [Commits](https://github.com/privatenumber/tsx/compare/v4.19.2...v4.19.3)

---
updated-dependencies:
- dependency-name: hast-util-to-html
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: production-dependencies
- dependency-name: hast-util-to-jsx-runtime
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: production-dependencies
- dependency-name: preact
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: production-dependencies
- dependency-name: rehype-mathjax
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: production-dependencies
- dependency-name: ws
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: production-dependencies
- dependency-name: "@types/node"
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: production-dependencies
- dependency-name: prettier
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: production-dependencies
- dependency-name: tsx
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: production-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>

* chore: update type error

Signed-off-by: Aaron Pham <contact@aarnphm.xyz>

---------

Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: Aaron Pham <contact@aarnphm.xyz>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Aaron Pham <contact@aarnphm.xyz>
2025-02-25 16:52:52 -05:00
28fe9b2095 chore(deps): bump sigstore/cosign-installer in the ci-dependencies group (#1789)
Bumps the ci-dependencies group with 1 update: [sigstore/cosign-installer](https://github.com/sigstore/cosign-installer).


Updates `sigstore/cosign-installer` from 3.8.0 to 3.8.1
- [Release notes](https://github.com/sigstore/cosign-installer/releases)
- [Commits](https://github.com/sigstore/cosign-installer/compare/v3.8.0...v3.8.1)

---
updated-dependencies:
- dependency-name: sigstore/cosign-installer
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: ci-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-02-25 16:35:10 -05:00
9a0d919a3b docs: add Citation plugin & feature pages (#1772)
* docs: add Citation plugin & feature pages

Discussed and extracted from #1557

* Update docs/features/Citations.md

* Apply suggestions from code review

---------

Co-authored-by: Aaron Pham <Aaronpham0103@gmail.com>
2025-02-25 16:34:37 -05:00
598741a571 fix(fonts): update system-ui trick for improve cross-platform compatibility (#1778) 2025-02-25 16:31:41 -05:00
29c533a265 fix(aliases): wikilink resolution for aliases (#1681)
With markdownLinkResolution: "shortest", aka "+/- how Obsidian does it"
and given pages A and nested/B which has an alias Z, if you try to link
from A using [[Z]] it wouldn't work and get 404.

This is caused by alias slugs (nested/Z in this case, emitted by
AliasRedirects) not being present in the `allSlugs` list which is used
by the link transformer.

The fix is to compute the alias slugs in the frontmatter transformer
and add them to `allSlugs` there.
Also we store them in file data to avoid recomputing them when emitting
alias redirect pages.

Fixes #904

Note: given how currently the markdown/html transformers are ordered
this doesn't really work.

Given pages A and nested/B which has an alias Z, here's the order which
currently happens:

md-transformers(A) => html-transformers(A) =>
md-transformers(B) => html-transformers(B)

Since the nested/Z slug will get added when md-transformers(B) are run,
but the slugs are used by html-transformers(A) when resolving it's
links - the link [[Z]] in A will still 404

A fix for this is to split the parser into two stages - first apply the
md-transformers to all files, and only then apply html-transformers to
all files.

I did just that in a different commit, which is needed for this one to
work correctly.
2025-02-25 16:28:16 -05:00
1a02642469 feat(i18n): add Finnish translations for i18n (#1782) 2025-02-25 16:27:32 -05:00
5794405974 feat(cli): absolute path support for -d flag (#1756) 2025-02-25 16:27:10 -05:00
59d5a0ed3a fix(graph): mobile global graph overlay (#1790) 2025-02-25 13:35:24 +01:00
dd6bd498db chore(deps): bump the production-dependencies group with 5 updates (#1775)
Bumps the production-dependencies group with 5 updates:

| Package | From | To |
| --- | --- | --- |
| [pixi.js](https://github.com/pixijs/pixijs) | `8.7.3` | `8.8.0` |
| [preact](https://github.com/preactjs/preact) | `10.25.4` | `10.26.0` |
| [rehype-mathjax](https://github.com/remarkjs/remark-math) | `6.0.0` | `7.0.0` |
| [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) | `22.13.1` | `22.13.4` |
| [prettier](https://github.com/prettier/prettier) | `3.5.0` | `3.5.1` |


Updates `pixi.js` from 8.7.3 to 8.8.0
- [Release notes](https://github.com/pixijs/pixijs/releases)
- [Commits](https://github.com/pixijs/pixijs/compare/v8.7.3...v8.8.0)

Updates `preact` from 10.25.4 to 10.26.0
- [Release notes](https://github.com/preactjs/preact/releases)
- [Commits](https://github.com/preactjs/preact/compare/10.25.4...10.26.0)

Updates `rehype-mathjax` from 6.0.0 to 7.0.0
- [Release notes](https://github.com/remarkjs/remark-math/releases)
- [Commits](https://github.com/remarkjs/remark-math/compare/rehype-mathjax@6.0.0...rehype-mathjax@7.0.0)

Updates `@types/node` from 22.13.1 to 22.13.4
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

Updates `prettier` from 3.5.0 to 3.5.1
- [Release notes](https://github.com/prettier/prettier/releases)
- [Changelog](https://github.com/prettier/prettier/blob/main/CHANGELOG.md)
- [Commits](https://github.com/prettier/prettier/compare/3.5.0...3.5.1)

---
updated-dependencies:
- dependency-name: pixi.js
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: production-dependencies
- dependency-name: preact
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: production-dependencies
- dependency-name: rehype-mathjax
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: production-dependencies
- dependency-name: "@types/node"
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: production-dependencies
- dependency-name: prettier
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: production-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-02-17 21:54:07 -05:00
04423d4931 chore(deps): bump the production-dependencies group with 6 updates (#1761)
Bumps the production-dependencies group with 6 updates:

| Package | From | To |
| --- | --- | --- |
| [@clack/prompts](https://github.com/natemoo-re/clack/tree/HEAD/packages/prompts) | `0.9.1` | `0.10.0` |
| [globby](https://github.com/sindresorhus/globby) | `14.0.2` | `14.1.0` |
| [remark-gfm](https://github.com/remarkjs/remark-gfm) | `4.0.0` | `4.0.1` |
| [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) | `22.13.0` | `22.13.1` |
| [esbuild](https://github.com/evanw/esbuild) | `0.24.2` | `0.25.0` |
| [prettier](https://github.com/prettier/prettier) | `3.4.2` | `3.5.0` |


Updates `@clack/prompts` from 0.9.1 to 0.10.0
- [Release notes](https://github.com/natemoo-re/clack/releases)
- [Changelog](https://github.com/bombshell-dev/clack/blob/main/packages/prompts/CHANGELOG.md)
- [Commits](https://github.com/natemoo-re/clack/commits/@clack/prompts@0.10.0/packages/prompts)

Updates `globby` from 14.0.2 to 14.1.0
- [Release notes](https://github.com/sindresorhus/globby/releases)
- [Commits](https://github.com/sindresorhus/globby/compare/v14.0.2...v14.1.0)

Updates `remark-gfm` from 4.0.0 to 4.0.1
- [Release notes](https://github.com/remarkjs/remark-gfm/releases)
- [Commits](https://github.com/remarkjs/remark-gfm/compare/4.0.0...4.0.1)

Updates `@types/node` from 22.13.0 to 22.13.1
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

Updates `esbuild` from 0.24.2 to 0.25.0
- [Release notes](https://github.com/evanw/esbuild/releases)
- [Changelog](https://github.com/evanw/esbuild/blob/main/CHANGELOG-2024.md)
- [Commits](https://github.com/evanw/esbuild/compare/v0.24.2...v0.25.0)

Updates `prettier` from 3.4.2 to 3.5.0
- [Release notes](https://github.com/prettier/prettier/releases)
- [Changelog](https://github.com/prettier/prettier/blob/main/CHANGELOG.md)
- [Commits](https://github.com/prettier/prettier/compare/3.4.2...3.5.0)

---
updated-dependencies:
- dependency-name: "@clack/prompts"
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: production-dependencies
- dependency-name: globby
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: production-dependencies
- dependency-name: remark-gfm
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: production-dependencies
- dependency-name: "@types/node"
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: production-dependencies
- dependency-name: esbuild
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: production-dependencies
- dependency-name: prettier
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: production-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-02-11 01:28:02 -05:00
be846e6a5f chore(deps): bump sigstore/cosign-installer in the ci-dependencies group (#1762)
Bumps the ci-dependencies group with 1 update: [sigstore/cosign-installer](https://github.com/sigstore/cosign-installer).


Updates `sigstore/cosign-installer` from 3.7.0 to 3.8.0
- [Release notes](https://github.com/sigstore/cosign-installer/releases)
- [Commits](https://github.com/sigstore/cosign-installer/compare/v3.7.0...v3.8.0)

---
updated-dependencies:
- dependency-name: sigstore/cosign-installer
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: ci-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-02-11 01:27:43 -05:00
32ec711767 chore(deps-dev): bump @types/node in the production-dependencies group (#1751)
Bumps the production-dependencies group with 1 update: [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node).


Updates `@types/node` from 22.12.0 to 22.13.0
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: production-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-02-05 05:07:14 -05:00
91189dfd2f feat(explorer): collapsible mobile explorer (#1471)
Co-authored-by: Aaron Pham <Aaronpham0103@gmail.com>
2025-02-03 09:25:42 -05:00
fbc45548f7 feat(graph): enable radial mode (#1738) 2025-02-01 16:22:29 -05:00
7be47742a6 chore(deps): bump the production-dependencies group across 1 directory with 3 updates (#1744)
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-01-31 06:46:45 -05:00
4e4930ef9c chore(styles): omit sass deprecation warnings (#1737)
update to newer API
2025-01-23 22:19:46 -05:00
01943ff5a0 feat(i18n): Lithuanian (#1733) 2025-01-21 00:20:02 -05:00
8cf3e3001f feat(i18n): Thai translations (#1722) 2025-01-16 15:44:33 -05:00
992ac00f7c chore(deps): bump the production-dependencies group with 7 updates (#1719)
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-01-14 00:02:49 -05:00
09f8670db7 chore(deps): bump the production-dependencies group with 4 updates (#1711)
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Aaron Pham <contact@aarnphm.xyz>
2025-01-07 20:32:02 -05:00
7e828252bb fix(path): handle lone slash (#1713) 2025-01-07 16:00:09 -05:00
c90dbacab0 chore(build): separate markdown and html handling into two separate stages (#1675) 2025-01-07 15:33:34 -05:00
b7a945e034 fix(tags): Dont consume a space before content tags (#1706) 2025-01-05 01:11:15 -05:00
dc3323b574 chore: use Google Fonts API v2 to get fonts for ogp (#1705) 2025-01-04 09:45:53 -08:00
c98ef7e89f perf(img): lazy load chunks (#1700) 2025-01-03 11:27:43 -08:00
2e6a675edd perf: reduce bundle size (closes #1607) (#1689) 2025-01-01 12:24:32 -08:00
e3162f7a7e chore: joinSegments fix + tests 2025-01-01 12:11:16 -08:00
9466c145b1 fix(path): correct handle URI schemes in joinSegments (#1693) 2025-01-01 10:07:59 -08:00
a934397961 fix(spa): Fix relative alias redirects (#1688) 2024-12-30 18:21:07 -08:00
b2752e7262 chore(deps): bump the production-dependencies group with 2 updates (#1696)
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-12-30 18:19:22 -08:00
d9e36e60d1 fix(search): Fix super-inconsistent preview widths in search previews (#1677)
Don't know if this was uncovered by my local setup or just nobody
noticed, but page previews were pretty wonky for me
2024-12-30 09:55:53 -08:00
46adb35966 fix(spa): Normalize empty hrefs (#1695)
A final breadcrumb has an empty href, linking to the current page, but
the relative url normalization method missed those, making the link
appear broken in search previews and popovers.

Fixes #1690
2024-12-30 09:55:18 -08:00
e1c9eabef4 fix(css): oops fit-content not no width specification for codeblock title 2024-12-30 09:28:02 -08:00
d88e43010a fix(tags): Fix TagContent not sorting the page list when opening a tag (#1692) 2024-12-30 09:08:35 -08:00
ef72f1bf70 Fix ObsidianFlavoredMarkdown source link (#1694) 2024-12-30 08:03:57 -08:00
7d4bed64a9 fix(css): allow proper width on code block title (closes #1683) 2024-12-28 15:17:58 -08:00
99011cb1b0 fix(spa): handle HTML redirects for aliases (#1680) 2024-12-27 07:18:22 -07:00
c91cf97f99 feat(spa): add loading bar (#1684) 2024-12-26 22:18:17 -07:00
05e6f05a50 feat(backlinks): hide by default when empty (#1674)
Co-authored-by: Aaron Pham <Aaronpham0103@gmail.com>
2024-12-26 21:05:35 -07:00
7533d504dc fix(tags): Set consistent titles for tags with description pages (#1671) 2024-12-26 17:50:06 -07:00
69a0ddf733 fix(tags): Show tag descriptions when hovering (#1670) 2024-12-26 06:50:54 -07:00
a582505daf chore(deps): bump the production-dependencies group with 7 updates (#1667)
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-12-23 16:35:08 -05:00
965f9e123c chore(frontmatter): dealias created/modified/updated time (#1664) 2024-12-23 15:00:26 -05:00
ff9e60a7fc fix(search): restore mobile search view (#1576) 2024-12-17 13:07:00 -05:00
367bb0e6ce chore(deps): bump the production-dependencies group across 1 directory with 14 updates (#1655)
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Aaron Pham <contact@aarnphm.xyz>
2024-12-17 03:53:51 -05:00
8141cb1587 fix(cssclasses): apply frontmatter classes uniformly between page types (#1645) 2024-12-11 00:43:27 +01:00
5ccc2dcbba fix(head): update open-graph width and height protocol per ogp (#1512)
Co-authored-by: Aaron Pham <contact@aarnphm.xyz>
2024-12-03 04:52:51 -05:00
11c98f5600 feat(i18n): add zh-TW (#1621) 2024-12-03 04:52:36 -05:00
5a5ef670fe fix(darkmode): check for null (#1531) 2024-12-03 01:56:59 -05:00
285c0e9768 docs(showcase): 8cat.life (#1617) 2024-12-03 01:50:50 -05:00
adb326c933 fix(style): ensure images have no background color when linked (#1623) 2024-12-03 01:43:22 -05:00
Bao
0c4281eb53 fix: use time HTML element for date strings (#1622) 2024-12-03 01:41:55 -05:00
7ac94e1d84 fix(comments): properly check if comments is in frontmatter (#1627) 2024-11-30 21:03:20 -05:00
e1d754ef79 Update showcase.md (#1611) 2024-11-22 11:44:40 -08:00
a727b57e46 docs(hosting): add apache config example (#1608) 2024-11-20 19:29:43 -05:00
1a4cfa606f chore(deps): bump the production-dependencies group with 3 updates (#1600)
Bumps the production-dependencies group with 3 updates: [@clack/prompts](https://github.com/natemoo-re/clack/tree/HEAD/packages/prompts), [satori](https://github.com/vercel/satori) and [shiki](https://github.com/shikijs/shiki/tree/HEAD/packages/shiki).


Updates `@clack/prompts` from 0.7.0 to 0.8.1
- [Release notes](https://github.com/natemoo-re/clack/releases)
- [Changelog](https://github.com/bombshell-dev/clack/blob/main/packages/prompts/CHANGELOG.md)
- [Commits](https://github.com/natemoo-re/clack/commits/@clack/prompts@0.8.1/packages/prompts)

Updates `satori` from 0.10.14 to 0.11.3
- [Release notes](https://github.com/vercel/satori/releases)
- [Commits](https://github.com/vercel/satori/compare/0.10.14...0.11.3)

Updates `shiki` from 1.22.2 to 1.23.1
- [Release notes](https://github.com/shikijs/shiki/releases)
- [Changelog](https://github.com/shikijs/shiki/blob/main/CHANGELOG.md)
- [Commits](https://github.com/shikijs/shiki/commits/v1.23.1/packages/shiki)

---
updated-dependencies:
- dependency-name: "@clack/prompts"
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: production-dependencies
- dependency-name: satori
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: production-dependencies
- dependency-name: shiki
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: production-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-11-19 00:36:08 -05:00
410001b942 docs: add the pond (#1598) 2024-11-18 11:39:44 -08:00
f24a147276 fix(comment): negate check (closes #1582) (#1586) 2024-11-14 06:28:06 -05:00
137d55eb1b feat(open-graph): generate OG images + further OG support (#740)
* Quartz sync: Aug 29, 2023, 10:17 PM

* feat: add basic satori og image generation

* Squashed commit of the following:

commit fa69c2a565
Author: Ben Schlegel <31989404+benschlegel@users.noreply.github.com>
Date:   Thu Sep 21 19:35:11 2023 +0200

    fix(explorer): increase consistency, explicitly use font-family (#496)

    * fix(explorer): display name for folders without `index` file

    * docs(explorer): add section for folder display names

    * docs(explorer): fix broken wikilink

    * fix(consistency): explicitly set font + label/link fix

    Use consistent styling between folders with `folderClickBehavior: "link"` and `"collapse`

    * Update quartz/components/styles/explorer.scss

    Co-authored-by: Jacky Zhao <j.zhao2k19@gmail.com>

    * Update quartz/components/styles/explorer.scss

    Co-authored-by: Jacky Zhao <j.zhao2k19@gmail.com>

    ---------

    Co-authored-by: Jacky Zhao <j.zhao2k19@gmail.com>

commit 8eb1554b13
Author: Ben Schlegel <31989404+benschlegel@users.noreply.github.com>
Date:   Thu Sep 21 18:54:33 2023 +0200

    fix(explorer): display names for folders without frontmatter (#494)

    * fix(explorer): display name for folders without `index` file

    * docs(explorer): add section for folder display names

commit dcdeae4e7b
Author: Ben Schlegel <31989404+benschlegel@users.noreply.github.com>
Date:   Thu Sep 21 18:53:19 2023 +0200

    docs(explorer): update default config + new example (#493)

commit 48452231d5
Author: Jacky Zhao <j.zhao2k19@gmail.com>
Date:   Wed Sep 20 16:09:18 2023 -0700

    perf: memoize filetree computation (#490)

    * perf: memoize filetree computation

    * format

    * var -> let

commit 16d33fb771
Author: Jacky Zhao <j.zhao2k19@gmail.com>
Date:   Wed Sep 20 16:08:54 2023 -0700

    feat: display name for folders, expand explorer a little bit (#489)

    * feat: display name for folders, expand explorer a little bit

    * update docs

commit b029eeadab
Author: Ben Schlegel <31989404+benschlegel@users.noreply.github.com>
Date:   Wed Sep 20 22:55:29 2023 +0200

    feat(explorer): improve accessibility and consistency (+ bug fix) (#488)

    * feat(consistency): use `all: unset` on button

    * style: improve accessibility and consistency for explorer

    * fix: localStorage bug with folder name changes

    * chore: bump quartz version

commit 6a9e6352e8
Author: Jacky Zhao <j.zhao2k19@gmail.com>
Date:   Wed Sep 20 13:52:45 2023 -0700

    Revert "feat: Making Quartz available offline by making it a PWA (#465)"

    This reverts commit d6301fae90.

commit 70e029d151
Author: Jacky Zhao <j.zhao2k19@gmail.com>
Date:   Wed Sep 20 13:52:29 2023 -0700

    Revert "docs: wording changes for offline support"

    This reverts commit 52a172d1a4.

commit 0bad3ce799
Author: Jacky Zhao <j.zhao2k19@gmail.com>
Date:   Wed Sep 20 11:58:52 2023 -0700

    docs: document enableToc

commit 52a172d1a4
Author: Jacky Zhao <j.zhao2k19@gmail.com>
Date:   Wed Sep 20 11:40:36 2023 -0700

    docs: wording changes for offline support

commit d6301fae90
Author: Adam Brangenberg <adambrangenberg@proton.me>
Date:   Wed Sep 20 20:38:13 2023 +0200

    feat: Making Quartz available offline by making it a PWA (#465)

    * Adding PWA and chaching for offline aviability

    * renamed workbox config to fit Quartz' scheme

    * Documenting new configuration

    * Added missig umami documentation

    * Fixed formatting so the build passes, thank you prettier :)

    * specified caching strategies to improve performance

    * formatting...

    * fixing "404 manifest.json not found" on subdirectories by adding a / to manifestpath

    * turning it into a plugin

    * Removed Workbox-cli and updated @types/node

    * Added Serviceworkercode to offline.ts

    * formatting

    * Removing workbox from docs

    * applied suggestions

    * Removed path.join for sw path

    Co-authored-by: Jacky Zhao <j.zhao2k19@gmail.com>

    * Removed path.join for manifest path

    Co-authored-by: Jacky Zhao <j.zhao2k19@gmail.com>

    * Removing path module import

    * Added absolute path to manifests start_url and manifest "import" using baseUrl

    * Adding protocol to baseurl

    Co-authored-by: Jacky Zhao <j.zhao2k19@gmail.com>

    * Adding protocol to start_url too then

    * formatting...

    * Adding fallback page

    * Documenting offline plugin

    * formatting...

    * merge suggestion

    Co-authored-by: Jacky Zhao <j.zhao2k19@gmail.com>

    * merge suggestion

    Co-authored-by: Jacky Zhao <j.zhao2k19@gmail.com>

    * merge suggestion

    Co-authored-by: Jacky Zhao <j.zhao2k19@gmail.com>

    * merge suggestion

    Co-authored-by: Jacky Zhao <j.zhao2k19@gmail.com>

    * merge suggestion

    Co-authored-by: Jacky Zhao <j.zhao2k19@gmail.com>

    * merge suggestion

    Co-authored-by: Jacky Zhao <j.zhao2k19@gmail.com>

    * merge suggestion

    Co-authored-by: Jacky Zhao <j.zhao2k19@gmail.com>

    * merge suggestion

    Co-authored-by: Jacky Zhao <j.zhao2k19@gmail.com>

    * merge suggestion

    Co-authored-by: Jacky Zhao <j.zhao2k19@gmail.com>

    * merge suggestion

    Co-authored-by: Jacky Zhao <j.zhao2k19@gmail.com>

    * merge suggestion

    Co-authored-by: Jacky Zhao <j.zhao2k19@gmail.com>

    * merge suggestion

    Co-authored-by: Jacky Zhao <j.zhao2k19@gmail.com>

    * formatting...

    * Fixing manifest path, all these nits hiding the actual issues .-.

    * Offline fallback page through plugins, most things taken from 404 Plugin

    * adding Offline Plugin to config

    * formatting...

    * Turned offline off as default and removed offline.md

    ---------

    Co-authored-by: Jacky Zhao <j.zhao2k19@gmail.com>

commit 27a6087dd5
Author: rwutscher <richard.wutscher@gmail.com>
Date:   Tue Sep 19 21:26:30 2023 +0200

    fix: tag regex no longer includes purely numerical 'tags' (#485)

    * fix: tag regex no longer includes purely numerical 'tags'

    * fix: formatting

    * fix: use guard in findAndReplace() instead of expanding the regex

commit 1bf7e3d8b3
Author: Jacky Zhao <j.zhao2k19@gmail.com>
Date:   Tue Sep 19 10:22:39 2023 -0700

    fix(nit): make defaultOptions on explorer not a function

commit cc31a40b0c
Author: David Fischer <david@konst.fish>
Date:   Tue Sep 19 18:25:51 2023 +0200

    feat: support changes in system theme (#484)

    * feat: support changes in system theme

    * fix: run prettier

    * fix: add content/.gitkeep

commit 0d3cf29226
Author: Ben Schlegel <31989404+benschlegel@users.noreply.github.com>
Date:   Mon Sep 18 23:32:00 2023 +0200

    docs: fix explorer example (#483)

* feat: dynamically generate og images, write to fs as png

* fix: og preview on discord

* feat: use `sharp` to convert to webp, add content headers

* feat: add config for theme (light or dark)

* feat: improve image margins, add font breakpoint

* feat: use config header + body fonts for satori

* perf: memoize fonts

* feat: use default og image if no path exists

* feat: add config option for social images

* feat: support custom og images via frontmatter

* refactor: clean font helpers, rename fonts helper

* refactor: make image generation cleaner

* refactor: move default image to own component

* chore: add todos

* fix: only set width/height header if known

* feat: remove html from description

* feat: make image dimensions configurable

* feat: pass userOpts to image generator

* feat: option for users to provide own image struct (satori)

This allows users to pass their own jsx for generating the default og image

* refactor: rename `defaultImage.tsx` > `socialImage.tsx`

* chore: improve comments + types

* refactor: rename socialImage frontmatter property

* feat: add frontmatter aliases for cover image

* feat: add frontmatter alias for obsidian publish

* docs: add documentation for social images

* feat: add `generateSocialImages` prop to config

* chore: update lock file

* fix: fix type error

* chore: update package.json

* chore: update package-lock.json

* docs: update docs

Co-authored-by: Jacky Zhao <j.zhao2k19@gmail.com>

* fix: clean url for use in metadata

* refactor: clean function signature

* feat: pass `fileData` to image generator

* CI: run format

* fix: file system import

* fix: merge paths using `joinSegments`

* fix: get output dir via `ctx.argv.output`

* chore: add explanation to font regex

* Squashed commit of the following:

commit 7164857f6e
Author: Aaron Pham <29749331+aarnphm@users.noreply.github.com>
Date:   Fri Mar 15 21:17:42 2024 -0400

    chore(ofm): remove unused (#999)

    Signed-off-by: Aaron <29749331+aarnphm@users.noreply.github.com>

commit 47024022e8
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Fri Mar 15 18:29:14 2024 -0400

    chore(deps-dev): bump @types/node from 20.11.24 to 20.11.25 (#990)

    Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 20.11.24 to 20.11.25.
    - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
    - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

    ---
    updated-dependencies:
    - dependency-name: "@types/node"
      dependency-type: direct:development
      update-type: version-update:semver-patch
    ...

    Signed-off-by: dependabot[bot] <support@github.com>
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

commit b98e4be665
Author: Mara-Li <lili.simonetti@outlook.fr>
Date:   Fri Mar 15 23:28:31 2024 +0100

    feat(i18n): Add French translation for reading time (#998)

    Signed-off-by: Mara-Li <lili.simonetti@outlook.fr>

commit 8be51a0504
Author: catcodeme <1020082805@qq.com>
Date:   Fri Mar 15 14:25:01 2024 +0800

    fix: wikiLink in table (#993)

    * fix: wikiLink in table

    - update regexp to make '\' to group in alias
    - handle alias using block_id

    * style: format with prettier

    * style: add comment for block_ref(without alias) in table

    ---------

    Co-authored-by: hulinjiang <hulinjiang@58.com>

commit 92cc23dc45
Author: Linus Sehn <37184648+linozen@users.noreply.github.com>
Date:   Wed Mar 13 08:59:37 2024 +0100

    feat(plugin): citations (#984)

    * feat: add rehype-citations

    * feat: add citations transformer plugin

    * feat: add rehype-rewrite

    * feat: add csl option and add no-popover to citation links

    * revert: add rehype-rewrite

    04b2692 'feat: add rehype-rewrite'

    * feat: use existing package for html manipulation

    * fix: remove `console.log()`

commit 097abc3cda
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Mon Mar 11 13:41:48 2024 -0700

    chore(deps): bump async-mutex from 0.4.1 to 0.5.0 (#991)

    Bumps [async-mutex](https://github.com/DirtyHairy/async-mutex) from 0.4.1 to 0.5.0.
    - [Changelog](https://github.com/DirtyHairy/async-mutex/blob/master/CHANGELOG.md)
    - [Commits](https://github.com/DirtyHairy/async-mutex/compare/v0.4.1...v0.5.0)

    ---
    updated-dependencies:
    - dependency-name: async-mutex
      dependency-type: direct:production
      update-type: version-update:semver-minor
    ...

    Signed-off-by: dependabot[bot] <support@github.com>
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

commit a00324ddfd
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Mon Mar 11 13:41:41 2024 -0700

    chore(deps-dev): bump typescript from 5.3.3 to 5.4.2 (#989)

    Bumps [typescript](https://github.com/Microsoft/TypeScript) from 5.3.3 to 5.4.2.
    - [Release notes](https://github.com/Microsoft/TypeScript/releases)
    - [Changelog](https://github.com/microsoft/TypeScript/blob/main/azure-pipelines.release.yml)
    - [Commits](https://github.com/Microsoft/TypeScript/compare/v5.3.3...v5.4.2)

    ---
    updated-dependencies:
    - dependency-name: typescript
      dependency-type: direct:development
      update-type: version-update:semver-minor
    ...

    Signed-off-by: dependabot[bot] <support@github.com>
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

commit 9fff6d7d0d
Author: Mara-Li <lili.simonetti@outlook.fr>
Date:   Mon Mar 11 17:46:53 2024 +0100

    fix: spelling error (#987)

    I really don't know why I translated this like that into "pas trouvé", and it bugged me a lot. I finally fixed it…

    Signed-off-by: Mara-Li <lili.simonetti@outlook.fr>

commit 0f5a9d7b66
Author: Matt Vogel <mainmoniker@googlemail.com>
Date:   Sun Mar 10 12:57:10 2024 -0400

    feat: separated content meta (#929)

    to allow for CSS styling

commit b4236e5142
Author: kabirgh <15871468+kabirgh@users.noreply.github.com>
Date:   Sun Mar 10 00:42:23 2024 +0000

    feat(perf:fast-rebuilds): Stop mutating resources param in ComponentResources emitter (#977)

    * Stop mutating resources param in ComponentResources emitter

    * Add done rebuilding log for fast rebuilds

    * Move google font loading to Head component

    * Simplify code and fix comment

commit 6e0c102970
Author: Emile Bangma <ewjbangma@hotmail.com>
Date:   Sun Mar 10 01:14:31 2024 +0100

    fix(transclusion): prevent duplicate transclusion if multiple transclusions are present. (#982)

commit 94a54698ab
Author: Emile Bangma <ewjbangma@hotmail.com>
Date:   Sat Mar 9 17:59:55 2024 +0100

    fix(resources): Use full path to font when cdnCache is false (#976)

commit 2e9a0c21db
Author: Emile Bangma <ewjbangma@hotmail.com>
Date:   Sat Mar 9 17:43:40 2024 +0100

    fix(description): first sentence no longer repeats until max length (#981)

commit b30a200bd4
Author: Aaron Pham <29749331+aarnphm@users.noreply.github.com>
Date:   Fri Mar 8 12:14:22 2024 -0500

    fix(i18n): make sure to use correct fileData for manual localization (#975)

    Signed-off-by: Aaron <29749331+aarnphm@users.noreply.github.com>

commit 6d59aa8201
Author: Emile Bangma <ewjbangma@hotmail.com>
Date:   Fri Mar 8 10:04:44 2024 +0100

    fix(description): counts characters instead of words (#972)

    * fix(description): make sure description counts characters instead of words

    * ref: removed duplicate ternary

* CI: fix package log post merge

* CI: fix more merge artifacts

* CI: fix package-lock.json

* feat: add new default image template

* feat: use icon.png for image generation

* chore: update satori and sharp version

* feat(image-generator): add new default template

* Update quartz/components/Head.tsx

* Update quartz/components/Head.tsx

* Update quartz/components/Head.tsx

* Update docs/features/social images.md

* Update quartz/components/Head.tsx

Co-authored-by: Jacky Zhao <j.zhao2k19@gmail.com>

* feat(og-image): add config option to use default og image for root path

* docs(og-image): add `excludeRoot` config + update preview images

* docs(open-graph): add examples section

* chore: remove unused `socialImage2.tsx` component

* feat(open-graph): add frontmatter aliases for socialImage/cover/image

* fix(open-graph): only load satori font if config option is enabled

* refactor(open-graph): dont use async promise inside `fetchTtf()`

* chore: renaming and finished copywriting

Signed-off-by: Aaron Pham <contact@aarnphm.xyz>

* chore: update typo

Signed-off-by: Aaron Pham <contact@aarnphm.xyz>

* chore: update hinting for socialImage

Signed-off-by: Aaron Pham <contact@aarnphm.xyz>

---------

Signed-off-by: Aaron Pham <contact@aarnphm.xyz>
Co-authored-by: Jacky Zhao <j.zhao2k19@gmail.com>
Co-authored-by: Emile Bangma <ewjbangma@hotmail.com>
Co-authored-by: Emile Bangma <github@emilebangma.com>
Co-authored-by: Aaron Pham <contact@aarnphm.xyz>
2024-11-12 07:33:35 -05:00
9188939b1f feat(math): typst support(closes #1568) (#1569)
Co-authored-by: Aaron Pham <contact@aarnphm.xyz>
Co-authored-by: Aaron Pham <Aaronpham0103@gmail.com>
2024-11-12 06:42:44 -05:00
92676d746e feat(ofm): support parsing footnotes in table (#1581) 2024-11-12 03:37:59 -05:00
1893196939 chore(deps): bump rehype-citation from 2.2.1 to 2.2.2 in the production-dependencies group (#1583)
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-11-12 00:38:48 -05:00
1ab9c91df1 feat(mermaid): improvement navigation (#1575)
* feat(mermaid): custom stuff

Signed-off-by: Aaron Pham <contact@aarnphm.xyz>

* chore: use mermaid and update clipboard content

Signed-off-by: Aaron Pham <contact@aarnphm.xyz>

* fix: explicitly use center div

Signed-off-by: Aaron Pham <contact@aarnphm.xyz>

---------

Signed-off-by: Aaron Pham <contact@aarnphm.xyz>
2024-11-10 18:13:12 -05:00
0ad9111388 chore(deps): bump rlespinasse/github-slug-action from 4.4.1 to 5.0.0 in the ci-dependencies group (#1578)
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-11-10 04:46:14 -05:00
cbeef5541f chore(deps-dev): bump @types/node from 22.8.7 to 22.9.0 in the production-dependencies group (#1579)
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-11-10 04:46:01 -05:00
0f04f1262c ci(dependabot): update GA periodically (#1577)
Co-authored-by: Aaron Pham <contact@aarnphm.xyz>
2024-11-10 04:41:56 -05:00
31e0b7c6f8 feat(comments): conditional display via frontmatter (#1566) 2024-11-09 04:44:32 -05:00
a6b2967df8 fix: account for chokidar v4 glob deprecation in source watching 2024-11-07 16:32:26 -08:00
f84a6554f6 fix(style): remove flex end to fix tag alignment in content meta 2024-11-07 15:13:28 -08:00
1d5b6f58d8 chore(deps): bump the production-dependencies group with 4 updates (#1565)
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-11-04 21:03:30 -05:00
74f8c13598 fix: reset z-index instead of inherited unset (#1528)
Co-authored-by: Aaron Pham <contact@aarnphm.xyz>
2024-11-04 20:22:36 -05:00
56ba2f4fa7 feat(build): add support for parsing inline sass (#1558) 2024-11-01 07:16:12 -04:00
314a88d5c6 feat(transformer): allow inline CSS styling (#1551)
* feat(transformer): allow inline CSS styling

* Updated docs

* Default to inline: false

* Removed redundant inline: false
2024-10-30 23:57:39 +01:00
a53772bbd1 feat(i18n): add turkish language (#1554) 2024-10-30 18:33:22 -04:00
1915a198d9 chore(deps): bump the production-dependencies group with 5 updates (#1548)
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-10-29 20:04:45 -04:00
1d2dc167f4 feat(folder): add intermediate folders pages (#1295)
Co-authored-by: Aaron Pham <Aaronpham0103@gmail.com>
Co-authored-by: Aaron Pham <contact@aarnphm.xyz>
2024-10-25 12:52:33 -04:00
3ef2a24f4b chore(deps): bump the production-dependencies group across 1 directory with 7 updates (#1540) 2024-10-22 17:54:41 -04:00
d98a3a088a Merge pull request #1543 from saberzero1/draft-publish-string
feat(filters): support "true" as valid for frontmatter filters
2024-10-22 22:38:16 +02:00
ad52d09567 Feat(filters): Support "true" as valid for draft and publish frontmatter values (b3a02909ba) 2024-10-22 20:33:54 +00:00
9f701e5045 fix(grid): $desktop variable (#1511) 2024-10-17 23:50:48 -04:00
67e1beea70 feat(comments): support custom giscus themes (#1526)
Co-authored-by: Aaron Pham <Aaronpham0103@gmail.com>
Co-authored-by: Aaron Pham <contact@aarnphm.xyz>
2024-10-17 18:30:16 -04:00
3aa11357aa fix(toc): regression (#1517) 2024-10-16 17:44:30 -04:00
b3a02909ba fix: make filter checks more strict (closes #1519) 2024-10-15 09:34:46 -07:00
1dc208356a fix(cli): use shell on win32 for update (#1503) (#1504)
If there is no `npm.exe` on the system, but
instead an `npm.cmd`, then node won't find
the `npm` executable when calling `spawnSync`.

This occurs frequently when using node package
managers on Windows.

See the node documentation for `.bat` and `.cmd`
files here.

<https://nodejs.org/api/child_process.html#spawning-bat-and-cmd-files-on-windows>.
2024-10-13 10:46:51 -07:00
3d0ba32070 docs: Update Name and URL of Simon's SB and adding DE Vault (#1507) 2024-10-13 10:42:29 -07:00
c5d97db000 fix(toc): invalid desktop-only styling (#1502)
* fix(toc): invalid desktop-only styling

should display none instead.

* Update toc.scss
2024-10-12 18:33:07 -04:00
0d1f15d37c feat(ofm): Allow for dashes in custom callout label (#1493)
* [OFM] Allow for dashes in custom callout label

For compatibility with Obsidian's behavior, a custom callout like
[!see-also] is possible. Previously, this was parsed by Quartz as a
callout “see” with metadata “-also”. Instead, this is should be a
callout “see-also” with title “See also” (capitalization + replace
dashes by spaces).

* prettier
2024-10-10 07:15:23 -04:00
11c23a137a chore(deps): bump the production-dependencies group with 9 updates (#1495)
Bumps the production-dependencies group with 9 updates:

| Package | From | To |
| --- | --- | --- |
| [chokidar](https://github.com/paulmillr/chokidar) | `3.6.0` | `4.0.1` |
| [esbuild-sass-plugin](https://github.com/glromeo/esbuild-sass-plugin) | `2.16.1` | `3.3.1` |
| [lightningcss](https://github.com/parcel-bundler/lightningcss) | `1.26.0` | `1.27.0` |
| [preact](https://github.com/preactjs/preact) | `10.24.1` | `10.24.2` |
| [rehype-citation](https://github.com/timlrx/rehype-citation) | `2.1.1` | `2.1.2` |
| [shiki](https://github.com/shikijs/shiki/tree/HEAD/packages/shiki) | `1.18.0` | `1.22.0` |
| [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) | `22.7.4` | `22.7.5` |
| [esbuild](https://github.com/evanw/esbuild) | `0.19.12` | `0.24.0` |
| [typescript](https://github.com/microsoft/TypeScript) | `5.6.2` | `5.6.3` |


Updates `chokidar` from 3.6.0 to 4.0.1
- [Release notes](https://github.com/paulmillr/chokidar/releases)
- [Commits](https://github.com/paulmillr/chokidar/compare/3.6.0...4.0.1)

Updates `esbuild-sass-plugin` from 2.16.1 to 3.3.1
- [Release notes](https://github.com/glromeo/esbuild-sass-plugin/releases)
- [Commits](https://github.com/glromeo/esbuild-sass-plugin/compare/v2.16.1...v3.3.1)

Updates `lightningcss` from 1.26.0 to 1.27.0
- [Release notes](https://github.com/parcel-bundler/lightningcss/releases)
- [Commits](https://github.com/parcel-bundler/lightningcss/compare/v1.26.0...v1.27.0)

Updates `preact` from 10.24.1 to 10.24.2
- [Release notes](https://github.com/preactjs/preact/releases)
- [Commits](https://github.com/preactjs/preact/compare/10.24.1...10.24.2)

Updates `rehype-citation` from 2.1.1 to 2.1.2
- [Release notes](https://github.com/timlrx/rehype-citation/releases)
- [Commits](https://github.com/timlrx/rehype-citation/compare/v2.1.1...v2.1.2)

Updates `shiki` from 1.18.0 to 1.22.0
- [Release notes](https://github.com/shikijs/shiki/releases)
- [Changelog](https://github.com/shikijs/shiki/blob/main/CHANGELOG.md)
- [Commits](https://github.com/shikijs/shiki/commits/v1.22.0/packages/shiki)

Updates `@types/node` from 22.7.4 to 22.7.5
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

Updates `esbuild` from 0.19.12 to 0.24.0
- [Release notes](https://github.com/evanw/esbuild/releases)
- [Changelog](https://github.com/evanw/esbuild/blob/main/CHANGELOG.md)
- [Commits](https://github.com/evanw/esbuild/compare/v0.19.12...v0.24.0)

Updates `typescript` from 5.6.2 to 5.6.3
- [Release notes](https://github.com/microsoft/TypeScript/releases)
- [Changelog](https://github.com/microsoft/TypeScript/blob/main/azure-pipelines.release.yml)
- [Commits](https://github.com/microsoft/TypeScript/compare/v5.6.2...v5.6.3)

---
updated-dependencies:
- dependency-name: chokidar
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: production-dependencies
- dependency-name: esbuild-sass-plugin
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: production-dependencies
- dependency-name: lightningcss
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: production-dependencies
- dependency-name: preact
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: production-dependencies
- dependency-name: rehype-citation
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: production-dependencies
- dependency-name: shiki
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: production-dependencies
- dependency-name: "@types/node"
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: production-dependencies
- dependency-name: esbuild
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: production-dependencies
- dependency-name: typescript
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: production-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-10-09 14:57:33 -07:00
8a95c865c8 chore(citations): passthrough options (#1429) 2024-10-09 14:14:44 -04:00
fe4b039b60 chore(ci): group dependabot upgrade (#1491)
Signed-off-by: Aaron Pham <contact@aarnphm.xyz>
2024-10-09 09:52:49 -07:00
497d51973a chore(ci): remove signing and vuln (#1484)
Signed-off-by: Aaron Pham <contact@aarnphm.xyz>
2024-10-07 02:52:14 -04:00
66d7dd8677 fix(ci): run build on tags (#1483)
* fix(ci): run build on tags

Signed-off-by: Aaron Pham <contact@aarnphm.xyz>

* chore: update docker warning and not push on PR

Signed-off-by: Aaron Pham <contact@aarnphm.xyz>

---------

Signed-off-by: Aaron Pham <contact@aarnphm.xyz>
2024-10-06 22:34:31 -04:00
313cef60ee infra: build quartz docker image to GHCR (#1192)
* Add GitHub action to build & push Docker image to GHCR

* Use double quotes to keep `prettier` happy :)

* Don't run Docker build & push on forks

* -1 char commit lmao

* Add git metadata to Docker image

* Apply Aaron's patch

* chore: run prettier

---------

Signed-off-by: Aaron Pham <contact@aarnphm.xyz>
Co-authored-by: Aaron Pham <contact@aarnphm.xyz>
2024-10-06 22:15:19 -04:00
af14ca7c4f i18n: add Czech translation (#1477)
* add Czech translation

* fix formatting
2024-10-04 09:10:40 -07:00
e06f681ce7 chore(deps): bump preact from 10.24.0 to 10.24.1 (#1464)
Bumps [preact](https://github.com/preactjs/preact) from 10.24.0 to 10.24.1.
- [Release notes](https://github.com/preactjs/preact/releases)
- [Commits](https://github.com/preactjs/preact/compare/10.24.0...10.24.1)

---
updated-dependencies:
- dependency-name: preact
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-10-02 04:42:14 -04:00
62906eebd3 chore(deps-dev): bump @types/node from 22.5.5 to 22.7.4 (#1465)
Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 22.5.5 to 22.7.4.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-10-02 04:42:02 -04:00
9cd072bfc3 chore(deps): bump hast-util-to-string from 3.0.0 to 3.0.1 (#1466)
Bumps [hast-util-to-string](https://github.com/rehypejs/rehype-minify) from 3.0.0 to 3.0.1.
- [Release notes](https://github.com/rehypejs/rehype-minify/releases)
- [Changelog](https://github.com/rehypejs/rehype-minify/blob/main/changelog.md)
- [Commits](https://github.com/rehypejs/rehype-minify/commits)

---
updated-dependencies:
- dependency-name: hast-util-to-string
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-10-02 04:41:50 -04:00
319b4497bc chore(deps-dev): bump tsx from 4.19.0 to 4.19.1 (#1467)
Bumps [tsx](https://github.com/privatenumber/tsx) from 4.19.0 to 4.19.1.
- [Release notes](https://github.com/privatenumber/tsx/releases)
- [Changelog](https://github.com/privatenumber/tsx/blob/master/release.config.cjs)
- [Commits](https://github.com/privatenumber/tsx/compare/v4.19.0...v4.19.1)

---
updated-dependencies:
- dependency-name: tsx
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-10-02 04:41:36 -04:00
b0c079f24a fix(layout): restore footer to the proper position (#1470)
* fix(layout): restore footer to the proper position

* align ToC scrollbar properly on short headers
2024-10-01 08:49:13 -07:00
1b122a1da0 chore(deps): bump @floating-ui/dom from 1.6.10 to 1.6.11 (#1463)
Bumps [@floating-ui/dom](https://github.com/floating-ui/floating-ui/tree/HEAD/packages/dom) from 1.6.10 to 1.6.11.
- [Release notes](https://github.com/floating-ui/floating-ui/releases)
- [Changelog](https://github.com/floating-ui/floating-ui/blob/master/packages/dom/CHANGELOG.md)
- [Commits](https://github.com/floating-ui/floating-ui/commits/@floating-ui/dom@1.6.11/packages/dom)

---
updated-dependencies:
- dependency-name: "@floating-ui/dom"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-09-30 20:10:05 -04:00
b8c46ba81a feat(analytics): clarity (#1446)
Add the code necessary for support of Microsoft clarity
2024-09-30 10:06:37 -07:00
1416f62a47 fix(layout): backlinks grid triage (#1447)
* fix: mobile backlinks orientation

* temp: hide broken list gradient

* fix: backlinks overflow
2024-09-29 22:24:15 -04:00
8889ab63eb fix: provide default pageTitleSuffix (closes #1452) 2024-09-28 09:38:19 -07:00
5eec1e98e6 fix(layout): grid triage with backlinks (#1442) 2024-09-25 18:15:07 -04:00
a7a0dcad22 fix(layout): grid triage and regression (#1440)
* fix(table of contents): multiple scrollbars (https://github.com/jackyzha0/quartz/issues/1388)

* fix(center): Main content mininum width (https://github.com/jackyzha0/quartz/issues/1439)

* fix(code block): Horizontal overflow fix (https://github.com/jackyzha0/quartz/issues/1438, https://github.com/jackyzha0/quartz/issues/1353)

* WIP fix for ul/ol .overflow

* Fix: restore former scrollbar behavior for overflow lists (https://github.com/jackyzha0/quartz/issues/1437)

* Fix: code block overflow-x

* fix: Table of Content overflow (https://github.com/jackyzha0/quartz/issues/1437)

* Address feedback

* Move max-height toggle from js to css
2024-09-25 17:20:58 -04:00
921f45cf70 feat: add a config option for a pageTitleSuffix (#1320)
* feat: add a config option for a pageTitleSuffix

* Run Prettier on Head.tsx

* Make pageTitleSuffix optional

Co-authored-by: Aaron Pham <Aaronpham0103@gmail.com>

---------

Co-authored-by: Aaron Pham <Aaronpham0103@gmail.com>
2024-09-24 20:20:36 -04:00
90c187587f chore(deps): bump pixi.js from 8.3.4 to 8.4.1 (#1432)
Bumps [pixi.js](https://github.com/pixijs/pixijs) from 8.3.4 to 8.4.1.
- [Release notes](https://github.com/pixijs/pixijs/releases)
- [Commits](https://github.com/pixijs/pixijs/compare/v8.3.4...v8.4.1)

---
updated-dependencies:
- dependency-name: pixi.js
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-09-24 20:19:48 -04:00
08e20a7006 chore(deps): bump remark-rehype from 11.1.0 to 11.1.1 (#1435)
Bumps [remark-rehype](https://github.com/remarkjs/remark-rehype) from 11.1.0 to 11.1.1.
- [Release notes](https://github.com/remarkjs/remark-rehype/releases)
- [Commits](https://github.com/remarkjs/remark-rehype/compare/11.1.0...11.1.1)

---
updated-dependencies:
- dependency-name: remark-rehype
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-09-24 20:19:37 -04:00
9e32016508 chore(deps): bump rehype-pretty-code from 0.13.2 to 0.14.0 (#1433)
Bumps [rehype-pretty-code](https://github.com/rehype-pretty/rehype-pretty-code/tree/HEAD/packages/core) from 0.13.2 to 0.14.0.
- [Release notes](https://github.com/rehype-pretty/rehype-pretty-code/releases)
- [Changelog](https://github.com/rehype-pretty/rehype-pretty-code/blob/master/packages/core/CHANGELOG.md)
- [Commits](https://github.com/rehype-pretty/rehype-pretty-code/commits/rehype-pretty-code@0.14.0/packages/core)

---
updated-dependencies:
- dependency-name: rehype-pretty-code
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-09-24 20:19:25 -04:00
8a050c0be0 chore(deps): bump hast-util-to-html from 9.0.2 to 9.0.3 (#1434)
Bumps [hast-util-to-html](https://github.com/syntax-tree/hast-util-to-html) from 9.0.2 to 9.0.3.
- [Release notes](https://github.com/syntax-tree/hast-util-to-html/releases)
- [Commits](https://github.com/syntax-tree/hast-util-to-html/compare/9.0.2...9.0.3)

---
updated-dependencies:
- dependency-name: hast-util-to-html
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-09-24 20:19:12 -04:00
0aacd8ed2e chore(deps): bump shiki from 1.12.1 to 1.18.0 (#1436)
Bumps [shiki](https://github.com/shikijs/shiki/tree/HEAD/packages/shiki) from 1.12.1 to 1.18.0.
- [Release notes](https://github.com/shikijs/shiki/releases)
- [Changelog](https://github.com/shikijs/shiki/blob/main/CHANGELOG.md)
- [Commits](https://github.com/shikijs/shiki/commits/v1.18.0/packages/shiki)

---
updated-dependencies:
- dependency-name: shiki
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-09-24 20:18:55 -04:00
7d7e334976 feat: responsive design grid (#1354)
* Responsive design grid

* Addressed PR feedback

* Bump Quartz version 4.3.1 => 4.4.0

* Moved page-header into center

* Updated docs with new layouts

* Sync updated version number with package-lock

* Table of Content scrollbar auto

* Reset node_modules

* Updated layout images

* Fixed tablet layout

* Finilazed layout images
2024-09-23 13:40:12 -07:00
9cefcd0dd1 Revert "perf: eagerly compute explorer nodes to avoid re-render in memoized value"
This reverts commit 16a9caa555.
2024-09-20 15:48:14 -07:00
4aaeb768d8 update cabin url (#1428) 2024-09-20 09:23:19 -07:00
743ef712d5 chore(deps): bump preact-render-to-string from 6.5.10 to 6.5.11 (#1417)
Bumps [preact-render-to-string](https://github.com/preactjs/preact-render-to-string) from 6.5.10 to 6.5.11.
- [Release notes](https://github.com/preactjs/preact-render-to-string/releases)
- [Changelog](https://github.com/preactjs/preact-render-to-string/blob/main/CHANGELOG.md)
- [Commits](https://github.com/preactjs/preact-render-to-string/compare/v6.5.10...v6.5.11)

---
updated-dependencies:
- dependency-name: preact-render-to-string
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-09-16 22:24:03 -04:00
9a6e4e2f80 chore(deps-dev): bump typescript from 5.5.4 to 5.6.2 (#1418)
Bumps [typescript](https://github.com/microsoft/TypeScript) from 5.5.4 to 5.6.2.
- [Release notes](https://github.com/microsoft/TypeScript/releases)
- [Changelog](https://github.com/microsoft/TypeScript/blob/main/azure-pipelines.release.yml)
- [Commits](https://github.com/microsoft/TypeScript/compare/v5.5.4...v5.6.2)

---
updated-dependencies:
- dependency-name: typescript
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-09-16 19:56:14 -04:00
14cb50de9b chore(deps): bump preact from 10.23.2 to 10.24.0 (#1419)
Bumps [preact](https://github.com/preactjs/preact) from 10.23.2 to 10.24.0.
- [Release notes](https://github.com/preactjs/preact/releases)
- [Commits](https://github.com/preactjs/preact/compare/10.23.2...10.24.0)

---
updated-dependencies:
- dependency-name: preact
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-09-16 19:56:00 -04:00
dad0ae4e3f chore(deps-dev): bump @types/node from 22.5.4 to 22.5.5 (#1420)
Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 22.5.4 to 22.5.5.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-09-16 19:55:42 -04:00
9c060f3cf2 chore(deps): bump vfile from 6.0.2 to 6.0.3 (#1421)
Bumps [vfile](https://github.com/vfile/vfile) from 6.0.2 to 6.0.3.
- [Release notes](https://github.com/vfile/vfile/releases)
- [Changelog](https://github.com/vfile/vfile/blob/main/changelog.md)
- [Commits](https://github.com/vfile/vfile/compare/6.0.2...6.0.3)

---
updated-dependencies:
- dependency-name: vfile
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-09-16 19:55:23 -04:00
16a9caa555 perf: eagerly compute explorer nodes to avoid re-render in memoized value 2024-09-15 18:05:17 -07:00
b1c60b8833 Add alexanderweichart.de to showcase.md (#1378)
Added my own website ^^

Co-authored-by: Jacky Zhao <j.zhao2k19@gmail.com>
2024-09-15 17:03:22 -07:00
50a78bafa5 docs: clarify prod hosting 2024-09-15 16:47:11 -07:00
6ea359e55e perf: have more than 1ms granularity for rebuild detection 2024-09-15 16:42:07 -07:00
cd3bb25626 fix: account for subtags in numerical tags (closes #1408) (#1410) 2024-09-15 11:25:31 -04:00
eb9bbd1666 fix: constrain link icon size (#1409) 2024-09-14 10:10:01 -07:00
c36551310d chore(deps): bump preact-render-to-string from 6.5.9 to 6.5.10 (#1390)
Bumps [preact-render-to-string](https://github.com/preactjs/preact-render-to-string) from 6.5.9 to 6.5.10.
- [Release notes](https://github.com/preactjs/preact-render-to-string/releases)
- [Changelog](https://github.com/preactjs/preact-render-to-string/blob/main/CHANGELOG.md)
- [Commits](https://github.com/preactjs/preact-render-to-string/compare/v6.5.9...v6.5.10)

---
updated-dependencies:
- dependency-name: preact-render-to-string
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-09-11 14:46:22 -07:00
6215dd5565 docs: fix roam research docs 2024-09-11 14:45:04 -07:00
c89c76b40a chore(deps-dev): bump tsx from 4.18.0 to 4.19.0 (#1391)
Bumps [tsx](https://github.com/privatenumber/tsx) from 4.18.0 to 4.19.0.
- [Release notes](https://github.com/privatenumber/tsx/releases)
- [Changelog](https://github.com/privatenumber/tsx/blob/master/release.config.cjs)
- [Commits](https://github.com/privatenumber/tsx/compare/v4.18.0...v4.19.0)

---
updated-dependencies:
- dependency-name: tsx
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-09-11 03:30:44 -04:00
a145e320d0 chore(deps): bump hast-util-to-html from 9.0.1 to 9.0.2 (#1393)
Bumps [hast-util-to-html](https://github.com/syntax-tree/hast-util-to-html) from 9.0.1 to 9.0.2.
- [Release notes](https://github.com/syntax-tree/hast-util-to-html/releases)
- [Commits](https://github.com/syntax-tree/hast-util-to-html/compare/9.0.1...9.0.2)

---
updated-dependencies:
- dependency-name: hast-util-to-html
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-09-11 03:30:28 -04:00
082cbb74c3 chore(deps-dev): bump @types/node from 22.5.0 to 22.5.4 (#1403)
Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 22.5.0 to 22.5.4.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-09-11 03:29:51 -04:00
93b2481261 chore(deps): bump pixi.js from 8.3.3 to 8.3.4 (#1394)
Bumps [pixi.js](https://github.com/pixijs/pixijs) from 8.3.3 to 8.3.4.
- [Release notes](https://github.com/pixijs/pixijs/releases)
- [Commits](https://github.com/pixijs/pixijs/compare/v8.3.3...v8.3.4)

---
updated-dependencies:
- dependency-name: pixi.js
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-09-11 03:29:36 -04:00
d2414b3903 feat(markdown): Roam Research flavour (#985)
* feat: Roam Research flavor markdown

* docs: Roam Research transformer

* use markdownPlugins

* fix roam matching

* cleanup: Roam Plugin

---------

Co-authored-by: Matt Vogel <>
2024-09-11 03:29:07 -04:00
01fc26d2c0 fix: Reload graph after a theme change (closes #1380) (#1383)
* FIX: Reload graph after a theme change

* FIX: Reload graph after a theme change - comment updated

* FIX: Reload graph after a theme change - comment updated

* FIX: Reload graph after a theme change

* fix: Reload graph after a theme change
2024-08-31 12:25:30 -07:00
84a9be65ce Add Projects & Privacy to showcase.md (#1381) 2024-08-31 11:43:49 -07:00
6715079a89 fix: only apply z-index on left sidebar 2024-08-28 12:50:25 -07:00
d613a3d2f2 chore(deps): bump unified from 11.0.4 to 11.0.5 (#1373)
Bumps [unified](https://github.com/unifiedjs/unified) from 11.0.4 to 11.0.5.
- [Release notes](https://github.com/unifiedjs/unified/releases)
- [Changelog](https://github.com/unifiedjs/unified/blob/main/changelog.md)
- [Commits](https://github.com/unifiedjs/unified/compare/11.0.4...11.0.5)

---
updated-dependencies:
- dependency-name: unified
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-08-26 14:13:09 -07:00
9b75faafea chore(deps-dev): bump @types/yargs from 17.0.32 to 17.0.33 (#1374)
Bumps [@types/yargs](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/yargs) from 17.0.32 to 17.0.33.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/yargs)

---
updated-dependencies:
- dependency-name: "@types/yargs"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-08-26 14:13:00 -07:00
5a26b582ed chore(deps-dev): bump @types/node from 22.1.0 to 22.5.0 (#1375)
Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 22.1.0 to 22.5.0.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-08-26 14:12:51 -07:00
4e2aea8a5a chore(deps): bump @napi-rs/simple-git from 0.1.17 to 0.1.19 (#1376)
Bumps [@napi-rs/simple-git](https://github.com/Brooooooklyn/simple-git) from 0.1.17 to 0.1.19.
- [Release notes](https://github.com/Brooooooklyn/simple-git/releases)
- [Commits](https://github.com/Brooooooklyn/simple-git/compare/v0.1.17...v0.1.19)

---
updated-dependencies:
- dependency-name: "@napi-rs/simple-git"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-08-26 14:12:45 -07:00
40f039983c chore(deps-dev): bump tsx from 4.17.0 to 4.18.0 (#1377)
Bumps [tsx](https://github.com/privatenumber/tsx) from 4.17.0 to 4.18.0.
- [Release notes](https://github.com/privatenumber/tsx/releases)
- [Changelog](https://github.com/privatenumber/tsx/blob/master/release.config.cjs)
- [Commits](https://github.com/privatenumber/tsx/compare/v4.17.0...v4.18.0)

---
updated-dependencies:
- dependency-name: tsx
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-08-26 14:12:35 -07:00
3b988aec61 fix: Popover z-index issue on left sidebar (#1230) 2024-08-25 19:33:34 -07:00
bca74623a3 perf(graph): canvas implementation (#1328)
* perf(graph): initial canvas layout

include nodes and links drawn

Signed-off-by: Aaron Pham <contact@aarnphm.xyz>

* fix(graph): update persistent for nodeGfx

Signed-off-by: Aaron Pham <contact@aarnphm.xyz>

* chore(graph): add canvas element to avoid rerendering glitch

Signed-off-by: Aaron Pham <contact@aarnphm.xyz>

* fix(spa): only render graph once in global

Signed-off-by: Aaron Pham <contact@aarnphm.xyz>

* fix(graph): change svg as button

render global graph on toggle

Signed-off-by: Aaron Pham <contact@aarnphm.xyz>

* fix(graph): fix anchor position and zIndex behaviour

Signed-off-by: Aaron Pham <contact@aarnphm.xyz>

* chore(graph): increase linkDistance

Signed-off-by: Aaron Pham <contact@aarnphm.xyz>

* refactor

* fmt

* pkg

---------

Signed-off-by: Aaron Pham <contact@aarnphm.xyz>
Co-authored-by: Jacky Zhao <j.zhao2k19@gmail.com>
2024-08-25 00:33:14 -07:00
4c9e860150 a11y(darkmode): use a button for the theme toggle (#1335)
* Use a `<button>` for theme toggle

* docs: Adds back Xinyang's cs garden to showcase (#1323)

adding back my garden which was deleted from the cleanup showcase

* feat(toc,explorer): add accessibility for toggle (#1327)

* Restore focus highlight on explorer toggle button.

Remove `unset: all` declaration causing `outline`
property to be unset. This allows the default
browser focus highlight to be shown.

* Fix semantics of expandable sections (explorer, toc).

This adds the appropriate aria attributes for the [disclosure pattern](https://www.w3.org/WAI/ARIA/apg/patterns/disclosure/examples/disclosure-image-description/#javascriptandcsssourcecode) and uses `visibility: hidden` to remove the hidden elements from the focus order without disrupting the animations. Further work is needed on the tree view nodes.

* Run prettier for SCSS files.

* feat: custom global latex macros (closes #1325)

* chore: ts fixes

* docs: recommend at least node 20 in gh

* fix: unmemoize explorer on rebuild (closes #1077)

* fix: pass buildId to worker

* Fix theme button DOM hierarchy and styles

* Restore functionality of theme button

* `aria-label` on theme svgs so their accessible labels are included in button content

---------

Co-authored-by: Xinyang Yu <47915643+xy-241@users.noreply.github.com>
Co-authored-by: Jacky Zhao <j.zhao2k19@gmail.com>
2024-08-24 13:33:30 -07:00
46b63b68bf fix: Link visibility in exampanded TOC while collapseByDefault is true (#1371) 2024-08-24 12:56:17 -07:00
c4cd84dcc8 fix: Add a wrapper element to dates in PageList. (#1345)
* Add a wrapper span to dates in PageList.

This means there is a placeholder when date is not specified, so the values in grid-template-columns always line up correctly.

* Use a <div> instead -- better practice to stick to block elements.
2024-08-24 10:13:55 -07:00
2be9c096a1 chore(features): remove implemented (#1350) 2024-08-24 10:13:14 -07:00
f913332862 docs: Update Gitlab CI runner tag to use Gitlab runner (#1365)
Co-authored-by: Tony Jackson <tony.aaj.jackson@protonmail.com>
2024-08-23 18:55:03 -07:00
647c125525 docs: added permalink description to supported frontmatter doc (#1369) 2024-08-23 18:35:52 -07:00
3b74453fe6 docs: RTL showcase (#1362) 2024-08-20 09:28:52 -07:00
6b499ed90c chore(deps): bump @floating-ui/dom from 1.6.8 to 1.6.10 (#1358)
Bumps [@floating-ui/dom](https://github.com/floating-ui/floating-ui/tree/HEAD/packages/dom) from 1.6.8 to 1.6.10.
- [Release notes](https://github.com/floating-ui/floating-ui/releases)
- [Changelog](https://github.com/floating-ui/floating-ui/blob/master/packages/dom/CHANGELOG.md)
- [Commits](https://github.com/floating-ui/floating-ui/commits/@floating-ui/dom@1.6.10/packages/dom)

---
updated-dependencies:
- dependency-name: "@floating-ui/dom"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-08-19 14:18:00 -07:00
437d65c847 chore(deps): bump lightningcss from 1.25.1 to 1.26.0 (#1359)
Bumps [lightningcss](https://github.com/parcel-bundler/lightningcss) from 1.25.1 to 1.26.0.
- [Release notes](https://github.com/parcel-bundler/lightningcss/releases)
- [Commits](https://github.com/parcel-bundler/lightningcss/compare/v1.25.1...v1.26.0)

---
updated-dependencies:
- dependency-name: lightningcss
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-08-19 14:15:43 -07:00
7c5709b660 chore(deps): bump preact-render-to-string from 6.5.7 to 6.5.9 (#1360)
Bumps [preact-render-to-string](https://github.com/preactjs/preact-render-to-string) from 6.5.7 to 6.5.9.
- [Release notes](https://github.com/preactjs/preact-render-to-string/releases)
- [Changelog](https://github.com/preactjs/preact-render-to-string/blob/main/CHANGELOG.md)
- [Commits](https://github.com/preactjs/preact-render-to-string/compare/v6.5.7...v6.5.9)

---
updated-dependencies:
- dependency-name: preact-render-to-string
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-08-19 14:15:34 -07:00
21e1921822 chore(deps): bump @napi-rs/simple-git from 0.1.16 to 0.1.17 (#1357)
Bumps [@napi-rs/simple-git](https://github.com/Brooooooklyn/simple-git) from 0.1.16 to 0.1.17.
- [Release notes](https://github.com/Brooooooklyn/simple-git/releases)
- [Commits](https://github.com/Brooooooklyn/simple-git/compare/v0.1.16...v0.1.17)

---
updated-dependencies:
- dependency-name: "@napi-rs/simple-git"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-08-19 14:14:45 -07:00
e47c29d2fd chore(deps): bump rehype-katex from 7.0.0 to 7.0.1 (#1356)
Bumps [rehype-katex](https://github.com/remarkjs/remark-math) from 7.0.0 to 7.0.1.
- [Release notes](https://github.com/remarkjs/remark-math/releases)
- [Commits](https://github.com/remarkjs/remark-math/compare/rehype-katex@7.0.0...rehype-katex@7.0.1)

---
updated-dependencies:
- dependency-name: rehype-katex
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-08-19 14:14:29 -07:00
a5f2f874f7 chore(deps-dev): bump tsx from 4.16.2 to 4.17.0 (#1340)
Bumps [tsx](https://github.com/privatenumber/tsx) from 4.16.2 to 4.17.0.
- [Release notes](https://github.com/privatenumber/tsx/releases)
- [Changelog](https://github.com/privatenumber/tsx/blob/master/release.config.cjs)
- [Commits](https://github.com/privatenumber/tsx/compare/v4.16.2...v4.17.0)

---
updated-dependencies:
- dependency-name: tsx
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-08-15 05:07:05 -04:00
eb23cbe8da chore(deps): bump rehype-citation from 2.0.0 to 2.1.1 (#1341)
Bumps [rehype-citation](https://github.com/timlrx/rehype-citation) from 2.0.0 to 2.1.1.
- [Release notes](https://github.com/timlrx/rehype-citation/releases)
- [Commits](https://github.com/timlrx/rehype-citation/compare/v2.0.0...v2.1.1)

---
updated-dependencies:
- dependency-name: rehype-citation
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-08-15 04:25:07 -04:00
cb68069d45 chore(deps-dev): bump typescript from 5.5.3 to 5.5.4 (#1343)
Bumps [typescript](https://github.com/Microsoft/TypeScript) from 5.5.3 to 5.5.4.
- [Release notes](https://github.com/Microsoft/TypeScript/releases)
- [Changelog](https://github.com/microsoft/TypeScript/blob/main/azure-pipelines.release.yml)
- [Commits](https://github.com/Microsoft/TypeScript/compare/v5.5.3...v5.5.4)

---
updated-dependencies:
- dependency-name: typescript
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-08-15 04:24:48 -04:00
d27c292736 feat: Mark the external link icon as aria-hidden (#1346) 2024-08-12 20:06:19 -07:00
0ee103a514 chore(deps): bump shiki from 1.10.3 to 1.12.1 (#1344)
Bumps [shiki](https://github.com/shikijs/shiki/tree/HEAD/packages/shiki) from 1.10.3 to 1.12.1.
- [Release notes](https://github.com/shikijs/shiki/releases)
- [Changelog](https://github.com/shikijs/shiki/blob/main/CHANGELOG.md)
- [Commits](https://github.com/shikijs/shiki/commits/v1.12.1/packages/shiki)

---
updated-dependencies:
- dependency-name: shiki
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-08-12 13:38:15 -07:00
c5f0b69a52 chore(deps): bump preact from 10.22.1 to 10.23.2 (#1342)
Bumps [preact](https://github.com/preactjs/preact) from 10.22.1 to 10.23.2.
- [Release notes](https://github.com/preactjs/preact/releases)
- [Commits](https://github.com/preactjs/preact/compare/10.22.1...10.23.2)

---
updated-dependencies:
- dependency-name: preact
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-08-12 13:37:54 -07:00
323167a001 docs(hosting): missing key with: (#1334) 2024-08-10 08:32:51 -07:00
3b5ed813f5 feat(search): keyboard-accessible search button (#1331)
* Use a `<button>` for search

* Fix search button styles to match preexisting styling

* Remove additional native button properties.

* Invoke search button on click or keyboard.

* Reorganize search button DOM hierarchy

* Restore focus to the search button when exiting the search overlay

* Run prettier on Search.tsx
2024-08-09 18:46:50 -07:00
195fc5134c fix: pass buildId to worker 2024-08-08 19:33:27 -07:00
e89c395f7c fix: unmemoize explorer on rebuild (closes #1077) 2024-08-08 19:17:20 -07:00
2db735a150 docs: recommend at least node 20 in gh 2024-08-08 18:38:17 -07:00
39eebca3cf chore: ts fixes 2024-08-08 18:28:13 -07:00
9acaa1c8ac feat: custom global latex macros (closes #1325) 2024-08-08 18:19:45 -07:00
27a41abb62 feat(toc,explorer): add accessibility for toggle (#1327)
* Restore focus highlight on explorer toggle button.

Remove `unset: all` declaration causing `outline`
property to be unset. This allows the default
browser focus highlight to be shown.

* Fix semantics of expandable sections (explorer, toc).

This adds the appropriate aria attributes for the [disclosure pattern](https://www.w3.org/WAI/ARIA/apg/patterns/disclosure/examples/disclosure-image-description/#javascriptandcsssourcecode) and uses `visibility: hidden` to remove the hidden elements from the focus order without disrupting the animations. Further work is needed on the tree view nodes.

* Run prettier for SCSS files.
2024-08-08 18:07:47 -07:00
12904ab796 docs: Adds back Xinyang's cs garden to showcase (#1323)
adding back my garden which was deleted from the cleanup showcase
2024-08-08 18:00:20 -07:00
4bbcc0c50a pkg: minor bump for breaking nodejs bump :) 2024-08-05 19:33:23 -07:00
3938904cd0 fix: embed pdf aspect ratio (closes #1310) 2024-08-05 19:31:54 -07:00
407fad384c fix: only one h1 on a page (closes #1269) 2024-08-05 19:18:48 -07:00
ca3943b500 fix: responsive youtube embed (closes #1167) 2024-08-05 19:14:14 -07:00
6c4ed249ba chore(deps): bump rimraf from 5.0.7 to 6.0.1 (#1277)
Bumps [rimraf](https://github.com/isaacs/rimraf) from 5.0.7 to 6.0.1.
- [Changelog](https://github.com/isaacs/rimraf/blob/main/CHANGELOG.md)
- [Commits](https://github.com/isaacs/rimraf/compare/v5.0.7...v6.0.1)

---
updated-dependencies:
- dependency-name: rimraf
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-08-05 18:54:10 -07:00
563ab4aaaf docs: update node version in hosting docs 2024-08-05 18:49:20 -07:00
1c2d542138 build: add .node-version 2024-08-05 18:48:29 -07:00
e864740df7 docs: Adds back Pelayo Arbues blog to showcase (#1314)
Co-authored-by: Pelayo Arbues <pgarbues@idealista.com>
2024-08-05 18:44:34 -07:00
efed544df1 docs: Add "Ellie's Notes" to the showcase (#1315)
Thank you for Quartz! I really love using it. Just adding my notes to the showcase 😊
2024-08-05 18:43:57 -07:00
3d156b8497 deps(dev): bump nodejs in ci 2024-08-05 18:43:05 -07:00
38361aaf48 deps: change min required nodejs to v20 (breaking) 2024-08-05 18:41:46 -07:00
f3e07fd51c chore(deps-dev): bump prettier from 3.3.2 to 3.3.3 (#1293)
* chore(deps-dev): bump prettier from 3.3.2 to 3.3.3

Bumps [prettier](https://github.com/prettier/prettier) from 3.3.2 to 3.3.3.
- [Release notes](https://github.com/prettier/prettier/releases)
- [Changelog](https://github.com/prettier/prettier/blob/main/CHANGELOG.md)
- [Commits](https://github.com/prettier/prettier/compare/3.3.2...3.3.3)

---
updated-dependencies:
- dependency-name: prettier
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* make prettier happy

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Jacky Zhao <j.zhao2k19@gmail.com>
2024-08-05 18:38:07 -07:00
d79911fa79 chore(deps): bump workerpool from 9.1.2 to 9.1.3 (#1318)
Bumps [workerpool](https://github.com/josdejong/workerpool) from 9.1.2 to 9.1.3.
- [Changelog](https://github.com/josdejong/workerpool/blob/master/HISTORY.md)
- [Commits](https://github.com/josdejong/workerpool/compare/v9.1.2...v9.1.3)

---
updated-dependencies:
- dependency-name: workerpool
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-08-05 18:46:00 -04:00
963c7c8654 chore(deps-dev): bump @types/node from 20.14.11 to 22.1.0 (#1319)
Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 20.14.11 to 22.1.0.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-08-05 16:49:37 -04:00
3728929ee6 chore(deps): bump preact-render-to-string from 6.5.5 to 6.5.7 (#1317)
Bumps [preact-render-to-string](https://github.com/preactjs/preact-render-to-string) from 6.5.5 to 6.5.7.
- [Release notes](https://github.com/preactjs/preact-render-to-string/releases)
- [Changelog](https://github.com/preactjs/preact-render-to-string/blob/main/CHANGELOG.md)
- [Commits](https://github.com/preactjs/preact-render-to-string/compare/v6.5.5...v6.5.7)

---
updated-dependencies:
- dependency-name: preact-render-to-string
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-08-05 16:49:19 -04:00
1224c7d32f refactor(comments): move script to files (#1308)
* refactor(comments): move script to files

for LSP, treesitter, and the whole galore.

Signed-off-by: Aaron Pham <contact@aarnphm.xyz>

* fix(type): support removeEventListener with CustomEventMap

Signed-off-by: Aaron Pham <contact@aarnphm.xyz>

* fix: parse bool to string first

Signed-off-by: Aaron Pham <contact@aarnphm.xyz>

* chore: address comments and test on branch

Signed-off-by: Aaron Pham <contact@aarnphm.xyz>

* revert: remove comments section from main quartz pages

Signed-off-by: Aaron Pham <contact@aarnphm.xyz>

---------

Signed-off-by: Aaron Pham <contact@aarnphm.xyz>
2024-08-05 15:17:11 -04:00
bf1c9d1791 chore(deps): bump globby from 14.0.1 to 14.0.2 (#1301)
Bumps [globby](https://github.com/sindresorhus/globby) from 14.0.1 to 14.0.2.
- [Release notes](https://github.com/sindresorhus/globby/releases)
- [Commits](https://github.com/sindresorhus/globby/compare/v14.0.1...v14.0.2)

---
updated-dependencies:
- dependency-name: globby
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-08-02 14:48:54 -04:00
6264f5685c fix: comments on spa should work (closes #1296) (#1298)
* fix comments on spa

* fix giscus
2024-07-30 01:13:13 -07:00
e1a9661be7 docs: cleanup showcase 2024-07-29 16:33:50 -07:00
bc95332fce chore(deps-dev): bump @types/ws from 8.5.11 to 8.5.12 (#1300)
Bumps [@types/ws](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/ws) from 8.5.11 to 8.5.12.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/ws)

---
updated-dependencies:
- dependency-name: "@types/ws"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-07-29 13:14:34 -07:00
740172acb6 chore(deps): bump vfile from 6.0.1 to 6.0.2 (#1299)
Bumps [vfile](https://github.com/vfile/vfile) from 6.0.1 to 6.0.2.
- [Release notes](https://github.com/vfile/vfile/releases)
- [Changelog](https://github.com/vfile/vfile/blob/main/changelog.md)
- [Commits](https://github.com/vfile/vfile/compare/6.0.1...6.0.2)

---
updated-dependencies:
- dependency-name: vfile
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-07-29 13:14:25 -07:00
5ccdb5f35f Squashed 'content/' changes from ff5f50d..fc5c89d
fc5c89d Fixed a small typo

git-subtree-dir: content
git-subtree-split: fc5c89dfe688e16b9eda99df9f2f5db6d605c602
2024-06-11 16:29:18 +02:00
cd5ce9642d Merge commit '5ccdb5f35f05f9c51205a9f8a49421c14060f596' into jpg 2024-06-11 16:29:18 +02:00
6ef2730a85 Squashed 'content/' changes from 3f325ff..ff5f50d
ff5f50d Fixed some small typos

git-subtree-dir: content
git-subtree-split: ff5f50dece27dcb2bb61944daa174b5bb696fddc
2024-06-11 16:24:51 +02:00
a47bda30ac Merge commit '6ef2730a855f21cbd449b161f9ff4bf5f544d55e' into jpg 2024-06-11 16:24:51 +02:00
1f1cbb88d3 Sidebar redesign, CSS reorganization 2024-06-11 16:15:40 +02:00
7c7de05047 Layout update 2024-06-11 15:42:52 +02:00
506e066f11 Squashed 'content/' changes from 69352f5..3f325ff
3f325ff Added all N3 notions
06af741 Obsidian settings updated
b399f6b Added a new style for other side usage

git-subtree-dir: content
git-subtree-split: 3f325ffe0f3ee8169ee45746916e823422ab0591
2024-06-10 13:00:27 +02:00
0b25d016e2 Merge commit '506e066f11f0e7c424fc084d6b50c6d2734f15d8' into jpg 2024-06-10 13:00:27 +02:00
469f1a51f8 Merge branch 'v4' into jpg 2024-06-10 12:59:45 +02:00
1d423e3e31 Small footer margin 2024-06-10 12:57:17 +02:00
55cb4c3b24 Merge remote-tracking branch 'refs/remotes/origin/jpg' into jpg 2024-05-22 17:03:19 +02:00
Keb
ed1dd8a959 Merge branch 'jackyzha0:v4' into jpg 2024-05-22 17:01:24 +02:00
519cf47e67 Squashed 'content/' changes from a335319..69352f5
69352f5 Rename folders + misc fixes

git-subtree-dir: content
git-subtree-split: 69352f57813b02e02eefb93777decfcb21d943cb
2024-05-22 17:00:52 +02:00
30ef552287 Merge commit '519cf47e676dea17a70ac6ec501e7b15428e00a3' into jpg 2024-05-22 17:00:52 +02:00
784f17d83d Better CSS styling fitting the needs of the project
Bigger sizing mostly, also bigger popovers
Readjustment of some components
2024-05-22 16:58:08 +02:00
a7f550d69f Reworked layout 2024-05-22 16:57:19 +02:00
7ef7344fa2 Remove analytics and CDN caching 2024-05-22 16:57:02 +02:00
23821c6795 Merge commit '60b63687e840a3affe063196f2ec6df4636119b2' into jpg 2024-05-21 15:46:18 +02:00
60b63687e8 Squashed 'custom/convert-furigana/' changes from f21e49b..40c6789
40c6789 Fixed kanji parsing by adding 々

git-subtree-dir: custom/convert-furigana
git-subtree-split: 40c67897788021b364f2e768944b1966df069033
2024-05-21 15:46:18 +02:00
f1fdd0ef81 Squashed 'content/' changes from a304a63..a335319
a335319 Fixed parsing errors

git-subtree-dir: content
git-subtree-split: a335319fae183609b9793cfc47f96bceb6ff0642
2024-05-21 15:42:33 +02:00
93bd1d8a7f Merge commit 'f1fdd0ef81b543a2ae1058fee735873d7ade4795' into jpg 2024-05-21 15:42:33 +02:00
f172200585 Removed unnecessary spacing 2024-05-21 15:42:03 +02:00
c172c9eea2 Squashed 'content/' changes from 331cd4b..a304a63
a304a63 Added most of N5-N4 grammar notions
4f75a84 Added a new type of usage CSS
55e1946 Added conjugation basics
805d58a Updated Te-Form
ca05b9a Added new resources

git-subtree-dir: content
git-subtree-split: a304a630cbe3f72d39d131e32ec241fd412215a1
2024-05-20 23:41:57 +02:00
2d4f9c3f57 Merge commit 'c172c9eea2158870d53dc4b01d430588406b0a2d' into jpg 2024-05-20 23:41:57 +02:00
5aabf1faaa Merge branch 'v4' into jpg 2024-05-20 23:40:45 +02:00
fa650bf623 Update style 2024-05-20 23:37:10 +02:00
91837b8574 Squashed 'content/' changes from ecd4614..331cd4b
331cd4b Misc fixes on Te-Form pages

git-subtree-dir: content
git-subtree-split: 331cd4bb3cffa1fd580b1a2db8fb6e5ffdf7fee9
2024-05-03 01:29:53 +02:00
abd71c4e3e Merge commit '91837b857403541a299867d87d752d6c91e544ce' into jpg 2024-05-03 01:29:53 +02:00
a65f656192 Squashed 'content/' changes from 6f86fb4..ecd4614
ecd4614 Add a first draft of Te-Form
8827e72 Change usage CSS: more flexible for styling
71fe2e2 Snippet: highlight color

git-subtree-dir: content
git-subtree-split: ecd46140386747c1e59fbde26fb12a4ac6608112
2024-05-03 01:21:16 +02:00
e3f604107a Merge commit 'a65f65619253f4c04671bc06ea23c1e9a6865477' into jpg 2024-05-03 01:21:16 +02:00
f96c408d02 Merge commit '4decba7b95f33fe058e8d3fa7c19256df7938e96' into jpg 2024-05-02 19:55:04 +02:00
4decba7b95 Squashed 'content/' changes from 0ba6983..6f86fb4
6f86fb4 Added obsidian vault configuration

git-subtree-dir: content
git-subtree-split: 6f86fb45f9558cbf3089c1007252100af3339570
2024-05-02 19:55:03 +02:00
a572f8e701 Merge branch 'v4' into jpg 2024-05-02 19:53:54 +02:00
3dd1f22428 Change usage CSS: more flexible for styling 2024-05-02 19:46:40 +02:00
10886de473 Update URL 2024-05-02 19:46:21 +02:00
726ea3b91f Squashed 'content/' changes from 61bf995..0ba6983
0ba6983 Added index

git-subtree-dir: content
git-subtree-split: 0ba69837fc65f6c9c2e82762cf10cbd099bacde9
2024-04-08 00:24:24 +02:00
bf5aa870ab Merge commit '726ea3b91f41db4c665cc94305b8d5b7cbe61d15' into jpg 2024-04-08 00:24:24 +02:00
c6f9cd12e0 Added content repo in update script 2024-04-08 00:10:18 +02:00
e86450abd3 Better styling: tables with borders, line breaks 2024-04-08 00:04:39 +02:00
6e29281f91 Merge commit 'd63e5ae6a77e5f39e25d87500c67488ff4570cbc' into jpg 2024-04-07 23:13:27 +02:00
d63e5ae6a7 Squashed 'custom/convert-usage/' changes from 89c8624..bbefbc5
bbefbc5 Added usage
8be4d39 Fixed an issue with character encoding

git-subtree-dir: custom/convert-usage
git-subtree-split: bbefbc5dd202ca299e1760f6934ace79ba320499
2024-04-07 23:13:27 +02:00
5f4e04d364 Update light theme callout color 2024-04-07 11:48:54 +02:00
1ce534d696 Apply convert scripts in Dockerfile 2024-04-07 00:20:19 +02:00
760cb91ad2 Squashed 'content/' content from commit 61bf995
git-subtree-dir: content
git-subtree-split: 61bf99591773d910cda558e2779b351914b5b74a
2024-04-06 18:42:39 +02:00
242bd75378 Merge commit '760cb91ad2651bd2a43b9e2a623f46bbf3e83017' as 'content' 2024-04-06 18:42:39 +02:00
7d8cc8d0be Remove content folder 2024-04-06 18:42:36 +02:00
51da3c172d Add subtrees and scripts to build and update subtrees 2024-04-06 18:38:57 +02:00
4cb6b5fa4c Squashed 'custom/convert-usage/' content from commit 89c8624
git-subtree-dir: custom/convert-usage
git-subtree-split: 89c86247bbe47eac5ae358ca188e5d7a99abe2ee
2024-04-06 18:34:02 +02:00
2be716bf75 Merge commit '4cb6b5fa4c881f21ad9d9280248feedfa97dab72' as 'custom/convert-usage' 2024-04-06 18:34:02 +02:00
7108c68a7b Merge commit '5283a7e4813de74b9dae8da1d17817fd89d0132e' as 'custom/convert-furigana' 2024-04-06 18:30:43 +02:00
5283a7e481 Squashed 'custom/convert-furigana/' content from commit f21e49b
git-subtree-dir: custom/convert-furigana
git-subtree-split: f21e49bb9b19794b85ea4cf778872c0524d84573
2024-04-06 18:30:42 +02:00
c2dab1344e Merge branch 'v4' into jpg 2024-04-06 18:18:57 +02:00
fbed2635e2 Docker: compose file and script to build and run 2024-04-06 18:13:39 +02:00
4595f54660 Quartz configuration and styling 2024-04-06 18:10:41 +02:00
320 changed files with 32649 additions and 5087 deletions

2
.dockerignore Normal file
View File

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

View File

@ -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:
- "*"

43
.github/workflows/build-preview.yaml vendored Normal file
View File

@ -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

View File

@ -26,7 +26,7 @@ jobs:
- name: Setup Node
uses: actions/setup-node@v4
with:
node-version: 18
node-version: 22
- name: Cache dependencies
uses: actions/cache@v4
@ -45,7 +45,7 @@ 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' && github.ref == 'refs/heads/v4' }}
@ -59,7 +59,7 @@ jobs:
- name: Setup Node
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

37
.github/workflows/deploy-preview.yaml vendored Normal file
View File

@ -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 }}

View File

@ -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

1
.node-version Normal file
View File

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

View File

@ -1,11 +1,29 @@
FROM node:20-slim as builder
FROM python:latest AS convert
WORKDIR /usr/src/app
COPY content/ ./
COPY custom/convert-furigana/program/convert-furigana.py ./
COPY custom/convert-usage/program/convert-usage.py ./
ENV PIP_ROOT_USER_ACTION=ignore
RUN python -m pip install --upgrade pip
RUN python -m pip install beautifulsoup4
RUN python convert-furigana.py .
RUN python convert-usage.py .
FROM node: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 . .
CMD ["npx", "quartz", "build", "--serve"]
COPY --from=convert /usr/src/app/ /usr/src/app/content/
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/

2
content/.gitignore vendored Normal file
View File

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

View File

10
content/.obsidian/app.json vendored Normal file
View File

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

11
content/.obsidian/appearance.json vendored Normal file
View File

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

View File

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

View File

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

31
content/.obsidian/core-plugins.json vendored Normal file
View File

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

22
content/.obsidian/graph.json vendored Normal file
View File

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

File diff suppressed because one or more lines are too long

View File

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

View File

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

View File

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

View File

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

File diff suppressed because one or more lines are too long

View File

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

File diff suppressed because one or more lines are too long

View File

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

File diff suppressed because one or more lines are too long

View File

@ -0,0 +1,14 @@
{
"id": "obsidian42-brat",
"name": "BRAT",
"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": {
"Visit my site": "https://tfthacker.com"
}
}

View File

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

View File

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

View File

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

55
content/.obsidian/snippets/usage.css vendored Normal file
View File

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

View File

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

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,65 @@
# Basics
## う-verbs
| Tense | Dictionary positive | Dictionary negative | Polite positive | Polite negative |
| ------------------- | ------------------- | ------------------- | --------------- | --------------- |
| Present | 書く | 書かない | 書きます | 書きません |
| Past | 書いた | 書かなかった | 書きました | 書きませんでした |
| Volitional | 書こう | 書かないだろう | 書きましょう | 書かないでしょう |
| Present Progressive | 書いている | 書いていない | 書いています | 書いていません |
| Past Progressive | 書いていた | 書いていなかった | 書いていました | 書いていませんでした |
| Imperative | 書け | 書けな | 書いてください | 書かないでください |
| Conditional -eba | 書けば | 書かなければ | / | / |
| Conditional -tara | 書いたら | 書かなかったら | / | / |
| Potential | 書ける | 書けない | 書けます | 書けません |
| Causative | 書かせる | 書かせない | 書かせます | 書かせません |
| Passive | 書かれる | 書かれない | 書かれます | 書かれません |
## る-verbs
| Tense | Dictionary positive | Dictionary negative | Polite positive | Polite negative |
| ------------------- | ------------------- | ------------------- | --------------- | --------------- |
| Present | 食べる | 食べない | 食べます | 食べません |
| Past | 食べた | 食べなかった | 食べました | 食べませんでした |
| Volitional | 食べよう | 食べないだろう | 食べましょう | 食べませんでしょう |
| Present Progressive | 食べている | 食べていない | 食べています | 食べていません |
| Past Progressive | 食べていた | 食べていなかった | 食べていました | 食べていませんでした |
| Imperative | 食べろ | 食べるな | 食べてください | 食べないでください |
| Conditional -eba | 食べれば | 食べなければ | / | / |
| Conditional -tara | 食べたら | 食べなかったら | / | / |
| Potential | 食べられる | 食べられない | 食べられます | 食べられません |
| Causative | 食べさせる | 食べさせない | 食べさせます | 食べさせません |
| Passive | 食べられる | 食べられない | 食べられます | 食べられません |
## Irregular: する
| Tense | Dictionary positive | Dictionary negative | Polite positive | Polite negative |
| ------------------- | ------------------- | ------------------- | --------------- | --------------- |
| Present | する | しない | します | しません |
| Past | した | しなかった | しました | しませんでした |
| Volitional | しよう | しないだろう | しましょう | しませんでしょう |
| Present Progressive | している | していない | しています | していません |
| Past Progressive | していた | していなかった | していました | していませんでした |
| Imperative | しろ | するな | してください | しないでください |
| Conditional -eba | すれば | しなければ | / | / |
| Conditional -tara | したら | しなかったら | / | / |
| Potential | できる | できない | できます | できません |
| Causative | させる | させない | させます | させません |
| Passive | される | されない | されます | されません |
## Irregular: 来る
| Tense | Dictionary positive | Dictionary negative | Polite positive | Polite negative |
| ------------------- | ------------------- | ------------------- | --------------- | --------------- |
| Present | くる | こない | きます | きません |
| Past | きた | こなかった | きました | きませんでした |
| Volitional | きよう | こないだろう | きましょう | きませんでしょう |
| Present Progressive | きている | きていない | きています | きていません |
| Past Progressive | きていた | きていなかった | きていました | きていませんでした |
| Imperative | こい | くるな | きてください | こないでください |
| Conditional -eba | くれば | こなければ | / | / |
| Conditional -tara | きたら | こなかったら | / | / |
| Potential | こられる | こられない | こられます | こられません |
| Causative | こさせる | こさせない | こさせます | こさせません |
| Passive | こられる | こられない | こられます | こられません |

View File

@ -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
> {電車|でんしゃ}で行く==とすると==、20{分|っぷん}かかるです。
> 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.

View File

@ -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.

View File

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

View File

@ -0,0 +1,159 @@
# Te-Form (2) - manner of doing
## ていく・てくる
ていく combines the Te-form with the verb 行く.
てくる combines the Te-form with the verb 来る.
Both can be used when representing time or a physical place. Kanji and hiragana can be used, and they can be conjugated.
Only for **verbs**.
The first meaning is the following:
* ていく means to go and do something.
* てくる means to do and come back.
> [!info] Examples
> 家で食べ==ていく==か?
> Want to go and eat at my home?
>
> {晩御飯|ばんごはん}を買==ってきた==。
> I brought tonight's dinner. (bought and came with).
The second meaning is:
* ていく means to start doing something with your own agency.
* てくる on the contrary, is when something comes to the listener without agency from them.
> [!info] Examples
> 彼は駅まで歩い==ていきます==。
> He walk to the station.
>
> 雨が{降|ふ}==ってきた==。
> It started raining.
## てしまう・ちゃう・じゃう
<div class="usage">
<div>
<p><span class="box">Vて</span> + しまう</p>
<p><span class="box">V<strike></strike></span> + ちゃう</p>
<p><span class="box">V<strike></strike></span> + じゃう</p>
</div>
</div>
This means "by accident, unfortunately" or "completely".
Only for **verbs**.
> [!info] Examples
> {宿題|しゅく|だい}もうや==ってしまいました==。
> I've already finished my homework.
>
> もう{全部|ぜん|ぶ}食べ==ちゃった==。。。
> I've already eaten everything...
## てみる
Used to express the meaning of trying something, usually something new.
Can also be used to suggest to someone to try something.
Used in past tense, it implies a successful attempt.
Only for **verbs**.
> [!info] Example
> これを食べ==てみる==か?
> Do you want to try this food?
## てすみません
Means "sorry for".
> [!info] Example
> {遅|おく}れ==てすみません==。
> Sorry for being late.
## てよかった
Means "glad that".
> [!info] Example
> {美術館|びじゅつかん}に行==ってよかった==。
> I'm glad I went to the museum.
## ているところ
Means "in the process/middle of doing". Can either talk about the exact moment or in general.
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
> {切符|きっぷ}は500円==で済ませる==。
> 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.

View File

@ -0,0 +1,56 @@
# Te-Form (3) - give & receive
Extends the common forms of あげる, くれる, and もらう, but what is received or given is now a verb, instead of a noun.
## てあげる
Expresses that someone is doing or did something for someone else.
The person that received the favor is followed by the に particle.
Only for **verbs**.
> [!info] Example
> 母にケーキを買==ってあげた==。
> I bought a cake for my mother.
>
For casual language, てやる can be used.
## てくれる
Used to ask a favor from someone or to say that something was done to the speaker.
The person that received the favor (usually oneself and thus omitted) is followed by the に particle.
Only for **verbs**.
> [!info] Example
> {友達|とも|だち}がギターを{教|おし}え==てくれる==。
> My friend will teach me the guitar.
### てくれてありがとう
This form expresses gratitude for something that benefited the speaker. It is not used for something expected.
Only for **verbs**.
> [!info] Example
> 今日来==てくれてありがとう==
> Thank you for coming today!
## てもらう
This form expresses gratitude for a favor that the recipient generally requested for, or where gratitude is the focus.
Only for **verbs**.
> [!info] Example
> {友達|とも|だち}が手伝==ってもらった==。
> My friend helped me (and I owe him / because I asked him and I am grateful)
## てくれない・てもらえない
Used as a mean to ask for a favor like "would you, could you?". Used in a similar form to じゃないか.
Only for **verbs**.
> [!info] Example
> {電気|でん|き}をつけ==てもらえない==か。
> Could you please turn on the lights?
>
> 電気をつけ==ないでもらえない==か。
> Could you please turn off the light?

View File

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

View File

@ -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.

57
content/index.md Normal file
View File

@ -0,0 +1,57 @@
# Japanese Grammar
Welcome to my Japanese Grammar project!
## Goal
The goal of this website is to be a synthesis of useful resources for my Japanese learning adventure. I want to have grammar points next to each other, independently of any "difficulty level", set up in a logical and consistent form. I don't want to have to open 5 pages to compare information, and I don't want a deep dive into a notion. The goal is to be a reminder of the things I learn, rather than a way to learn. I want a few examples to grasp it, but I do not want to have ten of the same kind. And nothing quite fits for me!
## Sources
Of course, since I'm _learning_ the language, I need to 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://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/)
* [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/)
## Other useful resources
In addition to those I cited, here are other resources I find useful.
### Kanjis
* [Remembering the Kanji (RTK)](https://en.wikipedia.org/wiki/Remembering_the_Kanji_and_Remembering_the_Hanzi), a kanji learning method
* [Kanji Koohii](https://kanji.koohii.com/), a website using the RTK method and spaced repetition
* [Remember the JLPT](https://git.marchal.dev/keb/remember-the-JLPT), a tool I made to learn kanjis by JLPT levels
### Reading
* [Sakubun](https://sakubun.xyz/)
* [NHK News Web Easy](https://www3.nhk.or.jp/news/easy/)
* [Natively](https://learnnatively.com/browse/jpn/)
### Grammar
* [jtest4you](https://japanesetest4you.com/)
* [Japanese Conjugation Drill](https://drill.jp.marchal.dev)
### Vocabulary
* [Jisho](https://jisho.org/), an online dictionary
* [Tatoeba](https://tatoeba.org), for its sentences database
### Apps
- [Anki](https://apps.ankiweb.net/), the spaced repetition software
## Any errors?
If you find any error, please do contact me! I wrote the examples by myself, so they might not be accurate. You can find my website in the footer of any page of this website. Thanks!

View File

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

View File

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

View File

@ -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?

View File

@ -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.

View File

@ -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.

View File

@ -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?
>
> {医者|いしゃ}に1時間==ぐらい==を{待|ま}ってました。
> 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
> {薬屋|くすりや}まで10分==ばかり==かかる。
> 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.

View File

@ -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.

View File

@ -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.

View File

@ -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.

View File

@ -0,0 +1,210 @@
# Combination actions
Those rules combine a verb and an adjective to make a new meaning.
<div class="usage">
<div class="">
<p><span class="box">V-<strike>ます</strike></span></p>
</div>
<p class="r">+ Adj</p>
</div>
## Difficulty
### ~やすい: easy
Means:
* easy to do
* likely to happen
* has a tendency of
> [!info] Example
> 見==やすい==。
> Easy to see.
>
> {泣|な}き==やすい==。
> 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.
> [!info] Example
> 見==にくい==。
> 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.
> [!info] Example
> {飲|の}み==始める==。
> To start to drink.
## ~出す
{出|だ}す means that something suddenly started. Has the nuance of being unintentional, or cannot be avoided.
> [!info] Example
> 雨が降り==出した==。
> It suddenly started raining.
## ~続く
{続|つづ}く means that something continues.
> [!info] Example
> {飲|の}み==続ける==。
> To continue to drink.
## ~終わる
{終|お}わる means that something ends.
> [!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
> この13時間{飛行|ひこう}で{座|すわ}り==っぱなし==でした。
> 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).

View File

@ -0,0 +1,146 @@
# Comparison
## より
With the following pattern, it means that A is "more" something "than" B.
<div class="usage">
<p class="r">AはB +</p>
<div class="">
<p><span class="box">より</span></p>
</div>
<p class="r">+ Adj + です</p>
</div>
> [!info] Example
> 電車は車==より=={速|はや}いです。
> 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">
<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>
With the following pattern, it means that B is more than A:
<div class="usage">
<p class="r">A +</p>
<div class="">
<p><span class="box">より</span></p>
</div>
<p class="r">+ B +</p>
<div class="">
<p><span class="box">ほうが</span></p>
</div>
</div>
より indicates the lesser thing, and {方|ほう}が the greater thing.
> [!info] Example
> 昨日==より==今日の==ほうが==寒いです。
> Today is colder than yesterday.
## に比べて
に{比|くら}べて is used for comparison.
Used with nouns.
> [!info] Example
> 昨日==に比べて==、今日は晴れるです。
> 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.

View File

@ -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
> 100メートルを{泳|およ}げる==ように==、毎週練習しなきゃ。
> 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.

View File

@ -0,0 +1,86 @@
# Connectors (conjunctions)
## Just by: だけで
Means "just by doing".
Used with nouns and verbs.
> [!info] Example
> 会う==だけで=={幸|しあわ}せになる。
> Just by meeting you, I get happy.
## のに
### 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>
The first meaning is "although", "even tough". Cannot be an hypothesis, must be a confirmed fact. This, it works with past tense.
> [!info] Example
> 食べたばかり==なのに==、まだお{腹|なか}が{空|す}いた。
> Even tough I just ate, I'm still hungry.
### In order to
Means "to do", "in order to".
Used with a verb (dictionary).
> [!info] Example
> {勉強|べんきょう}する==のに=={図書館|としょかん}に行くつもりです。
> In order to study, I plan to go to the library.
## And: そして, それから, それに, それで
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.

View File

@ -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.

View File

@ -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.

View File

@ -0,0 +1,23 @@
# Decision
## ことになる
Used for a decision that is made from an external factor. Means "it has been decided that".
Used with verbs.
> [!info] Example
> {病気|びょうき}だから少し{仕事|しごと}を休む==ことになった==。
> I had to take some time off work because I was sick.
## ことにする
Used for a decision that is made by oneself. Means "to decide on".
Used with verbs.
> [!info] Example
> {吸|す}うを止める==ことにしました==。
> I decided to stop smoking.
## にする
See [[Actions#To decide]].

View File

@ -0,0 +1,105 @@
# Description
## って・って言う・と言う
Means "named", "called".
* って and っていう: used after a noun.
* という: used after a noun or a phrase.
> [!info] Examples
> ゴキブリ==って==虫しっているか。
> Do you know the insect named cockroach?
>
> スペイン語で、ゴキブリは「クカラチャ」==といいます==。
> In Spanish, cockroaches are called "cucaracha".
>
> {台風|たいふう}が来る==という==ニュース。
> 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
> サッカーは{彼|かれ}の{得意|とくい}です。ほとんどサッカーのプロ==と言ってもいい==。
> Soccer is his strong point. You could almost say he's a pro.
## がする
This means to experience a sense (except visual): to smell, to hear, to taste, etc, depending on the noun.
> [!info] Example
> いい{匂|にお}い==がする==。
> It smells good.
>
> 今日は{最悪|さいあく}日{気|き}==がする==。
> I feel like today is the worst.
## から作る・で作る
Means "made from".
> [!info] Example
> チーズは{牛乳|ぎゅうにゅう}==から作る==。
> Cheese is made from milk.
## のが「好き・上手・下手」
のが({好|すき}き・{上手|じょうず}・{下手|へた}) means "to (like/be good/be bad)" at an action.
Used with a verb in dictionary form.
> [!info] Example
> テレビでサッカーを見る==のが好き==です。
> I like watching soccer on the television.
>
> 彼女は料理を作る==のが上手==と思います。
> I think she is a good cook.
>
> {絵|え}を{塗|ぬる}る==のが下手==です。
> 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>
</div>
</div>
<p class="right">+ で有名</p>
</div>
は~で{有名|ゆうめい} means "famous for". Used to describe why people, places or things are famous.
> [!info] Example
> パリ==は==エッフェル{塔|とう}==で有名==です。
> Paris is famous for its Eiffel Tower.

View File

@ -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.

View File

@ -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.

View File

@ -0,0 +1,18 @@
# Experience
## たことがある
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.

View File

@ -0,0 +1,89 @@
# Give and receive; lend and borrow
## Give and receive
### あげる
<div class="usage">
<p class="r">Giver が Receiver に Object を + </p>
<div class="">
<p><span class="box">あげる</span></p>
</div>
</div>
Used when you give an object to someone.
> [!info] Example
> {友達|とも|だち}に本を==あげる==。
> I give a book to my friend.
### くれる
<div class="usage">
<p class="r">Giver が Receiver に Object を + </p>
<div class="">
<p><span class="box">くれる</span></p>
</div>
</div>
Used when someone gives an object to you.
> [!info] Example
> {友達|とも|だち}が本を==くれる==。
> My friend gives me a book.
### もらう
<div class="usage">
<p class="r">Receiver が Giver 「に・から」 Object を + </p>
<div class="">
<p><span class="box">もらう</span></p>
</div>
</div>
Used when you receive an object from someone.
> [!info] Example
> {友達|とも|だち}に本を==もらう==。
> I get a book from my friend.
### When to use?
#### Giving
There's a nuance between the two terms depending on who you are close to.
The general rule is that you:
* use ==あげる== if you, your friends or family give something to others (closer to giver's side).
* use ==くれる== if you, your friends or family are receiving things from others (closer to receiver's side).
In both cases, the topic is the giver.
#### Receiving
There's only one word: ==もらう==, and it doesn't matter who you are close to.
In this case, the topic is the receiver.
## Lend and borrow
### 貸す
{貸|か}す means to lend.
> [!info] Examples
> 傘を==貸しました==。
> I lent my umbrella.
>
> 傘を==貸して==くれませんか?
> Could you do me a favor of lending me your umbrella?
>
> トイレ==貸りて==もいい。
> Could I use your toilets?
### 借りる
{借|か}りる means to borrow.
> [!info] Example
> 傘を==借りました==。
> I borrowed the umbrella.

View File

@ -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.

View File

@ -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.

View File

@ -0,0 +1,178 @@
# Listing
## Connecting sentences
### そして
This conjunction means "and". It implies a cause-effect relationship between the two sentences. There's an interconnection, where the order of the actions cannot be changed.
> [!info] Examples
> バスケットボールをした。==そして==水を{飲|の}んだ。
> I played basketball. Then, I drank water.
### それから
This conjunction means "and" or "after that". It implies a chronological order to the events. Since there's no interconnection, the order of actions could be changed.
> [!info] Examples
> スーパーに行きました。==それから=={弁当|べんとう}を食べました。
> I went to the supermarket. After that, I ate my bento.
### それに
This conjunction means "and", "besides" or "in addition". Implies a new information in relation to the precedent one. It is not used to add a negative information to a positive one, and vice-versa.
> [!info] Examples
> 昨日、{病気|びょうき}になった。==それに==パソコンも{壊|こわ}れた。
> I got sick yesterday. Beside, my computer broke.
### それで
Means "because of that", "therefore". Substitutes the first sentence happening before by それ, highlighting information from it.
> [!info] Examples
> {子供|こども}のころ、毎日{電車|でんしゃ}で{通|かよ}うていた。==それで=={電車|でんしゃ}{運転手|うんてんしゅ}になりたかった。
> When I was a child, I took the train to school every day. Because of that, I wanted to be a train driver.
## Exhaustive listing
### と
This particles means "and" or "with". Used for a list that is exhaustive. Connects sentences.
> [!info] Examples
> 犬==と=={住|す}んでいます。
> I live with my dog.
>
> フランス語==と==スペイン語を習っています。
> 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.
See [[TeF (1) - basics#て sequence]].
## Unexhaustive listing
### や
Used for a list that is unexhaustive. Translates to "among other things". Formal.
Used only with nouns.
> [!info] Example
> フランス==や==スペインに{旅行|りょこう}しました。
> I travelled to France and Spain (among others).
### など
Means "things as". Can be used with や for a meaning like "etc".
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 "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
> {果物|くだもの}はバナナ==とか==リンゴ==とか==が好きです。
> I like fruits like bananas and apples.
>
> 明日{野球|やきゅう}==とか==しようか。
> Do you want to play baseball (or something) tomorrow?
>
> もう{諦|あきら}めよう==とか==言わないで。
> Don't say (things like) we should already give up.
### たり~たり
<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>
</div>
<p class="right">+ り...します</p>
</div>
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
> {週末|しゅうまつ}に{泳|およ}い==だり==、{散歩|さんぽ}し==たり==、{買|か}い{物|もの}し==たり==します。
> On the weekends, I do things like swimming, walking and shopping.
### し
<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>
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
> この電車は{速|はや}い==し==デザインもかっこいい。
> This train is fast and has a cool design.
>
> 言ってない==し==
> I never said that!
### やら~やら
<div class="usage">
<div class="left">
<p><span class="box">V</span></p>
<p><span class="box">い-Adj</span></p>
<p><span class="box">N</span></p>
</div>
<p class="right">+ やら + B + やら</p>
</div>
This form is unexhaustive and can be translated as "and", "among other things".
It has 3 nuances:
- Conveys a negative image
- Among other things, in an unorganized manner
- Conflicting feelings
> [!info] Examples
> {今日|きょう}{電車|でんしゃ}がなかった==やら==、{車|くるま}が{壊|こわ}れた==やら==、{家|いえ}に{出|で}かけられませんでした。
> There were no trains and my car broke down, so I couldn't go out.
>
> {黒|くろ}い==やら=={白|しろ}い==やら=={着物|きもの}があります。
> There are black and white kimonos (among other things).
>
## Summing up
* ==や== means "and", and is formal. Can be completed by ==など== (= etc).
* ==とか== also means "and", but is casual.
* ==たり== means "or", "things like". Used to express possibilities.
* ==し== means "and", but with an emphasis on a review.

View File

@ -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.

View File

@ -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.

View File

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

View File

@ -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.

View File

@ -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#とか~とか]].

View File

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

View File

@ -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.

View File

@ -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.

View File

@ -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.

View File

@ -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...

View File

@ -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.

View File

@ -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.

View File

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

View File

@ -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.

View File

@ -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.

View File

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

View File

@ -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.

View File

@ -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.

View File

@ -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?

View File

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

View File

@ -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.

View File

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

View File

@ -0,0 +1,318 @@
# Reason
## ので
<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 after a reason, to explain the consequence. Means "because of", "since".
It is more objective than から: it expresses a situation that exists, and that is outside of one's control. For this reason, it can also be perceived as more polite.
> [!info] Example
> 雨な==ので==傘を持ってきてください。
> Since it is raining, please bring an umbrella.
## から
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">
<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>
It is used to explain or put emphasis on something.
のだ・のです is a bit more formal than んだ・んです.
It is only used with nouns when asking questions.
> [!info] Example
> {良|よ}い{仕事|しごと}な==のです==か。
> Is it a good job?
>
> もう言った==んだ==よ!
> I've already told you!
## のは・のが
Means "the reason for A is B", "doing A is B".
See [[Transformation#のは・のが sentence as noun]].
## なぜなら~から
<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.

View File

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

View File

@ -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.

View File

@ -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
> この{映画|えいが}は120分、==つまり==2時です。
> 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
> この{映画|えいが}は120分、==すなわち==2時です。
> 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
> {日本|にほん}には6月から9月==にかけて==は{暑|あつ}いです。
> 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!

View File

@ -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.

View File

@ -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.

View File

@ -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
> 1時から9じまでの==間==、{寝|ね}ます。
> 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.

View File

@ -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.

View File

@ -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.

View File

@ -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
> この電車は4分==おきに=={出発|しゅ|っぱつ}します。
> 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
> 1日==おきに== =2日==ごとに== = every other day = every second day
> ●○●○●○●
>
> 2日==おきに== =3日==ごとに== = 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.

View File

@ -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
> ==ふと=={通|とお}りに1000円を{見|み}つけた。
> 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.

View File

@ -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.

Some files were not shown because too many files have changed in this diff Show More