changes

A deeply nested document could overflow the stack and abort the entire
import. Bound block recursion depth and wrap each chapter build in a
try/catch so one unreadable chapter is skipped instead of failing the
whole import.

Claude-Session: https://claude.ai/code/session_01RzTWrLiy4zGuw2hZSQGamk

.github/workflows/release.yml

@@ -85,7 +85,7 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - os: macos-26
+          - os: macos-latest
             args: "--target universal-apple-darwin --config src-tauri/tauri.release.conf.json"
             rust-targets: "aarch64-apple-darwin,x86_64-apple-darwin"
           - os: ubuntu-latest
@@ -137,19 +137,6 @@ jobs:
       - name: Install frontend dependencies
         run: pnpm install --frozen-lockfile
 
-      - name: Provision Google credentials
-        shell: bash
-        env:
-          GOOGLE_CREDENTIALS: ${{ secrets.GOOGLE_CREDENTIALS }}
-        run: |
-          if [ -n "$GOOGLE_CREDENTIALS" ]; then
-            printf '%s' "$GOOGLE_CREDENTIALS" > google-credentials.json
-            echo "Wrote google-credentials.json from GOOGLE_CREDENTIALS secret."
-          else
-            cp google-credentials.example.json google-credentials.json
-            echo "::warning::GOOGLE_CREDENTIALS secret not set — embedding placeholder credentials; Google Drive backup will be disabled in this release."
-          fi
-
       - name: Build and upload
         uses: tauri-apps/tauri-action@v0
         env:

.gitignore

@@ -26,10 +26,6 @@ dist-ssr
 # Tauri build output
 src-tauri/target/
 
-# Google OAuth desktop client (real values, never commit)
-/google-credentials.json
-/client_secret_*.json
-
 # Screenshots & Playwright MCP artifacts
 .playwright-mcp/
 /*.png

CLAUDE.md

@@ -10,7 +10,7 @@
 
 ## Git Commit Rules
 
-  - Do not make branches, commit in main only
   - Use conventional commit format: `feat|fix|refactor|docs|test|chore|ci(scope): message`
   - Never use `git add .` or `git add -A`. Always stage specific files by name.
   - Don't batch multiple unrelated changes into one commit.
+  - Commit early and often. A working 5-line change is better than a pending 200-line change.

README.md

@@ -1,3 +1,37 @@
 # margin
 
-Write your book. Own every word. A calm, offline studio to write, format, and publish your book to every store and to print.
+An offline desktop app for writing books and exporting them to print-ready PDF and reflowable EPUB — a focused, free alternative to InDesign for text-first books (novels, non-fiction).
+
+## Stack
+
+- **Tauri 2** (Rust shell) — offline by construction; the entire export pipeline runs locally, nothing hits the network.
+- **React + TipTap** — the semantic writing surface.
+- **Typst** (embedded as a Rust crate) — print-ready PDF with real book typography.
+- **Built-in EPUB3** generator + zip packager.
+
+One semantic document feeds three renderers — the editor, the PDF, and the EPUB — from a single design-token theme (**Quiet Press**: Literata for the page, Hanken Grotesk for the chrome). Both fonts are bundled.
+
+## Develop
+
+```sh
+pnpm install
+pnpm tauri dev     # the real desktop app: live PDF dock, file dialogs, PDF/EPUB export
+pnpm dev           # browser-only UI preview (Tauri APIs are inert)
+```
+
+The first `tauri dev` build is slow because it compiles Typst.
+
+## Using it
+
+- A book saves as a single `.margin` file (JSON). Open / Save with ⌘O / ⌘S.
+- Click the title in the top bar for **Book setup** (title, author, ISBN, trim size, language).
+- Insert images from the toolbar and choose a placement (inline / full-width / full-page / float).
+- Export to **PDF** or **EPUB** from the titlebar menu.
+
+## Layout
+
+- `src/editor/` — TipTap editor, extensions, figure block, floating toolbar.
+- `src/components/` — app shell, preview dock, book-setup panel, pdf.js renderer.
+- `src/export/` — `typst.ts` (book → Typst source), `epub.ts` (book → EPUB3 files), `exporters.ts`.
+- `src/store/`, `src/model/` — document model and state.
+- `src-tauri/src/` — `pdf.rs` (Typst compile), `epub.rs` (zip packager), `project.rs` (file IO).

google-credentials.example.json

@@ -1,11 +0,0 @@
-{
-  "installed": {
-    "client_id": "YOUR_CLIENT_ID.apps.googleusercontent.com",
-    "project_id": "your-project-id",
-    "auth_uri": "https://accounts.google.com/o/oauth2/auth",
-    "token_uri": "https://oauth2.googleapis.com/token",
-    "auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs",
-    "client_secret": "YOUR_CLIENT_SECRET",
-    "redirect_uris": ["http://127.0.0.1"]
-  }
-}

index.html

@@ -2,7 +2,7 @@
 <html lang="en">
   <head>
     <meta charset="UTF-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no, viewport-fit=cover" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <link rel="icon" type="image/png" href="/margin-mark.png" />
     <script>
       (function () {

package.json

@@ -1,7 +1,7 @@
 {
   "name": "margin-app",
   "private": true,
-  "version": "0.1.17",
+  "version": "0.1.3",
   "type": "module",
   "scripts": {
     "dev": "vite",

public/fonts/EBGaramond-OFL.txt

@@ -1,93 +0,0 @@
-Copyright 2017 The EB Garamond Project Authors (https://github.com/octaviopardo/EBGaramond12)
-
-This Font Software is licensed under the SIL Open Font License, Version 1.1.
-This license is copied below, and is also available with a FAQ at:
-https://openfontlicense.org
-
-
------------------------------------------------------------
-SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
------------------------------------------------------------
-
-PREAMBLE
-The goals of the Open Font License (OFL) are to stimulate worldwide
-development of collaborative font projects, to support the font creation
-efforts of academic and linguistic communities, and to provide a free and
-open framework in which fonts may be shared and improved in partnership
-with others.
-
-The OFL allows the licensed fonts to be used, studied, modified and
-redistributed freely as long as they are not sold by themselves. The
-fonts, including any derivative works, can be bundled, embedded, 
-redistributed and/or sold with any software provided that any reserved
-names are not used by derivative works. The fonts and derivatives,
-however, cannot be released under any other type of license. The
-requirement for fonts to remain under this license does not apply
-to any document created using the fonts or their derivatives.
-
-DEFINITIONS
-"Font Software" refers to the set of files released by the Copyright
-Holder(s) under this license and clearly marked as such. This may
-include source files, build scripts and documentation.
-
-"Reserved Font Name" refers to any names specified as such after the
-copyright statement(s).
-
-"Original Version" refers to the collection of Font Software components as
-distributed by the Copyright Holder(s).
-
-"Modified Version" refers to any derivative made by adding to, deleting,
-or substituting -- in part or in whole -- any of the components of the
-Original Version, by changing formats or by porting the Font Software to a
-new environment.
-
-"Author" refers to any designer, engineer, programmer, technical
-writer or other person who contributed to the Font Software.
-
-PERMISSION & CONDITIONS
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the Font Software, to use, study, copy, merge, embed, modify,
-redistribute, and sell modified and unmodified copies of the Font
-Software, subject to the following conditions:
-
-1) Neither the Font Software nor any of its individual components,
-in Original or Modified Versions, may be sold by itself.
-
-2) Original or Modified Versions of the Font Software may be bundled,
-redistributed and/or sold with any software, provided that each copy
-contains the above copyright notice and this license. These can be
-included either as stand-alone text files, human-readable headers or
-in the appropriate machine-readable metadata fields within text or
-binary files as long as those fields can be easily viewed by the user.
-
-3) No Modified Version of the Font Software may use the Reserved Font
-Name(s) unless explicit written permission is granted by the corresponding
-Copyright Holder. This restriction only applies to the primary font name as
-presented to the users.
-
-4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
-Software shall not be used to promote, endorse or advertise any
-Modified Version, except to acknowledge the contribution(s) of the
-Copyright Holder(s) and the Author(s) or with their explicit written
-permission.
-
-5) The Font Software, modified or unmodified, in part or in whole,
-must be distributed entirely under this license, and must not be
-distributed under any other license. The requirement for fonts to
-remain under this license does not apply to any document created
-using the Font Software.
-
-TERMINATION
-This license becomes null and void if any of the above conditions are
-not met.
-
-DISCLAIMER
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-OTHER DEALINGS IN THE FONT SOFTWARE.

public/fonts/Fraunces-OFL.txt

@@ -1,93 +0,0 @@
-Copyright 2018 The Fraunces Project Authors (https://github.com/undercasetype/Fraunces)
-
-This Font Software is licensed under the SIL Open Font License, Version 1.1.
-This license is copied below, and is also available with a FAQ at:
-http://scripts.sil.org/OFL
-
-
------------------------------------------------------------
-SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
------------------------------------------------------------
-
-PREAMBLE
-The goals of the Open Font License (OFL) are to stimulate worldwide
-development of collaborative font projects, to support the font creation
-efforts of academic and linguistic communities, and to provide a free and
-open framework in which fonts may be shared and improved in partnership
-with others.
-
-The OFL allows the licensed fonts to be used, studied, modified and
-redistributed freely as long as they are not sold by themselves. The
-fonts, including any derivative works, can be bundled, embedded, 
-redistributed and/or sold with any software provided that any reserved
-names are not used by derivative works. The fonts and derivatives,
-however, cannot be released under any other type of license. The
-requirement for fonts to remain under this license does not apply
-to any document created using the fonts or their derivatives.
-
-DEFINITIONS
-"Font Software" refers to the set of files released by the Copyright
-Holder(s) under this license and clearly marked as such. This may
-include source files, build scripts and documentation.
-
-"Reserved Font Name" refers to any names specified as such after the
-copyright statement(s).
-
-"Original Version" refers to the collection of Font Software components as
-distributed by the Copyright Holder(s).
-
-"Modified Version" refers to any derivative made by adding to, deleting,
-or substituting -- in part or in whole -- any of the components of the
-Original Version, by changing formats or by porting the Font Software to a
-new environment.
-
-"Author" refers to any designer, engineer, programmer, technical
-writer or other person who contributed to the Font Software.
-
-PERMISSION & CONDITIONS
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the Font Software, to use, study, copy, merge, embed, modify,
-redistribute, and sell modified and unmodified copies of the Font
-Software, subject to the following conditions:
-
-1) Neither the Font Software nor any of its individual components,
-in Original or Modified Versions, may be sold by itself.
-
-2) Original or Modified Versions of the Font Software may be bundled,
-redistributed and/or sold with any software, provided that each copy
-contains the above copyright notice and this license. These can be
-included either as stand-alone text files, human-readable headers or
-in the appropriate machine-readable metadata fields within text or
-binary files as long as those fields can be easily viewed by the user.
-
-3) No Modified Version of the Font Software may use the Reserved Font
-Name(s) unless explicit written permission is granted by the corresponding
-Copyright Holder. This restriction only applies to the primary font name as
-presented to the users.
-
-4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
-Software shall not be used to promote, endorse or advertise any
-Modified Version, except to acknowledge the contribution(s) of the
-Copyright Holder(s) and the Author(s) or with their explicit written
-permission.
-
-5) The Font Software, modified or unmodified, in part or in whole,
-must be distributed entirely under this license, and must not be
-distributed under any other license. The requirement for fonts to
-remain under this license does not apply to any document created
-using the Font Software.
-
-TERMINATION
-This license becomes null and void if any of the above conditions are
-not met.
-
-DISCLAIMER
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-OTHER DEALINGS IN THE FONT SOFTWARE.

public/fonts/Lora-OFL.txt

@@ -1,93 +0,0 @@
-Copyright 2011 The Lora Project Authors (https://github.com/cyrealtype/Lora-Cyrillic), with Reserved Font Name "Lora".
-
-This Font Software is licensed under the SIL Open Font License, Version 1.1.
-This license is copied below, and is also available with a FAQ at:
-https://scripts.sil.org/OFL
-
-
------------------------------------------------------------
-SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
------------------------------------------------------------
-
-PREAMBLE
-The goals of the Open Font License (OFL) are to stimulate worldwide
-development of collaborative font projects, to support the font creation
-efforts of academic and linguistic communities, and to provide a free and
-open framework in which fonts may be shared and improved in partnership
-with others.
-
-The OFL allows the licensed fonts to be used, studied, modified and
-redistributed freely as long as they are not sold by themselves. The
-fonts, including any derivative works, can be bundled, embedded, 
-redistributed and/or sold with any software provided that any reserved
-names are not used by derivative works. The fonts and derivatives,
-however, cannot be released under any other type of license. The
-requirement for fonts to remain under this license does not apply
-to any document created using the fonts or their derivatives.
-
-DEFINITIONS
-"Font Software" refers to the set of files released by the Copyright
-Holder(s) under this license and clearly marked as such. This may
-include source files, build scripts and documentation.
-
-"Reserved Font Name" refers to any names specified as such after the
-copyright statement(s).
-
-"Original Version" refers to the collection of Font Software components as
-distributed by the Copyright Holder(s).
-
-"Modified Version" refers to any derivative made by adding to, deleting,
-or substituting -- in part or in whole -- any of the components of the
-Original Version, by changing formats or by porting the Font Software to a
-new environment.
-
-"Author" refers to any designer, engineer, programmer, technical
-writer or other person who contributed to the Font Software.
-
-PERMISSION & CONDITIONS
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the Font Software, to use, study, copy, merge, embed, modify,
-redistribute, and sell modified and unmodified copies of the Font
-Software, subject to the following conditions:
-
-1) Neither the Font Software nor any of its individual components,
-in Original or Modified Versions, may be sold by itself.
-
-2) Original or Modified Versions of the Font Software may be bundled,
-redistributed and/or sold with any software, provided that each copy
-contains the above copyright notice and this license. These can be
-included either as stand-alone text files, human-readable headers or
-in the appropriate machine-readable metadata fields within text or
-binary files as long as those fields can be easily viewed by the user.
-
-3) No Modified Version of the Font Software may use the Reserved Font
-Name(s) unless explicit written permission is granted by the corresponding
-Copyright Holder. This restriction only applies to the primary font name as
-presented to the users.
-
-4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
-Software shall not be used to promote, endorse or advertise any
-Modified Version, except to acknowledge the contribution(s) of the
-Copyright Holder(s) and the Author(s) or with their explicit written
-permission.
-
-5) The Font Software, modified or unmodified, in part or in whole,
-must be distributed entirely under this license, and must not be
-distributed under any other license. The requirement for fonts to
-remain under this license does not apply to any document created
-using the Font Software.
-
-TERMINATION
-This license becomes null and void if any of the above conditions are
-not met.
-
-DISCLAIMER
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-OTHER DEALINGS IN THE FONT SOFTWARE.

public/fonts/SourceSerif4-OFL.txt

@@ -1,93 +0,0 @@
-Copyright 2014 The Source Serif 4 Project Authors (https://github.com/adobe-fonts/source-serif)
-
-This Font Software is licensed under the SIL Open Font License, Version 1.1.
-This license is copied below, and is also available with a FAQ at:
-https://openfontlicense.org
-
-
------------------------------------------------------------
-SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
------------------------------------------------------------
-
-PREAMBLE
-The goals of the Open Font License (OFL) are to stimulate worldwide
-development of collaborative font projects, to support the font creation
-efforts of academic and linguistic communities, and to provide a free and
-open framework in which fonts may be shared and improved in partnership
-with others.
-
-The OFL allows the licensed fonts to be used, studied, modified and
-redistributed freely as long as they are not sold by themselves. The
-fonts, including any derivative works, can be bundled, embedded, 
-redistributed and/or sold with any software provided that any reserved
-names are not used by derivative works. The fonts and derivatives,
-however, cannot be released under any other type of license. The
-requirement for fonts to remain under this license does not apply
-to any document created using the fonts or their derivatives.
-
-DEFINITIONS
-"Font Software" refers to the set of files released by the Copyright
-Holder(s) under this license and clearly marked as such. This may
-include source files, build scripts and documentation.
-
-"Reserved Font Name" refers to any names specified as such after the
-copyright statement(s).
-
-"Original Version" refers to the collection of Font Software components as
-distributed by the Copyright Holder(s).
-
-"Modified Version" refers to any derivative made by adding to, deleting,
-or substituting -- in part or in whole -- any of the components of the
-Original Version, by changing formats or by porting the Font Software to a
-new environment.
-
-"Author" refers to any designer, engineer, programmer, technical
-writer or other person who contributed to the Font Software.
-
-PERMISSION & CONDITIONS
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the Font Software, to use, study, copy, merge, embed, modify,
-redistribute, and sell modified and unmodified copies of the Font
-Software, subject to the following conditions:
-
-1) Neither the Font Software nor any of its individual components,
-in Original or Modified Versions, may be sold by itself.
-
-2) Original or Modified Versions of the Font Software may be bundled,
-redistributed and/or sold with any software, provided that each copy
-contains the above copyright notice and this license. These can be
-included either as stand-alone text files, human-readable headers or
-in the appropriate machine-readable metadata fields within text or
-binary files as long as those fields can be easily viewed by the user.
-
-3) No Modified Version of the Font Software may use the Reserved Font
-Name(s) unless explicit written permission is granted by the corresponding
-Copyright Holder. This restriction only applies to the primary font name as
-presented to the users.
-
-4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
-Software shall not be used to promote, endorse or advertise any
-Modified Version, except to acknowledge the contribution(s) of the
-Copyright Holder(s) and the Author(s) or with their explicit written
-permission.
-
-5) The Font Software, modified or unmodified, in part or in whole,
-must be distributed entirely under this license, and must not be
-distributed under any other license. The requirement for fonts to
-remain under this license does not apply to any document created
-using the Font Software.
-
-TERMINATION
-This license becomes null and void if any of the above conditions are
-not met.
-
-DISCLAIMER
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-OTHER DEALINGS IN THE FONT SOFTWARE.

src-tauri/Cargo.lock

@@ -3089,10 +3089,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ff2abc00be7fca6ebc474524697ae276ad847ad0a6b3faa4bcb027e9a4614ad0"
 dependencies = [
  "cfg-if",
- "js-sys",
  "libc",
  "wasi",
- "wasm-bindgen",
 ]
 
 [[package]]
@@ -3756,7 +3754,6 @@ dependencies = [
  "tokio",
  "tokio-rustls",
  "tower-service",
- "webpki-roots",
 ]
 
 [[package]]
@@ -4635,12 +4632,6 @@ dependencies = [
  "hashbrown 0.17.1",
 ]
 
-[[package]]
-name = "lru-slab"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "112b39cec0b298b6c1999fee3e31427f74f676e4cb9879ed1a121b43661a4154"
-
 [[package]]
 name = "lzma-rs"
 version = "0.3.0"
@@ -4713,19 +4704,12 @@ checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d"
 
 [[package]]
 name = "margin-app"
-version = "0.1.15"
+version = "0.1.3"
 dependencies = [
  "base64 0.22.1",
- "fontdb",
  "harper-core",
- "objc2",
- "objc2-app-kit",
- "objc2-foundation",
- "rand 0.8.6",
- "reqwest 0.12.28",
  "serde",
  "serde_json",
- "sha2",
  "spellbook",
  "tauri",
  "tauri-build",
@@ -4736,7 +4720,6 @@ dependencies = [
  "typst",
  "typst-as-lib",
  "typst-pdf",
- "url",
  "zip 2.4.2",
 ]
 
@@ -5141,17 +5124,9 @@ checksum = "d49e936b501e5c5bf01fda3a9452ff86dc3ea98ad5f283e1455153142d97518c"
 dependencies = [
  "bitflags 2.13.0",
  "block2",
- "libc",
  "objc2",
- "objc2-cloud-kit",
- "objc2-core-data",
  "objc2-core-foundation",
- "objc2-core-graphics",
- "objc2-core-image",
- "objc2-core-text",
- "objc2-core-video",
  "objc2-foundation",
- "objc2-quartz-core",
 ]
 
 [[package]]
@@ -5171,7 +5146,6 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0b402a653efbb5e82ce4df10683b6b28027616a2715e90009947d50b8dd298fa"
 dependencies = [
- "bitflags 2.13.0",
  "objc2",
  "objc2-foundation",
 ]
@@ -5232,19 +5206,6 @@ dependencies = [
  "objc2-core-graphics",
 ]
 
-[[package]]
-name = "objc2-core-video"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d425caf1df73233f29fd8a5c3e5edbc30d2d4307870f802d18f00d83dc5141a6"
-dependencies = [
- "bitflags 2.13.0",
- "objc2",
- "objc2-core-foundation",
- "objc2-core-graphics",
- "objc2-io-surface",
-]
-
 [[package]]
 name = "objc2-encode"
 version = "4.1.0"
@@ -6005,61 +5966,6 @@ dependencies = [
  "memchr",
 ]
 
-[[package]]
-name = "quinn"
-version = "0.11.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c1a41e437b6bbd489372cd4971de128e85c855f56c57f283d20ff016cf7c0a8"
-dependencies = [
- "bytes",
- "cfg_aliases",
- "pin-project-lite",
- "quinn-proto",
- "quinn-udp",
- "rustc-hash 2.1.2",
- "rustls",
- "socket2",
- "thiserror 2.0.18",
- "tokio",
- "tracing",
- "web-time",
-]
-
-[[package]]
-name = "quinn-proto"
-version = "0.11.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fcb935c5bec503c2f0e306bdd3e58bb9029dcb14fa8d9ac76e3a5256ac0763e"
-dependencies = [
- "bytes",
- "getrandom 0.3.4",
- "lru-slab",
- "rand 0.9.4",
- "ring",
- "rustc-hash 2.1.2",
- "rustls",
- "rustls-pki-types",
- "slab",
- "thiserror 2.0.18",
- "tinyvec",
- "tracing",
- "web-time",
-]
-
-[[package]]
-name = "quinn-udp"
-version = "0.5.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "addec6a0dcad8a8d96a771f815f0eaf55f9d1805756410b39f5fa81332574cbd"
-dependencies = [
- "cfg_aliases",
- "libc",
- "once_cell",
- "socket2",
- "tracing",
- "windows-sys 0.60.2",
-]
-
 [[package]]
 name = "quote"
 version = "1.0.45"
@@ -6087,8 +5993,6 @@ version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5ca0ecfa931c29007047d1bc58e623ab12e5590e8c7cc53200d5202b69266d8a"
 dependencies = [
- "libc",
- "rand_chacha 0.3.1",
  "rand_core 0.6.4",
  "serde",
 ]
@@ -6129,7 +6033,6 @@ version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
 dependencies = [
- "getrandom 0.2.17",
  "serde",
 ]
 
@@ -6300,44 +6203,6 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "19b30a45b0cd0bcca8037f3d0dc3421eaf95327a17cad11964fb8179b4fc4832"
 
-[[package]]
-name = "reqwest"
-version = "0.12.28"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eddd3ca559203180a307f12d114c268abf583f59b03cb906fd0b3ff8646c1147"
-dependencies = [
- "base64 0.22.1",
- "bytes",
- "futures-core",
- "http",
- "http-body",
- "http-body-util",
- "hyper",
- "hyper-rustls",
- "hyper-util",
- "js-sys",
- "log",
- "percent-encoding",
- "pin-project-lite",
- "quinn",
- "rustls",
- "rustls-pki-types",
- "serde",
- "serde_json",
- "serde_urlencoded",
- "sync_wrapper",
- "tokio",
- "tokio-rustls",
- "tower",
- "tower-http",
- "tower-service",
- "url",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "web-sys",
- "webpki-roots",
-]
-
 [[package]]
 name = "reqwest"
 version = "0.13.4"
@@ -6560,7 +6425,6 @@ version = "1.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "30a7197ae7eb376e574fe940d068c30fe0462554a3ddbe4eca7838e049c937a9"
 dependencies = [
- "web-time",
  "zeroize",
 ]
 
@@ -6909,18 +6773,6 @@ dependencies = [
  "serde_core",
 ]
 
-[[package]]
-name = "serde_urlencoded"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd"
-dependencies = [
- "form_urlencoded",
- "itoa",
- "ryu",
- "serde",
-]
-
 [[package]]
 name = "serde_with"
 version = "3.21.0"
@@ -7569,7 +7421,7 @@ dependencies = [
  "percent-encoding",
  "plist",
  "raw-window-handle",
- "reqwest 0.13.4",
+ "reqwest",
  "serde",
  "serde_json",
  "serde_repr",
@@ -7758,7 +7610,7 @@ dependencies = [
  "minisign-verify",
  "osakit",
  "percent-encoding",
- "reqwest 0.13.4",
+ "reqwest",
  "rustls",
  "semver",
  "serde",
@@ -9297,15 +9149,6 @@ dependencies = [
  "rustls-pki-types",
 ]
 
-[[package]]
-name = "webpki-roots"
-version = "1.0.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf85cb06032201fa7c6f829d7db5a7e5aa45bcc0655327713065f6f0576731bf"
-dependencies = [
- "rustls-pki-types",
-]
-
 [[package]]
 name = "webview2-com"
 version = "0.38.2"

src-tauri/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "margin-app"
-version = "0.1.17"
+version = "0.1.3"
 description = "A Tauri App"
 authors = ["you"]
 edition = "2021"
@@ -27,38 +27,14 @@ serde = { version = "1", features = ["derive"] }
 serde_json = "1"
 base64 = "0.22"
 zip = "2"
-fontdb = "0.23"
 typst = "0.14.2"
 typst-pdf = "0.14.2"
 typst-as-lib = "0.15.5"
+spellbook = "0.4"
 # Pinned exactly: the [patch] stubs below are tied to this version's burn/cubecl graph. A minor
 # bump could silently invalidate the patch ("unused") and pull the broken CUDA subtree back in,
 # so bump deliberately and re-audit the stubs. (see [patch.crates-io])
 harper-core = { version = "=2.5.0", features = ["concurrent"] }
-reqwest = { version = "0.12", default-features = false, features = ["rustls-tls", "json"] }
-sha2 = "0.10"
-rand = "0.8"
-url = "2"
-
-# Spelling on macOS uses the system NSSpellChecker (same engine as TextEdit/Safari): far better
-# vocabulary than the bundled Hunspell dictionary and it skips URLs. These objc2 crates are already
-# in the graph via Tauri, so this adds nothing new to the build.
-[target.'cfg(target_os = "macos")'.dependencies]
-objc2 = "0.6"
-objc2-app-kit = { version = "0.3", features = [
-    "NSSpellChecker",
-    "NSApplication",
-    "NSEvent",
-    "NSMenu",
-    "NSMenuItem",
-    "NSResponder",
-    "NSWritingToolsCoordinator",
-] }
-objc2-foundation = { version = "0.3", features = ["NSString", "NSArray", "NSRange", "NSTextCheckingResult"] }
-
-# Other platforms fall back to the bundled Hunspell dictionary via spellbook.
-[target.'cfg(not(target_os = "macos"))'.dependencies]
-spellbook = "0.4"
 
 # harper-core transitively declares an optional, disabled `burn-cuda` (CUDA backend).
 # Cargo still version-resolves that dead subtree, which currently fails (broken tracel-llvm

src-tauri/capabilities/default.json

@@ -6,8 +6,9 @@
   "permissions": [
     "core:default",
     "core:window:allow-destroy",
-    "core:window:allow-start-dragging",
     "opener:default",
-    "dialog:default"
+    "dialog:default",
+    "updater:default",
+    "process:allow-restart"
   ]
 }

src-tauri/capabilities/desktop.json

@@ -1,8 +0,0 @@
-{
-  "$schema": "../gen/schemas/desktop-schema.json",
-  "identifier": "desktop",
-  "description": "Desktop-only permissions (updater, process restart)",
-  "platforms": ["macOS", "windows", "linux"],
-  "windows": ["main"],
-  "permissions": ["updater:default", "process:allow-restart"]
-}

src-tauri/gen/apple/.gitignore

@@ -1,3 +0,0 @@
-xcuserdata/
-build/
-Externals/

src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -1,116 +0,0 @@
-{
-  "images" : [
-    {
-      "size" : "20x20",
-      "idiom" : "iphone",
-      "filename" : "[email protected]",
-      "scale" : "2x"
-    },
-    {
-      "size" : "20x20",
-      "idiom" : "iphone",
-      "filename" : "[email protected]",
-      "scale" : "3x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "iphone",
-      "filename" : "[email protected]",
-      "scale" : "2x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "iphone",
-      "filename" : "[email protected]",
-      "scale" : "3x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "iphone",
-      "filename" : "[email protected]",
-      "scale" : "2x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "iphone",
-      "filename" : "[email protected]",
-      "scale" : "3x"
-    },
-    {
-      "size" : "60x60",
-      "idiom" : "iphone",
-      "filename" : "[email protected]",
-      "scale" : "2x"
-    },
-    {
-      "size" : "60x60",
-      "idiom" : "iphone",
-      "filename" : "[email protected]",
-      "scale" : "3x"
-    },
-    {
-      "size" : "20x20",
-      "idiom" : "ipad",
-      "filename" : "[email protected]",
-      "scale" : "1x"
-    },
-    {
-      "size" : "20x20",
-      "idiom" : "ipad",
-      "filename" : "[email protected]",
-      "scale" : "2x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "ipad",
-      "filename" : "[email protected]",
-      "scale" : "1x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "ipad",
-      "filename" : "[email protected]",
-      "scale" : "2x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "ipad",
-      "filename" : "[email protected]",
-      "scale" : "1x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "ipad",
-      "filename" : "[email protected]",
-      "scale" : "2x"
-    },
-    {
-      "size" : "76x76",
-      "idiom" : "ipad",
-      "filename" : "[email protected]",
-      "scale" : "1x"
-    },
-    {
-      "size" : "76x76",
-      "idiom" : "ipad",
-      "filename" : "[email protected]",
-      "scale" : "2x"
-    },
-    {
-      "size" : "83.5x83.5",
-      "idiom" : "ipad",
-      "filename" : "[email protected]",
-      "scale" : "2x"
-    },
-    {
-      "size" : "1024x1024",
-      "idiom" : "ios-marketing",
-      "filename" : "[email protected]",
-      "scale" : "1x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

src-tauri/gen/apple/Assets.xcassets/Contents.json

@@ -1,6 +0,0 @@
-{
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

src-tauri/gen/apple/ExportOptions.plist

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-    <key>method</key>
-    <string>debugging</string>
-</dict>
-</plist>

src-tauri/gen/apple/LaunchScreen.storyboard

@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17150" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="Y6W-OH-hqX">
-    <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17122"/>
-        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
-        <capability name="System colors in document resources" minToolsVersion="11.0"/>
-        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
-    </dependencies>
-    <scenes>
-        <!--View Controller-->
-        <scene sceneID="s0d-6b-0kx">
-            <objects>
-                <viewController id="Y6W-OH-hqX" sceneMemberID="viewController">
-                    <view key="view" contentMode="scaleToFill" id="5EZ-qb-Rvc">
-                        <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <viewLayoutGuide key="safeArea" id="vDu-zF-Fre"/>
-                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
-                    </view>
-                </viewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="Ief-a0-LHa" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
-            </objects>
-        </scene>
-    </scenes>
-    <resources>
-        <systemColor name="systemBackgroundColor">
-            <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-        </systemColor>
-    </resources>
-</document>

src-tauri/gen/apple/Podfile

@@ -1,21 +0,0 @@
-# Uncomment the next line to define a global platform for your project
-
-target 'margin-app_iOS' do
-platform :ios, '14.0'
-  # Pods for margin-app_iOS
-end
-
-target 'margin-app_macOS' do
-platform :osx, '11.0'
-  # Pods for margin-app_macOS
-end
-
-# Delete the deployment target for iOS and macOS, causing it to be inherited from the Podfile
-post_install do |installer|
- installer.pods_project.targets.each do |target|
-  target.build_configurations.each do |config|
-   config.build_settings.delete 'IPHONEOS_DEPLOYMENT_TARGET'
-   config.build_settings.delete 'MACOSX_DEPLOYMENT_TARGET'
-  end
- end
-end

src-tauri/gen/apple/Sources/margin-app/bindings/bindings.h

@@ -1,8 +0,0 @@
-#pragma once
-
-namespace ffi {
-    extern "C" {
-        void start_app();
-    }
-}
-

src-tauri/gen/apple/Sources/margin-app/main.mm

@@ -1,6 +0,0 @@
-#include "bindings/bindings.h"
-
-int main(int argc, char * argv[]) {
-	ffi::start_app();
-	return 0;
-}

src-tauri/gen/apple/assets/resources/dictionaries/en/SCOWL-license.txt

@@ -1,347 +0,0 @@
-en_US Hunspell Dictionary
-Version 2020.12.07
-Mon Dec 7 20:14:35 2020 -0500 [5ef55f9]
-http://wordlist.sourceforge.net
-
-README file for English Hunspell dictionaries derived from SCOWL.
-
-These dictionaries are created using the speller/make-hunspell-dict
-script in SCOWL.
-
-The following dictionaries are available:
-
-  en_US (American)
-  en_CA (Canadian)
-  en_GB-ise (British with "ise" spelling)
-  en_GB-ize (British with "ize" spelling)
-  en_AU (Australian)
-
-  en_US-large
-  en_CA-large
-  en_GB-large (with both "ise" and "ize" spelling)
-  en_AU-large
-
-The normal (non-large) dictionaries correspond to SCOWL size 60 and,
-to encourage consistent spelling, generally only include one spelling
-variant for a word.  The large dictionaries correspond to SCOWL size
-70 and may include multiple spelling for a word when both variants are
-considered almost equal.  The larger dictionaries however (1) have not
-been as carefully checked for errors as the normal dictionaries and
-thus may contain misspelled or invalid words; and (2) contain
-uncommon, yet valid, words that might cause problems as they are
-likely to be misspellings of more common words (for example, "ort" and
-"calender").
-
-To get an idea of the difference in size, here are 25 random words
-only found in the large dictionary for American English:
-
-  Bermejo Freyr's Guenevere Hatshepsut Nottinghamshire arrestment
-  crassitudes crural dogwatches errorless fetial flaxseeds godroon
-  incretion jalapeño's kelpie kishkes neuroglias pietisms pullulation
-  stemwinder stenoses syce thalassic zees
-
-The en_US, en_CA and en_AU are the official dictionaries for Hunspell.
-The en_GB and large dictionaries are made available on an experimental
-basis.  If you find them useful please send me a quick email at
-[email protected].
-
-If none of these dictionaries suite you (for example, maybe you want
-the normal dictionary that also includes common variants) additional
-dictionaries can be generated at http://app.aspell.net/create or by
-modifying speller/make-hunspell-dict in SCOWL.  Please do let me know
-if you end up publishing a customized dictionary.
-
-If a word is not found in the dictionary or a word is there you think
-shouldn't be, you can lookup the word up at http://app.aspell.net/lookup
-to help determine why that is.
-
-General comments on these list can be sent directly to me at
-[email protected] or to the wordlist-devel mailing lists
-(https://lists.sourceforge.net/lists/listinfo/wordlist-devel).  If you
-have specific issues with any of these dictionaries please file a bug
-report at https://github.com/kevina/wordlist/issues.
-
-IMPORTANT CHANGES INTRODUCED In 2016.11.20:
-
-New Australian dictionaries thanks to the work of Benjamin Titze
-([email protected]).
-
-IMPORTANT CHANGES INTRODUCED IN 2016.04.24:
-
-The dictionaries are now in UTF-8 format instead of ISO-8859-1.  This
-was required to handle smart quotes correctly.
-
-IMPORTANT CHANGES INTRODUCED IN 2016.01.19:
-
-"SET UTF8" was changes to "SET UTF-8" in the affix file as some
-versions of Hunspell do not recognize "UTF8".
-
-ADDITIONAL NOTES:
-
-The NOSUGGEST flag was added to certain taboo words.  While I made an
-honest attempt to flag the strongest taboo words with the NOSUGGEST
-flag, I MAKE NO GUARANTEE THAT I FLAGGED EVERY POSSIBLE TABOO WORD.
-The list was originally derived from Németh László, however I removed
-some words which, while being considered taboo by some dictionaries,
-are not really considered swear words in today's society.
-
-COPYRIGHT, SOURCES, and CREDITS:
-
-The English dictionaries come directly from SCOWL
-and is thus under the same copyright of SCOWL.  The affix file is
-a heavily modified version of the original english.aff file which was
-released as part of Geoff Kuenning's Ispell and as such is covered by
-his BSD license.  Part of SCOWL is also based on Ispell thus the
-Ispell copyright is included with the SCOWL copyright.
-
-The collective work is Copyright 2000-2018 by Kevin Atkinson as well
-as any of the copyrights mentioned below:
-
-  Copyright 2000-2018 by Kevin Atkinson
-
-  Permission to use, copy, modify, distribute and sell these word
-  lists, the associated scripts, the output created from the scripts,
-  and its documentation for any purpose is hereby granted without fee,
-  provided that the above copyright notice appears in all copies and
-  that both that copyright notice and this permission notice appear in
-  supporting documentation. Kevin Atkinson makes no representations
-  about the suitability of this array for any purpose. It is provided
-  "as is" without express or implied warranty.
-
-Alan Beale <[email protected]> also deserves special credit as he has,
-in addition to providing the 12Dicts package and being a major
-contributor to the ENABLE word list, given me an incredible amount of
-feedback and created a number of special lists (those found in the
-Supplement) in order to help improve the overall quality of SCOWL.
-
-The 10 level includes the 1000 most common English words (according to
-the Moby (TM) Words II [MWords] package), a subset of the 1000 most
-common words on the Internet (again, according to Moby Words II), and
-frequently class 16 from Brian Kelk's "UK English Wordlist
-with Frequency Classification".
-
-The MWords package was explicitly placed in the public domain:
-
-    The Moby lexicon project is complete and has
-    been place into the public domain. Use, sell,
-    rework, excerpt and use in any way on any platform.
-
-    Placing this material on internal or public servers is
-    also encouraged. The compiler is not aware of any
-    export restrictions so freely distribute world-wide.
-
-    You can verify the public domain status by contacting
-
-    Grady Ward
-    3449 Martha Ct.
-    Arcata, CA  95521-4884
-
-    [email protected]
-    [email protected]
-
-The "UK English Wordlist With Frequency Classification" is also in the
-Public Domain:
-
-  Date: Sat, 08 Jul 2000 20:27:21 +0100
-  From: Brian Kelk <[email protected]>
-
-  > I was wondering what the copyright status of your "UK English
-  > Wordlist With Frequency Classification" word list as it seems to
-  > be lacking any copyright notice.
-
-  There were many many sources in total, but any text marked
-  "copyright" was avoided. Locally-written documentation was one
-  source. An earlier version of the list resided in a filespace called
-  PUBLIC on the University mainframe, because it was considered public
-  domain.
-
-  Date: Tue, 11 Jul 2000 19:31:34 +0100
-
-  > So are you saying your word list is also in the public domain?
-
-  That is the intention.
-
-The 20 level includes frequency classes 7-15 from Brian's word list.
-
-The 35 level includes frequency classes 2-6 and words appearing in at
-least 11 of 12 dictionaries as indicated in the 12Dicts package.  All
-words from the 12Dicts package have had likely inflections added via
-my inflection database.
-
-The 12Dicts package and Supplement is in the Public Domain.
-
-The WordNet database, which was used in the creation of the
-Inflections database, is under the following copyright:
-
-  This software and database is being provided to you, the LICENSEE,
-  by Princeton University under the following license.  By obtaining,
-  using and/or copying this software and database, you agree that you
-  have read, understood, and will comply with these terms and
-  conditions.:
-
-  Permission to use, copy, modify and distribute this software and
-  database and its documentation for any purpose and without fee or
-  royalty is hereby granted, provided that you agree to comply with
-  the following copyright notice and statements, including the
-  disclaimer, and that the same appear on ALL copies of the software,
-  database and documentation, including modifications that you make
-  for internal use or for distribution.
-
-  WordNet 1.6 Copyright 1997 by Princeton University.  All rights
-  reserved.
-
-  THIS SOFTWARE AND DATABASE IS PROVIDED "AS IS" AND PRINCETON
-  UNIVERSITY MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
-  IMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, PRINCETON
-  UNIVERSITY MAKES NO REPRESENTATIONS OR WARRANTIES OF MERCHANT-
-  ABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE
-  LICENSED SOFTWARE, DATABASE OR DOCUMENTATION WILL NOT INFRINGE ANY
-  THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
-
-  The name of Princeton University or Princeton may not be used in
-  advertising or publicity pertaining to distribution of the software
-  and/or database.  Title to copyright in this software, database and
-  any associated documentation shall at all times remain with
-  Princeton University and LICENSEE agrees to preserve same.
-
-The 40 level includes words from Alan's 3esl list found in version 4.0
-of his 12dicts package.  Like his other stuff the 3esl list is also in the
-public domain.
-
-The 50 level includes Brian's frequency class 1, words appearing
-in at least 5 of 12 of the dictionaries as indicated in the 12Dicts
-package, and uppercase words in at least 4 of the previous 12
-dictionaries.  A decent number of proper names is also included: The
-top 1000 male, female, and Last names from the 1990 Census report; a
-list of names sent to me by Alan Beale; and a few names that I added
-myself.  Finally a small list of abbreviations not commonly found in
-other word lists is included.
-
-The name files form the Census report is a government document which I
-don't think can be copyrighted.
-
-The file special-jargon.50 uses common.lst and word.lst from the
-"Unofficial Jargon File Word Lists" which is derived from "The Jargon
-File".  All of which is in the Public Domain.  This file also contain
-a few extra UNIX terms which are found in the file "unix-terms" in the
-special/ directory.
-
-The 55 level includes words from Alan's 2of4brif list found in version
-4.0 of his 12dicts package.  Like his other stuff the 2of4brif is also
-in the public domain.
-
-The 60 level includes all words appearing in at least 2 of the 12
-dictionaries as indicated by the 12Dicts package.
-
-The 70 level includes Brian's frequency class 0 and the 74,550 common
-dictionary words from the MWords package.  The common dictionary words,
-like those from the 12Dicts package, have had all likely inflections
-added.  The 70 level also included the 5desk list from version 4.0 of
-the 12Dics package which is in the public domain.
-
-The 80 level includes the ENABLE word list, all the lists in the
-ENABLE supplement package (except for ABLE), the "UK Advanced Cryptics
-Dictionary" (UKACD), the list of signature words from the YAWL package,
-and the 10,196 places list from the MWords package.
-
-The ENABLE package, mainted by M\Cooper <[email protected]>,
-is in the Public Domain:
-
-  The ENABLE master word list, WORD.LST, is herewith formally released
-  into the Public Domain. Anyone is free to use it or distribute it in
-  any manner they see fit. No fee or registration is required for its
-  use nor are "contributions" solicited (if you feel you absolutely
-  must contribute something for your own peace of mind, the authors of
-  the ENABLE list ask that you make a donation on their behalf to your
-  favorite charity). This word list is our gift to the Scrabble
-  community, as an alternate to "official" word lists. Game designers
-  may feel free to incorporate the WORD.LST into their games. Please
-  mention the source and credit us as originators of the list. Note
-  that if you, as a game designer, use the WORD.LST in your product,
-  you may still copyright and protect your product, but you may *not*
-  legally copyright or in any way restrict redistribution of the
-  WORD.LST portion of your product. This *may* under law restrict your
-  rights to restrict your users' rights, but that is only fair.
-
-UKACD, by J Ross Beresford <[email protected]>, is under the
-following copyright:
-
-  Copyright (c) J Ross Beresford 1993-1999. All Rights Reserved.
-
-  The following restriction is placed on the use of this publication:
-  if The UK Advanced Cryptics Dictionary is used in a software package
-  or redistributed in any form, the copyright notice must be
-  prominently displayed and the text of this document must be included
-  verbatim.
-
-  There are no other restrictions: I would like to see the list
-  distributed as widely as possible.
-
-The 95 level includes the 354,984 single words, 256,772 compound
-words, 4,946 female names and the 3,897 male names, and 21,986 names
-from the MWords package, ABLE.LST from the ENABLE Supplement, and some
-additional words found in my part-of-speech database that were not
-found anywhere else.
-
-Accent information was taken from UKACD.
-
-The VarCon package was used to create the American, British, Canadian,
-and Australian word list.  It is under the following copyright:
-
-  Copyright 2000-2016 by Kevin Atkinson
-
-  Permission to use, copy, modify, distribute and sell this array, the
-  associated software, and its documentation for any purpose is hereby
-  granted without fee, provided that the above copyright notice appears
-  in all copies and that both that copyright notice and this permission
-  notice appear in supporting documentation. Kevin Atkinson makes no
-  representations about the suitability of this array for any
-  purpose. It is provided "as is" without express or implied warranty.
-
-  Copyright 2016 by Benjamin Titze
-
-  Permission to use, copy, modify, distribute and sell this array, the
-  associated software, and its documentation for any purpose is hereby
-  granted without fee, provided that the above copyright notice appears
-  in all copies and that both that copyright notice and this permission
-  notice appear in supporting documentation. Benjamin Titze makes no
-  representations about the suitability of this array for any
-  purpose. It is provided "as is" without express or implied warranty.
-
-  Since the original words lists come from the Ispell distribution:
-
-  Copyright 1993, Geoff Kuenning, Granada Hills, CA
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions
-  are met:
-
-  1. Redistributions of source code must retain the above copyright
-     notice, this list of conditions and the following disclaimer.
-  2. Redistributions in binary form must reproduce the above copyright
-     notice, this list of conditions and the following disclaimer in the
-     documentation and/or other materials provided with the distribution.
-  3. All modifications to the source code must be clearly marked as
-     such.  Binary redistributions based on modified source code
-     must be clearly marked as modified versions in the documentation
-     and/or other materials provided with the distribution.
-  (clause 4 removed with permission from Geoff Kuenning)
-  5. The name of Geoff Kuenning may not be used to endorse or promote
-     products derived from this software without specific prior
-     written permission.
-
-  THIS SOFTWARE IS PROVIDED BY GEOFF KUENNING AND CONTRIBUTORS ``AS IS'' AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-  ARE DISCLAIMED.  IN NO EVENT SHALL GEOFF KUENNING OR CONTRIBUTORS BE LIABLE
-  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-  OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-  HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-  LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-  OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-  SUCH DAMAGE.
-
-Build Date: Mon Dec  7 20:19:27 EST 2020
-Wordlist Command: mk-list --accents=strip en_US 60

src-tauri/gen/apple/assets/resources/dictionaries/en/index.aff

@@ -1,205 +0,0 @@
-SET UTF-8
-TRY esianrtolcdugmphbyfvkwzESIANRTOLCDUGMPHBYFVKWZ'
-ICONV 1
-ICONV ’ '
-NOSUGGEST !
-
-# ordinal numbers
-COMPOUNDMIN 1
-# only in compounds: 1th, 2th, 3th
-ONLYINCOMPOUND c
-# compound rules:
-# 1. [0-9]*1[0-9]th (10th, 11th, 12th, 56714th, etc.)
-# 2. [0-9]*[02-9](1st|2nd|3rd|[4-9]th) (21st, 22nd, 123rd, 1234th, etc.)
-COMPOUNDRULE 2
-COMPOUNDRULE n*1t
-COMPOUNDRULE n*mp
-WORDCHARS 0123456789
-
-PFX A Y 1
-PFX A   0     re         .
-
-PFX I Y 1
-PFX I   0     in         .
-
-PFX U Y 1
-PFX U   0     un         .
-
-PFX C Y 1
-PFX C   0     de          .
-
-PFX E Y 1
-PFX E   0     dis         .
-
-PFX F Y 1
-PFX F   0     con         .
-
-PFX K Y 1
-PFX K   0     pro         .
-
-SFX V N 2
-SFX V   e     ive        e
-SFX V   0     ive        [^e]
-
-SFX N Y 3
-SFX N   e     ion        e
-SFX N   y     ication    y
-SFX N   0     en         [^ey]
-
-SFX X Y 3
-SFX X   e     ions       e
-SFX X   y     ications   y
-SFX X   0     ens        [^ey]
-
-SFX H N 2
-SFX H   y     ieth       y
-SFX H   0     th         [^y]
-
-SFX Y Y 1
-SFX Y   0     ly         .
-
-SFX G Y 2
-SFX G   e     ing        e
-SFX G   0     ing        [^e]
-
-SFX J Y 2
-SFX J   e     ings       e
-SFX J   0     ings       [^e]
-
-SFX D Y 4
-SFX D   0     d          e
-SFX D   y     ied        [^aeiou]y
-SFX D   0     ed         [^ey]
-SFX D   0     ed         [aeiou]y
-
-SFX T N 4
-SFX T   0     st         e
-SFX T   y     iest       [^aeiou]y
-SFX T   0     est        [aeiou]y
-SFX T   0     est        [^ey]
-
-SFX R Y 4
-SFX R   0     r          e
-SFX R   y     ier        [^aeiou]y
-SFX R   0     er         [aeiou]y
-SFX R   0     er         [^ey]
-
-SFX Z Y 4
-SFX Z   0     rs         e
-SFX Z   y     iers       [^aeiou]y
-SFX Z   0     ers        [aeiou]y
-SFX Z   0     ers        [^ey]
-
-SFX S Y 4
-SFX S   y     ies        [^aeiou]y
-SFX S   0     s          [aeiou]y
-SFX S   0     es         [sxzh]
-SFX S   0     s          [^sxzhy]
-
-SFX P Y 3
-SFX P   y     iness      [^aeiou]y
-SFX P   0     ness       [aeiou]y
-SFX P   0     ness       [^y]
-
-SFX M Y 1
-SFX M   0     's         .
-
-SFX B Y 3
-SFX B   0     able       [^aeiou]
-SFX B   0     able       ee
-SFX B   e     able       [^aeiou]e
-
-SFX L Y 1
-SFX L   0     ment       .
-
-REP 90
-REP a ei
-REP ei a
-REP a ey
-REP ey a
-REP ai ie
-REP ie ai
-REP alot a_lot
-REP are air
-REP are ear
-REP are eir
-REP air are
-REP air ere
-REP ere air
-REP ere ear
-REP ere eir
-REP ear are
-REP ear air
-REP ear ere
-REP eir are
-REP eir ere
-REP ch te
-REP te ch
-REP ch ti
-REP ti ch
-REP ch tu
-REP tu ch
-REP ch s
-REP s ch
-REP ch k
-REP k ch
-REP f ph
-REP ph f
-REP gh f
-REP f gh
-REP i igh
-REP igh i
-REP i uy
-REP uy i
-REP i ee
-REP ee i
-REP j di
-REP di j
-REP j gg
-REP gg j
-REP j ge
-REP ge j
-REP s ti
-REP ti s
-REP s ci
-REP ci s
-REP k cc
-REP cc k
-REP k qu
-REP qu k
-REP kw qu
-REP o eau
-REP eau o
-REP o ew
-REP ew o
-REP oo ew
-REP ew oo
-REP ew ui
-REP ui ew
-REP oo ui
-REP ui oo
-REP ew u
-REP u ew
-REP oo u
-REP u oo
-REP u oe
-REP oe u
-REP u ieu
-REP ieu u
-REP ue ew
-REP ew ue
-REP uff ough
-REP oo ieu
-REP ieu oo
-REP ier ear
-REP ear ier
-REP ear air
-REP air ear
-REP w qu
-REP qu w
-REP z ss
-REP ss z
-REP shun tion
-REP shun sion
-REP shun cion
-REP size cise

src-tauri/gen/apple/margin-app.xcodeproj/project.pbxproj

@@ -1,474 +0,0 @@
-// !$*UTF8*$!
-{
-	archiveVersion = 1;
-	classes = {
-	};
-	objectVersion = 77;
-	objects = {
-
-/* Begin PBXBuildFile section */
-		0EC3DA4FFDC5C3B2B4E0B13B /* MetalKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DD7D0823B077104D6C806D11 /* MetalKit.framework */; };
-		380D17F67E636CBECF7E4E6D /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F2318AB597D2BA37D0450A64 /* WebKit.framework */; };
-		3E829B66804DD93D0CE82436 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2C46540657F8D4E893AC66C7 /* QuartzCore.framework */; };
-		8261C76B0C8AAFFF0976BB94 /* Metal.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F9B857C0B494A9C83F9F9115 /* Metal.framework */; };
-		89611C54325E79BBFCAF5A6F /* libapp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 623FD9F4898AE5FDE23B0A73 /* libapp.a */; };
-		911563A32C960AC8241ED351 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 8CC5D253EF80093EC54CD51D /* Assets.xcassets */; };
-		D6FCF60E9A225E886B4201B4 /* main.mm in Sources */ = {isa = PBXBuildFile; fileRef = D7C0C2B726053A491DE0A492 /* main.mm */; };
-		E9F56517F64D408654A47123 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 877554CC1AAF0ED8612C473F /* Security.framework */; };
-		EA15997B9A4564CD88AAF265 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = AC3E0782AC1DE69EC1393F4F /* LaunchScreen.storyboard */; };
-		F1736708F9507F3358D2FB10 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 360E99CA5BCBFEBC9E48DB30 /* CoreGraphics.framework */; };
-		F6530048C395DF030B4AB269 /* assets in Resources */ = {isa = PBXBuildFile; fileRef = E4E3950AAF9CFB9F61092532 /* assets */; };
-		F75C7FAF5CEEF9BE332DC814 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AEE5851B77FD26F3F57404A0 /* UIKit.framework */; };
-/* End PBXBuildFile section */
-
-/* Begin PBXFileReference section */
-		14817B3F82D600114D013B7D /* pdf.rs */ = {isa = PBXFileReference; path = pdf.rs; sourceTree = "<group>"; };
-		277A822D18EFBF6E79B2EFC6 /* bindings.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = bindings.h; sourceTree = "<group>"; };
-		2C46540657F8D4E893AC66C7 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
-		360E99CA5BCBFEBC9E48DB30 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
-		448CDA24E192A9EDE84EE2F6 /* library.rs */ = {isa = PBXFileReference; path = library.rs; sourceTree = "<group>"; };
-		623FD9F4898AE5FDE23B0A73 /* libapp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libapp.a; sourceTree = "<group>"; };
-		6A0CF179B6206602B684ACC5 /* margin-app_iOS.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "margin-app_iOS.entitlements"; sourceTree = "<group>"; };
-		769526E10F6C7273A9421972 /* epub.rs */ = {isa = PBXFileReference; path = epub.rs; sourceTree = "<group>"; };
-		832AEF636C465719EE30629D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
-		877554CC1AAF0ED8612C473F /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; };
-		8C696B0612077DC32CFD7281 /* proofing.rs */ = {isa = PBXFileReference; path = proofing.rs; sourceTree = "<group>"; };
-		8CC5D253EF80093EC54CD51D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
-		AC3E0782AC1DE69EC1393F4F /* LaunchScreen.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = LaunchScreen.storyboard; sourceTree = "<group>"; };
-		AEE5851B77FD26F3F57404A0 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
-		B94688F7EA7A2C4A8C0DFD01 /* margin-app_iOS.app */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = wrapper.application; path = "margin-app_iOS.app"; sourceTree = BUILT_PRODUCTS_DIR; };
-		C018CB1E589580D894AB7585 /* gdrive.rs */ = {isa = PBXFileReference; path = gdrive.rs; sourceTree = "<group>"; };
-		D33920AF504282488CBE64EF /* main.rs */ = {isa = PBXFileReference; path = main.rs; sourceTree = "<group>"; };
-		D74A9059FCE11D1A08EC6511 /* project.rs */ = {isa = PBXFileReference; path = project.rs; sourceTree = "<group>"; };
-		D7C0C2B726053A491DE0A492 /* main.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = main.mm; sourceTree = "<group>"; };
-		DD7D0823B077104D6C806D11 /* MetalKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MetalKit.framework; path = System/Library/Frameworks/MetalKit.framework; sourceTree = SDKROOT; };
-		E4E3950AAF9CFB9F61092532 /* assets */ = {isa = PBXFileReference; lastKnownFileType = folder; path = assets; sourceTree = SOURCE_ROOT; };
-		F2318AB597D2BA37D0450A64 /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = System/Library/Frameworks/WebKit.framework; sourceTree = SDKROOT; };
-		F8B65F0038A8DDF9CE7C2310 /* fonts.rs */ = {isa = PBXFileReference; path = fonts.rs; sourceTree = "<group>"; };
-		F95681711AA6F4A228A97009 /* lib.rs */ = {isa = PBXFileReference; path = lib.rs; sourceTree = "<group>"; };
-		F9B857C0B494A9C83F9F9115 /* Metal.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Metal.framework; path = System/Library/Frameworks/Metal.framework; sourceTree = SDKROOT; };
-/* End PBXFileReference section */
-
-/* Begin PBXFrameworksBuildPhase section */
-		AACF50BDF8AA677AF9F50383 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				89611C54325E79BBFCAF5A6F /* libapp.a in Frameworks */,
-				F1736708F9507F3358D2FB10 /* CoreGraphics.framework in Frameworks */,
-				8261C76B0C8AAFFF0976BB94 /* Metal.framework in Frameworks */,
-				0EC3DA4FFDC5C3B2B4E0B13B /* MetalKit.framework in Frameworks */,
-				3E829B66804DD93D0CE82436 /* QuartzCore.framework in Frameworks */,
-				E9F56517F64D408654A47123 /* Security.framework in Frameworks */,
-				F75C7FAF5CEEF9BE332DC814 /* UIKit.framework in Frameworks */,
-				380D17F67E636CBECF7E4E6D /* WebKit.framework in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXFrameworksBuildPhase section */
-
-/* Begin PBXGroup section */
-		1F4A93A133625BBBC5DD173D /* margin-app */ = {
-			isa = PBXGroup;
-			children = (
-				D7C0C2B726053A491DE0A492 /* main.mm */,
-				E1DE2A12D42E2CA3B48BF39C /* bindings */,
-			);
-			path = "margin-app";
-			sourceTree = "<group>";
-		};
-		603E19204F4A400DBF3BDC47 /* Frameworks */ = {
-			isa = PBXGroup;
-			children = (
-				360E99CA5BCBFEBC9E48DB30 /* CoreGraphics.framework */,
-				623FD9F4898AE5FDE23B0A73 /* libapp.a */,
-				F9B857C0B494A9C83F9F9115 /* Metal.framework */,
-				DD7D0823B077104D6C806D11 /* MetalKit.framework */,
-				2C46540657F8D4E893AC66C7 /* QuartzCore.framework */,
-				877554CC1AAF0ED8612C473F /* Security.framework */,
-				AEE5851B77FD26F3F57404A0 /* UIKit.framework */,
-				F2318AB597D2BA37D0450A64 /* WebKit.framework */,
-			);
-			name = Frameworks;
-			sourceTree = "<group>";
-		};
-		AF74A9A4E2E249230D0E350E /* Products */ = {
-			isa = PBXGroup;
-			children = (
-				B94688F7EA7A2C4A8C0DFD01 /* margin-app_iOS.app */,
-			);
-			name = Products;
-			sourceTree = "<group>";
-		};
-		B3F300FBBFBCCA3CA7B12D3D /* src */ = {
-			isa = PBXGroup;
-			children = (
-				769526E10F6C7273A9421972 /* epub.rs */,
-				F8B65F0038A8DDF9CE7C2310 /* fonts.rs */,
-				C018CB1E589580D894AB7585 /* gdrive.rs */,
-				F95681711AA6F4A228A97009 /* lib.rs */,
-				448CDA24E192A9EDE84EE2F6 /* library.rs */,
-				D33920AF504282488CBE64EF /* main.rs */,
-				14817B3F82D600114D013B7D /* pdf.rs */,
-				D74A9059FCE11D1A08EC6511 /* project.rs */,
-				8C696B0612077DC32CFD7281 /* proofing.rs */,
-			);
-			name = src;
-			path = ../../src;
-			sourceTree = "<group>";
-		};
-		C49F8FAE68067D0E047F17C1 /* margin-app_iOS */ = {
-			isa = PBXGroup;
-			children = (
-				832AEF636C465719EE30629D /* Info.plist */,
-				6A0CF179B6206602B684ACC5 /* margin-app_iOS.entitlements */,
-			);
-			path = "margin-app_iOS";
-			sourceTree = "<group>";
-		};
-		D99826F6BEBF021E86B50785 = {
-			isa = PBXGroup;
-			children = (
-				E4E3950AAF9CFB9F61092532 /* assets */,
-				8CC5D253EF80093EC54CD51D /* Assets.xcassets */,
-				AC3E0782AC1DE69EC1393F4F /* LaunchScreen.storyboard */,
-				FF76185D65C96C10997F4EC9 /* Externals */,
-				C49F8FAE68067D0E047F17C1 /* margin-app_iOS */,
-				F62D42C7D88CAD0BB5707700 /* Sources */,
-				B3F300FBBFBCCA3CA7B12D3D /* src */,
-				603E19204F4A400DBF3BDC47 /* Frameworks */,
-				AF74A9A4E2E249230D0E350E /* Products */,
-			);
-			sourceTree = "<group>";
-		};
-		E1DE2A12D42E2CA3B48BF39C /* bindings */ = {
-			isa = PBXGroup;
-			children = (
-				277A822D18EFBF6E79B2EFC6 /* bindings.h */,
-			);
-			path = bindings;
-			sourceTree = "<group>";
-		};
-		F62D42C7D88CAD0BB5707700 /* Sources */ = {
-			isa = PBXGroup;
-			children = (
-				1F4A93A133625BBBC5DD173D /* margin-app */,
-			);
-			path = Sources;
-			sourceTree = "<group>";
-		};
-		FF76185D65C96C10997F4EC9 /* Externals */ = {
-			isa = PBXGroup;
-			children = (
-			);
-			path = Externals;
-			sourceTree = "<group>";
-		};
-/* End PBXGroup section */
-
-/* Begin PBXNativeTarget section */
-		D914A04EE7625E0BFF302CBB /* margin-app_iOS */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 2AFB5AED9BBDA36D01ECA7AE /* Build configuration list for PBXNativeTarget "margin-app_iOS" */;
-			buildPhases = (
-				AB760B90696AB2964C7D49A9 /* Build Rust Code */,
-				DE9CC46A3C745D3EE2659FC1 /* Sources */,
-				303B1D89A72F4ED6D2E12CFD /* Resources */,
-				AACF50BDF8AA677AF9F50383 /* Frameworks */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = "margin-app_iOS";
-			packageProductDependencies = (
-			);
-			productName = "margin-app_iOS";
-			productReference = B94688F7EA7A2C4A8C0DFD01 /* margin-app_iOS.app */;
-			productType = "com.apple.product-type.application";
-		};
-/* End PBXNativeTarget section */
-
-/* Begin PBXProject section */
-		5FC750CFBA18ED6763EEF3A3 /* Project object */ = {
-			isa = PBXProject;
-			attributes = {
-				BuildIndependentTargetsInParallel = YES;
-				LastUpgradeCheck = 1430;
-				TargetAttributes = {
-				};
-			};
-			buildConfigurationList = C4AD3401C458C5C48B1EF849 /* Build configuration list for PBXProject "margin-app" */;
-			developmentRegion = en;
-			hasScannedForEncodings = 0;
-			knownRegions = (
-				Base,
-				en,
-			);
-			mainGroup = D99826F6BEBF021E86B50785;
-			minimizedProjectReferenceProxies = 1;
-			preferredProjectObjectVersion = 77;
-			productRefGroup = AF74A9A4E2E249230D0E350E /* Products */;
-			projectDirPath = "";
-			projectRoot = "";
-			targets = (
-				D914A04EE7625E0BFF302CBB /* margin-app_iOS */,
-			);
-		};
-/* End PBXProject section */
-
-/* Begin PBXResourcesBuildPhase section */
-		303B1D89A72F4ED6D2E12CFD /* Resources */ = {
-			isa = PBXResourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				911563A32C960AC8241ED351 /* Assets.xcassets in Resources */,
-				EA15997B9A4564CD88AAF265 /* LaunchScreen.storyboard in Resources */,
-				F6530048C395DF030B4AB269 /* assets in Resources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXResourcesBuildPhase section */
-
-/* Begin PBXShellScriptBuildPhase section */
-		AB760B90696AB2964C7D49A9 /* Build Rust Code */ = {
-			isa = PBXShellScriptBuildPhase;
-			alwaysOutOfDate = 1;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-			);
-			inputPaths = (
-			);
-			name = "Build Rust Code";
-			outputFileListPaths = (
-			);
-			outputPaths = (
-				"$(SRCROOT)/Externals/x86_64/${CONFIGURATION}/libapp.a",
-				"$(SRCROOT)/Externals/arm64/${CONFIGURATION}/libapp.a",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "npm run -- tauri ios xcode-script -v --platform ${PLATFORM_DISPLAY_NAME:?} --sdk-root ${SDKROOT:?} --framework-search-paths \"${FRAMEWORK_SEARCH_PATHS:?}\" --header-search-paths \"${HEADER_SEARCH_PATHS:?}\" --gcc-preprocessor-definitions \"${GCC_PREPROCESSOR_DEFINITIONS:-}\" --configuration ${CONFIGURATION:?} ${FORCE_COLOR} ${ARCHS:?}";
-		};
-/* End PBXShellScriptBuildPhase section */
-
-/* Begin PBXSourcesBuildPhase section */
-		DE9CC46A3C745D3EE2659FC1 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				D6FCF60E9A225E886B4201B4 /* main.mm in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXSourcesBuildPhase section */
-
-/* Begin XCBuildConfiguration section */
-		2115AE8BB6330806DC18A6DE /* release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
-				ARCHS = (
-					arm64,
-				);
-				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				CODE_SIGN_ENTITLEMENTS = "margin-app_iOS/margin-app_iOS.entitlements";
-				CODE_SIGN_IDENTITY = "iPhone Developer";
-				ENABLE_BITCODE = NO;
-				"EXCLUDED_ARCHS[sdk=iphoneos*]" = x86_64;
-				FRAMEWORK_SEARCH_PATHS = (
-					"$(inherited)",
-					"\".\"",
-				);
-				INFOPLIST_FILE = "margin-app_iOS/Info.plist";
-				LD_RUNPATH_SEARCH_PATHS = (
-					"$(inherited)",
-					"@executable_path/Frameworks",
-				);
-				"LIBRARY_SEARCH_PATHS[arch=arm64]" = "$(inherited) $(PROJECT_DIR)/Externals/arm64/$(CONFIGURATION) $(SDKROOT)/usr/lib/swift $(DEVELOPER_DIR)/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift/$(PLATFORM_NAME) $(DEVELOPER_DIR)/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift-5.0/$(PLATFORM_NAME)";
-				"LIBRARY_SEARCH_PATHS[arch=x86_64]" = "$(inherited) $(PROJECT_DIR)/Externals/x86_64/$(CONFIGURATION) $(SDKROOT)/usr/lib/swift $(DEVELOPER_DIR)/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift/$(PLATFORM_NAME) $(DEVELOPER_DIR)/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift-5.0/$(PLATFORM_NAME)";
-				PRODUCT_BUNDLE_IDENTIFIER = studio.margin.app;
-				PRODUCT_NAME = "Margin";
-				SDKROOT = iphoneos;
-				TARGETED_DEVICE_FAMILY = "1,2";
-				VALID_ARCHS = arm64;
-			};
-			name = release;
-		};
-		44B57C3232BEF013CE90639D /* debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				CLANG_ANALYZER_NONNULL = YES;
-				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
-				CLANG_CXX_LIBRARY = "libc++";
-				CLANG_ENABLE_MODULES = YES;
-				CLANG_ENABLE_OBJC_ARC = YES;
-				CLANG_ENABLE_OBJC_WEAK = YES;
-				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
-				CLANG_WARN_BOOL_CONVERSION = YES;
-				CLANG_WARN_COMMA = YES;
-				CLANG_WARN_CONSTANT_CONVERSION = YES;
-				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
-				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
-				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
-				CLANG_WARN_EMPTY_BODY = YES;
-				CLANG_WARN_ENUM_CONVERSION = YES;
-				CLANG_WARN_INFINITE_RECURSION = YES;
-				CLANG_WARN_INT_CONVERSION = YES;
-				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
-				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
-				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
-				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
-				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
-				CLANG_WARN_STRICT_PROTOTYPES = YES;
-				CLANG_WARN_SUSPICIOUS_MOVE = YES;
-				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
-				CLANG_WARN_UNREACHABLE_CODE = YES;
-				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				COPY_PHASE_STRIP = NO;
-				DEBUG_INFORMATION_FORMAT = dwarf;
-				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				ENABLE_TESTABILITY = YES;
-				GCC_C_LANGUAGE_STANDARD = gnu11;
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_NO_COMMON_BLOCKS = YES;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					"$(inherited)",
-					"DEBUG=1",
-				);
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-				GCC_WARN_UNDECLARED_SELECTOR = YES;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-				GCC_WARN_UNUSED_FUNCTION = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
-				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
-				MTL_FAST_MATH = YES;
-				ONLY_ACTIVE_ARCH = YES;
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				SDKROOT = iphoneos;
-				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
-				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 5.0;
-			};
-			name = debug;
-		};
-		845C6F72D84890D3B5F7D222 /* release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				CLANG_ANALYZER_NONNULL = YES;
-				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
-				CLANG_CXX_LIBRARY = "libc++";
-				CLANG_ENABLE_MODULES = YES;
-				CLANG_ENABLE_OBJC_ARC = YES;
-				CLANG_ENABLE_OBJC_WEAK = YES;
-				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
-				CLANG_WARN_BOOL_CONVERSION = YES;
-				CLANG_WARN_COMMA = YES;
-				CLANG_WARN_CONSTANT_CONVERSION = YES;
-				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
-				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
-				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
-				CLANG_WARN_EMPTY_BODY = YES;
-				CLANG_WARN_ENUM_CONVERSION = YES;
-				CLANG_WARN_INFINITE_RECURSION = YES;
-				CLANG_WARN_INT_CONVERSION = YES;
-				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
-				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
-				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
-				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
-				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
-				CLANG_WARN_STRICT_PROTOTYPES = YES;
-				CLANG_WARN_SUSPICIOUS_MOVE = YES;
-				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
-				CLANG_WARN_UNREACHABLE_CODE = YES;
-				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				COPY_PHASE_STRIP = NO;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				ENABLE_NS_ASSERTIONS = NO;
-				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				GCC_C_LANGUAGE_STANDARD = gnu11;
-				GCC_NO_COMMON_BLOCKS = YES;
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-				GCC_WARN_UNDECLARED_SELECTOR = YES;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-				GCC_WARN_UNUSED_FUNCTION = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
-				MTL_ENABLE_DEBUG_INFO = NO;
-				MTL_FAST_MATH = YES;
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				SDKROOT = iphoneos;
-				SWIFT_COMPILATION_MODE = wholemodule;
-				SWIFT_OPTIMIZATION_LEVEL = "-O";
-				SWIFT_VERSION = 5.0;
-			};
-			name = release;
-		};
-		E3805913695CB6F5D2BE9BCB /* debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
-				ARCHS = (
-					arm64,
-				);
-				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				CODE_SIGN_ENTITLEMENTS = "margin-app_iOS/margin-app_iOS.entitlements";
-				CODE_SIGN_IDENTITY = "iPhone Developer";
-				ENABLE_BITCODE = NO;
-				"EXCLUDED_ARCHS[sdk=iphoneos*]" = x86_64;
-				FRAMEWORK_SEARCH_PATHS = (
-					"$(inherited)",
-					"\".\"",
-				);
-				INFOPLIST_FILE = "margin-app_iOS/Info.plist";
-				LD_RUNPATH_SEARCH_PATHS = (
-					"$(inherited)",
-					"@executable_path/Frameworks",
-				);
-				"LIBRARY_SEARCH_PATHS[arch=arm64]" = "$(inherited) $(PROJECT_DIR)/Externals/arm64/$(CONFIGURATION) $(SDKROOT)/usr/lib/swift $(DEVELOPER_DIR)/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift/$(PLATFORM_NAME) $(DEVELOPER_DIR)/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift-5.0/$(PLATFORM_NAME)";
-				"LIBRARY_SEARCH_PATHS[arch=x86_64]" = "$(inherited) $(PROJECT_DIR)/Externals/x86_64/$(CONFIGURATION) $(SDKROOT)/usr/lib/swift $(DEVELOPER_DIR)/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift/$(PLATFORM_NAME) $(DEVELOPER_DIR)/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift-5.0/$(PLATFORM_NAME)";
-				PRODUCT_BUNDLE_IDENTIFIER = studio.margin.app;
-				PRODUCT_NAME = "Margin";
-				SDKROOT = iphoneos;
-				TARGETED_DEVICE_FAMILY = "1,2";
-				VALID_ARCHS = arm64;
-			};
-			name = debug;
-		};
-/* End XCBuildConfiguration section */
-
-/* Begin XCConfigurationList section */
-		2AFB5AED9BBDA36D01ECA7AE /* Build configuration list for PBXNativeTarget "margin-app_iOS" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				E3805913695CB6F5D2BE9BCB /* debug */,
-				2115AE8BB6330806DC18A6DE /* release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = debug;
-		};
-		C4AD3401C458C5C48B1EF849 /* Build configuration list for PBXProject "margin-app" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				44B57C3232BEF013CE90639D /* debug */,
-				845C6F72D84890D3B5F7D222 /* release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = debug;
-		};
-/* End XCConfigurationList section */
-	};
-	rootObject = 5FC750CFBA18ED6763EEF3A3 /* Project object */;
-}

src-tauri/gen/apple/margin-app.xcodeproj/project.xcworkspace/contents.xcworkspacedata

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Workspace
-   version = "1.0">
-   <FileRef
-      location = "self:">
-   </FileRef>
-</Workspace>

src-tauri/gen/apple/margin-app.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>BuildSystemType</key>
-	<string>Original</string>
-	<key>DisableBuildSystemDeprecationDiagnostic</key>
-	<true/>
-</dict>
-</plist>

src-tauri/gen/apple/margin-app.xcodeproj/xcshareddata/xcschemes/margin-app_iOS.xcscheme

@@ -1,131 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "1430"
-   version = "1.7">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES"
-      runPostActionsOnFailure = "NO">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "D914A04EE7625E0BFF302CBB"
-               BuildableName = "margin-app_iOS.app"
-               BlueprintName = "margin-app_iOS"
-               ReferencedContainer = "container:margin-app.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      buildConfiguration = "debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "NO"
-      onlyGenerateCoverageForSpecifiedTargets = "NO">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "D914A04EE7625E0BFF302CBB"
-            BuildableName = "margin-app_iOS.app"
-            BlueprintName = "margin-app_iOS"
-            ReferencedContainer = "container:margin-app.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <Testables>
-      </Testables>
-      <CommandLineArguments>
-      </CommandLineArguments>
-      <EnvironmentVariables>
-         <EnvironmentVariable
-            key = "RUST_BACKTRACE"
-            value = "full"
-            isEnabled = "YES">
-         </EnvironmentVariable>
-         <EnvironmentVariable
-            key = "RUST_LOG"
-            value = "info"
-            isEnabled = "YES">
-         </EnvironmentVariable>
-      </EnvironmentVariables>
-   </TestAction>
-   <LaunchAction
-      buildConfiguration = "debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      launchStyle = "0"
-      useCustomWorkingDirectory = "NO"
-      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      debugServiceExtension = "internal"
-      allowLocationSimulation = "YES">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "D914A04EE7625E0BFF302CBB"
-            BuildableName = "margin-app_iOS.app"
-            BlueprintName = "margin-app_iOS"
-            ReferencedContainer = "container:margin-app.xcodeproj">
-         </BuildableReference>
-      </BuildableProductRunnable>
-      <CommandLineArguments>
-      </CommandLineArguments>
-      <EnvironmentVariables>
-         <EnvironmentVariable
-            key = "RUST_BACKTRACE"
-            value = "full"
-            isEnabled = "YES">
-         </EnvironmentVariable>
-         <EnvironmentVariable
-            key = "RUST_LOG"
-            value = "info"
-            isEnabled = "YES">
-         </EnvironmentVariable>
-      </EnvironmentVariables>
-   </LaunchAction>
-   <ProfileAction
-      buildConfiguration = "release"
-      shouldUseLaunchSchemeArgsEnv = "NO"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      debugDocumentVersioning = "YES">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "D914A04EE7625E0BFF302CBB"
-            BuildableName = "margin-app_iOS.app"
-            BlueprintName = "margin-app_iOS"
-            ReferencedContainer = "container:margin-app.xcodeproj">
-         </BuildableReference>
-      </BuildableProductRunnable>
-      <CommandLineArguments>
-      </CommandLineArguments>
-      <EnvironmentVariables>
-         <EnvironmentVariable
-            key = "RUST_BACKTRACE"
-            value = "full"
-            isEnabled = "YES">
-         </EnvironmentVariable>
-         <EnvironmentVariable
-            key = "RUST_LOG"
-            value = "info"
-            isEnabled = "YES">
-         </EnvironmentVariable>
-      </EnvironmentVariables>
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "debug">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>

src-tauri/gen/apple/margin-app_iOS/Info.plist

@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>$(DEVELOPMENT_LANGUAGE)</string>
-	<key>CFBundleExecutable</key>
-	<string>$(EXECUTABLE_NAME)</string>
-	<key>CFBundleIdentifier</key>
-	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>$(PRODUCT_NAME)</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>0.1.7</string>
-	<key>CFBundleVersion</key>
-	<string>0.1.7</string>
-	<key>LSRequiresIPhoneOS</key>
-	<true/>
-	<key>UILaunchStoryboardName</key>
-	<string>LaunchScreen</string>
-	<key>UIRequiredDeviceCapabilities</key>
-	<array>
-		<string>arm64</string>
-		<string>metal</string>
-	</array>
-	<key>UISupportedInterfaceOrientations</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
-	<key>UISupportedInterfaceOrientations~ipad</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationPortraitUpsideDown</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
-</dict>
-</plist>

src-tauri/gen/apple/margin-app_iOS/margin-app_iOS.entitlements

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict/>
-</plist>

src-tauri/gen/apple/project.yml

@@ -1,88 +0,0 @@
-name: margin-app
-options:
-  bundleIdPrefix: studio.margin.app
-  deploymentTarget:
-    iOS: 14.0
-fileGroups: [../../src]
-configs:
-  debug: debug
-  release: release
-settingGroups:
-  app:
-    base:
-      PRODUCT_NAME: Margin
-      PRODUCT_BUNDLE_IDENTIFIER: studio.margin.app
-targetTemplates:
-  app:
-    type: application
-    sources:
-      - path: Sources
-    scheme:
-      environmentVariables:
-        RUST_BACKTRACE: full
-        RUST_LOG: info
-    settings:
-      groups: [app]
-targets:
-  margin-app_iOS:
-    type: application
-    platform: iOS
-    sources:
-      - path: Sources
-      - path: Assets.xcassets
-      - path: Externals
-      - path: margin-app_iOS
-      - path: assets
-        buildPhase: resources
-        type: folder
-      - path: LaunchScreen.storyboard
-    info:
-      path: margin-app_iOS/Info.plist
-      properties:
-        LSRequiresIPhoneOS: true
-        UILaunchStoryboardName: LaunchScreen
-        UIRequiredDeviceCapabilities: [arm64, metal]
-        UISupportedInterfaceOrientations:
-          - UIInterfaceOrientationPortrait
-          - UIInterfaceOrientationLandscapeLeft
-          - UIInterfaceOrientationLandscapeRight
-        UISupportedInterfaceOrientations~ipad:
-          - UIInterfaceOrientationPortrait
-          - UIInterfaceOrientationPortraitUpsideDown
-          - UIInterfaceOrientationLandscapeLeft
-          - UIInterfaceOrientationLandscapeRight
-        CFBundleShortVersionString: 0.1.7
-        CFBundleVersion: "0.1.7"
-    entitlements:
-      path: margin-app_iOS/margin-app_iOS.entitlements
-    scheme:
-      environmentVariables:
-        RUST_BACKTRACE: full
-        RUST_LOG: info
-    settings:
-      base:
-        ENABLE_BITCODE: false
-        ARCHS: [arm64]
-        VALID_ARCHS: arm64 
-        LIBRARY_SEARCH_PATHS[arch=x86_64]: $(inherited) $(PROJECT_DIR)/Externals/x86_64/$(CONFIGURATION) $(SDKROOT)/usr/lib/swift $(DEVELOPER_DIR)/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift/$(PLATFORM_NAME) $(DEVELOPER_DIR)/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift-5.0/$(PLATFORM_NAME)
-        LIBRARY_SEARCH_PATHS[arch=arm64]: $(inherited) $(PROJECT_DIR)/Externals/arm64/$(CONFIGURATION) $(SDKROOT)/usr/lib/swift $(DEVELOPER_DIR)/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift/$(PLATFORM_NAME) $(DEVELOPER_DIR)/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift-5.0/$(PLATFORM_NAME)
-        ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES: true
-        EXCLUDED_ARCHS[sdk=iphoneos*]: x86_64
-      groups: [app]
-    dependencies:
-      - framework: libapp.a
-        embed: false
-      - sdk: CoreGraphics.framework
-      - sdk: Metal.framework
-      - sdk: MetalKit.framework
-      - sdk: QuartzCore.framework
-      - sdk: Security.framework
-      - sdk: UIKit.framework
-      - sdk: WebKit.framework
-    preBuildScripts:
-      - script: npm run -- tauri ios xcode-script -v --platform ${PLATFORM_DISPLAY_NAME:?} --sdk-root ${SDKROOT:?} --framework-search-paths "${FRAMEWORK_SEARCH_PATHS:?}" --header-search-paths "${HEADER_SEARCH_PATHS:?}" --gcc-preprocessor-definitions "${GCC_PREPROCESSOR_DEFINITIONS:-}" --configuration ${CONFIGURATION:?} ${FORCE_COLOR} ${ARCHS:?}
-        name: Build Rust Code
-        basedOnDependencyAnalysis: false
-        outputFiles:
-          - $(SRCROOT)/Externals/x86_64/${CONFIGURATION}/libapp.a
-          - $(SRCROOT)/Externals/arm64/${CONFIGURATION}/libapp.a

src-tauri/resources/dictionaries/en/tech.txt

@@ -1,304 +0,0 @@
-# Bundled technical and product terms accepted by the spell checker.
-# Matched case-insensitively. Words with internal capitals (macOS, iOS,
-# iPhone, GitHub) are already accepted by a heuristic and need not be listed.
-
-# Platforms and operating systems
-ios
-ipados
-macos
-watchos
-tvos
-android
-linux
-unix
-ubuntu
-debian
-fedora
-centos
-distro
-kernel
-chromeos
-
-# Apple ecosystem
-iphone
-ipad
-ipod
-imac
-macbook
-airpods
-airpod
-airtag
-homepod
-icloud
-airdrop
-facetime
-imessage
-siri
-retina
-
-# Devices and hardware
-smartphone
-smartphones
-smartwatch
-touchscreen
-webcam
-microcontroller
-cpu
-gpu
-ssd
-hdd
-ram
-usb
-hdmi
-ethernet
-bluetooth
-wifi
-nfc
-
-# Languages and runtimes
-javascript
-typescript
-nodejs
-node
-deno
-bun
-golang
-kotlin
-swift
-rust
-ruby
-python
-php
-perl
-scala
-clojure
-elixir
-haskell
-dart
-lua
-
-# Tooling and package managers
-npm
-npx
-nvm
-yarn
-pnpm
-webpack
-vite
-rollup
-esbuild
-babel
-eslint
-prettier
-tsconfig
-linter
-linters
-transpiler
-bundler
-runtime
-runtimes
-toolchain
-boilerplate
-
-# Web and frontend
-frontend
-backend
-fullstack
-middleware
-serverless
-api
-apis
-endpoint
-endpoints
-url
-urls
-uri
-uris
-cors
-oauth
-jwt
-csrf
-xss
-favicon
-viewport
-responsive
-dropdown
-checkbox
-tooltip
-modal
-navbar
-sidebar
-toolbar
-wireframe
-mockup
-placeholder
-
-# Data formats and protocols
-json
-yaml
-toml
-xml
-svg
-csv
-markdown
-http
-https
-ssh
-ftp
-sftp
-tcp
-udp
-dns
-vpn
-ssl
-tls
-localhost
-hostname
-subdomain
-namespace
-
-# Databases
-sql
-nosql
-postgres
-postgresql
-mysql
-mariadb
-sqlite
-mongodb
-redis
-elasticsearch
-schema
-schemas
-schemaless
-indexing
-
-# DevOps and cloud
-docker
-dockerfile
-kubernetes
-nginx
-serverless
-devops
-ci
-cd
-pipeline
-pipelines
-deploy
-deployment
-rollback
-autoscaling
-balancer
-microservice
-microservices
-container
-containers
-orchestration
-
-# Cloud providers and services
-aws
-gcp
-azure
-cloudflare
-vercel
-netlify
-heroku
-firebase
-supabase
-digitalocean
-
-# Version control and collaboration
-git
-github
-gitlab
-bitbucket
-repo
-repos
-monorepo
-changelog
-commit
-commits
-rebase
-merge
-codebase
-hotfix
-changeset
-
-# Programming concepts
-async
-await
-callback
-callbacks
-boolean
-enum
-struct
-regex
-stdin
-stdout
-stderr
-config
-configs
-metadata
-dataset
-datasets
-workflow
-workflows
-plugin
-plugins
-framework
-frameworks
-sdk
-cli
-gui
-ide
-debugger
-breakpoint
-recursion
-memoization
-multithreading
-serialization
-deserialization
-preprocessor
-middleware
-
-# AI and data
-chatgpt
-openai
-anthropic
-llm
-llms
-chatbot
-chatbots
-embeddings
-tokenization
-finetuning
-inference
-
-# Web3 and crypto
-blockchain
-bitcoin
-ethereum
-crypto
-cryptocurrency
-nft
-nfts
-
-# Product and UX
-ux
-ui
-onboarding
-login
-logout
-signup
-username
-usernames
-changelog
-screenshot
-screenshots
-emoji
-emojis
-hashtag
-hashtags
-clickable
-scrollable
-swipeable

src-tauri/src/epub.rs

@@ -5,6 +5,9 @@ use std::io::{Read, Write};
 use zip::write::SimpleFileOptions;
 use zip::{CompressionMethod, ZipArchive, ZipWriter};
 
+static LITERATA: &[u8] = include_bytes!("../../public/fonts/Literata-VF.ttf");
+static LITERATA_ITALIC: &[u8] = include_bytes!("../../public/fonts/Literata-Italic-VF.ttf");
+
 #[derive(Deserialize, Serialize)]
 pub struct EpubFile {
     path: String,
@@ -45,6 +48,14 @@ fn build(files: &[EpubFile]) -> Result<Vec<u8>, String> {
         zip.write_all(&bytes).map_err(|e| e.to_string())?;
     }
 
+    for (path, bytes) in [
+        ("OEBPS/fonts/Literata-VF.ttf", LITERATA),
+        ("OEBPS/fonts/Literata-Italic-VF.ttf", LITERATA_ITALIC),
+    ] {
+        zip.start_file(path, deflated).map_err(|e| e.to_string())?;
+        zip.write_all(bytes).map_err(|e| e.to_string())?;
+    }
+
     Ok(zip.finish().map_err(|e| e.to_string())?.into_inner())
 }
 

src-tauri/src/fonts.rs

@@ -1,47 +0,0 @@
-use fontdb::{Database, Family, Query};
-
-fn system_db() -> Database {
-    let mut db = Database::new();
-    db.load_system_fonts();
-    db
-}
-
-#[tauri::command(async)]
-pub fn list_system_fonts() -> Vec<String> {
-    let db = system_db();
-    let mut names: Vec<String> = db
-        .faces()
-        .filter_map(|face| face.families.first().map(|(name, _)| name.clone()))
-        .collect();
-    names.sort();
-    names.dedup();
-    names
-}
-
-pub fn system_font_bytes(family: &str) -> Vec<Vec<u8>> {
-    let db = system_db();
-    let mut out = Vec::new();
-    let styles = [
-        (fontdb::Weight::NORMAL, fontdb::Style::Normal),
-        (fontdb::Weight::NORMAL, fontdb::Style::Italic),
-        (fontdb::Weight::BOLD, fontdb::Style::Normal),
-        (fontdb::Weight::BOLD, fontdb::Style::Italic),
-    ];
-    let mut seen = std::collections::HashSet::new();
-    for (weight, style) in styles {
-        let query = Query {
-            families: &[Family::Name(family)],
-            weight,
-            style,
-            ..Query::default()
-        };
-        if let Some(id) = db.query(&query) {
-            if seen.insert(id) {
-                if let Some(bytes) = db.with_face_data(id, |data, _index| data.to_vec()) {
-                    out.push(bytes);
-                }
-            }
-        }
-    }
-    out
-}

src-tauri/src/gdrive.rs

@@ -1,953 +0,0 @@
-use base64::Engine;
-use base64::engine::general_purpose::URL_SAFE_NO_PAD;
-use rand::RngCore;
-use serde::de::DeserializeOwned;
-use serde::{Deserialize, Serialize};
-use sha2::{Digest, Sha256};
-use std::collections::HashMap;
-use std::fs;
-use std::io::{Read, Write};
-use std::net::{TcpListener, TcpStream};
-use std::path::PathBuf;
-use std::sync::{LazyLock, Mutex};
-use std::time::{Duration, Instant, SystemTime, UNIX_EPOCH};
-use tauri::{Emitter, Manager};
-
-const FOLDER_NAME: &str = "margin";
-const DICTIONARY_NAME: &str = "custom-dictionary.txt";
-const DRIVE_SCOPE: &str = "https://www.googleapis.com/auth/drive.file";
-const SCOPES: &str = "openid email https://www.googleapis.com/auth/drive.file";
-const AUTH_TIMEOUT_SECS: u64 = 120;
-
-const CREDENTIALS_JSON: &str =
-    include_str!(concat!(env!("CARGO_MANIFEST_DIR"), "/../google-credentials.json"));
-
-static HTTP: LazyLock<reqwest::Client> = LazyLock::new(reqwest::Client::new);
-
-#[derive(Deserialize)]
-struct CredentialsFile {
-    installed: Credentials,
-}
-
-#[derive(Deserialize)]
-struct Credentials {
-    client_id: String,
-    client_secret: String,
-    auth_uri: String,
-    token_uri: String,
-}
-
-fn load_credentials() -> Result<Credentials, String> {
-    let runtime_path = concat!(env!("CARGO_MANIFEST_DIR"), "/../google-credentials.json");
-    let raw = fs::read_to_string(runtime_path).unwrap_or_else(|_| CREDENTIALS_JSON.to_string());
-    let parsed: CredentialsFile = serde_json::from_str(&raw)
-        .map_err(|e| format!("invalid google-credentials.json: {e}"))?;
-    let creds = parsed.installed;
-    if creds.client_id.starts_with("YOUR_CLIENT_ID") || creds.client_secret.starts_with("YOUR_CLIENT_SECRET") {
-        return Err("Google Drive is not set up yet. Add a real OAuth desktop client to google-credentials.json.".to_string());
-    }
-    Ok(creds)
-}
-
-#[derive(Default)]
-pub struct GDriveState(pub Mutex<Session>);
-
-#[derive(Default)]
-pub struct Session {
-    refresh_token: Option<String>,
-    access_token: Option<String>,
-    access_expiry: u64,
-    email: Option<String>,
-    folder_id: Option<String>,
-    scopes: Option<String>,
-}
-
-#[derive(Serialize, Deserialize, Default)]
-struct BackupState {
-    #[serde(default)]
-    refresh_token: Option<String>,
-    email: Option<String>,
-    folder_id: Option<String>,
-    last_backup: Option<u64>,
-    #[serde(default)]
-    scopes: Option<String>,
-    #[serde(default)]
-    files: HashMap<String, FileRecord>,
-}
-
-#[derive(Serialize, Deserialize, Clone)]
-struct FileRecord {
-    hash: String,
-    drive_id: String,
-}
-
-#[derive(Serialize)]
-#[serde(rename_all = "camelCase")]
-pub struct Status {
-    connected: bool,
-    email: Option<String>,
-    last_backup: Option<u64>,
-    pending: bool,
-    needs_reauth: bool,
-}
-
-#[derive(Serialize)]
-#[serde(rename_all = "camelCase")]
-pub struct RestoreResult {
-    restored: usize,
-}
-
-#[derive(Serialize)]
-#[serde(rename_all = "camelCase")]
-pub struct SyncOutcome {
-    uploaded: usize,
-    downloaded: usize,
-    #[serde(flatten)]
-    status: Status,
-}
-
-#[derive(Serialize)]
-#[serde(rename_all = "camelCase")]
-pub struct BackupOutcome {
-    uploaded: usize,
-    #[serde(flatten)]
-    status: Status,
-}
-
-#[derive(Serialize)]
-#[serde(rename_all = "camelCase")]
-pub struct RemoteBackup {
-    name: String,
-}
-
-#[derive(Clone, Serialize)]
-#[serde(rename_all = "camelCase")]
-struct AuthEvent {
-    ok: bool,
-    error: Option<String>,
-}
-
-fn now() -> u64 {
-    SystemTime::now().duration_since(UNIX_EPOCH).unwrap_or_default().as_secs()
-}
-
-fn dictionary_path(app: &tauri::AppHandle) -> Result<PathBuf, String> {
-    Ok(crate::library::app_data_dir(app)?.join(DICTIONARY_NAME))
-}
-
-fn state_path(app: &tauri::AppHandle) -> Result<PathBuf, String> {
-    Ok(crate::library::app_data_dir(app)?.join("backup.json"))
-}
-
-fn load_state(app: &tauri::AppHandle) -> BackupState {
-    let path = match state_path(app) {
-        Ok(p) => p,
-        Err(_) => return BackupState::default(),
-    };
-    match fs::read_to_string(&path) {
-        Ok(contents) => serde_json::from_str(&contents).unwrap_or_default(),
-        Err(_) => BackupState::default(),
-    }
-}
-
-fn save_state(app: &tauri::AppHandle, state: &BackupState) -> Result<(), String> {
-    let path = state_path(app)?;
-    let contents = serde_json::to_string_pretty(state).map_err(|e| e.to_string())?;
-    crate::project::atomic_write(&path, contents.as_bytes(), false)
-}
-
-fn random_b64(bytes: usize) -> String {
-    let mut buf = vec![0u8; bytes];
-    rand::thread_rng().fill_bytes(&mut buf);
-    URL_SAFE_NO_PAD.encode(buf)
-}
-
-fn pkce_challenge(verifier: &str) -> String {
-    let mut hasher = Sha256::new();
-    hasher.update(verifier.as_bytes());
-    URL_SAFE_NO_PAD.encode(hasher.finalize())
-}
-
-fn hash_bytes(bytes: &[u8]) -> String {
-    let mut hasher = Sha256::new();
-    hasher.update(bytes);
-    format!("{:x}", hasher.finalize())
-}
-
-fn urlencode(s: &str) -> String {
-    url::form_urlencoded::byte_serialize(s.as_bytes()).collect()
-}
-
-fn has_drive_scope(scope: &str) -> bool {
-    scope.split_whitespace().any(|s| s == DRIVE_SCOPE)
-}
-
-const REAUTH_MESSAGE: &str =
-    "margin needs the \"See, edit, create and delete only the specific Google Drive files you use with this app\" permission. Connect again and tick that box.";
-
-fn drive_escape(s: &str) -> String {
-    s.replace('\\', "\\\\").replace('\'', "\\'")
-}
-
-fn safe_book_name(name: &str) -> bool {
-    match name.strip_suffix(".margin") {
-        Some(stem) => !stem.is_empty() && stem.chars().all(|c| c.is_ascii_alphanumeric() || c == '-' || c == '_'),
-        None => false,
-    }
-}
-
-fn write_http_message(stream: &mut TcpStream, message: &str) {
-    let body = format!(
-        "<!doctype html><html><head><meta charset=\"utf-8\"><title>margin</title></head>\
-         <body style=\"font-family:system-ui,sans-serif;text-align:center;padding-top:80px;color:#222\">\
-         <h2>{message}</h2></body></html>"
-    );
-    let response = format!(
-        "HTTP/1.1 200 OK\r\nContent-Type: text/html; charset=utf-8\r\nContent-Length: {}\r\nConnection: close\r\n\r\n{}",
-        body.len(),
-        body
-    );
-    let _ = stream.write_all(response.as_bytes());
-    let _ = stream.flush();
-}
-
-fn await_code(listener: TcpListener, expected_state: &str, deadline: Instant) -> Result<String, String> {
-    listener.set_nonblocking(true).map_err(|e| e.to_string())?;
-    loop {
-        if Instant::now() > deadline {
-            return Err("Timed out waiting for Google authorization.".to_string());
-        }
-        match listener.accept() {
-            Ok((mut stream, _)) => {
-                stream.set_nonblocking(false).ok();
-                stream.set_read_timeout(Some(Duration::from_secs(5))).ok();
-                let mut buf = [0u8; 8192];
-                let n = stream.read(&mut buf).unwrap_or(0);
-                let request = String::from_utf8_lossy(&buf[..n]);
-                let path = request.lines().next().and_then(|line| line.split_whitespace().nth(1)).unwrap_or("");
-                if path == "/favicon.ico" {
-                    write_http_message(&mut stream, "margin");
-                    continue;
-                }
-                let full = format!("http://127.0.0.1{path}");
-                let parsed = match url::Url::parse(&full) {
-                    Ok(p) => p,
-                    Err(_) => {
-                        write_http_message(&mut stream, "Waiting for Google…");
-                        continue;
-                    }
-                };
-                let mut code = None;
-                let mut state = None;
-                let mut error = None;
-                for (key, value) in parsed.query_pairs() {
-                    match key.as_ref() {
-                        "code" => code = Some(value.into_owned()),
-                        "state" => state = Some(value.into_owned()),
-                        "error" => error = Some(value.into_owned()),
-                        _ => {}
-                    }
-                }
-                if let Some(error) = error {
-                    write_http_message(&mut stream, "Authorization was cancelled. You can close this tab.");
-                    return Err(format!("Google authorization failed: {error}"));
-                }
-                match (code, state) {
-                    (Some(code), Some(state)) if state == expected_state => {
-                        write_http_message(&mut stream, "Connected to margin. You can close this tab.");
-                        return Ok(code);
-                    }
-                    (Some(_), _) => {
-                        write_http_message(&mut stream, "Could not verify the request. You can close this tab.");
-                        return Err("State mismatch during Google authorization.".to_string());
-                    }
-                    _ => {
-                        write_http_message(&mut stream, "Waiting for Google…");
-                    }
-                }
-            }
-            Err(ref e) if e.kind() == std::io::ErrorKind::WouldBlock => {
-                std::thread::sleep(Duration::from_millis(150));
-            }
-            Err(e) => return Err(e.to_string()),
-        }
-    }
-}
-
-#[derive(Deserialize)]
-struct TokenResponse {
-    access_token: String,
-    #[serde(default)]
-    refresh_token: Option<String>,
-    #[serde(default)]
-    expires_in: u64,
-    #[serde(default)]
-    scope: Option<String>,
-}
-
-#[derive(Deserialize)]
-struct UserInfo {
-    #[serde(default)]
-    email: Option<String>,
-}
-
-#[derive(Deserialize)]
-struct DriveFile {
-    id: String,
-    #[serde(default)]
-    name: String,
-}
-
-#[derive(Deserialize)]
-struct FileList {
-    #[serde(default)]
-    files: Vec<DriveFile>,
-    #[serde(default, rename = "nextPageToken")]
-    next_page_token: Option<String>,
-}
-
-async fn read_json<T: DeserializeOwned>(resp: reqwest::Response, context: &str) -> Result<T, String> {
-    let status = resp.status();
-    let text = resp.text().await.map_err(|e| e.to_string())?;
-    if !status.is_success() {
-        return Err(format!("{context} failed ({status}): {text}"));
-    }
-    serde_json::from_str(&text).map_err(|e| format!("{context}: could not parse response: {e}"))
-}
-
-async fn exchange_code(creds: &Credentials, code: &str, redirect: &str, verifier: &str) -> Result<TokenResponse, String> {
-    let resp = HTTP
-        .post(&creds.token_uri)
-        .form(&[
-            ("client_id", creds.client_id.as_str()),
-            ("client_secret", creds.client_secret.as_str()),
-            ("code", code),
-            ("code_verifier", verifier),
-            ("grant_type", "authorization_code"),
-            ("redirect_uri", redirect),
-        ])
-        .send()
-        .await
-        .map_err(|e| e.to_string())?;
-    read_json(resp, "Google token exchange").await
-}
-
-async fn refresh_access_token(creds: &Credentials, refresh_token: &str) -> Result<TokenResponse, String> {
-    let resp = HTTP
-        .post(&creds.token_uri)
-        .form(&[
-            ("client_id", creds.client_id.as_str()),
-            ("client_secret", creds.client_secret.as_str()),
-            ("refresh_token", refresh_token),
-            ("grant_type", "refresh_token"),
-        ])
-        .send()
-        .await
-        .map_err(|e| e.to_string())?;
-    read_json(resp, "Google token refresh").await
-}
-
-async fn fetch_email(access_token: &str) -> Result<String, String> {
-    let resp = HTTP
-        .get("https://www.googleapis.com/oauth2/v2/userinfo")
-        .bearer_auth(access_token)
-        .send()
-        .await
-        .map_err(|e| e.to_string())?;
-    let info: UserInfo = read_json(resp, "Google account lookup").await?;
-    Ok(info.email.unwrap_or_default())
-}
-
-async fn ensure_folder(access_token: &str) -> Result<String, String> {
-    let query = format!(
-        "name = '{}' and mimeType = 'application/vnd.google-apps.folder' and trashed = false",
-        drive_escape(FOLDER_NAME)
-    );
-    let resp = HTTP
-        .get("https://www.googleapis.com/drive/v3/files")
-        .bearer_auth(access_token)
-        .query(&[
-            ("q", query.as_str()),
-            ("fields", "files(id,name)"),
-            ("spaces", "drive"),
-            ("pageSize", "1"),
-        ])
-        .send()
-        .await
-        .map_err(|e| e.to_string())?;
-    let list: FileList = read_json(resp, "Drive folder lookup").await?;
-    if let Some(folder) = list.files.into_iter().next() {
-        return Ok(folder.id);
-    }
-    let body = serde_json::json!({
-        "name": FOLDER_NAME,
-        "mimeType": "application/vnd.google-apps.folder",
-    });
-    let resp = HTTP
-        .post("https://www.googleapis.com/drive/v3/files")
-        .bearer_auth(access_token)
-        .query(&[("fields", "id")])
-        .json(&body)
-        .send()
-        .await
-        .map_err(|e| e.to_string())?;
-    let created: DriveFile = read_json(resp, "Drive folder creation").await?;
-    Ok(created.id)
-}
-
-async fn find_file(access_token: &str, folder_id: &str, name: &str) -> Result<Option<DriveFile>, String> {
-    let query = format!(
-        "'{}' in parents and name = '{}' and trashed = false",
-        drive_escape(folder_id),
-        drive_escape(name)
-    );
-    let resp = HTTP
-        .get("https://www.googleapis.com/drive/v3/files")
-        .bearer_auth(access_token)
-        .query(&[
-            ("q", query.as_str()),
-            ("fields", "files(id,name)"),
-            ("spaces", "drive"),
-            ("pageSize", "1"),
-        ])
-        .send()
-        .await
-        .map_err(|e| e.to_string())?;
-    let list: FileList = read_json(resp, "Drive file lookup").await?;
-    Ok(list.files.into_iter().next())
-}
-
-async fn list_in_folder(access_token: &str, folder_id: &str) -> Result<Vec<DriveFile>, String> {
-    let query = format!("'{}' in parents and trashed = false", drive_escape(folder_id));
-    let mut files = Vec::new();
-    let mut page_token: Option<String> = None;
-    loop {
-        let mut request = HTTP
-            .get("https://www.googleapis.com/drive/v3/files")
-            .bearer_auth(access_token)
-            .query(&[
-                ("q", query.as_str()),
-                ("fields", "nextPageToken,files(id,name)"),
-                ("spaces", "drive"),
-                ("pageSize", "100"),
-            ]);
-        if let Some(token) = &page_token {
-            request = request.query(&[("pageToken", token.as_str())]);
-        }
-        let resp = request.send().await.map_err(|e| e.to_string())?;
-        let FileList { files: page, next_page_token } = read_json(resp, "Drive file list").await?;
-        files.extend(page);
-        match next_page_token {
-            Some(token) => page_token = Some(token),
-            None => break,
-        }
-    }
-    Ok(files)
-}
-
-async fn upload_file(
-    access_token: &str,
-    folder_id: &str,
-    name: &str,
-    bytes: &[u8],
-    existing_id: Option<String>,
-) -> Result<DriveFile, String> {
-    let boundary = "margin7f3e2a1b9c8d";
-    let metadata = match &existing_id {
-        Some(_) => serde_json::json!({ "name": name }),
-        None => serde_json::json!({ "name": name, "parents": [folder_id] }),
-    };
-    let mut body: Vec<u8> = Vec::new();
-    body.extend_from_slice(format!("--{boundary}\r\nContent-Type: application/json; charset=UTF-8\r\n\r\n").as_bytes());
-    body.extend_from_slice(serde_json::to_string(&metadata).unwrap_or_default().as_bytes());
-    body.extend_from_slice(format!("\r\n--{boundary}\r\nContent-Type: application/octet-stream\r\n\r\n").as_bytes());
-    body.extend_from_slice(bytes);
-    body.extend_from_slice(format!("\r\n--{boundary}--\r\n").as_bytes());
-
-    let request = match &existing_id {
-        Some(id) => HTTP.patch(format!("https://www.googleapis.com/upload/drive/v3/files/{id}")),
-        None => HTTP.post("https://www.googleapis.com/upload/drive/v3/files"),
-    };
-    let resp = request
-        .bearer_auth(access_token)
-        .query(&[("uploadType", "multipart"), ("fields", "id")])
-        .header(reqwest::header::CONTENT_TYPE, format!("multipart/related; boundary={boundary}"))
-        .body(body)
-        .send()
-        .await
-        .map_err(|e| e.to_string())?;
-    read_json(resp, &format!("Drive upload of {name}")).await
-}
-
-async fn download_file(access_token: &str, id: &str) -> Result<Vec<u8>, String> {
-    let resp = HTTP
-        .get(format!("https://www.googleapis.com/drive/v3/files/{id}"))
-        .bearer_auth(access_token)
-        .query(&[("alt", "media")])
-        .send()
-        .await
-        .map_err(|e| e.to_string())?;
-    let status = resp.status();
-    if !status.is_success() {
-        let text = resp.text().await.unwrap_or_default();
-        return Err(format!("Drive download failed ({status}): {text}"));
-    }
-    Ok(resp.bytes().await.map_err(|e| e.to_string())?.to_vec())
-}
-
-async fn valid_access_token(app: &tauri::AppHandle, state: &GDriveState) -> Result<String, String> {
-    let (access, expiry, refresh) = {
-        let session = state.0.lock().unwrap();
-        (session.access_token.clone(), session.access_expiry, session.refresh_token.clone())
-    };
-    if let Some(token) = access {
-        if now() < expiry {
-            return Ok(token);
-        }
-    }
-    let refresh = refresh.ok_or("Not connected to Google Drive.")?;
-    let creds = load_credentials()?;
-    let tokens = match refresh_access_token(&creds, &refresh).await {
-        Ok(tokens) => tokens,
-        Err(e) => {
-            if e.contains("invalid_grant") {
-                forget_credentials(app, state);
-                return Err(
-                    "Google Drive access has expired. Connect again to keep backing up.".to_string()
-                );
-            }
-            return Err(e);
-        }
-    };
-    if let Some(granted) = &tokens.scope {
-        if !has_drive_scope(granted) {
-            let mut session = state.0.lock().unwrap();
-            session.scopes = Some(granted.clone());
-            drop(session);
-            let mut stored = load_state(app);
-            stored.scopes = Some(granted.clone());
-            let _ = save_state(app, &stored);
-            return Err(REAUTH_MESSAGE.to_string());
-        }
-    }
-    let access_token = tokens.access_token.clone();
-    {
-        let mut session = state.0.lock().unwrap();
-        session.access_token = Some(tokens.access_token);
-        session.access_expiry = now() + tokens.expires_in.saturating_sub(60);
-        if let Some(rotated) = &tokens.refresh_token {
-            session.refresh_token = Some(rotated.clone());
-        }
-        if let Some(granted) = &tokens.scope {
-            session.scopes = Some(granted.clone());
-        }
-    }
-    if tokens.refresh_token.is_some() || tokens.scope.is_some() {
-        let mut stored = load_state(app);
-        if let Some(rotated) = &tokens.refresh_token {
-            stored.refresh_token = Some(rotated.clone());
-        }
-        if let Some(granted) = &tokens.scope {
-            stored.scopes = Some(granted.clone());
-        }
-        let _ = save_state(app, &stored);
-    }
-    Ok(access_token)
-}
-
-async fn ensure_folder_id(app: &tauri::AppHandle, state: &GDriveState, access_token: &str) -> Result<String, String> {
-    {
-        let session = state.0.lock().unwrap();
-        if let Some(folder) = &session.folder_id {
-            return Ok(folder.clone());
-        }
-    }
-    let folder_id = ensure_folder(access_token).await?;
-    {
-        let mut session = state.0.lock().unwrap();
-        session.folder_id = Some(folder_id.clone());
-    }
-    let mut stored = load_state(app);
-    stored.folder_id = Some(folder_id.clone());
-    save_state(app, &stored)?;
-    Ok(folder_id)
-}
-
-fn collect_local_files(app: &tauri::AppHandle) -> Result<Vec<(String, Vec<u8>)>, String> {
-    let mut files = Vec::new();
-    let library = crate::library::library_dir(app)?;
-    for entry in fs::read_dir(&library).map_err(|e| e.to_string())? {
-        let path = match entry {
-            Ok(entry) => entry.path(),
-            Err(_) => continue,
-        };
-        if path.extension().and_then(|e| e.to_str()) != Some("margin") {
-            continue;
-        }
-        let name = match path.file_name().and_then(|n| n.to_str()) {
-            Some(name) if safe_book_name(name) => name.to_string(),
-            _ => continue,
-        };
-        let bytes = fs::read(&path).map_err(|e| e.to_string())?;
-        files.push((name, bytes));
-    }
-    let dictionary = dictionary_path(app)?;
-    if dictionary.exists() {
-        let bytes = fs::read(&dictionary).map_err(|e| e.to_string())?;
-        files.push((DICTIONARY_NAME.to_string(), bytes));
-    }
-    Ok(files)
-}
-
-fn file_pending(path: &std::path::Path, name: &str, stored: &BackupState, last_backup: u64) -> bool {
-    let record = match stored.files.get(name) {
-        Some(record) => record,
-        None => return true,
-    };
-    let touched = fs::metadata(path)
-        .and_then(|meta| meta.modified())
-        .ok()
-        .and_then(|time| time.duration_since(UNIX_EPOCH).ok())
-        .map(|since| since.as_secs() > last_backup)
-        .unwrap_or(true);
-    if !touched {
-        return false;
-    }
-    match fs::read(path) {
-        Ok(bytes) => record.hash != hash_bytes(&bytes),
-        Err(_) => false,
-    }
-}
-
-fn compute_pending(app: &tauri::AppHandle, stored: &BackupState) -> bool {
-    let last_backup = stored.last_backup.unwrap_or(0);
-    let library = match crate::library::library_dir(app) {
-        Ok(dir) => dir,
-        Err(_) => return false,
-    };
-    if let Ok(entries) = fs::read_dir(&library) {
-        for entry in entries.flatten() {
-            let path = entry.path();
-            if path.extension().and_then(|e| e.to_str()) != Some("margin") {
-                continue;
-            }
-            if let Some(name) = path.file_name().and_then(|n| n.to_str()) {
-                if safe_book_name(name) && file_pending(&path, name, stored, last_backup) {
-                    return true;
-                }
-            }
-        }
-    }
-    match dictionary_path(app) {
-        Ok(dict) if dict.exists() => file_pending(&dict, DICTIONARY_NAME, stored, last_backup),
-        _ => false,
-    }
-}
-
-fn status_inner(app: &tauri::AppHandle, state: &GDriveState) -> Status {
-    let (connected, email, scopes) = {
-        let session = state.0.lock().unwrap();
-        (session.refresh_token.is_some(), session.email.clone(), session.scopes.clone())
-    };
-    let stored = load_state(app);
-    let pending = connected && compute_pending(app, &stored);
-    let granted = scopes.or_else(|| stored.scopes.clone());
-    Status {
-        connected,
-        email: email.or(stored.email),
-        last_backup: stored.last_backup,
-        pending,
-        needs_reauth: connected && granted.map(|s| !has_drive_scope(&s)).unwrap_or(false),
-    }
-}
-
-pub fn init_session(app: &tauri::AppHandle) {
-    let state = app.state::<GDriveState>();
-    let stored = load_state(app);
-    let mut session = state.0.lock().unwrap();
-    session.refresh_token = stored.refresh_token;
-    session.email = stored.email;
-    session.folder_id = stored.folder_id;
-    session.scopes = stored.scopes;
-}
-
-fn forget_credentials(app: &tauri::AppHandle, state: &GDriveState) {
-    {
-        let mut session = state.0.lock().unwrap();
-        session.refresh_token = None;
-        session.access_token = None;
-        session.access_expiry = 0;
-        session.scopes = None;
-    }
-    let mut stored = load_state(app);
-    stored.refresh_token = None;
-    stored.scopes = None;
-    let _ = save_state(app, &stored);
-}
-
-async fn complete_auth(
-    app: &tauri::AppHandle,
-    listener: TcpListener,
-    csrf: String,
-    verifier: String,
-    redirect: String,
-    creds: Credentials,
-) -> Result<(), String> {
-    let code = tauri::async_runtime::spawn_blocking(move || {
-        let deadline = Instant::now() + Duration::from_secs(AUTH_TIMEOUT_SECS);
-        await_code(listener, &csrf, deadline)
-    })
-    .await
-    .map_err(|e| e.to_string())??;
-
-    let tokens = exchange_code(&creds, &code, &redirect, &verifier).await?;
-    let granted = tokens.scope.clone().unwrap_or_default();
-    if !has_drive_scope(&granted) {
-        let _ = HTTP
-            .post("https://oauth2.googleapis.com/revoke")
-            .form(&[("token", tokens.access_token.as_str())])
-            .send()
-            .await;
-        return Err(REAUTH_MESSAGE.to_string());
-    }
-    let email = fetch_email(&tokens.access_token).await?;
-    let folder_id = ensure_folder(&tokens.access_token).await?;
-
-    {
-        let state = app.state::<GDriveState>();
-        let mut session = state.0.lock().unwrap();
-        if let Some(refresh) = &tokens.refresh_token {
-            session.refresh_token = Some(refresh.clone());
-        }
-        session.access_token = Some(tokens.access_token.clone());
-        session.access_expiry = now() + tokens.expires_in.saturating_sub(60);
-        session.email = Some(email.clone());
-        session.folder_id = Some(folder_id.clone());
-        session.scopes = Some(granted.clone());
-    }
-
-    let mut stored = load_state(app);
-    if let Some(refresh) = &tokens.refresh_token {
-        stored.refresh_token = Some(refresh.clone());
-    }
-    stored.email = Some(email);
-    stored.folder_id = Some(folder_id);
-    stored.scopes = Some(granted);
-    save_state(app, &stored)?;
-    Ok(())
-}
-
-#[tauri::command]
-pub async fn gdrive_connect(app: tauri::AppHandle) -> Result<String, String> {
-    let creds = load_credentials()?;
-    let verifier = random_b64(64);
-    let challenge = pkce_challenge(&verifier);
-    let csrf = random_b64(24);
-
-    let listener = TcpListener::bind("127.0.0.1:0").map_err(|e| e.to_string())?;
-    let port = listener.local_addr().map_err(|e| e.to_string())?.port();
-    let redirect = format!("http://127.0.0.1:{port}");
-
-    let auth_url = format!(
-        "{}?client_id={}&redirect_uri={}&response_type=code&scope={}&code_challenge={}&code_challenge_method=S256&state={}&access_type=offline&prompt=consent",
-        creds.auth_uri,
-        urlencode(&creds.client_id),
-        urlencode(&redirect),
-        urlencode(SCOPES),
-        challenge,
-        urlencode(&csrf),
-    );
-
-    use tauri_plugin_opener::OpenerExt;
-    let _ = app.opener().open_url(auth_url.clone(), None::<&str>);
-
-    let app_bg = app.clone();
-    tauri::async_runtime::spawn(async move {
-        let event = match complete_auth(&app_bg, listener, csrf, verifier, redirect, creds).await {
-            Ok(()) => AuthEvent { ok: true, error: None },
-            Err(error) => AuthEvent { ok: false, error: Some(error) },
-        };
-        let _ = app_bg.emit("gdrive-auth", event);
-    });
-
-    Ok(auth_url)
-}
-
-#[tauri::command]
-pub async fn gdrive_disconnect(app: tauri::AppHandle, state: tauri::State<'_, GDriveState>) -> Result<Status, String> {
-    let refresh = {
-        let session = state.0.lock().unwrap();
-        session.refresh_token.clone()
-    };
-    if let Some(refresh) = refresh {
-        let _ = HTTP
-            .post("https://oauth2.googleapis.com/revoke")
-            .form(&[("token", refresh.as_str())])
-            .send()
-            .await;
-    }
-    {
-        let mut session = state.0.lock().unwrap();
-        session.refresh_token = None;
-        session.access_token = None;
-        session.access_expiry = 0;
-        session.email = None;
-        session.scopes = None;
-    }
-    let mut stored = load_state(&app);
-    stored.refresh_token = None;
-    stored.email = None;
-    stored.scopes = None;
-    save_state(&app, &stored)?;
-    Ok(status_inner(&app, &state))
-}
-
-#[tauri::command]
-pub async fn gdrive_status(app: tauri::AppHandle, state: tauri::State<'_, GDriveState>) -> Result<Status, String> {
-    Ok(status_inner(&app, &state))
-}
-
-async fn push_local_files(
-    app: &tauri::AppHandle,
-    access_token: &str,
-    folder_id: &str,
-    stored: &mut BackupState,
-) -> Result<usize, String> {
-    let files = collect_local_files(app)?;
-    let mut uploaded = 0;
-    for (name, bytes) in &files {
-        let hash = hash_bytes(bytes);
-        let existing = stored.files.get(name).cloned();
-        if let Some(record) = &existing {
-            if record.hash == hash {
-                continue;
-            }
-        }
-        let drive_id = match existing.filter(|record| !record.drive_id.is_empty()) {
-            Some(record) => Some(record.drive_id),
-            None => find_file(access_token, folder_id, name).await?.map(|file| file.id),
-        };
-        let result = upload_file(access_token, folder_id, name, bytes, drive_id).await?;
-        stored.files.insert(name.clone(), FileRecord { hash, drive_id: result.id });
-        uploaded += 1;
-    }
-    Ok(uploaded)
-}
-
-#[tauri::command]
-pub async fn gdrive_backup(app: tauri::AppHandle, state: tauri::State<'_, GDriveState>) -> Result<BackupOutcome, String> {
-    let access_token = valid_access_token(&app, &state).await?;
-    let folder_id = ensure_folder_id(&app, &state, &access_token).await?;
-    let mut stored = load_state(&app);
-    let uploaded = push_local_files(&app, &access_token, &folder_id, &mut stored).await?;
-    if uploaded > 0 {
-        stored.last_backup = Some(now());
-    }
-    save_state(&app, &stored)?;
-    Ok(BackupOutcome {
-        uploaded,
-        status: Status {
-            connected: true,
-            email: stored.email.clone(),
-            last_backup: stored.last_backup,
-            pending: false,
-            needs_reauth: false,
-        },
-    })
-}
-
-#[tauri::command]
-pub async fn gdrive_sync(app: tauri::AppHandle, state: tauri::State<'_, GDriveState>) -> Result<SyncOutcome, String> {
-    let access_token = valid_access_token(&app, &state).await?;
-    let folder_id = ensure_folder_id(&app, &state, &access_token).await?;
-    let remote = list_in_folder(&access_token, &folder_id).await?;
-    let mut stored = load_state(&app);
-    let mut downloaded = 0;
-
-    for file in &remote {
-        let is_dictionary = file.name == DICTIONARY_NAME;
-        if !is_dictionary && !safe_book_name(&file.name) {
-            continue;
-        }
-        let destination = if is_dictionary {
-            dictionary_path(&app)?
-        } else {
-            crate::library::library_dir(&app)?.join(&file.name)
-        };
-        if destination.exists() {
-            let record = stored
-                .files
-                .entry(file.name.clone())
-                .or_insert_with(|| FileRecord { hash: String::new(), drive_id: file.id.clone() });
-            record.drive_id = file.id.clone();
-            continue;
-        }
-        let bytes = download_file(&access_token, &file.id).await?;
-        crate::project::atomic_write(&destination, &bytes, false)?;
-        stored.files.insert(
-            file.name.clone(),
-            FileRecord { hash: hash_bytes(&bytes), drive_id: file.id.clone() },
-        );
-        downloaded += 1;
-    }
-
-    let uploaded = push_local_files(&app, &access_token, &folder_id, &mut stored).await?;
-    if uploaded > 0 || downloaded > 0 {
-        stored.last_backup = Some(now());
-    }
-    save_state(&app, &stored)?;
-    Ok(SyncOutcome {
-        uploaded,
-        downloaded,
-        status: Status {
-            connected: true,
-            email: stored.email.clone(),
-            last_backup: stored.last_backup,
-            pending: false,
-            needs_reauth: false,
-        },
-    })
-}
-
-#[tauri::command]
-pub async fn gdrive_restore(app: tauri::AppHandle, state: tauri::State<'_, GDriveState>) -> Result<RestoreResult, String> {
-    let access_token = valid_access_token(&app, &state).await?;
-    let folder_id = ensure_folder_id(&app, &state, &access_token).await?;
-    let remote = list_in_folder(&access_token, &folder_id).await?;
-    let mut stored = load_state(&app);
-    let mut restored = 0;
-    for file in &remote {
-        let is_dictionary = file.name == DICTIONARY_NAME;
-        let is_book = safe_book_name(&file.name);
-        if !is_dictionary && !is_book {
-            continue;
-        }
-        let bytes = download_file(&access_token, &file.id).await?;
-        let destination = if is_dictionary {
-            dictionary_path(&app)?
-        } else {
-            crate::library::library_dir(&app)?.join(&file.name)
-        };
-        crate::project::atomic_write(&destination, &bytes, false)?;
-        stored.files.insert(
-            file.name.clone(),
-            FileRecord { hash: hash_bytes(&bytes), drive_id: file.id.clone() },
-        );
-        restored += 1;
-    }
-    stored.last_backup = Some(now());
-    save_state(&app, &stored)?;
-    Ok(RestoreResult { restored })
-}
-
-#[tauri::command]
-pub async fn gdrive_list_backups(app: tauri::AppHandle, state: tauri::State<'_, GDriveState>) -> Result<Vec<RemoteBackup>, String> {
-    let access_token = valid_access_token(&app, &state).await?;
-    let folder_id = ensure_folder_id(&app, &state, &access_token).await?;
-    let remote = list_in_folder(&access_token, &folder_id).await?;
-    Ok(remote
-        .into_iter()
-        .filter(|file| safe_book_name(&file.name))
-        .map(|file| RemoteBackup { name: file.name })
-        .collect())
-}

src-tauri/src/lib.rs

@@ -1,138 +1,58 @@
 mod epub;
-mod fonts;
-mod gdrive;
 mod library;
-#[cfg(target_os = "macos")]
-mod macspell;
 mod pdf;
 mod project;
 mod proofing;
-mod writingtools;
 
-#[cfg(desktop)]
 use tauri::menu::{Menu, MenuItemBuilder, MenuItemKind, PredefinedMenuItem, SubmenuBuilder};
-#[cfg(desktop)]
 use tauri::{Emitter, Runtime};
 
-#[cfg(desktop)]
 fn build_menu<R: Runtime>(handle: &tauri::AppHandle<R>) -> tauri::Result<Menu<R>> {
     let menu = Menu::default(handle)?;
-
     let new_book = MenuItemBuilder::with_id("new-book", "New Book")
         .accelerator("CmdOrCtrl+N")
         .build(handle)?;
-    let save = MenuItemBuilder::with_id("save", "Save")
-        .accelerator("CmdOrCtrl+S")
-        .build(handle)?;
-    let export_pdf = MenuItemBuilder::with_id("export-pdf", "Export as PDF…")
-        .accelerator("CmdOrCtrl+Shift+P")
-        .build(handle)?;
-    let export_epub = MenuItemBuilder::with_id("export-epub", "Export as EPUB…")
-        .accelerator("CmdOrCtrl+Shift+E")
-        .build(handle)?;
+    let export_pdf = MenuItemBuilder::with_id("export-pdf", "Export as PDF…").build(handle)?;
+    let export_epub = MenuItemBuilder::with_id("export-epub", "Export as EPUB…").build(handle)?;
     let check_updates =
         MenuItemBuilder::with_id("check-updates", "Check for Updates…").build(handle)?;
-    let settings = MenuItemBuilder::with_id("settings", "Settings…")
-        .accelerator("CmdOrCtrl+,")
-        .build(handle)?;
-    let find = MenuItemBuilder::with_id("find", "Find…")
-        .accelerator("CmdOrCtrl+F")
-        .build(handle)?;
-    let report_issue =
-        MenuItemBuilder::with_id("report-issue", "Report an Issue…").build(handle)?;
 
-    let submenus: Vec<_> = menu
+    let file_submenu = menu
         .items()?
         .into_iter()
-        .filter_map(|item| match item {
-            MenuItemKind::Submenu(submenu) => Some(submenu),
+        .find_map(|item| match item {
+            MenuItemKind::Submenu(submenu)
+                if submenu.text().map(|t| t == "File").unwrap_or(false) =>
+            {
+                Some(submenu)
+            }
             _ => None,
-        })
-        .collect();
+        });
 
-    let find_submenu = |name: &str| {
-        submenus
-            .iter()
-            .find(|submenu| submenu.text().map(|t| t == name).unwrap_or(false))
-            .cloned()
-    };
-
-    match find_submenu("File") {
+    match file_submenu {
         Some(submenu) => {
             submenu.prepend_items(&[
                 &new_book,
                 &PredefinedMenuItem::separator(handle)?,
-                &save,
-                &PredefinedMenuItem::separator(handle)?,
                 &export_pdf,
                 &export_epub,
                 &PredefinedMenuItem::separator(handle)?,
+                &check_updates,
+                &PredefinedMenuItem::separator(handle)?,
             ])?;
         }
         None => {
             let submenu = SubmenuBuilder::new(handle, "File")
                 .item(&new_book)
                 .item(&PredefinedMenuItem::separator(handle)?)
-                .item(&save)
-                .item(&PredefinedMenuItem::separator(handle)?)
                 .item(&export_pdf)
                 .item(&export_epub)
+                .item(&PredefinedMenuItem::separator(handle)?)
+                .item(&check_updates)
                 .build()?;
             menu.insert(&submenu, 1)?;
         }
     }
-
-    if let Some(edit) = find_submenu("Edit") {
-        edit.append_items(&[&PredefinedMenuItem::separator(handle)?, &find])?;
-    }
-
-    if let Some(help) = find_submenu("Help") {
-        help.append_items(&[&report_issue])?;
-    }
-
-    #[cfg(target_os = "macos")]
-    {
-        if let Some(app_submenu) = submenus.first() {
-            app_submenu.insert(&check_updates, 1)?;
-            app_submenu.insert(&settings, 3)?;
-            app_submenu.insert(&PredefinedMenuItem::separator(handle)?, 4)?;
-        }
-        if let Some(window) = find_submenu("Window") {
-            let show_window = MenuItemBuilder::with_id("show-window", "Open Window")
-                .accelerator("CmdOrCtrl+Shift+M")
-                .build(handle)?;
-            window.append_items(&[&PredefinedMenuItem::separator(handle)?, &show_window])?;
-        }
-        if let Some(view) = find_submenu("View") {
-            let toggle_chapters = MenuItemBuilder::with_id("toggle-chapters", "Toggle Chapters")
-                .accelerator("CmdOrCtrl+\\")
-                .build(handle)?;
-            let next_chapter = MenuItemBuilder::with_id("next-chapter", "Next Chapter")
-                .accelerator("CmdOrCtrl+Alt+Down")
-                .build(handle)?;
-            let prev_chapter = MenuItemBuilder::with_id("prev-chapter", "Previous Chapter")
-                .accelerator("CmdOrCtrl+Alt+Up")
-                .build(handle)?;
-            view.prepend_items(&[
-                &toggle_chapters,
-                &PredefinedMenuItem::separator(handle)?,
-                &next_chapter,
-                &prev_chapter,
-                &PredefinedMenuItem::separator(handle)?,
-            ])?;
-        }
-    }
-
-    #[cfg(not(target_os = "macos"))]
-    {
-        if let Some(file) = find_submenu("File") {
-            file.append_items(&[&PredefinedMenuItem::separator(handle)?, &check_updates])?;
-        }
-        if let Some(edit) = find_submenu("Edit") {
-            edit.append_items(&[&settings])?;
-        }
-    }
-
     Ok(menu)
 }
 
@@ -140,61 +60,29 @@ fn build_menu<R: Runtime>(handle: &tauri::AppHandle<R>) -> tauri::Result<Menu<R>
 pub fn run() {
     let context = tauri::generate_context!();
 
-    #[cfg_attr(mobile, allow(unused_mut))]
     let mut builder = tauri::Builder::default()
         .plugin(tauri_plugin_opener::init())
-        .plugin(tauri_plugin_dialog::init());
+        .plugin(tauri_plugin_dialog::init())
+        .plugin(tauri_plugin_process::init());
 
-    #[cfg(desktop)]
-    {
-        builder = builder.plugin(tauri_plugin_process::init());
     if context.config().plugins.0.contains_key("updater") {
         builder = builder.plugin(tauri_plugin_updater::Builder::new().build());
     }
-    }
 
-    builder = builder
+    builder
         .manage(proofing::new_state())
-        .manage(gdrive::GDriveState::default())
-        .setup(|app| {
-            gdrive::init_session(app.handle());
-            writingtools::label_writing_tool_shortcuts();
-            Ok(())
-        });
-
-    #[cfg(desktop)]
-    {
-        builder = builder
         .menu(|handle| build_menu(handle))
         .on_menu_event(|app, event| {
             if matches!(
                 event.id().0.as_str(),
-                    "new-book"
-                        | "save"
-                        | "export-pdf"
-                        | "export-epub"
-                        | "check-updates"
-                        | "settings"
-                        | "find"
-                        | "toggle-chapters"
-                        | "next-chapter"
-                        | "prev-chapter"
-                        | "report-issue"
+                "new-book" | "export-pdf" | "export-epub" | "check-updates"
             ) {
                 app.emit("menu-action", event.id().0.as_str()).ok();
             }
-                #[cfg(target_os = "macos")]
-                if event.id().0.as_str() == "show-window" {
-                    open_main_window(app);
-                }
-            });
-    }
-
-    let app = builder
+        })
         .invoke_handler(tauri::generate_handler![
             epub::package_epub,
             epub::unzip_epub,
-            fonts::list_system_fonts,
             pdf::compile_pdf,
             project::read_file,
             project::write_file,
@@ -204,42 +92,8 @@ pub fn run() {
             library::save_book,
             library::delete_book,
             proofing::proof_text,
-            proofing::remember_word,
-            writingtools::run_writing_tool,
-            gdrive::gdrive_connect,
-            gdrive::gdrive_disconnect,
-            gdrive::gdrive_status,
-            gdrive::gdrive_backup,
-            gdrive::gdrive_sync,
-            gdrive::gdrive_restore,
-            gdrive::gdrive_list_backups
+            proofing::remember_word
         ])
-        .build(context)
-        .expect("error while building margin");
-
-    app.run(|_app, _event| {
-        #[cfg(target_os = "macos")]
-        match &_event {
-            tauri::RunEvent::ExitRequested { code: None, api, .. } => api.prevent_exit(),
-            tauri::RunEvent::Reopen { has_visible_windows: false, .. } => open_main_window(_app),
-            _ => {}
-        }
-    });
-}
-
-#[cfg(target_os = "macos")]
-fn open_main_window(app: &tauri::AppHandle) {
-    use tauri::Manager;
-    if let Some(window) = app.get_webview_window("main") {
-        let _ = window.show();
-        let _ = window.unminimize();
-        let _ = window.set_focus();
-        return;
-    }
-    let Some(config) = app.config().app.windows.first().cloned() else {
-        return;
-    };
-    if let Ok(builder) = tauri::WebviewWindowBuilder::from_config(app, &config) {
-        let _ = builder.build();
-    }
+        .run(context)
+        .expect("error while running margin");
 }

src-tauri/src/library.rs

@@ -1,16 +1,13 @@
 use std::fs;
-use std::path::{Path, PathBuf};
-use std::time::UNIX_EPOCH;
+use std::path::PathBuf;
 use tauri::Manager;
 
 #[derive(serde::Serialize)]
-#[serde(rename_all = "camelCase")]
 pub struct BookSummary {
     id: String,
     title: String,
     author: String,
     corrupt: bool,
-    updated_at: u64,
 }
 
 fn corrupt_summary(stem: &str) -> BookSummary {
@@ -19,41 +16,15 @@ fn corrupt_summary(stem: &str) -> BookSummary {
         title: "Unreadable book".to_string(),
         author: String::new(),
         corrupt: true,
-        updated_at: 0,
     }
 }
 
-fn file_modified_ms(path: &Path) -> u64 {
-    fs::metadata(path)
-        .and_then(|m| m.modified())
-        .ok()
-        .and_then(|t| t.duration_since(UNIX_EPOCH).ok())
-        .map(|d| d.as_millis() as u64)
-        .unwrap_or(0)
-}
-
-fn latest_chapter_ms(value: &serde_json::Value) -> u64 {
-    value
-        .get("chapters")
-        .and_then(|c| c.as_array())
-        .map(|chapters| {
-            chapters
-                .iter()
-                .filter_map(|c| c.get("updatedAt").and_then(|v| v.as_u64()))
-                .max()
-                .unwrap_or(0)
-        })
-        .unwrap_or(0)
-}
-
-pub(crate) fn app_data_dir(app: &tauri::AppHandle) -> Result<PathBuf, String> {
-    let dir = app.path().app_data_dir().map_err(|e| e.to_string())?;
-    fs::create_dir_all(&dir).map_err(|e| e.to_string())?;
-    Ok(dir)
-}
-
-pub(crate) fn library_dir(app: &tauri::AppHandle) -> Result<PathBuf, String> {
-    let dir = app_data_dir(app)?.join("library");
+fn library_dir(app: &tauri::AppHandle) -> Result<PathBuf, String> {
+    let dir = app
+        .path()
+        .app_data_dir()
+        .map_err(|e| e.to_string())?
+        .join("library");
     fs::create_dir_all(&dir).map_err(|e| e.to_string())?;
     Ok(dir)
 }
@@ -108,19 +79,13 @@ pub fn list_books(app: tauri::AppHandle) -> Result<Vec<BookSummary>, String> {
             .and_then(|v| v.as_str())
             .unwrap_or("")
             .to_string();
-        let updated_at = match latest_chapter_ms(&value) {
-            0 => file_modified_ms(&path),
-            ms => ms,
-        };
         books.push(BookSummary {
             id: id.to_string(),
             title,
             author,
             corrupt: false,
-            updated_at,
         });
     }
-    books.sort_by_key(|b| std::cmp::Reverse(b.updated_at));
     Ok(books)
 }
 

src-tauri/src/macspell.rs

@@ -1,73 +0,0 @@
-use std::collections::HashSet;
-
-use objc2::rc::autoreleasepool;
-use objc2_app_kit::NSSpellChecker;
-use objc2_foundation::{NSRange, NSString, NSTextCheckingType};
-
-pub struct MacIssue {
-    pub start: usize,
-    pub end: usize,
-    pub word: String,
-    pub suggestions: Vec<String>,
-}
-
-fn utf16_to_codepoint(text: &str, utf16_len: usize) -> Vec<usize> {
-    let mut map = Vec::with_capacity(utf16_len + 1);
-    let mut cp = 0;
-    for ch in text.chars() {
-        for _ in 0..ch.len_utf16() {
-            map.push(cp);
-        }
-        cp += 1;
-    }
-    map.push(cp);
-    map
-}
-
-pub fn check(text: &str, custom: &HashSet<String>) -> Vec<MacIssue> {
-    autoreleasepool(|_| {
-        let checker = NSSpellChecker::sharedSpellChecker();
-        let ns = NSString::from_str(text);
-        let len = ns.length();
-        let results = unsafe {
-            checker.checkString_range_types_options_inSpellDocumentWithTag_orthography_wordCount(
-                &ns,
-                NSRange { location: 0, length: len },
-                (NSTextCheckingType::Spelling | NSTextCheckingType::Link).bits(),
-                None,
-                0,
-                None,
-                std::ptr::null_mut(),
-            )
-        };
-
-        let map = utf16_to_codepoint(text, len);
-        let chars: Vec<char> = text.chars().collect();
-        let mut issues = Vec::new();
-        for result in results.iter() {
-            if result.resultType() != NSTextCheckingType::Spelling {
-                continue;
-            }
-            let range = result.range();
-            let start = map[range.location.min(len)];
-            let end = map[(range.location + range.length).min(len)];
-            let word: String = chars[start..end].iter().collect();
-            if custom.contains(&word.to_lowercase()) {
-                continue;
-            }
-            let mut suggestions = Vec::new();
-            if let Some(guesses) =
-                checker.guessesForWordRange_inString_language_inSpellDocumentWithTag(range, &ns, None, 0)
-            {
-                for guess in guesses.iter() {
-                    suggestions.push(guess.to_string());
-                    if suggestions.len() >= 5 {
-                        break;
-                    }
-                }
-            }
-            issues.push(MacIssue { start, end, word, suggestions });
-        }
-        issues
-    })
-}

src-tauri/src/pdf.rs

@@ -10,29 +10,6 @@ static LITERATA: &[u8] = include_bytes!("../../public/fonts/Literata-VF.ttf");
 static LITERATA_ITALIC: &[u8] = include_bytes!("../../public/fonts/Literata-Italic-VF.ttf");
 static HANKEN: &[u8] = include_bytes!("../../public/fonts/HankenGrotesk-VF.ttf");
 static HANKEN_ITALIC: &[u8] = include_bytes!("../../public/fonts/HankenGrotesk-Italic-VF.ttf");
-static EB_GARAMOND: &[u8] = include_bytes!("../../public/fonts/EBGaramond-VF.ttf");
-static EB_GARAMOND_ITALIC: &[u8] = include_bytes!("../../public/fonts/EBGaramond-Italic-VF.ttf");
-static LORA: &[u8] = include_bytes!("../../public/fonts/Lora-VF.ttf");
-static LORA_ITALIC: &[u8] = include_bytes!("../../public/fonts/Lora-Italic-VF.ttf");
-static SOURCE_SERIF: &[u8] = include_bytes!("../../public/fonts/SourceSerif4-VF.ttf");
-static SOURCE_SERIF_ITALIC: &[u8] = include_bytes!("../../public/fonts/SourceSerif4-Italic-VF.ttf");
-static FRAUNCES: &[u8] = include_bytes!("../../public/fonts/Fraunces-VF.ttf");
-static FRAUNCES_ITALIC: &[u8] = include_bytes!("../../public/fonts/Fraunces-Italic-VF.ttf");
-
-static EB_GARAMOND_FONTS: [&[u8]; 2] = [EB_GARAMOND, EB_GARAMOND_ITALIC];
-static LORA_FONTS: [&[u8]; 2] = [LORA, LORA_ITALIC];
-static SOURCE_SERIF_FONTS: [&[u8]; 2] = [SOURCE_SERIF, SOURCE_SERIF_ITALIC];
-static FRAUNCES_FONTS: [&[u8]; 2] = [FRAUNCES, FRAUNCES_ITALIC];
-
-fn bundled_font_bytes(id: &str) -> &'static [&'static [u8]] {
-    match id {
-        "eb-garamond" => &EB_GARAMOND_FONTS,
-        "lora" => &LORA_FONTS,
-        "source-serif" => &SOURCE_SERIF_FONTS,
-        "fraunces" => &FRAUNCES_FONTS,
-        _ => &[],
-    }
-}
 
 #[derive(Deserialize)]
 pub struct ImageInput {
@@ -40,12 +17,7 @@ pub struct ImageInput {
     data: String,
 }
 
-fn compile(
-    source: String,
-    images: &[ImageInput],
-    bundled_fonts: &[String],
-    system_fonts: &[String],
-) -> Result<(Vec<u8>, String), String> {
+fn compile(source: String, images: &[ImageInput]) -> Result<(Vec<u8>, String), String> {
     let mut binaries: Vec<(&str, Vec<u8>)> = Vec::with_capacity(images.len());
     for image in images {
         let bytes = STANDARD
@@ -54,24 +26,9 @@ fn compile(
         binaries.push((image.path.as_str(), bytes));
     }
 
-    let mut fonts: Vec<Vec<u8>> = vec![
-        LITERATA.to_vec(),
-        LITERATA_ITALIC.to_vec(),
-        HANKEN.to_vec(),
-        HANKEN_ITALIC.to_vec(),
-    ];
-    for id in bundled_fonts {
-        for bytes in bundled_font_bytes(id) {
-            fonts.push(bytes.to_vec());
-        }
-    }
-    for family in system_fonts {
-        fonts.extend(crate::fonts::system_font_bytes(family));
-    }
-
     let engine = TypstEngine::builder()
         .main_file(source)
-        .fonts(fonts)
+        .fonts([LITERATA, LITERATA_ITALIC, HANKEN, HANKEN_ITALIC])
         .with_static_file_resolver(binaries)
         .build();
 
@@ -93,10 +50,8 @@ pub fn compile_pdf(
     source: String,
     images: Vec<ImageInput>,
     emit_warnings: bool,
-    bundled_fonts: Vec<String>,
-    system_fonts: Vec<String>,
 ) -> Result<tauri::ipc::Response, String> {
-    let (bytes, warnings) = compile(source, &images, &bundled_fonts, &system_fonts)?;
+    let (bytes, warnings) = compile(source, &images)?;
     if emit_warnings && !warnings.is_empty() {
         app.emit("pdf-warnings", warnings).ok();
     }

src-tauri/src/proofing.rs

@@ -27,7 +27,6 @@ struct Harper {
 }
 
 pub struct Engine {
-    #[cfg(not(target_os = "macos"))]
     speller: Option<spellbook::Dictionary>,
     harper: Option<Harper>,
     custom: HashSet<String>,
@@ -60,17 +59,11 @@ fn read_words(contents: &str, set: &mut HashSet<String>) {
     for line in contents.lines() {
         let word = line.trim();
         if !word.is_empty() && !word.starts_with('#') {
-            set.insert(word.to_lowercase());
+            set.insert(word.to_string());
         }
     }
 }
 
-fn load_tech(app: &tauri::AppHandle, set: &mut HashSet<String>) {
-    if let Ok(contents) = dict_file(app, "tech.txt") {
-        read_words(&contents, set);
-    }
-}
-
 fn load_custom(app: &tauri::AppHandle) -> HashSet<String> {
     let mut set = HashSet::new();
     if let Ok(path) = custom_dict_path(app) {
@@ -88,7 +81,6 @@ fn load_custom(app: &tauri::AppHandle) -> HashSet<String> {
     set
 }
 
-#[cfg(not(target_os = "macos"))]
 fn build_speller(app: &tauri::AppHandle) -> Result<spellbook::Dictionary, String> {
     let aff = dict_file(app, "index.aff")?;
     let dic = dict_file(app, "index.dic")?;
@@ -102,22 +94,14 @@ fn build_harper() -> Harper {
     Harper { linter, dict }
 }
 
-#[cfg(not(target_os = "macos"))]
 fn is_word_char(c: char) -> bool {
     c.is_alphabetic()
 }
 
-#[cfg(not(target_os = "macos"))]
-fn has_irregular_case(word: &str) -> bool {
-    word.chars().skip(1).any(|c| c.is_uppercase())
-}
-
-#[cfg(not(target_os = "macos"))]
 fn is_apostrophe(c: char) -> bool {
     c == '\'' || c == '\u{2019}'
 }
 
-#[cfg(not(target_os = "macos"))]
 fn collect_spelling(
     speller: &spellbook::Dictionary,
     custom: &HashSet<String>,
@@ -144,15 +128,11 @@ fn collect_spelling(
         }
         let end = i;
         let word: String = chars[start..end].iter().collect();
-        if has_irregular_case(&word) || speller.check(&word) || custom.contains(&word.to_lowercase()) {
+        if speller.check(&word) || custom.contains(&word) {
             continue;
         }
         let mut suggestions = Vec::new();
         speller.suggest(&word, &mut suggestions);
-        let lower = word.to_lowercase();
-        if suggestions.iter().any(|s| s.to_lowercase() == lower) {
-            continue;
-        }
         suggestions.truncate(5);
         issues.push(Issue {
             start,
@@ -204,13 +184,10 @@ pub async fn proof_text(
         let state = app.state::<ProofState>();
         let mut guard = state.lock().map_err(|e| e.to_string())?;
         if guard.is_none() {
-            let mut custom = load_custom(&app);
-            load_tech(&app, &mut custom);
             *guard = Some(Engine {
-                #[cfg(not(target_os = "macos"))]
                 speller: None,
                 harper: None,
-                custom,
+                custom: load_custom(&app),
             });
         }
         let engine = guard.as_mut().unwrap();
@@ -218,25 +195,11 @@ pub async fn proof_text(
         let chars: Vec<char> = text.chars().collect();
         let mut issues = Vec::new();
         if spelling {
-            #[cfg(target_os = "macos")]
-            for mi in crate::macspell::check(&text, &engine.custom) {
-                issues.push(Issue {
-                    start: mi.start,
-                    end: mi.end,
-                    kind: "spelling".into(),
-                    category: "Spelling".into(),
-                    message: format!("“{}” may be misspelled", mi.word),
-                    suggestions: mi.suggestions,
-                });
-            }
-            #[cfg(not(target_os = "macos"))]
-            {
             if engine.speller.is_none() {
                 engine.speller = Some(build_speller(&app)?);
             }
             collect_spelling(engine.speller.as_ref().unwrap(), &engine.custom, &chars, &mut issues);
         }
-        }
         if grammar {
             if engine.harper.is_none() {
                 engine.harper = Some(build_harper());
@@ -269,7 +232,7 @@ pub fn remember_word(
 
     let mut guard = state.inner().lock().map_err(|e| e.to_string())?;
     if let Some(engine) = guard.as_mut() {
-        engine.custom.insert(word.to_lowercase());
+        engine.custom.insert(word);
     }
     Ok(())
 }

src-tauri/src/writingtools.rs

@@ -1,81 +0,0 @@
-#[cfg(target_os = "macos")]
-mod mac {
-    use objc2::rc::Retained;
-    use objc2::MainThreadMarker;
-    use objc2_app_kit::{NSApplication, NSEventModifierFlags, NSMenu, NSMenuItem};
-    use objc2_foundation::{NSArray, NSString};
-
-    const SHORTCUTS: [(&str, &str); 2] = [("Proofread", "f"), ("Rewrite", "r")];
-
-    fn submenu_named(items: &NSArray<NSMenuItem>, title: &str) -> Option<Retained<NSMenu>> {
-        for i in 0..items.count() {
-            let item = items.objectAtIndex(i);
-            if item.title().to_string() == title {
-                return item.submenu();
-            }
-        }
-        None
-    }
-
-    fn edit_menu(mtm: MainThreadMarker) -> Option<Retained<NSMenu>> {
-        let main = NSApplication::sharedApplication(mtm).mainMenu()?;
-        for i in 0..main.numberOfItems() {
-            let Some(item) = main.itemAtIndex(i) else { continue };
-            let Some(submenu) = item.submenu() else { continue };
-            if submenu.title().to_string() == "Edit" || item.title().to_string() == "Edit" {
-                return Some(submenu);
-            }
-        }
-        None
-    }
-
-    fn writing_tools_menu(mtm: MainThreadMarker) -> Option<Retained<NSMenu>> {
-        submenu_named(&edit_menu(mtm)?.itemArray(), "Writing Tools")
-    }
-
-    pub fn label_shortcuts() {
-        let Some(mtm) = MainThreadMarker::new() else { return };
-        let Some(menu) = writing_tools_menu(mtm) else { return };
-        let items = menu.itemArray();
-        for i in 0..items.count() {
-            let item = items.objectAtIndex(i);
-            let title = item.title().to_string();
-            let Some((_, key)) = SHORTCUTS.iter().find(|(name, _)| *name == title) else { continue };
-            item.setKeyEquivalent(&NSString::from_str(key));
-            item.setKeyEquivalentModifierMask(
-                NSEventModifierFlags::Shift | NSEventModifierFlags::Option,
-            );
-        }
-    }
-
-    pub fn perform(tool: &str) {
-        let Some(mtm) = MainThreadMarker::new() else { return };
-        let Some(menu) = writing_tools_menu(mtm) else { return };
-        let items = menu.itemArray();
-        for i in 0..items.count() {
-            if items.objectAtIndex(i).title().to_string() == tool {
-                menu.performActionForItemAtIndex(i as isize);
-                return;
-            }
-        }
-    }
-}
-
-pub fn label_writing_tool_shortcuts() {
-    #[cfg(target_os = "macos")]
-    mac::label_shortcuts();
-}
-
-#[tauri::command]
-pub fn run_writing_tool(app: tauri::AppHandle, tool: String) -> Result<(), String> {
-    #[cfg(target_os = "macos")]
-    {
-        app.run_on_main_thread(move || mac::perform(&tool))
-            .map_err(|e| e.to_string())
-    }
-    #[cfg(not(target_os = "macos"))]
-    {
-        let _ = (app, tool);
-        Ok(())
-    }
-}

src-tauri/tauri.conf.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://schema.tauri.app/config/2",
-  "productName": "Margin",
-  "version": "0.1.17",
+  "productName": "margin",
+  "version": "0.1.3",
   "identifier": "studio.margin.app",
   "build": {
     "beforeDevCommand": "pnpm dev",

src/App.tsx

@@ -1,17 +1,11 @@
 import { useEffect } from "react";
 import { listen } from "@tauri-apps/api/event";
-import { openUrl } from "@tauri-apps/plugin-opener";
 import { getCurrentWindow } from "@tauri-apps/api/window";
 import { Library } from "./components/Library";
 import { EditorView } from "./components/EditorView";
-import { BackupSettings } from "./components/BackupSettings";
-import { ExportPreview } from "./components/ExportPreview";
-import { UpdateDialog } from "./components/UpdateDialog";
 import { useBook } from "./store/useBook";
-import { useBackup } from "./store/useBackup";
-import { useExportPreview } from "./store/useExportPreview";
 import { isDesktop } from "./ipc";
-import { createAndOpenBook, lastBookId, loadBook, saveBook } from "./library";
+import { createAndOpenBook, saveBook } from "./library";
 import { runExport } from "./export/run";
 import { checkForUpdates } from "./updater";
 
@@ -25,13 +19,9 @@ function App() {
     const unlisten = listen<string>("menu-action", (event) => {
       const state = useBook.getState();
       if (event.payload === "new-book") createAndOpenBook(state.openBook, state.setNotice);
-      else if (event.payload === "export-pdf") {
-        if (useBook.getState().book) useExportPreview.getState().openPreview();
-      }
+      else if (event.payload === "export-pdf") runExport("pdf");
       else if (event.payload === "export-epub") runExport("epub");
       else if (event.payload === "check-updates") checkForUpdates(false);
-      else if (event.payload === "report-issue")
-        openUrl("https://github.com/priyanshujain/margin/issues").catch(() => {});
     });
     const unlistenWarn = listen<string>("pdf-warnings", (event) => {
       useBook.getState().setNotice(`PDF exported with warnings:\n${event.payload}`);
@@ -47,11 +37,9 @@ function App() {
     const win = getCurrentWindow();
     const unlisten = win.onCloseRequested(async (event) => {
       const { book, dirty } = useBook.getState();
-      const { connected } = useBackup.getState();
-      if ((!book || !dirty) && !connected) return;
+      if (!book || !dirty) return;
       event.preventDefault();
-      if (book && dirty) await saveBook(book).catch(() => {});
-      if (connected) useBackup.getState().backup(true);
+      await saveBook(book).catch(() => {});
       win.destroy();
     });
     return () => {
@@ -59,54 +47,7 @@ function App() {
     };
   }, []);
 
-  useEffect(() => {
-    if (!isDesktop) return;
-    const unlisten = listen<{ ok: boolean; error: string | null }>("gdrive-auth", (event) => {
-      useBackup.getState().handleAuthEvent(event.payload.ok, event.payload.error);
-    });
-    return () => {
-      unlisten.then((stop) => stop());
-    };
-  }, []);
-
-  useEffect(() => {
-    if (!isDesktop) return;
-    let first = true;
-    const tick = async () => {
-      await useBackup.getState().refresh();
-      const state = useBackup.getState();
-      if (!state.connected || state.needsReauth) return;
-      if (first) {
-        first = false;
-        state.sync(true);
-      } else if (state.pending) {
-        state.backup(true);
-      }
-    };
-    tick();
-    const id = setInterval(tick, 15 * 60 * 1000);
-    return () => clearInterval(id);
-  }, []);
-
-  useEffect(() => {
-    if (!isDesktop) return;
-    const id = lastBookId();
-    if (!id || useBook.getState().book) return;
-    loadBook(id)
-      .then((last) => {
-        if (!useBook.getState().book) useBook.getState().openBook(last);
-      })
-      .catch(() => {});
-  }, []);
-
-  return (
-    <>
-      {book ? <EditorView /> : <Library onOpen={openBook} />}
-      {isDesktop && <BackupSettings />}
-      {isDesktop && <ExportPreview />}
-      {isDesktop && <UpdateDialog />}
-    </>
-  );
+  return book ? <EditorView /> : <Library onOpen={openBook} />;
 }
 
 export default App;

src/backup.ts

@@ -1,73 +0,0 @@
-import { invoke } from "@tauri-apps/api/core";
-import { isDesktop } from "./ipc";
-
-export interface BackupStatus {
-  connected: boolean;
-  email: string | null;
-  lastBackup: number | null;
-  pending: boolean;
-  needsReauth: boolean;
-}
-
-export interface RestoreResult {
-  restored: number;
-}
-
-export interface BackupOutcome extends BackupStatus {
-  uploaded: number;
-}
-
-export interface SyncOutcome extends BackupStatus {
-  uploaded: number;
-  downloaded: number;
-}
-
-export interface RemoteBackup {
-  name: string;
-}
-
-const OFFLINE: BackupStatus = { connected: false, email: null, lastBackup: null, pending: false, needsReauth: false };
-
-export async function gdriveStatus(): Promise<BackupStatus> {
-  if (!isDesktop) return OFFLINE;
-  return invoke<BackupStatus>("gdrive_status");
-}
-
-export async function gdriveConnect(): Promise<string> {
-  return invoke<string>("gdrive_connect");
-}
-
-export async function gdriveDisconnect(): Promise<BackupStatus> {
-  return invoke<BackupStatus>("gdrive_disconnect");
-}
-
-export async function gdriveBackup(): Promise<BackupOutcome> {
-  return invoke<BackupOutcome>("gdrive_backup");
-}
-
-export async function gdriveSync(): Promise<SyncOutcome> {
-  return invoke<SyncOutcome>("gdrive_sync");
-}
-
-export async function gdriveRestore(): Promise<RestoreResult> {
-  return invoke<RestoreResult>("gdrive_restore");
-}
-
-export async function gdriveListBackups(): Promise<RemoteBackup[]> {
-  if (!isDesktop) return [];
-  return invoke<RemoteBackup[]>("gdrive_list_backups");
-}
-
-export function formatBackupTime(ts: number | null): string {
-  if (!ts) return "Not backed up yet";
-  const diff = Date.now() - ts * 1000;
-  const min = Math.floor(diff / 60000);
-  if (min < 1) return "Backed up just now";
-  if (min < 60) return `Backed up ${min}m ago`;
-  const hr = Math.floor(min / 60);
-  if (hr < 24) return `Backed up ${hr}h ago`;
-  const day = Math.floor(hr / 24);
-  if (day === 1) return "Backed up yesterday";
-  if (day < 7) return `Backed up ${day}d ago`;
-  return `Backed up ${new Date(ts * 1000).toLocaleDateString()}`;
-}

src/book-style.ts

@@ -1,13 +0,0 @@
-import { type BookFonts, fontStack } from "./model/fonts";
-
-export function applyBookFonts(fonts: BookFonts): void {
-  const root = document.documentElement;
-  root.style.setProperty("--font-book", fontStack(fonts.body));
-  root.style.setProperty("--font-heading", fontStack(fonts.heading));
-}
-
-export function resetBookFonts(): void {
-  const root = document.documentElement;
-  root.style.removeProperty("--font-book");
-  root.style.removeProperty("--font-heading");
-}

src/components/AddPageMenu.tsx

@@ -1,12 +1,9 @@
 import { useEffect, useRef, useState } from "react";
 import { PAGE_TYPES } from "../model/book";
-import { useEscapeLayer } from "../escape";
-import { useFocusTrap } from "../focus";
 import { Icon } from "./Icon";
 
 interface AddPageMenuProps {
   onAdd: (group: "front" | "back", title: string) => void;
-  onAddPart: () => void;
 }
 
 const GROUPS: { key: "front" | "back"; label: string }[] = [
@@ -14,11 +11,10 @@ const GROUPS: { key: "front" | "back"; label: string }[] = [
   { key: "back", label: "Back matter" },
 ];
 
-export function AddPageMenu({ onAdd, onAddPart }: AddPageMenuProps) {
+export function AddPageMenu({ onAdd }: AddPageMenuProps) {
   const [open, setOpen] = useState(false);
   const [coords, setCoords] = useState({ top: 0, left: 0 });
   const btnRef = useRef<HTMLButtonElement>(null);
-  const popRef = useRef<HTMLDivElement>(null);
 
   const toggle = () => {
     if (!open && btnRef.current) {
@@ -41,33 +37,11 @@ export function AddPageMenu({ onAdd, onAddPart }: AddPageMenuProps) {
     };
   }, [open]);
 
-  useFocusTrap(popRef, open);
-
-  useEscapeLayer(open, () => {
-    setOpen(false);
-    btnRef.current?.focus();
-  });
-
-  const onMenuKeyDown = (e: React.KeyboardEvent) => {
-    if (e.key === "ArrowDown" || e.key === "ArrowUp") {
-      e.preventDefault();
-      const items = Array.from(popRef.current?.querySelectorAll<HTMLElement>(".add-page-item") ?? []);
-      const idx = items.indexOf(document.activeElement as HTMLElement);
-      const nextIdx = e.key === "ArrowDown" ? (idx + 1) % items.length : (idx - 1 + items.length) % items.length;
-      items[nextIdx]?.focus();
-    }
-  };
-
   const pick = (group: "front" | "back", label: string) => {
     setOpen(false);
     onAdd(group, label);
   };
 
-  const pickPart = () => {
-    setOpen(false);
-    onAddPart();
-  };
-
   return (
     <>
       <button ref={btnRef} className="add-page" data-open={open} onClick={toggle}>
@@ -76,18 +50,10 @@ export function AddPageMenu({ onAdd, onAddPart }: AddPageMenuProps) {
       </button>
       {open && (
         <div
-          ref={popRef}
           className="add-page-pop"
           style={{ top: coords.top, left: coords.left }}
           onMouseDown={(e) => e.stopPropagation()}
-          onKeyDown={onMenuKeyDown}
         >
-          <div className="add-page-group">
-            <div className="add-page-label">Body</div>
-            <button className="add-page-item" onClick={pickPart}>
-              Part divider
-            </button>
-          </div>
           {GROUPS.map((g) => (
             <div key={g.key} className="add-page-group">
               <div className="add-page-label">{g.label}</div>

src/components/BackupButton.tsx

@@ -1,48 +0,0 @@
-import { Icon } from "./Icon";
-import { useBackup } from "../store/useBackup";
-import { formatBackupTime } from "../backup";
-
-export function BackupButton() {
-  const connected = useBackup((s) => s.connected);
-  const pending = useBackup((s) => s.pending);
-  const phase = useBackup((s) => s.phase);
-  const lastBackup = useBackup((s) => s.lastBackup);
-  const openSettings = useBackup((s) => s.openSettings);
-
-  const busy = phase === "working" || phase === "connecting";
-  const error = phase === "error";
-
-  const state = busy ? "working" : error ? "error" : !connected ? "off" : pending ? "pending" : "synced";
-
-  const title =
-    phase === "connecting"
-      ? "Waiting for Google authorization…"
-      : state === "working"
-        ? "Backing up…"
-        : state === "error"
-          ? "Backup needs attention"
-          : state === "off"
-            ? "Connect Google Drive"
-            : state === "pending"
-              ? "Changes not backed up"
-              : formatBackupTime(lastBackup);
-
-  const onClick = () => {
-    openSettings();
-  };
-
-  return (
-    <button className="icon-btn backup-btn" data-state={state} onClick={onClick} title={title}>
-      {busy ? (
-        <Icon size={18}>
-          <path d="M21 12a9 9 0 1 1-2.6-6.4M21 4v5h-5" />
-        </Icon>
-      ) : (
-        <Icon size={18}>
-          <path d="M7 18a4 4 0 0 1 0-8 5 5 0 0 1 9.6-1.3A3.5 3.5 0 0 1 18 18H7z" />
-          {connected ? <path d="M12 16.5v-5M9.7 12.8l2.3-2.3 2.3 2.3" /> : null}
-        </Icon>
-      )}
-    </button>
-  );
-}

src/components/BackupSettings.tsx

@@ -1,179 +0,0 @@
-import { useEffect, useRef, useState } from "react";
-import { Icon } from "./Icon";
-import { ConfirmDialog } from "./ConfirmDialog";
-import { useBackup } from "../store/useBackup";
-import { useEscapeLayer } from "../escape";
-import { useFocusTrap } from "../focus";
-import { formatBackupTime, gdriveListBackups } from "../backup";
-
-export function BackupSettings() {
-  const open = useBackup((s) => s.settingsOpen);
-  const close = useBackup((s) => s.closeSettings);
-  const connected = useBackup((s) => s.connected);
-  const email = useBackup((s) => s.email);
-  const lastBackup = useBackup((s) => s.lastBackup);
-  const pending = useBackup((s) => s.pending);
-  const needsReauth = useBackup((s) => s.needsReauth);
-  const phase = useBackup((s) => s.phase);
-  const connect = useBackup((s) => s.connect);
-  const disconnect = useBackup((s) => s.disconnect);
-  const backup = useBackup((s) => s.backup);
-  const sync = useBackup((s) => s.sync);
-  const restore = useBackup((s) => s.restore);
-  const cancelConnect = useBackup((s) => s.cancelConnect);
-  const openAuthUrl = useBackup((s) => s.openAuthUrl);
-  const copyAuthUrl = useBackup((s) => s.copyAuthUrl);
-
-  const [remoteCount, setRemoteCount] = useState<number | null>(null);
-  const [confirmRestore, setConfirmRestore] = useState(false);
-  const panelRef = useRef<HTMLDivElement>(null);
-  const working = phase === "working";
-
-  useFocusTrap(panelRef, open && !confirmRestore);
-
-  useEffect(() => {
-    if (!open || !connected || needsReauth) {
-      setRemoteCount(null);
-      return;
-    }
-    let active = true;
-    gdriveListBackups()
-      .then((list) => active && setRemoteCount(list.length))
-      .catch(() => active && setRemoteCount(null));
-    return () => {
-      active = false;
-    };
-  }, [open, connected, needsReauth, lastBackup]);
-
-  useEscapeLayer(open, close);
-
-  if (!open) return null;
-
-  return (
-    <>
-      <div className="overlay" onClick={close}>
-        <div ref={panelRef} className="panel" onClick={(e) => e.stopPropagation()}>
-          <div className="panel-head">
-            <h2>Backup &amp; Sync</h2>
-            <button className="icon-btn" onClick={close} title="Close">
-              <Icon d="M6 6l12 12M18 6L6 18" />
-            </button>
-          </div>
-          <div className="panel-body">
-            {phase === "connecting" ? (
-              <div className="backup-connecting">
-                <div className="backup-waiting">
-                  <Icon size={16}>
-                    <path d="M21 12a9 9 0 1 1-2.6-6.4M21 4v5h-5" />
-                  </Icon>
-                  <span>Waiting for Google authorization…</span>
-                </div>
-                <p>Finish in the browser tab that opened. If it didn't open, reopen the link or copy it into a browser.</p>
-                <div className="backup-link-row">
-                  <button className="backup-text-btn" onClick={cancelConnect}>
-                    Stop linking
-                  </button>
-                  <div className="backup-links">
-                    <button className="backup-text-btn" onClick={openAuthUrl}>
-                      Open link again
-                    </button>
-                    <span className="backup-link-sep">·</span>
-                    <button className="backup-text-btn" onClick={copyAuthUrl}>
-                      Copy link
-                    </button>
-                  </div>
-                </div>
-              </div>
-            ) : !connected ? (
-              <div className="backup-intro">
-                <p>
-                  Connect Google Drive to keep a private backup of every book. margin only ever sees the files it
-                  creates in a <strong>margin</strong> folder, never the rest of your Drive.
-                </p>
-                <button className="btn-primary" disabled={working} onClick={connect}>
-                  {working ? "Connecting…" : "Connect Google Drive"}
-                </button>
-              </div>
-            ) : (
-              <>
-                <div className="backup-account">
-                  <div className="backup-account-info">
-                    <span className="field-label">Connected account</span>
-                    <span className="backup-email">{email || "Google Drive"}</span>
-                  </div>
-                  <button className="btn-ghost" disabled={working} onClick={disconnect}>
-                    Disconnect
-                  </button>
-                </div>
-
-                {needsReauth ? (
-                  <>
-                    <div className="backup-warn">
-                      margin can't reach your Drive folder. The permission to create and edit its own files was
-                      not granted, so nothing is being backed up.
-                    </div>
-                    <div className="backup-actions">
-                      <button className="btn-primary" disabled={working} onClick={connect}>
-                        {working ? "Working…" : "Reconnect Google Drive"}
-                      </button>
-                    </div>
-                    <p className="backup-note">
-                      On the Google screen, tick <strong>See, edit, create and delete only the specific Google Drive
-                      files you use with this app</strong> before continuing.
-                    </p>
-                  </>
-                ) : (
-                  <>
-                    <div className="backup-status-row">
-                      <span className={`backup-dot ${pending ? "is-pending" : "is-synced"}`} />
-                      <span>{pending ? "Changes not backed up" : formatBackupTime(lastBackup)}</span>
-                    </div>
-
-                    <div className="backup-actions">
-                      <button className="btn-primary" disabled={working} onClick={() => sync()}>
-                        {working ? "Working…" : "Sync now"}
-                      </button>
-                      <button className="btn-ghost" disabled={working} onClick={() => backup()}>
-                        Back up only
-                      </button>
-                      <button
-                        className="btn-ghost"
-                        disabled={working || remoteCount === 0}
-                        onClick={() => setConfirmRestore(true)}
-                      >
-                        {remoteCount === null ? "Restore from Drive" : `Restore ${remoteCount} book${remoteCount === 1 ? "" : "s"}`}
-                      </button>
-                    </div>
-
-                    <p className="backup-note">
-                      Syncs on launch and right after connecting, backs up when you close margin, and every 15 minutes
-                      while there are changes.
-                    </p>
-                  </>
-                )}
-              </>
-            )}
-          </div>
-        </div>
-      </div>
-
-      {confirmRestore && (
-        <ConfirmDialog
-          title="Restore from Google Drive"
-          message={
-            <>
-              This replaces your local books with the copies in Google Drive. Any local changes that haven't been backed
-              up will be lost.
-            </>
-          }
-          confirmLabel="Restore"
-          onConfirm={() => {
-            setConfirmRestore(false);
-            restore();
-          }}
-          onClose={() => setConfirmRestore(false)}
-        />
-      )}
-    </>
-  );
-}

src/components/ConfirmDialog.tsx

@@ -1,6 +1,4 @@
-import { useEffect, useRef, type ReactNode } from "react";
-import { useEscapeLayer } from "../escape";
-import { useFocusTrap } from "../focus";
+import type { ReactNode } from "react";
 import { Icon } from "./Icon";
 
 interface ConfirmDialogProps {
@@ -12,19 +10,9 @@ interface ConfirmDialogProps {
 }
 
 export function ConfirmDialog({ title, message, confirmLabel = "Delete", onConfirm, onClose }: ConfirmDialogProps) {
-  const confirmRef = useRef<HTMLButtonElement>(null);
-  const panelRef = useRef<HTMLDivElement>(null);
-
-  useEffect(() => {
-    confirmRef.current?.focus();
-  }, []);
-
-  useEscapeLayer(true, onClose);
-  useFocusTrap(panelRef);
-
   return (
     <div className="overlay" onClick={onClose}>
-      <div ref={panelRef} className="panel panel-confirm" onClick={(e) => e.stopPropagation()}>
+      <div className="panel panel-confirm" onClick={(e) => e.stopPropagation()}>
         <div className="panel-head">
           <h2>{title}</h2>
           <button className="icon-btn" onClick={onClose} title="Close">
@@ -38,7 +26,7 @@ export function ConfirmDialog({ title, message, confirmLabel = "Delete", onConfi
           <button className="btn-ghost" onClick={onClose}>
             Cancel
           </button>
-          <button ref={confirmRef} className="btn-danger" onClick={onConfirm}>
+          <button className="btn-danger" onClick={onConfirm}>
             {confirmLabel}
           </button>
         </div>

src/components/Dock.tsx

@@ -1,7 +1,7 @@
 import { type ReactNode, useEffect, useMemo, useRef, useState } from "react";
 import { generateHTML } from "@tiptap/core";
 import { COVER_ID, useBook } from "../store/useBook";
-import { type Chapter, type TrimSize, bodyNumber, chapterKind, partNumber, partRoman } from "../model/book";
+import { type Chapter, type TrimSize, bodyNumber, chapterKind } from "../model/book";
 import { editorExtensions } from "../editor/extensions";
 import { chapterToPdfInputs, coverToPdfInputs } from "../export/typst";
 import { compilePdf, isDesktop } from "../ipc";
@@ -71,15 +71,7 @@ function DockHead({ meta }: { meta?: ReactNode }) {
 
 function chapterEyebrow(chapter: Chapter, chapters: Chapter[], idx: number): string {
   const kind = chapterKind(chapter);
-  if (kind === "body") return `Chapter ${bodyNumber(chapters, idx) ?? ""}`;
-  if (kind === "part") return `Part ${partRoman(partNumber(chapters, idx) ?? 0)}`;
-  return kind === "front" ? "Front matter" : "Back matter";
-}
-
-function previewTitle(chapter: Chapter): string | undefined {
-  if (chapter.noTitle) return undefined;
-  if (chapterKind(chapter) === "part") return chapter.title || undefined;
-  return chapter.title || "Untitled";
+  return kind === "body" ? `Chapter ${bodyNumber(chapters, idx) ?? ""}` : kind === "front" ? "Front matter" : "Back matter";
 }
 
 function useActiveChapter() {
@@ -115,8 +107,8 @@ function PdfDock() {
     clearTimeout(timer.current);
     setBusy(true);
     timer.current = setTimeout(() => {
-      const { source, images, fonts } = coverActive ? coverToPdfInputs(book) : chapterToPdfInputs(book, idx);
-      compilePdf(source, images, false, fonts)
+      const { source, images } = coverActive ? coverToPdfInputs(book) : chapterToPdfInputs(book, idx);
+      compilePdf(source, images)
         .then((bytes) => {
           setPdf(bytes);
           setError(null);
@@ -171,7 +163,7 @@ function HtmlDock() {
       <div className="page">
         <div className="p-opener">
           <div className="p-num">{eyebrow}</div>
-          {previewTitle(chapter) !== undefined && <div className="p-title">{previewTitle(chapter)}</div>}
+          {!chapter.noTitle && <div className="p-title">{chapter.title || "Untitled"}</div>}
         </div>
         <div className="page-body" dangerouslySetInnerHTML={{ __html: html }} />
         <div className="folio">{idx * 8 + 7}</div>
@@ -215,7 +207,7 @@ function DeviceDock({ device }: { device: Device }) {
       <DeviceFrame
         device={device}
         eyebrow={eyebrow}
-        title={previewTitle(chapter)}
+        title={chapter.noTitle ? undefined : chapter.title || "Untitled"}
         html={html}
       />
     </section>

src/components/EditorView.tsx

@@ -1,13 +1,10 @@
-import { useCallback, useEffect, useLayoutEffect, useRef, useState } from "react";
-import { listen } from "@tauri-apps/api/event";
+import { useCallback, useEffect, useState } from "react";
 import type { Editor as TiptapEditor } from "@tiptap/react";
 import { Sidebar } from "./Sidebar";
 import { Dock } from "./Dock";
 import { ResizeHandle } from "./ResizeHandle";
 import { Icon } from "./Icon";
-import { Menu } from "./Menu";
 import { Settings } from "./Settings";
-import { BackupButton } from "./BackupButton";
 import { CoverView } from "./CoverView";
 import { FindBar } from "./FindBar";
 import { ProofPopover } from "./ProofPopover";
@@ -15,26 +12,16 @@ import { Editor } from "../editor/Editor";
 import { FloatingToolbar } from "../editor/FloatingToolbar";
 import type { ProofCoords, ProofIssue, ProofingStorage } from "../editor/proofing";
 import { COVER_ID, useBook } from "../store/useBook";
-import { useBackup } from "../store/useBackup";
-import { useExportPreview } from "../store/useExportPreview";
 import { useProofing } from "../store/useProofing";
 import { useTheme } from "../store/useTheme";
 import { useWidth } from "../store/useWidth";
 import { WIDTH_OPTIONS } from "../width";
-import { bodyNumber, chapterKind, partNumber, partRoman } from "../model/book";
+import { bodyNumber, chapterKind } from "../model/book";
 import { saveBook } from "../library";
-import { useEscapeLayer } from "../escape";
-import { focusTrapped } from "../focus";
-import { isDesktop, runWritingTool } from "../ipc";
-import { useCompact } from "../useMedia";
+import { isDesktop } from "../ipc";
 import { issueSignature, rememberWord, runProof } from "../proofing";
 import { runExport } from "../export/run";
 
-const WRITING_TOOLS: Record<string, "Proofread" | "Rewrite"> = {
-  KeyF: "Proofread",
-  KeyR: "Rewrite",
-};
-
 export function EditorView() {
   const book = useBook((s) => s.book);
   const activeChapterId = useBook((s) => s.activeChapterId);
@@ -45,32 +32,20 @@ export function EditorView() {
   const setChapterContent = useBook((s) => s.setChapterContent);
   const setChapterTitle = useBook((s) => s.setChapterTitle);
   const setChapterNoTitle = useBook((s) => s.setChapterNoTitle);
-  const pendingTitleFocus = useBook((s) => s.pendingTitleFocus);
-  const clearTitleFocus = useBook((s) => s.clearTitleFocus);
   const markSaved = useBook((s) => s.markSaved);
   const theme = useTheme((s) => s.theme);
   const toggleTheme = useTheme((s) => s.toggle);
   const width = useWidth((s) => s.width);
   const setWidth = useWidth((s) => s.setWidth);
 
-  const isCompact = useCompact();
   const [editor, setEditor] = useState<TiptapEditor | null>(null);
-  const editorRef = useRef<TiptapEditor | null>(null);
-  editorRef.current = editor;
-  const lastChapterRef = useRef<string>("");
-  const [sidebarOpen, setSidebarOpen] = useState(!isCompact);
-  const [dock, setDock] = useState(false);
+  const [dock, setDock] = useState(true);
   const [settingsOpen, setSettingsOpen] = useState(false);
   const [exportOpen, setExportOpen] = useState(false);
-  const [moreOpen, setMoreOpen] = useState(false);
   const [widthOpen, setWidthOpen] = useState(false);
   const [findOpen, setFindOpen] = useState(false);
   const [findExpanded, setFindExpanded] = useState(false);
   const [proofPopover, setProofPopover] = useState<{ issue: ProofIssue; coords: ProofCoords } | null>(null);
-  const [escArmed, setEscArmed] = useState(false);
-  const escArmedRef = useRef(false);
-  escArmedRef.current = escArmed;
-  const escTimer = useRef<ReturnType<typeof setTimeout> | undefined>(undefined);
 
   const spelling = useProofing((s) => s.spelling);
   const grammar = useProofing((s) => s.grammar);
@@ -81,58 +56,11 @@ export function EditorView() {
   const coverActive = activeChapterId === COVER_ID;
   const proofingAvailable = isDesktop && book?.metadata.language === "en";
 
-  const toggleSidebar = () =>
-    setSidebarOpen((open) => {
-      if (!open && isCompact) setDock(false);
-      return !open;
-    });
-  const toggleDock = () =>
-    setDock((open) => {
-      if (!open && isCompact) setSidebarOpen(false);
-      return !open;
-    });
-  const closeDrawers = () => {
-    setSidebarOpen(false);
-    setDock(false);
-  };
-
-  useEscapeLayer(true, () => {
-    clearTimeout(escTimer.current);
-    if (escArmedRef.current) {
-      setEscArmed(false);
-      useBook.getState().closeBook();
-      return;
-    }
-    (document.activeElement as HTMLElement | null)?.blur();
-    setEscArmed(true);
-    escTimer.current = setTimeout(() => setEscArmed(false), 1500);
-  });
-  useEscapeLayer(isCompact && (sidebarOpen || dock), closeDrawers);
-  useEscapeLayer(widthOpen, () => setWidthOpen(false));
-  useEscapeLayer(exportOpen, () => setExportOpen(false));
-  useEscapeLayer(moreOpen, () => setMoreOpen(false));
-  useEscapeLayer(!!proofPopover, () => setProofPopover(null));
-
-  useEffect(() => () => clearTimeout(escTimer.current), []);
-
   const openFind = useCallback((expanded: boolean) => {
     setFindExpanded(expanded);
     setFindOpen(true);
   }, []);
 
-  const focusEditorSoon = useCallback(() => {
-    if (useBook.getState().pendingTitleFocus || focusTrapped()) return;
-    requestAnimationFrame(() => editorRef.current?.commands.focus(undefined, { scrollIntoView: false }));
-  }, []);
-
-  const switchChapter = useCallback(
-    (dir: 1 | -1) => {
-      useBook.getState().goToAdjacentChapter(dir);
-      focusEditorSoon();
-    },
-    [focusEditorSoon]
-  );
-
   const reproof = useCallback(() => {
     if (!editor) return;
     const state = useProofing.getState();
@@ -151,7 +79,6 @@ export function EditorView() {
     saveBook(current)
       .then(() => {
         if (useBook.getState().book === current) markSaved();
-        useBackup.getState().refresh();
       })
       .catch((e) => setNotice(`Save failed: ${e}`));
   }, [markSaved, setNotice]);
@@ -164,50 +91,17 @@ export function EditorView() {
 
   useEffect(() => {
     const onKey = (e: KeyboardEvent) => {
-      if (focusTrapped()) return;
-      if (e.metaKey && e.altKey && e.key.toLowerCase() === "f") {
+      if ((e.metaKey || e.ctrlKey) && e.key.toLowerCase() === "s") {
         e.preventDefault();
-        openFind(true);
-      } else if (e.metaKey && e.altKey && e.key === "ArrowRight") {
+        saveNow();
+      } else if ((e.metaKey || e.ctrlKey) && e.key.toLowerCase() === "f") {
         e.preventDefault();
-        e.stopPropagation();
-        switchChapter(1);
-      } else if (e.metaKey && e.altKey && e.key === "ArrowLeft") {
-        e.preventDefault();
-        e.stopPropagation();
-        switchChapter(-1);
-      } else if (e.ctrlKey && !e.metaKey && e.key === "Tab") {
-        e.preventDefault();
-        e.stopPropagation();
-        switchChapter(e.shiftKey ? -1 : 1);
-      } else if (e.shiftKey && e.altKey && !e.metaKey && !e.ctrlKey && WRITING_TOOLS[e.code]) {
-        e.preventDefault();
-        e.stopPropagation();
-        runWritingTool(WRITING_TOOLS[e.code]).catch(() => {});
+        openFind(e.altKey);
       }
     };
-    window.addEventListener("keydown", onKey, true);
-    return () => window.removeEventListener("keydown", onKey, true);
-  }, [openFind, switchChapter]);
-
-  const menuCommands = useRef({ saveNow, openFind, setSettingsOpen, toggleSidebar, switchChapter });
-  menuCommands.current = { saveNow, openFind, setSettingsOpen, toggleSidebar, switchChapter };
-
-  useEffect(() => {
-    if (!isDesktop) return;
-    const unlisten = listen<string>("menu-action", (e) => {
-      const cmd = menuCommands.current;
-      if (e.payload === "save") cmd.saveNow();
-      else if (e.payload === "find") cmd.openFind(false);
-      else if (e.payload === "settings") cmd.setSettingsOpen(true);
-      else if (e.payload === "toggle-chapters") cmd.toggleSidebar();
-      else if (e.payload === "next-chapter") cmd.switchChapter(1);
-      else if (e.payload === "prev-chapter") cmd.switchChapter(-1);
-    });
-    return () => {
-      unlisten.then((stop) => stop());
-    };
-  }, []);
+    window.addEventListener("keydown", onKey);
+    return () => window.removeEventListener("keydown", onKey);
+  }, [saveNow, openFind]);
 
   useEffect(() => {
     if (!notice) return;
@@ -215,11 +109,6 @@ export function EditorView() {
     return () => clearTimeout(timer);
   }, [notice]);
 
-  useEffect(() => {
-    setSidebarOpen(!isCompact);
-    if (isCompact) setDock(false);
-  }, [isCompact]);
-
   useEffect(() => {
     if (!editor) return;
     const storage = (editor.storage as unknown as Record<string, ProofingStorage>).proofing;
@@ -255,45 +144,29 @@ export function EditorView() {
 
   const handleExport = (format: "pdf" | "epub") => {
     setExportOpen(false);
-    if (format === "pdf" && isDesktop) useExportPreview.getState().openPreview();
-    else runExport(format);
+    runExport(format);
   };
 
   if (!book) return null;
-  const activeIdx = book.chapters.findIndex((c) => c.id === activeChapterId);
-  const activeChapter = book.chapters[activeIdx];
-  if (activeChapter) lastChapterRef.current = activeChapter.id;
-  const editorIdx = activeChapter ? activeIdx : book.chapters.findIndex((c) => c.id === lastChapterRef.current);
-  const chapter = book.chapters[editorIdx] ?? book.chapters[0];
+  const idx = book.chapters.findIndex((c) => c.id === activeChapterId);
+  const chapter = book.chapters[idx] ?? book.chapters[0];
   const realIdx = book.chapters.findIndex((c) => c.id === chapter?.id);
   const kind = chapter ? chapterKind(chapter) : "body";
   const eyebrow =
-    kind === "body"
-      ? `Chapter ${bodyNumber(book.chapters, realIdx) ?? ""}`
-      : kind === "part"
-        ? `Part ${partRoman(partNumber(book.chapters, realIdx) ?? 0)}`
-        : kind === "front"
-          ? "Front matter"
-          : "Back matter";
+    kind === "body" ? `Chapter ${bodyNumber(book.chapters, realIdx) ?? ""}` : kind === "front" ? "Front matter" : "Back matter";
 
   return (
-    <div className="app" data-compact={isCompact} data-sidebar={sidebarOpen} data-dock={dock}>
+    <div className="app">
       <header className="titlebar" data-tauri-drag-region>
-        <div className="lead">
-          <button className="icon-btn" data-on={sidebarOpen} onClick={toggleSidebar} title="Toggle chapters" aria-label="Toggle chapters">
-            <Icon d="M3 4.5h18v15H3zM9 4.5v15" />
-          </button>
-        </div>
         <button className="doc-title" onClick={() => setSettingsOpen(true)} title="Book setup">
           {book.metadata.title || "Untitled"}
           {dirty && <span className="dirty-dot" />}
         </button>
         <div className="actions">
-          {isDesktop && !isCompact && <BackupButton />}
           <button className="icon-btn" data-on={findOpen} onClick={() => (findOpen ? setFindOpen(false) : openFind(false))} title="Find (⌘F)">
             <Icon d="M11 4a7 7 0 1 0 0 14 7 7 0 0 0 0-14zM20 20l-4-4" />
           </button>
-          {!isCompact && proofingAvailable && !coverActive && (
+          {proofingAvailable && !coverActive && (
             <>
               <button className="icon-btn" data-on={spelling} onClick={toggleSpelling} title="Check spelling">
                 <Icon d="M4 17l4-10 4 10M5.4 13.4h5.2M15 17l2.5 2.5L22 14" />
@@ -303,12 +176,14 @@ export function EditorView() {
               </button>
             </>
           )}
-          {!isCompact && (
           <div className="menu-wrap">
             <button className="icon-btn" data-on={widthOpen} onClick={() => setWidthOpen((v) => !v)} title="Editor width">
               <Icon d="M3 5v14M21 5v14M7 12h10M7 12l3-3M7 12l3 3M17 12l-3-3M17 12l-3 3" />
             </button>
-              <Menu open={widthOpen} onClose={() => setWidthOpen(false)}>
+            {widthOpen && (
+              <>
+                <div className="menu-backdrop" onClick={() => setWidthOpen(false)} />
+                <div className="menu">
                   {WIDTH_OPTIONS.map((w) => (
                     <button
                       key={w.id}
@@ -321,21 +196,24 @@ export function EditorView() {
                       {w.label}
                     </button>
                   ))}
-              </Menu>
                 </div>
+              </>
             )}
-          {!isCompact && (
+          </div>
           <div className="menu-wrap">
             <button className="icon-btn" data-on={exportOpen} onClick={() => setExportOpen((v) => !v)} title="Export">
               <Icon d="M5 13v6h14v-6M12 16V3M8 7l4-4 4 4" />
             </button>
-              <Menu open={exportOpen} onClose={() => setExportOpen(false)}>
+            {exportOpen && (
+              <>
+                <div className="menu-backdrop" onClick={() => setExportOpen(false)} />
+                <div className="menu">
                   <button onClick={() => handleExport("pdf")}>Export PDF…</button>
                   <button onClick={() => handleExport("epub")}>Export EPUB…</button>
-              </Menu>
                 </div>
+              </>
             )}
-          {!isCompact && (
+          </div>
           <button className="icon-btn" onClick={toggleTheme} title={theme === "dark" ? "Light mode" : "Dark mode"}>
             {theme === "dark" ? (
               <Icon>
@@ -346,62 +224,9 @@ export function EditorView() {
               <Icon d="M21 12.8A9 9 0 1 1 11.2 3a7 7 0 0 0 9.8 9.8z" />
             )}
           </button>
-          )}
-          <button className="icon-btn" data-on={dock} onClick={toggleDock} title="Toggle preview">
+          <button className="icon-btn" data-on={dock} onClick={() => setDock(!dock)} title="Toggle preview">
             <Icon d="M3 4.5h18v15H3zM14 4.5v15" />
           </button>
-          {isCompact && (
-            <div className="menu-wrap">
-              <button className="icon-btn" data-on={moreOpen} onClick={() => setMoreOpen((v) => !v)} title="More" aria-label="More options">
-                <Icon d="M5 12h.01M12 12h.01M19 12h.01" />
-              </button>
-              <Menu open={moreOpen} onClose={() => setMoreOpen(false)}>
-                <div className="menu-label">Editor width</div>
-                {WIDTH_OPTIONS.map((w) => (
-                  <button
-                    key={w.id}
-                    data-on={width === w.id}
-                    onClick={() => {
-                      setWidth(w.id);
-                      setMoreOpen(false);
-                    }}
-                  >
-                    {w.label}
-                  </button>
-                ))}
-                <div className="menu-sep" />
-                <button
-                  onClick={() => {
-                    setMoreOpen(false);
-                    handleExport("pdf");
-                  }}
-                >
-                  Export PDF…
-                </button>
-                <button
-                  onClick={() => {
-                    setMoreOpen(false);
-                    handleExport("epub");
-                  }}
-                >
-                  Export EPUB…
-                </button>
-                {proofingAvailable && !coverActive && (
-                  <>
-                    <div className="menu-sep" />
-                    <button data-on={spelling} onClick={toggleSpelling}>
-                      Check spelling
-                    </button>
-                    <button data-on={grammar} onClick={toggleGrammar}>
-                      Check grammar
-                    </button>
-                  </>
-                )}
-                <div className="menu-sep" />
-                <button onClick={toggleTheme}>{theme === "dark" ? "Light mode" : "Dark mode"}</button>
-              </Menu>
-            </div>
-          )}
         </div>
       </header>
 
@@ -413,27 +238,23 @@ export function EditorView() {
       />
 
       <div className="body">
-        <Sidebar
-          onNavigate={() => {
-            if (isCompact) setSidebarOpen(false);
-            focusEditorSoon();
-          }}
-        />
-        {sidebarOpen && !isCompact && <ResizeHandle pane="sidebar" />}
+        <Sidebar />
+        <ResizeHandle pane="sidebar" />
         <main className="editor-pane">
-          {coverActive && <CoverView />}
-          <article className="sheet" hidden={coverActive}>
+          {coverActive ? (
+            <CoverView />
+          ) : (
+            <>
+              <article className="sheet">
                 <header className="chapter-opener">
                   <div className="chapter-num">{eyebrow}</div>
-              <ChapterTitleInput
-                value={chapter.title}
-                placeholder={
-                  chapter.noTitle ? "No title" : kind === "body" ? "Chapter title" : kind === "part" ? "Part title (optional)" : "Page title"
-                }
-                disabled={!!chapter.noTitle}
-                focusRequest={pendingTitleFocus === chapter.id}
-                onFocused={clearTitleFocus}
-                onChange={(value) => setChapterTitle(chapter.id, value)}
+                  <input
+                    className="chapter-title-input"
+                    value={chapter.noTitle ? "" : chapter.title}
+                    placeholder={chapter.noTitle ? "No title" : kind === "body" ? "Chapter title" : "Page title"}
+                    spellCheck={false}
+                    disabled={chapter.noTitle}
+                    onChange={(e) => setChapterTitle(chapter.id, e.target.value)}
                   />
                   {(chapter.noTitle || !chapter.title.trim()) && (
                     <label className="no-title-check">
@@ -447,6 +268,7 @@ export function EditorView() {
                   )}
                 </header>
                 <Editor
+                  key={chapter.id}
                   bookId={book.id}
                   chapterId={chapter.id}
                   content={chapter.content}
@@ -457,13 +279,12 @@ export function EditorView() {
                   }
                 />
               </article>
-          {!coverActive && <FloatingToolbar editor={editor} />}
-        </main>
-        {dock && !isCompact && <ResizeHandle pane="dock" />}
-        {dock && <Dock />}
-        {isCompact && (sidebarOpen || dock) && (
-          <button className="drawer-scrim" aria-label="Close panel" onClick={closeDrawers} />
+              <FloatingToolbar editor={editor} />
+            </>
           )}
+        </main>
+        {dock && <ResizeHandle pane="dock" />}
+        {dock && <Dock />}
       </div>
 
       {proofPopover && editor && (
@@ -488,12 +309,6 @@ export function EditorView() {
         />
       )}
 
-      {escArmed && (
-        <div className="esc-hint">
-          Press <kbd>Esc</kbd> again for All books
-        </div>
-      )}
-
       {settingsOpen && <Settings onClose={() => setSettingsOpen(false)} onSave={saveNow} />}
       {exporting && (
         <div className="export-overlay">
@@ -509,51 +324,3 @@ export function EditorView() {
     </div>
   );
 }
-
-function ChapterTitleInput({
-  value,
-  placeholder,
-  disabled,
-  focusRequest,
-  onFocused,
-  onChange,
-}: {
-  value: string;
-  placeholder: string;
-  disabled: boolean;
-  focusRequest: boolean;
-  onFocused: () => void;
-  onChange: (value: string) => void;
-}) {
-  const ref = useRef<HTMLTextAreaElement>(null);
-
-  useLayoutEffect(() => {
-    const el = ref.current;
-    if (!el) return;
-    el.style.height = "auto";
-    el.style.height = `${el.scrollHeight}px`;
-  }, [value, disabled]);
-
-  useEffect(() => {
-    if (!focusRequest || disabled) return;
-    const el = ref.current;
-    if (!el) return;
-    el.focus();
-    el.select();
-    onFocused();
-  }, [focusRequest, disabled, onFocused]);
-
-  return (
-    <textarea
-      ref={ref}
-      className="chapter-title-input"
-      rows={1}
-      value={value}
-      placeholder={placeholder}
-      spellCheck={false}
-      disabled={disabled}
-      onKeyDown={(e) => e.key === "Enter" && e.preventDefault()}
-      onChange={(e) => onChange(e.target.value)}
-    />
-  );
-}

src/components/ExportPreview.tsx

@@ -1,336 +0,0 @@
-import { useEffect, useLayoutEffect, useRef, useState } from "react";
-import * as pdfjs from "pdfjs-dist";
-import type { PDFDocumentProxy, RenderTask } from "pdfjs-dist";
-import workerUrl from "pdfjs-dist/build/pdf.worker.min.mjs?url";
-import { useBook } from "../store/useBook";
-import { useExportPreview } from "../store/useExportPreview";
-import { bookToPdfInputs, unsupportedScripts } from "../export/typst";
-import { compilePdf } from "../ipc";
-import { saveBytes } from "../project";
-import { useEscapeLayer } from "../escape";
-import { useFocusTrap } from "../focus";
-import { Icon } from "./Icon";
-
-pdfjs.GlobalWorkerOptions.workerSrc = workerUrl;
-
-const PDF_FILTER = [{ name: "PDF", extensions: ["pdf"] }];
-const ZOOM_MIN = 0.5;
-const ZOOM_MAX = 2.5;
-const ZOOM_STEP = 0.25;
-
-interface Frame {
-  left: number;
-  top: number;
-  width: number;
-  height: number;
-}
-
-function measureEditorPane(): Frame | null {
-  const pane = document.querySelector(".editor-pane");
-  if (!pane) return null;
-  const r = pane.getBoundingClientRect();
-  return {
-    left: Math.round(r.left),
-    top: Math.round(r.top),
-    width: Math.round(r.width),
-    height: Math.round(r.height),
-  };
-}
-
-export function ExportPreview() {
-  const open = useExportPreview((s) => s.open);
-  const book = useBook((s) => s.book);
-  if (!open || !book) return null;
-  return <ExportPreviewModal />;
-}
-
-function ExportPreviewModal() {
-  const book = useBook((s) => s.book)!;
-  const close = useExportPreview((s) => s.close);
-  const [pdf, setPdf] = useState<Uint8Array | null>(null);
-  const [error, setError] = useState<string | null>(null);
-  const [pages, setPages] = useState(0);
-  const [zoom, setZoom] = useState(1);
-  const [saving, setSaving] = useState(false);
-  const [frame, setFrame] = useState<Frame | null>(measureEditorPane);
-  const panelRef = useRef<HTMLDivElement>(null);
-  const zoomRef = useRef(zoom);
-  zoomRef.current = zoom;
-
-  useLayoutEffect(() => {
-    const update = () => setFrame(measureEditorPane());
-    update();
-    const pane = document.querySelector(".editor-pane");
-    const observer = new ResizeObserver(update);
-    if (pane) observer.observe(pane);
-    window.addEventListener("resize", update);
-    return () => {
-      observer.disconnect();
-      window.removeEventListener("resize", update);
-    };
-  }, []);
-
-  useEffect(() => {
-    let cancelled = false;
-    setPdf(null);
-    setError(null);
-    const { source, images, fonts } = bookToPdfInputs(book);
-    compilePdf(source, images, false, fonts)
-      .then((bytes) => !cancelled && setPdf(bytes))
-      .catch((e) => !cancelled && setError(String(e)));
-    return () => {
-      cancelled = true;
-    };
-  }, [book]);
-
-  useEscapeLayer(true, close);
-  useFocusTrap(panelRef);
-
-  useEffect(() => {
-    const el = panelRef.current;
-    if (!el) return;
-    const clamp = (z: number) => Math.min(ZOOM_MAX, Math.max(ZOOM_MIN, z));
-    const snap = (z: number) => clamp(Math.round(z / ZOOM_STEP) * ZOOM_STEP);
-    let start = 1;
-    let accum = 0;
-
-    const onWheel = (e: WheelEvent) => {
-      if (!e.ctrlKey) return;
-      e.preventDefault();
-      accum += e.deltaY;
-      if (accum <= -40) {
-        accum = 0;
-        setZoom((z) => clamp(z + ZOOM_STEP));
-      } else if (accum >= 40) {
-        accum = 0;
-        setZoom((z) => clamp(z - ZOOM_STEP));
-      }
-    };
-    const onGestureStart = (e: Event) => {
-      e.preventDefault();
-      start = zoomRef.current;
-    };
-    const onGestureChange = (e: Event) => {
-      e.preventDefault();
-      const next = snap(start * (e as unknown as { scale: number }).scale);
-      setZoom((z) => (z === next ? z : next));
-    };
-    const onGestureEnd = (e: Event) => e.preventDefault();
-
-    el.addEventListener("wheel", onWheel, { passive: false });
-    el.addEventListener("gesturestart", onGestureStart);
-    el.addEventListener("gesturechange", onGestureChange);
-    el.addEventListener("gestureend", onGestureEnd);
-    return () => {
-      el.removeEventListener("wheel", onWheel);
-      el.removeEventListener("gesturestart", onGestureStart);
-      el.removeEventListener("gesturechange", onGestureChange);
-      el.removeEventListener("gestureend", onGestureEnd);
-    };
-  }, []);
-
-  const scripts = unsupportedScripts(book);
-
-  const save = async () => {
-    if (!pdf) return;
-    setSaving(true);
-    try {
-      await saveBytes(pdf, `${book.metadata.title || "Untitled"}.pdf`, PDF_FILTER);
-    } catch (e) {
-      setError(String(e));
-    } finally {
-      setSaving(false);
-    }
-  };
-
-  const adjustZoom = (delta: number) =>
-    setZoom((z) => Math.min(ZOOM_MAX, Math.max(ZOOM_MIN, Math.round((z + delta) * 100) / 100)));
-
-  const compact = (frame?.width ?? 1000) < 460;
-
-  return (
-    <div className="overlay preview-overlay" onClick={close}>
-      <div
-        ref={panelRef}
-        className="panel preview-panel"
-        style={frame ? { position: "fixed", left: frame.left, top: frame.top, width: frame.width, height: frame.height } : undefined}
-        onClick={(e) => e.stopPropagation()}
-      >
-        <header className="preview-bar">
-          <button className="icon-btn" onClick={close} title="Close (Esc)">
-            <Icon d="M6 6l12 12M18 6L6 18" />
-          </button>
-          <div className="preview-title">{book.metadata.title || "Untitled"}</div>
-          {pdf && !compact && (
-            <span className="preview-count">
-              {pages} {pages === 1 ? "page" : "pages"}
-            </span>
-          )}
-          <div className="preview-zoom">
-            <button className="icon-btn" disabled={!pdf || zoom <= ZOOM_MIN} onClick={() => adjustZoom(-ZOOM_STEP)} title="Zoom out">
-              <Icon d="M5 12h14" />
-            </button>
-            {!compact && <span>{zoom === 1 ? "Fit" : `${Math.round(zoom * 100)}%`}</span>}
-            <button className="icon-btn" disabled={!pdf || zoom >= ZOOM_MAX} onClick={() => adjustZoom(ZOOM_STEP)} title="Zoom in">
-              <Icon d="M12 5v14M5 12h14" />
-            </button>
-          </div>
-          <button className="btn-primary" disabled={!pdf || saving} onClick={save}>
-            {saving ? "Saving…" : compact ? "Save" : "Save PDF…"}
-          </button>
-        </header>
-
-        {pdf && scripts.length > 0 && (
-          <div className="preview-warn">
-            Some {scripts.join(", ")} characters may not render — the PDF fonts cover Latin scripts only.
-          </div>
-        )}
-
-        {error ? (
-          <div className="preview-stage">
-            <pre className="dock-error">{error}</pre>
-          </div>
-        ) : pdf ? (
-          <BookPages data={pdf} zoom={zoom} onPages={setPages} />
-        ) : (
-          <div className="preview-stage">
-            <div className="preview-loading">
-              <div className="spinner spinner-dark" />
-              <p>Typesetting your book…</p>
-            </div>
-          </div>
-        )}
-      </div>
-    </div>
-  );
-}
-
-function BookPages({ data, zoom, onPages }: { data: Uint8Array; zoom: number; onPages: (n: number) => void }) {
-  const stageRef = useRef<HTMLDivElement>(null);
-  const [doc, setDoc] = useState<PDFDocumentProxy | null>(null);
-  const [baseRatio, setBaseRatio] = useState<number | null>(null);
-  const [stage, setStage] = useState({ width: 0, height: 0 });
-
-  useEffect(() => {
-    let cancelled = false;
-    const task = pdfjs.getDocument({ data: data.slice() });
-    task.promise
-      .then(async (d) => {
-        if (cancelled) return;
-        const first = (await d.getPage(1)).getViewport({ scale: 1 });
-        if (cancelled) return;
-        setDoc(d);
-        setBaseRatio(first.height / first.width);
-        onPages(d.numPages);
-      })
-      .catch(() => {});
-    return () => {
-      cancelled = true;
-      task.destroy();
-    };
-  }, [data, onPages]);
-
-  useEffect(() => {
-    const el = stageRef.current;
-    if (!el) return;
-    const update = () => setStage({ width: el.clientWidth, height: el.clientHeight });
-    update();
-    const observer = new ResizeObserver(update);
-    observer.observe(el);
-    return () => observer.disconnect();
-  }, [doc]);
-
-  const pageFit = Math.max(240, Math.min(stage.width - 56, (stage.height - 56) / (baseRatio ?? 1)));
-  const displayWidth = Math.round(pageFit * zoom);
-
-  return (
-    <div className="preview-stage" ref={stageRef}>
-      {doc && baseRatio !== null && stage.width > 0 && (
-        <div className="preview-col">
-          {Array.from({ length: doc.numPages }, (_, i) => (
-            <PdfPage
-              key={i + 1}
-              doc={doc}
-              pageNumber={i + 1}
-              root={stageRef.current}
-              displayWidth={displayWidth}
-              baseRatio={baseRatio}
-            />
-          ))}
-        </div>
-      )}
-    </div>
-  );
-}
-
-function PdfPage({
-  doc,
-  pageNumber,
-  root,
-  displayWidth,
-  baseRatio,
-}: {
-  doc: PDFDocumentProxy;
-  pageNumber: number;
-  root: HTMLElement | null;
-  displayWidth: number;
-  baseRatio: number;
-}) {
-  const holder = useRef<HTMLDivElement>(null);
-  const [show, setShow] = useState(false);
-  const [ratio, setRatio] = useState(baseRatio);
-
-  useEffect(() => {
-    const el = holder.current;
-    if (!el) return;
-    const observer = new IntersectionObserver(([entry]) => setShow(entry.isIntersecting), {
-      root,
-      rootMargin: "1400px 0px",
-    });
-    observer.observe(el);
-    return () => observer.disconnect();
-  }, [root]);
-
-  useEffect(() => {
-    const el = holder.current;
-    if (!el) return;
-    if (!show) {
-      el.replaceChildren();
-      return;
-    }
-    let cancelled = false;
-    let task: RenderTask | undefined;
-    (async () => {
-      try {
-        const page = await doc.getPage(pageNumber);
-        if (cancelled) return;
-        const natural = page.getViewport({ scale: 1 });
-        setRatio(natural.height / natural.width);
-        const dpr = Math.min(window.devicePixelRatio || 1, 2);
-        const viewport = page.getViewport({ scale: (displayWidth / natural.width) * dpr });
-        const canvas = document.createElement("canvas");
-        canvas.className = "preview-canvas";
-        canvas.width = Math.ceil(viewport.width);
-        canvas.height = Math.ceil(viewport.height);
-        task = page.render({ canvas, viewport });
-        await task.promise;
-        if (cancelled) return;
-        el.replaceChildren(canvas);
-      } catch {
-        // render cancelled or page failed; keep the previous canvas
-      }
-    })();
-    return () => {
-      cancelled = true;
-      task?.cancel();
-    };
-  }, [show, doc, pageNumber, displayWidth]);
-
-  return (
-    <div
-      ref={holder}
-      className="preview-page"
-      style={{ width: displayWidth, height: Math.round(displayWidth * ratio) }}
-    />
-  );
-}

src/components/FindBar.tsx

@@ -3,7 +3,6 @@ import type { Editor as TiptapEditor } from "@tiptap/react";
 import { buildRegex, getSearchState } from "../editor/search";
 import { countMatches, replaceInContent } from "../search-book";
 import { useBook } from "../store/useBook";
-import { useEscapeLayer } from "../escape";
 import { Icon } from "./Icon";
 
 interface FindBarProps {
@@ -59,7 +58,7 @@ export function FindBar({ editor, open, initialExpanded, onClose }: FindBarProps
     return () => {
       editor.off("transaction", update);
     };
-  }, [editor, activeChapterId]);
+  }, [editor]);
 
   useEffect(() => {
     if (!editor) return;
@@ -68,7 +67,7 @@ export function FindBar({ editor, open, initialExpanded, onClose }: FindBarProps
     } else {
       editor.commands.clearSearch();
     }
-  }, [editor, open, query, caseSensitive, wholeWord, activeChapterId]);
+  }, [editor, open, query, caseSensitive, wholeWord]);
 
   useEffect(() => {
     if (open) {
@@ -96,13 +95,6 @@ export function FindBar({ editor, open, initialExpanded, onClose }: FindBarProps
     };
   }, [editor, pendingNav, activeChapterId]);
 
-  const close = () => {
-    editor?.commands.focus();
-    onClose();
-  };
-
-  useEscapeLayer(open, close);
-
   if (!open || !editor) return null;
 
   const before = jsonCounts.slice(0, Math.max(0, activeIdx)).reduce((a, b) => a + b, 0);
@@ -171,6 +163,9 @@ export function FindBar({ editor, open, initialExpanded, onClose }: FindBarProps
     if (e.key === "Enter") {
       e.preventDefault();
       e.shiftKey ? prev() : next();
+    } else if (e.key === "Escape") {
+      e.preventDefault();
+      onClose();
     }
   };
 
@@ -244,7 +239,7 @@ export function FindBar({ editor, open, initialExpanded, onClose }: FindBarProps
           <button className="find-toggle" data-on={wholeWord} title="Whole word" onClick={() => setWholeWord((v) => !v)}>
             <span className="find-ww">ab</span>
           </button>
-          <button className="find-btn" title="Close (Esc)" onClick={close}>
+          <button className="find-btn" title="Close (Esc)" onClick={onClose}>
             <Icon d="M18 6L6 18M6 6l12 12" size={14} />
           </button>
         </div>
@@ -261,6 +256,9 @@ export function FindBar({ editor, open, initialExpanded, onClose }: FindBarProps
                 if (e.key === "Enter") {
                   e.preventDefault();
                   replaceOne();
+                } else if (e.key === "Escape") {
+                  e.preventDefault();
+                  onClose();
                 }
               }}
             />

src/components/Library.tsx

@@ -1,39 +1,19 @@
 import { useEffect, useState } from "react";
-import {
-  type BookSummary,
-  createAndOpenBook,
-  deleteBook,
-  exampleBook,
-  lastBookId,
-  listBooks,
-  loadBook,
-  rememberLastBook,
-  saveBook,
-} from "../library";
+import { type BookSummary, createAndOpenBook, deleteBook, exampleBook, listBooks, loadBook, saveBook } from "../library";
 import type { Book } from "../model/book";
 import { importEpub } from "../import/epub";
 import { clearPositions } from "../editor/positions";
-import { clearChapterStates } from "../editor/session";
 import { isDesktop } from "../ipc";
 import { ConfirmDialog } from "./ConfirmDialog";
 import { Icon } from "./Icon";
 import { RowMenu } from "./RowMenu";
-import { BackupButton } from "./BackupButton";
-import { useBackup } from "../store/useBackup";
-import { useBook } from "../store/useBook";
-import { relativeTime } from "../time";
 
 export function Library({ onOpen }: { onOpen: (book: Book) => void }) {
   const [books, setBooks] = useState<BookSummary[]>([]);
   const [loaded, setLoaded] = useState(false);
-  const [now, setNow] = useState(() => Date.now());
   const [busy, setBusy] = useState(false);
+  const [notice, setNotice] = useState<string | null>(null);
   const [pendingDelete, setPendingDelete] = useState<BookSummary | null>(null);
-  const notice = useBook((s) => s.notice);
-  const setNotice = useBook((s) => s.setNotice);
-  const restoreNonce = useBackup((s) => s.restoreNonce);
-  const restoreWorking = useBackup((s) => s.phase === "working");
-  const restoreFromDrive = useBackup((s) => s.restoreFromDrive);
 
   const refresh = () =>
     listBooks()
@@ -43,18 +23,6 @@ export function Library({ onOpen }: { onOpen: (book: Book) => void }) {
   useEffect(() => {
     refresh();
   }, []);
-  useEffect(() => {
-    const timer = setInterval(() => setNow(Date.now()), 60_000);
-    return () => clearInterval(timer);
-  }, []);
-  useEffect(() => {
-    if (restoreNonce) refresh();
-  }, [restoreNonce]);
-  useEffect(() => {
-    if (!notice) return;
-    const timer = setTimeout(() => setNotice(null), 4000);
-    return () => clearTimeout(timer);
-  }, [notice]);
 
   const handleExample = async () => {
     const copy = exampleBook();
@@ -68,17 +36,10 @@ export function Library({ onOpen }: { onOpen: (book: Book) => void }) {
     onOpen(copy);
   };
 
-  const openById = (id: string) =>
-    loadBook(id)
-      .then(onOpen)
-      .catch((e) => setNotice(`Could not open book: ${e}`));
-
   const removeBook = async () => {
     if (!pendingDelete) return;
     await deleteBook(pendingDelete.id);
     clearPositions(pendingDelete.id);
-    clearChapterStates(pendingDelete.id);
-    if (lastBookId() === pendingDelete.id) rememberLastBook(null);
     setPendingDelete(null);
     refresh();
   };
@@ -103,9 +64,7 @@ export function Library({ onOpen }: { onOpen: (book: Book) => void }) {
 
   return (
     <div className="library">
-      <header className="library-head" data-tauri-drag-region>
-        {isDesktop && <BackupButton />}
-      </header>
+      <header className="library-head" data-tauri-drag-region />
       <div className="shelf">
         <button className="card card-action" onClick={() => createAndOpenBook(onOpen, setNotice)}>
           <Icon d="M12 5v14M5 12h14" size={20} />
@@ -132,32 +91,15 @@ export function Library({ onOpen }: { onOpen: (book: Book) => void }) {
             <div
               key={b.id}
               className="card card-book"
-              role="button"
-              tabIndex={0}
-              onClick={() => openById(b.id)}
-              onKeyDown={(e) => {
-                if (e.key === "Enter" || e.key === " ") {
-                  e.preventDefault();
-                  openById(b.id);
-                }
-              }}
+              onClick={() => loadBook(b.id).then(onOpen).catch((e) => setNotice(`Could not open book: ${e}`))}
             >
               <span className="card-title">{b.title || "Untitled"}</span>
               {b.author && <span className="card-author">{b.author}</span>}
-              {b.updatedAt > 0 && <span className="card-meta">Edited {relativeTime(b.updatedAt, now)}</span>}
               <RowMenu label="Book options" className="card-menu" onDelete={() => setPendingDelete(b)} />
             </div>
           ),
         )}
       </div>
-      {loaded && books.length === 0 && isDesktop && (
-        <div className="library-restore">
-          <button className="restore-link" onClick={restoreFromDrive} disabled={restoreWorking}>
-            <Icon d="M21 12a9 9 0 1 1-2.6-6.4M21 4v5h-5" size={15} />
-            {restoreWorking ? "Restoring…" : "Restore from Google Drive"}
-          </button>
-        </div>
-      )}
       {notice && (
         <div className="toast" onClick={() => setNotice(null)}>
           {notice}

src/components/Menu.tsx

@@ -1,42 +0,0 @@
-import { useRef, type ReactNode } from "react";
-import { useFocusTrap } from "../focus";
-
-interface MenuProps {
-  open: boolean;
-  onClose: () => void;
-  children: ReactNode;
-}
-
-export function Menu({ open, onClose, children }: MenuProps) {
-  const ref = useRef<HTMLDivElement>(null);
-
-  useFocusTrap(ref, open);
-
-  if (!open) return null;
-
-  const onKeyDown = (e: React.KeyboardEvent) => {
-    if (e.key !== "ArrowDown" && e.key !== "ArrowUp" && e.key !== "Home" && e.key !== "End") return;
-    e.preventDefault();
-    const items = Array.from(ref.current?.querySelectorAll<HTMLElement>("button") ?? []);
-    if (!items.length) return;
-    const at = items.indexOf(document.activeElement as HTMLElement);
-    const next =
-      e.key === "Home"
-        ? 0
-        : e.key === "End"
-          ? items.length - 1
-          : e.key === "ArrowDown"
-            ? (at + 1) % items.length
-            : (at - 1 + items.length) % items.length;
-    items[next]?.focus();
-  };
-
-  return (
-    <>
-      <div className="menu-backdrop" onClick={onClose} />
-      <div ref={ref} className="menu" onKeyDown={onKeyDown}>
-        {children}
-      </div>
-    </>
-  );
-}

src/components/MoveChapterDialog.tsx

@@ -1,87 +0,0 @@
-import { useEffect, useRef, useState } from "react";
-import type { Chapter } from "../model/book";
-import { type BookSummary, listBooks, moveChapterToBook, saveBook } from "../library";
-import { useBook } from "../store/useBook";
-import { useEscapeLayer } from "../escape";
-import { useFocusTrap } from "../focus";
-import { Icon } from "./Icon";
-
-interface MoveChapterDialogProps {
-  chapter: Chapter;
-  label: string;
-  onClose: () => void;
-}
-
-export function MoveChapterDialog({ chapter, label, onClose }: MoveChapterDialogProps) {
-  const bookId = useBook((s) => s.book?.id ?? "");
-  const deleteChapter = useBook((s) => s.deleteChapter);
-  const setNotice = useBook((s) => s.setNotice);
-  const [books, setBooks] = useState<BookSummary[] | null>(null);
-  const [moving, setMoving] = useState(false);
-  const panelRef = useRef<HTMLDivElement>(null);
-
-  useEscapeLayer(!moving, onClose);
-  useFocusTrap(panelRef, books !== null);
-
-  useEffect(() => {
-    listBooks()
-      .then((list) => setBooks(list.filter((b) => b.id !== bookId && !b.corrupt)))
-      .catch(() => setBooks([]));
-  }, [bookId]);
-
-  const move = async (target: BookSummary) => {
-    setMoving(true);
-    try {
-      const source = useBook.getState().book;
-      if (source) await saveBook(source);
-      await moveChapterToBook(chapter, target.id);
-      deleteChapter(chapter.id);
-      const trimmed = useBook.getState().book;
-      if (trimmed) await saveBook(trimmed);
-      setNotice(`Moved to ${target.title || "Untitled"}`);
-      onClose();
-    } catch (e) {
-      setNotice(`Could not move: ${e}`);
-      setMoving(false);
-    }
-  };
-
-  return (
-    <div className="overlay" onClick={moving ? undefined : onClose}>
-      <div ref={panelRef} className="panel panel-move" onClick={(e) => e.stopPropagation()}>
-        <div className="panel-head">
-          <h2>Move to book</h2>
-          <button className="icon-btn" onClick={onClose} title="Close">
-            <Icon d="M6 6l12 12M18 6L6 18" />
-          </button>
-        </div>
-        <div className="panel-body">
-          <p className="confirm-text">
-            Move <strong>{label}</strong> out of this book and into:
-          </p>
-          {books === null ? (
-            <p className="move-empty">Loading books…</p>
-          ) : books.length === 0 ? (
-            <p className="move-empty">There is no other book to move this into yet.</p>
-          ) : (
-            <ul className="move-list">
-              {books.map((b) => (
-                <li key={b.id}>
-                  <button className="move-target" disabled={moving} onClick={() => move(b)}>
-                    <span className="move-title">{b.title || "Untitled"}</span>
-                    {b.author && <span className="move-author">{b.author}</span>}
-                  </button>
-                </li>
-              ))}
-            </ul>
-          )}
-        </div>
-        <div className="panel-foot">
-          <button className="btn-ghost" onClick={onClose} disabled={moving}>
-            {moving ? "Moving…" : "Cancel"}
-          </button>
-        </div>
-      </div>
-    </div>
-  );
-}

src/components/ProofPopover.tsx

@@ -1,6 +1,5 @@
 import { useEffect, useRef } from "react";
 import { createPortal } from "react-dom";
-import { useFocusTrap } from "../focus";
 import { severityFor, type ProofCoords, type ProofIssue } from "../editor/proofing";
 
 function humanize(category: string): string {
@@ -21,8 +20,6 @@ const POP_WIDTH = 264;
 export function ProofPopover({ issue, coords, onReplace, onIgnore, onRemember, onClose }: ProofPopoverProps) {
   const popRef = useRef<HTMLDivElement>(null);
 
-  useFocusTrap(popRef);
-
   useEffect(() => {
     const onDown = (e: MouseEvent) => {
       if (popRef.current?.contains(e.target as Node)) return;

src/components/ResizeHandle.tsx

@@ -1,8 +1,6 @@
-import type { KeyboardEvent, PointerEvent } from "react";
+import type { PointerEvent } from "react";
 import { applyPaneWidth, currentPaneWidth, resetPaneWidth, type Pane } from "../panes";
 
-const STEP = 16;
-
 export function ResizeHandle({ pane }: { pane: Pane }) {
   const onPointerDown = (e: PointerEvent<HTMLDivElement>) => {
     e.preventDefault();
@@ -25,26 +23,12 @@ export function ResizeHandle({ pane }: { pane: Pane }) {
     handle.addEventListener("pointerup", onUp);
   };
 
-  const onKeyDown = (e: KeyboardEvent<HTMLDivElement>) => {
-    const towards = pane === "sidebar" ? 1 : -1;
-    if (e.key === "ArrowLeft" || e.key === "ArrowRight") {
-      e.preventDefault();
-      applyPaneWidth(pane, currentPaneWidth(pane) + (e.key === "ArrowRight" ? STEP : -STEP) * towards);
-    } else if (e.key === "Home" || e.key === "Enter") {
-      e.preventDefault();
-      resetPaneWidth(pane);
-    }
-  };
-
   return (
     <div
       className="pane-resizer"
       role="separator"
       aria-orientation="vertical"
-      aria-label={pane === "sidebar" ? "Resize chapters panel" : "Resize preview panel"}
-      tabIndex={0}
       onPointerDown={onPointerDown}
-      onKeyDown={onKeyDown}
       onDoubleClick={() => resetPaneWidth(pane)}
       title="Drag to resize · double-click to reset"
     />

src/components/RowMenu.tsx

@@ -1,29 +1,16 @@
 import { useEffect, useRef, useState } from "react";
 import { createPortal } from "react-dom";
-import { useEscapeLayer } from "../escape";
-import { useFocusTrap } from "../focus";
 import { Icon } from "./Icon";
 
 interface RowMenuProps {
   label: string;
   onDuplicate?: () => void;
-  onMove?: () => void;
   onDelete: () => void;
-  onToggleTitle?: () => void;
-  titleHidden?: boolean;
-  onToggleMargin?: () => void;
-  marginHidden?: boolean;
-  onOpenChange?: (open: boolean) => void;
   className?: string;
-  tabIndex?: number;
 }
 
-export function RowMenu({ label, onDuplicate, onMove, onDelete, onToggleTitle, titleHidden, onToggleMargin, marginHidden, onOpenChange, className = "", tabIndex }: RowMenuProps) {
+export function RowMenu({ label, onDuplicate, onDelete, className = "" }: RowMenuProps) {
   const [open, setOpen] = useState(false);
-
-  useEffect(() => {
-    onOpenChange?.(open);
-  }, [open]);
   const [coords, setCoords] = useState({ top: 0, right: 0 });
   const btnRef = useRef<HTMLButtonElement>(null);
   const popRef = useRef<HTMLDivElement>(null);
@@ -37,23 +24,6 @@ export function RowMenu({ label, onDuplicate, onMove, onDelete, onToggleTitle, t
     setOpen((v) => !v);
   };
 
-  useFocusTrap(popRef, open);
-
-  useEscapeLayer(open, () => {
-    setOpen(false);
-    btnRef.current?.focus();
-  });
-
-  const onMenuKeyDown = (e: React.KeyboardEvent) => {
-    if (e.key === "ArrowDown" || e.key === "ArrowUp") {
-      e.preventDefault();
-      const items = Array.from(popRef.current?.querySelectorAll<HTMLElement>(".row-menu-item") ?? []);
-      const idx = items.indexOf(document.activeElement as HTMLElement);
-      const nextIdx = e.key === "ArrowDown" ? (idx + 1) % items.length : (idx - 1 + items.length) % items.length;
-      items[nextIdx]?.focus();
-    }
-  };
-
   useEffect(() => {
     if (!open) return;
     const onDown = (e: MouseEvent) => {
@@ -71,30 +41,12 @@ export function RowMenu({ label, onDuplicate, onMove, onDelete, onToggleTitle, t
     };
   }, [open]);
 
-  const toggleTitle = (e: React.MouseEvent) => {
-    e.stopPropagation();
-    setOpen(false);
-    onToggleTitle?.();
-  };
-
-  const toggleMargin = (e: React.MouseEvent) => {
-    e.stopPropagation();
-    setOpen(false);
-    onToggleMargin?.();
-  };
-
   const duplicate = (e: React.MouseEvent) => {
     e.stopPropagation();
     setOpen(false);
     onDuplicate?.();
   };
 
-  const moveOut = (e: React.MouseEvent) => {
-    e.stopPropagation();
-    setOpen(false);
-    onMove?.();
-  };
-
   const remove = (e: React.MouseEvent) => {
     e.stopPropagation();
     setOpen(false);
@@ -107,7 +59,6 @@ export function RowMenu({ label, onDuplicate, onMove, onDelete, onToggleTitle, t
         ref={btnRef}
         className={`row-menu-btn ${className}`}
         data-open={open}
-        tabIndex={tabIndex}
         title={label}
         onMouseDown={(e) => e.stopPropagation()}
         onClick={toggle}
@@ -116,39 +67,13 @@ export function RowMenu({ label, onDuplicate, onMove, onDelete, onToggleTitle, t
       </button>
       {open &&
         createPortal(
-          <div ref={popRef} className="row-menu-pop" style={{ top: coords.top, right: coords.right }} onKeyDown={onMenuKeyDown}>
-            {onToggleTitle && (
-              <button className="row-menu-item" onClick={toggleTitle}>
-                {titleHidden ? (
-                  <Icon d="M1 12s4-8 11-8 11 8 11 8-4 8-11 8-11-8-11-8z M12 9a3 3 0 1 0 0 6 3 3 0 0 0 0-6z" size={14} />
-                ) : (
-                  <Icon d="M17.94 17.94A10.07 10.07 0 0 1 12 20c-7 0-11-8-11-8a18.45 18.45 0 0 1 5.06-5.94M9.9 4.24A9.12 9.12 0 0 1 12 4c7 0 11 8 11 8a18.5 18.5 0 0 1-2.16 3.19m-6.72-1.07a3 3 0 1 1-4.24-4.24M1 1l22 22" size={14} />
-                )}
-                {titleHidden ? "Show title" : "Hide title"}
-              </button>
-            )}
-            {onToggleMargin && (
-              <button className="row-menu-item" onClick={toggleMargin}>
-                {marginHidden ? (
-                  <Icon d="M4 5h16 M12 10v10 M8 16l4 4 4-4" size={14} />
-                ) : (
-                  <Icon d="M4 5h16 M12 20V10 M8 14l4-4 4 4" size={14} />
-                )}
-                {marginHidden ? "Show top margin" : "Hide top margin"}
-              </button>
-            )}
+          <div ref={popRef} className="row-menu-pop" style={{ top: coords.top, right: coords.right }}>
             {onDuplicate && (
               <button className="row-menu-item" onClick={duplicate}>
                 <Icon d="M9 9h11v11h-11z M6 15V5h9" size={14} />
                 Duplicate
               </button>
             )}
-            {onMove && (
-              <button className="row-menu-item" onClick={moveOut}>
-                <Icon d="M4 12h13M13 8l4 4-4 4M20 4v16" size={14} />
-                Move to book…
-              </button>
-            )}
             <button className="row-menu-item danger" onClick={remove}>
               <Icon d="M5 7h14M10 7V5h4v2M7 7l1 13h8l1-13M10 11v6M14 11v6" size={14} />
               Delete

src/components/Settings.tsx

@@ -1,20 +1,6 @@
-import { useEffect, useRef, useState } from "react";
+import { useState } from "react";
 import type { ReactNode } from "react";
 import { useBook } from "../store/useBook";
-import { listSystemFonts } from "../ipc";
-import {
-  type BookFonts,
-  type FontRef,
-  BUNDLED_FONTS,
-  DEFAULT_FONTS,
-  FONT_PAIRINGS,
-  decodeRef,
-  encodeRef,
-  fontStack,
-  pairingFor,
-} from "../model/fonts";
-import { useEscapeLayer } from "../escape";
-import { useFocusTrap } from "../focus";
 import { Icon } from "./Icon";
 
 const LANGUAGES = [
@@ -26,8 +12,6 @@ const LANGUAGES = [
   { value: "pt", label: "Portuguese" },
 ];
 
-let systemFontCache: string[] | null = null;
-
 interface Draft {
   title: string;
   subtitle: string;
@@ -35,7 +19,6 @@ interface Draft {
   isbn: string;
   language: string;
   bleed: boolean;
-  fonts: BookFonts;
 }
 
 function Field({ label, children }: { label: string; children: ReactNode }) {
@@ -47,30 +30,6 @@ function Field({ label, children }: { label: string; children: ReactNode }) {
   );
 }
 
-function FontSelect({ value, system, onChange }: { value: FontRef; system: string[]; onChange: (ref: FontRef) => void }) {
-  const extra = value.kind === "system" && !system.includes(value.family) ? [value.family] : [];
-  return (
-    <select value={encodeRef(value)} style={{ fontFamily: fontStack(value) }} onChange={(e) => onChange(decodeRef(e.target.value))}>
-      <optgroup label="Bundled">
-        {BUNDLED_FONTS.map((f) => (
-          <option key={f.id} value={`b:${f.id}`}>
-            {f.label}
-          </option>
-        ))}
-      </optgroup>
-      {(system.length > 0 || extra.length > 0) && (
-        <optgroup label="System">
-          {[...extra, ...system].map((name) => (
-            <option key={name} value={`s:${name}`}>
-              {name}
-            </option>
-          ))}
-        </optgroup>
-      )}
-    </select>
-  );
-}
-
 export function Settings({ onClose, onSave }: { onClose: () => void; onSave: () => void }) {
   const book = useBook((s) => s.book);
   const setMetadata = useBook((s) => s.setMetadata);
@@ -83,48 +42,23 @@ export function Settings({ onClose, onSave }: { onClose: () => void; onSave: ()
     isbn: book?.metadata.isbn ?? "",
     language: book?.metadata.language ?? "en",
     bleed: book?.settings.bleed ?? true,
-    fonts: book?.settings.fonts ?? DEFAULT_FONTS,
   }));
-  const [system, setSystem] = useState<string[]>(() => systemFontCache ?? []);
-  const [advanced, setAdvanced] = useState(() => pairingFor(draft.fonts) === null);
-  const panelRef = useRef<HTMLDivElement>(null);
-  const titleRef = useRef<HTMLInputElement>(null);
-
-  useEffect(() => {
-    titleRef.current?.focus();
-    titleRef.current?.select();
-  }, []);
-
-  useEffect(() => {
-    if (systemFontCache) return;
-    listSystemFonts().then((fonts) => {
-      systemFontCache = fonts;
-      setSystem(fonts);
-    });
-  }, []);
-
-  useEscapeLayer(true, onClose);
-  useFocusTrap(panelRef);
 
   if (!book) return null;
 
   const set = (patch: Partial<Draft>) => setDraft((d) => ({ ...d, ...patch }));
-  const setFont = (slot: "body" | "heading", ref: FontRef) => set({ fonts: { ...draft.fonts, [slot]: ref } });
-
-  const activePreset = pairingFor(draft.fonts);
-  const usesSystem = draft.fonts.body.kind === "system" || draft.fonts.heading.kind === "system";
 
   const save = () => {
-    const { bleed, fonts, ...metadata } = draft;
+    const { bleed, ...metadata } = draft;
     setMetadata(metadata);
-    setSettings({ bleed, fonts });
+    setSettings({ bleed });
     onSave();
     onClose();
   };
 
   return (
     <div className="overlay" onClick={onClose}>
-      <div ref={panelRef} className="panel" onClick={(e) => e.stopPropagation()}>
+      <div className="panel" onClick={(e) => e.stopPropagation()}>
         <div className="panel-head">
           <h2>Book setup</h2>
           <button className="icon-btn" onClick={onClose} title="Close">
@@ -133,7 +67,7 @@ export function Settings({ onClose, onSave }: { onClose: () => void; onSave: ()
         </div>
         <div className="panel-body">
           <Field label="Title">
-            <input ref={titleRef} value={draft.title} placeholder="Untitled" onChange={(e) => set({ title: e.target.value })} />
+            <input value={draft.title} placeholder="Untitled" onChange={(e) => set({ title: e.target.value })} />
           </Field>
           <Field label="Subtitle">
             <input value={draft.subtitle} onChange={(e) => set({ subtitle: e.target.value })} />
@@ -153,51 +87,6 @@ export function Settings({ onClose, onSave }: { onClose: () => void; onSave: ()
               ))}
             </select>
           </Field>
-
-          <div className="field">
-            <span className="field-label">Typography</span>
-            <div className="font-presets">
-              {FONT_PAIRINGS.map((p) => (
-                <button
-                  key={p.id}
-                  type="button"
-                  className="font-preset"
-                  data-on={activePreset === p.id}
-                  onClick={() => set({ fonts: { body: p.body, heading: p.heading } })}
-                >
-                  <span className="font-preset-demo" style={{ fontFamily: fontStack(p.heading) }}>
-                    Ag
-                  </span>
-                  <span className="font-preset-name">{p.label}</span>
-                </button>
-              ))}
-            </div>
-            <button type="button" className="font-advanced" onClick={() => setAdvanced((v) => !v)}>
-              {advanced ? "Hide custom fonts" : "Customize fonts"}
-            </button>
-          </div>
-
-          {advanced && (
-            <>
-              <Field label="Body font">
-                <FontSelect value={draft.fonts.body} system={system} onChange={(ref) => setFont("body", ref)} />
-              </Field>
-              <Field label="Heading font">
-                <FontSelect value={draft.fonts.heading} system={system} onChange={(ref) => setFont("heading", ref)} />
-              </Field>
-              {usesSystem && (
-                <p className="font-note">System fonts preview here but may not embed in exported PDF or EPUB, so they can look different on other devices.</p>
-              )}
-            </>
-          )}
-
-          <div className="font-sample" style={{ fontFamily: fontStack(draft.fonts.body) }}>
-            <span className="font-sample-title" style={{ fontFamily: fontStack(draft.fonts.heading) }}>
-              Chapter One
-            </span>
-            She read the first line twice, and the whole quiet house seemed to lean in to listen.
-          </div>
-
           <label className="check">
             <input type="checkbox" checked={draft.bleed} onChange={(e) => set({ bleed: e.target.checked })} />
             Add bleed for full-page images (print)

src/components/Sidebar.tsx

@@ -1,20 +1,15 @@
 import { useEffect, useRef, useState } from "react";
 import { COVER_ID, useBook } from "../store/useBook";
-import { type Chapter, type ChapterKind, bodyNumber, chapterKind, partNumber, partRoman } from "../model/book";
+import { type Chapter, type ChapterKind, bodyNumber, chapterKind } from "../model/book";
 import { AddPageMenu } from "./AddPageMenu";
 import { ConfirmDialog } from "./ConfirmDialog";
 import { Icon } from "./Icon";
 import { RowMenu } from "./RowMenu";
-import { MoveChapterDialog } from "./MoveChapterDialog";
-import { relativeTime } from "../time";
-import { isDesktop } from "../ipc";
 
 interface Row {
   chapter: Chapter;
   index: number;
   num: number | null;
-  part: number | null;
-  indent: boolean;
 }
 
 interface DropTarget {
@@ -22,16 +17,33 @@ interface DropTarget {
   index: number;
 }
 
-export function Sidebar({ onNavigate }: { onNavigate?: () => void }) {
+function formatEdited(ts: number, now: number): string {
+  const diff = Math.max(0, now - ts);
+  const min = 60_000;
+  const hour = 60 * min;
+  const day = 24 * hour;
+  if (diff < min) return "just now";
+  if (diff < hour) {
+    const m = Math.floor(diff / min);
+    return `${m} minute${m === 1 ? "" : "s"} ago`;
+  }
+  if (diff < day) {
+    const h = Math.floor(diff / hour);
+    return `${h} hour${h === 1 ? "" : "s"} ago`;
+  }
+  if (diff < 2 * day) return "yesterday";
+  const d = Math.floor(diff / day);
+  if (d < 7) return `${d} days ago`;
+  return new Date(ts).toLocaleDateString(undefined, { month: "short", day: "numeric", year: "numeric" });
+}
+
+export function Sidebar() {
   const chapters = useBook((s) => s.book?.chapters ?? []);
   const activeChapterId = useBook((s) => s.activeChapterId);
   const setActiveChapter = useBook((s) => s.setActiveChapter);
   const addChapter = useBook((s) => s.addChapter);
   const addPage = useBook((s) => s.addPage);
-  const addPart = useBook((s) => s.addPart);
   const duplicateChapter = useBook((s) => s.duplicateChapter);
-  const setChapterNoTitle = useBook((s) => s.setChapterNoTitle);
-  const setChapterNoMargin = useBook((s) => s.setChapterNoMargin);
   const deleteChapter = useBook((s) => s.deleteChapter);
   const moveChapter = useBook((s) => s.moveChapter);
   const closeBook = useBook((s) => s.closeBook);
@@ -39,8 +51,6 @@ export function Sidebar({ onNavigate }: { onNavigate?: () => void }) {
   const [dragIndex, setDragIndex] = useState<number | null>(null);
   const [dropTarget, setDropTarget] = useState<DropTarget | null>(null);
   const [pendingDelete, setPendingDelete] = useState<{ id: string; title: string } | null>(null);
-  const [pendingMove, setPendingMove] = useState<{ chapter: Chapter; label: string } | null>(null);
-  const [menuOpenId, setMenuOpenId] = useState<string | null>(null);
   const [now, setNow] = useState(() => Date.now());
 
   const dropRef = useRef<DropTarget | null>(null);
@@ -52,23 +62,15 @@ export function Sidebar({ onNavigate }: { onNavigate?: () => void }) {
     return () => clearInterval(timer);
   }, []);
 
-  const rows: Row[] = chapters.map((chapter, index) => ({
-    chapter,
-    index,
-    num: bodyNumber(chapters, index),
-    part: partNumber(chapters, index),
-    indent: chapterKind(chapter) === "body" && chapters.slice(0, index).some((c) => chapterKind(c) === "part"),
-  }));
-  const inBody = (r: Row) => chapterKind(r.chapter) === "body" || chapterKind(r.chapter) === "part";
+  const rows: Row[] = chapters.map((chapter, index) => ({ chapter, index, num: bodyNumber(chapters, index) }));
   const groups: { kind: ChapterKind; label: string; rows: Row[] }[] = [
     { kind: "front", label: "Front matter", rows: rows.filter((r) => chapterKind(r.chapter) === "front") },
-    { kind: "body", label: "Chapters", rows: rows.filter(inBody) },
+    { kind: "body", label: "Chapters", rows: rows.filter((r) => chapterKind(r.chapter) === "body") },
     { kind: "back", label: "Back matter", rows: rows.filter((r) => chapterKind(r.chapter) === "back") },
   ];
   const groupEnd: Record<ChapterKind, number> = {
     front: groups[0].rows.length,
     body: groups[0].rows.length + groups[1].rows.length,
-    part: groups[0].rows.length + groups[1].rows.length,
     back: rows.length,
   };
 
@@ -123,7 +125,7 @@ export function Sidebar({ onNavigate }: { onNavigate?: () => void }) {
   };
 
   const onRowPointerDown = (e: React.PointerEvent, index: number) => {
-    if (e.button !== 0 || chapters[index]?.id === menuOpenId || (e.target as HTMLElement).closest(".row-menu-btn")) return;
+    if (e.button !== 0 || (e.target as HTMLElement).closest(".row-menu-btn")) return;
     suppressClick.current = false;
     gesture.current = { from: index, x: e.clientX, y: e.clientY, active: false };
     window.addEventListener("pointermove", onPointerMove);
@@ -136,37 +138,8 @@ export function Sidebar({ onNavigate }: { onNavigate?: () => void }) {
       return;
     }
     setActiveChapter(id);
-    onNavigate?.();
   };
 
-  const focusRow = (id: string) =>
-    requestAnimationFrame(() => {
-      document.querySelector<HTMLElement>(`.chapter[data-id="${CSS.escape(id)}"]`)?.focus();
-    });
-
-  const onRowKeyDown = (e: React.KeyboardEvent, index: number, id: string) => {
-    if ((e.target as HTMLElement).closest(".row-menu-btn")) return;
-    if (e.key === "Enter" || e.key === " ") {
-      e.preventDefault();
-      setActiveChapter(id);
-      onNavigate?.();
-    } else if (e.key === "ArrowDown" || e.key === "ArrowUp" || e.key === "Home" || e.key === "End") {
-      e.preventDefault();
-      const target =
-        e.key === "Home"
-          ? chapters[0]
-          : e.key === "End"
-            ? chapters[chapters.length - 1]
-            : chapters[index + (e.key === "ArrowDown" ? 1 : -1)];
-      if (target) {
-        setActiveChapter(target.id);
-        focusRow(target.id);
-      }
-    }
-  };
-
-  const tabStopId = chapters.some((c) => c.id === activeChapterId) ? activeChapterId : chapters[0]?.id;
-
   return (
     <aside className="sidebar">
       <button className="brand" onClick={closeBook} title="All books">
@@ -176,15 +149,12 @@ export function Sidebar({ onNavigate }: { onNavigate?: () => void }) {
       <button
         className="cover-item"
         data-active={activeChapterId === COVER_ID}
-        onClick={() => {
-          setActiveChapter(COVER_ID);
-          onNavigate?.();
-        }}
+        onClick={() => setActiveChapter(COVER_ID)}
       >
         <Icon d="M5 4h11l3 3v13H5zM16 4v4h3" size={15} />
         <span className="title">Cover</span>
       </button>
-      <AddPageMenu onAdd={addPage} onAddPart={addPart} />
+      <AddPageMenu onAdd={addPage} />
 
       <div className="nav-scroll">
         {groups.map((group) =>
@@ -192,41 +162,24 @@ export function Sidebar({ onNavigate }: { onNavigate?: () => void }) {
             <div key={group.kind} className="nav-section" data-kind={group.kind}>
               <div className="nav-label">{group.label}</div>
               <ul className="chapters">
-                {group.rows.map((row, i) => {
-                  const isPart = chapterKind(row.chapter) === "part";
-                  const partLabel = `Part ${partRoman(row.part ?? 0)}`;
-                  const rowLabel = isPart
-                    ? row.chapter.title
-                      ? `${partLabel}: ${row.chapter.title}`
-                      : partLabel
-                    : row.chapter.title || "Untitled";
-                  return (
+                {group.rows.map((row, i) => (
                   <li
                     key={row.chapter.id}
                     className="chapter"
                     data-idx={row.index}
-                    data-id={row.chapter.id}
                     data-kind={group.kind}
-                    data-part={isPart}
-                    data-indent={row.indent}
                     data-active={row.chapter.id === activeChapterId}
                     data-dragging={dragIndex === row.index}
                     data-drop-before={dropTarget?.kind === group.kind && dropTarget.index === row.index}
                     data-drop-after={dropTarget?.kind === group.kind && i === group.rows.length - 1 && dropTarget.index === row.index + 1}
-                    role="button"
-                    tabIndex={row.chapter.id === tabStopId ? 0 : -1}
-                    aria-current={row.chapter.id === activeChapterId}
                     onClick={() => onRowClick(row.chapter.id)}
-                    onKeyDown={(e) => onRowKeyDown(e, row.index, row.chapter.id)}
                     onPointerDown={(e) => onRowPointerDown(e, row.index)}
                   >
                     <span className="grip" title="Drag to reorder">
                       <Icon d="M9 6h.01M15 6h.01M9 12h.01M15 12h.01M9 18h.01M15 18h.01" size={14} />
                     </span>
-                    {!isPart && <span className="num">{row.num ?? ""}</span>}
+                    <span className="num">{row.num ?? ""}</span>
                     <span className="text">
-                      {isPart && <span className="part-eyebrow">Part {partRoman(row.part ?? 0)}</span>}
-                      {(!isPart || row.chapter.title) && (
                       <span
                         className="title"
                         onMouseEnter={(e) => {
@@ -237,28 +190,17 @@ export function Sidebar({ onNavigate }: { onNavigate?: () => void }) {
                       >
                         {row.chapter.title || "Untitled"}
                       </span>
-                      )}
                       {row.chapter.id === activeChapterId && (
-                        <span className="meta">Edited {relativeTime(row.chapter.updatedAt, now)}</span>
+                        <span className="meta">Edited {formatEdited(row.chapter.updatedAt, now)}</span>
                       )}
                     </span>
                     <RowMenu
                       label="Page options"
-                      tabIndex={row.chapter.id === tabStopId ? 0 : -1}
-                      onOpenChange={(open) =>
-                        setMenuOpenId((cur) => (open ? row.chapter.id : cur === row.chapter.id ? null : cur))
-                      }
-                      titleHidden={!!row.chapter.noTitle}
-                      onToggleTitle={() => setChapterNoTitle(row.chapter.id, !row.chapter.noTitle)}
-                      marginHidden={!!row.chapter.noMargin}
-                      onToggleMargin={() => setChapterNoMargin(row.chapter.id, !row.chapter.noMargin)}
                       onDuplicate={() => duplicateChapter(row.chapter.id)}
-                      onMove={isDesktop ? () => setPendingMove({ chapter: row.chapter, label: rowLabel }) : undefined}
-                      onDelete={() => setPendingDelete({ id: row.chapter.id, title: rowLabel })}
+                      onDelete={() => setPendingDelete({ id: row.chapter.id, title: row.chapter.title || "Untitled" })}
                     />
                   </li>
-                  );
-                })}
+                ))}
                 {!group.rows.length && (
                   <li className="chapter-drop" data-on={dropTarget?.kind === group.kind}>
                     Drop here
@@ -266,13 +208,7 @@ export function Sidebar({ onNavigate }: { onNavigate?: () => void }) {
                 )}
               </ul>
               {group.kind === "body" && (
-                <button
-                  className="add-chapter"
-                  onClick={() => {
-                    addChapter();
-                    onNavigate?.();
-                  }}
-                >
+                <button className="add-chapter" onClick={addChapter}>
                   <Icon d="M12 5v14M5 12h14" />
                   New chapter
                 </button>
@@ -282,14 +218,6 @@ export function Sidebar({ onNavigate }: { onNavigate?: () => void }) {
         )}
       </div>
 
-      {pendingMove && (
-        <MoveChapterDialog
-          chapter={pendingMove.chapter}
-          label={pendingMove.label}
-          onClose={() => setPendingMove(null)}
-        />
-      )}
-
       {pendingDelete && (
         <ConfirmDialog
           title="Delete"

src/components/UpdateDialog.tsx

@@ -1,111 +0,0 @@
-import { useRef } from "react";
-import { useUpdater } from "../store/useUpdater";
-import { installUpdate, dismissUpdate } from "../updater";
-import { useEscapeLayer } from "../escape";
-import { useFocusTrap } from "../focus";
-import { Icon } from "./Icon";
-
-const TITLES: Record<string, string> = {
-  checking: "Check for Updates",
-  available: "Update Available",
-  downloading: "Updating margin",
-  installing: "Updating margin",
-  uptodate: "Check for Updates",
-  error: "Update Failed",
-};
-
-export function UpdateDialog() {
-  const phase = useUpdater((s) => s.phase);
-  const version = useUpdater((s) => s.version);
-  const notes = useUpdater((s) => s.notes);
-  const downloaded = useUpdater((s) => s.downloaded);
-  const total = useUpdater((s) => s.total);
-  const error = useUpdater((s) => s.error);
-
-  const busy = phase === "downloading" || phase === "installing";
-  const panelRef = useRef<HTMLDivElement>(null);
-  useEscapeLayer(phase !== "idle" && !busy, dismissUpdate);
-  useFocusTrap(panelRef, phase !== "idle");
-
-  if (phase === "idle") return null;
-
-  const pct = total > 0 ? Math.min(100, Math.round((downloaded / total) * 100)) : 0;
-  const close = busy ? undefined : dismissUpdate;
-
-  return (
-    <div className="overlay" onClick={close}>
-      <div ref={panelRef} className="panel panel-confirm" onClick={(e) => e.stopPropagation()}>
-        <div className="panel-head">
-          <h2>{TITLES[phase]}</h2>
-          {!busy && (
-            <button className="icon-btn" onClick={dismissUpdate} title="Close">
-              <Icon d="M6 6l12 12M18 6L6 18" />
-            </button>
-          )}
-        </div>
-
-        <div className="panel-body">
-          {phase === "checking" && (
-            <div className="update-status-row">
-              <span className="update-spinner" />
-              <span>Checking for updates…</span>
-            </div>
-          )}
-
-          {phase === "uptodate" && <p className="confirm-text">margin is up to date.</p>}
-
-          {phase === "available" && (
-            <>
-              <p className="confirm-text">
-                <strong>margin {version}</strong> is available.
-              </p>
-              {notes && <div className="update-notes">{notes}</div>}
-            </>
-          )}
-
-          {phase === "downloading" && (
-            <>
-              <div className={`update-progress${total > 0 ? "" : " indeterminate"}`}>
-                <div className="update-progress-fill" style={total > 0 ? { width: `${pct}%` } : undefined} />
-              </div>
-              <p className="update-status">{total > 0 ? `Downloading update… ${pct}%` : "Downloading update…"}</p>
-            </>
-          )}
-
-          {phase === "installing" && (
-            <div className="update-status-row">
-              <span className="update-spinner" />
-              <span>Installing update. margin will restart…</span>
-            </div>
-          )}
-
-          {phase === "error" && (
-            <>
-              <p className="confirm-text">Could not update margin.</p>
-              {error && <div className="update-notes">{error}</div>}
-            </>
-          )}
-        </div>
-
-        {phase === "available" && (
-          <div className="panel-foot">
-            <button className="btn-ghost" onClick={dismissUpdate}>
-              Later
-            </button>
-            <button className="btn-primary" onClick={installUpdate}>
-              Install &amp; Restart
-            </button>
-          </div>
-        )}
-
-        {(phase === "uptodate" || phase === "error") && (
-          <div className="panel-foot">
-            <button className="btn-primary" onClick={dismissUpdate}>
-              OK
-            </button>
-          </div>
-        )}
-      </div>
-    </div>
-  );
-}

src/editor/Editor.tsx

@@ -1,10 +1,8 @@
-import { useEffect, useLayoutEffect, useRef, useState } from "react";
-import { EditorContent, type Editor as TiptapEditor } from "@tiptap/react";
-import { EditorState } from "@tiptap/pm/state";
+import { useEffect, useRef } from "react";
+import { EditorContent, useEditor, type Editor as TiptapEditor } from "@tiptap/react";
 import type { JSONContent } from "@tiptap/core";
+import { editorExtensions } from "./extensions";
 import { loadPosition, savePosition, type ChapterPosition } from "./positions";
-import { loadChapterState, saveChapterState, sharedEditor, type ChapterState } from "./session";
-import { useBook } from "../store/useBook";
 
 interface EditorProps {
   bookId: string;
@@ -15,127 +13,67 @@ interface EditorProps {
   onContentError: (error: Error) => void;
 }
 
-function buildState(editor: TiptapEditor, content: JSONContent, onError: (error: Error) => void): EditorState {
-  const base = editor.view.state;
-  try {
-    const doc = editor.schema.nodeFromJSON(content);
-    doc.check();
-    return EditorState.create({ doc, plugins: base.plugins });
-  } catch (error) {
-    onError(error as Error);
-    return EditorState.create({ schema: base.schema, plugins: base.plugins });
-  }
-}
-
-function stillMatches(editor: TiptapEditor, entry: ChapterState, content: JSONContent): boolean {
-  if (entry.state.schema !== editor.schema) return false;
-  if (entry.content === content) return true;
-  try {
-    return entry.state.doc.eq(editor.schema.nodeFromJSON(content));
-  } catch {
-    return false;
-  }
-}
-
 export function Editor({ bookId, chapterId, content, onChange, onReady, onContentError }: EditorProps) {
   const onChangeRef = useRef(onChange);
   onChangeRef.current = onChange;
   const onContentErrorRef = useRef(onContentError);
   onContentErrorRef.current = onContentError;
 
-  const [editor] = useState(() =>
-    sharedEditor({
-      onUpdate: (next) => onChangeRef.current(next),
-      onContentError: (error) => onContentErrorRef.current(error),
-    })
-  );
-
-  const active = useRef({ bookId: "", chapterId: "" });
   const latest = useRef<ChapterPosition | null>(null);
-  const restoreToken = useRef(0);
 
-  const scrollerOf = (ed: TiptapEditor) => ed.view.dom.closest(".editor-pane") as HTMLElement | null;
-
-  const restorePosition = (ed: TiptapEditor, id: string, focus: boolean) => {
-    const scroller = scrollerOf(ed);
-    const saved = loadPosition(bookId, id);
-    const size = ed.state.doc.content.size;
-    const selection = saved ? { from: Math.min(saved.from, size), to: Math.min(saved.to, size) } : 0;
-    const chain = ed.chain().setTextSelection(selection);
-    if (focus) chain.focus(undefined, { scrollIntoView: false });
-    chain.run();
-    if (scroller) {
-      const token = ++restoreToken.current;
-      const top = saved?.scroll ?? 0;
-      const apply = () => {
-        if (restoreToken.current === token) scroller.scrollTop = top;
-      };
-      apply();
-      requestAnimationFrame(apply);
-      document.fonts?.ready.then(apply).catch(() => {});
-    }
-  };
-
-  const stash = (ed: TiptapEditor) => {
-    const { bookId: prevBook, chapterId: prevChapter } = active.current;
-    if (!prevChapter) return;
-    const scroller = scrollerOf(ed);
-    const { from, to } = ed.state.selection;
-    const scroll = scroller?.scrollTop ?? loadChapterState(prevBook, prevChapter)?.scroll ?? 0;
-    const stored = useBook.getState().book?.chapters.find((c) => c.id === prevChapter)?.content ?? ed.getJSON();
-    saveChapterState(prevBook, prevChapter, { state: ed.view.state, content: stored, scroll });
-    savePosition(prevBook, prevChapter, { from, to, scroll });
-  };
-
-  const applyChapter = (ed: TiptapEditor, id: string, next: JSONContent, focus: boolean) => {
-    const entry = loadChapterState(bookId, id);
-    if (entry && stillMatches(ed, entry, next)) {
-      entry.content = next;
-      ed.view.updateState(entry.state);
-      const scroller = scrollerOf(ed);
-      if (scroller) scroller.scrollTop = entry.scroll;
-      ++restoreToken.current;
-      if (focus) ed.commands.focus(undefined, { scrollIntoView: false });
-      return;
-    }
-    ed.view.updateState(buildState(ed, next, onContentErrorRef.current));
-    saveChapterState(bookId, id, { state: ed.view.state, content: next, scroll: 0 });
-    restorePosition(ed, id, focus);
-  };
-
-  useLayoutEffect(() => {
-    const prev = active.current;
-    if (prev.bookId === bookId && prev.chapterId === chapterId) return;
-    stash(editor);
-    applyChapter(editor, chapterId, content, !prev.chapterId);
-    active.current = { bookId, chapterId };
-    latest.current = null;
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [bookId, chapterId, content, editor]);
+  const editor = useEditor({
+    extensions: editorExtensions,
+    content,
+    immediatelyRender: false,
+    enableContentCheck: true,
+    editorProps: { attributes: { class: "prose" } },
+    onContentError: ({ error }) => onContentErrorRef.current(error),
+    onUpdate: ({ editor }) => onChangeRef.current(editor.getJSON()),
+  });
 
   useEffect(() => {
     onReady(editor);
+    return () => onReady(null);
+  }, [editor, onReady]);
+
+  useEffect(() => {
+    if (!editor) return;
+    let active = true;
+    const scroller = editor.view.dom.closest(".editor-pane") as HTMLElement | null;
+
+    const saved = loadPosition(bookId, chapterId);
+    const size = editor.state.doc.content.size;
+    const selection = saved ? { from: Math.min(saved.from, size), to: Math.min(saved.to, size) } : 0;
+    editor.chain().setTextSelection(selection).focus(undefined, { scrollIntoView: false }).run();
+
+    if (scroller) {
+      const top = saved?.scroll ?? 0;
+      const restore = () => {
+        if (active) scroller.scrollTop = top;
+      };
+      restore();
+      requestAnimationFrame(restore);
+      document.fonts?.ready.then(restore).catch(() => {});
+    }
+
     return () => {
-      stash(editor);
-      onReady(null);
+      active = false;
     };
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [editor]);
 
   useEffect(() => {
-    const scroller = scrollerOf(editor);
+    if (!editor) return;
+    const scroller = editor.view.dom.closest(".editor-pane") as HTMLElement | null;
     let timer: ReturnType<typeof setTimeout>;
     const capture = () => {
       const { from, to } = editor.state.selection;
-      const scroll = scroller?.scrollTop ?? 0;
-      latest.current = { from, to, scroll };
-      const entry = loadChapterState(active.current.bookId, active.current.chapterId);
-      if (entry) entry.scroll = scroll;
+      latest.current = { from, to, scroll: scroller?.scrollTop ?? 0 };
     };
     const persist = () => {
       capture();
       clearTimeout(timer);
-      timer = setTimeout(() => savePosition(active.current.bookId, active.current.chapterId, latest.current!), 400);
+      timer = setTimeout(() => savePosition(bookId, chapterId, latest.current!), 400);
     };
     editor.on("selectionUpdate", persist);
     scroller?.addEventListener("scroll", persist, { passive: true });
@@ -143,9 +81,9 @@ export function Editor({ bookId, chapterId, content, onChange, onReady, onConten
       clearTimeout(timer);
       editor.off("selectionUpdate", persist);
       scroller?.removeEventListener("scroll", persist);
-      if (latest.current) savePosition(active.current.bookId, active.current.chapterId, latest.current);
+      if (latest.current) savePosition(bookId, chapterId, latest.current);
     };
-  }, [editor]);
+  }, [editor, bookId, chapterId]);
 
   return <EditorContent editor={editor} className="editor-host" />;
 }

src/editor/FigureView.tsx

@@ -20,14 +20,6 @@ export function FigureView({ node, updateAttributes, selected }: NodeViewProps)
   const baseWidth = node.attrs.width ?? FIGURE_WIDTH[placement as FigurePlacement] ?? 100;
   const width = resizable ? (dragWidth ?? baseWidth) : null;
 
-  const nudge = (delta: number) => updateAttributes({ width: clampWidth((width ?? baseWidth) + delta) });
-
-  const onHandleKey = (e: React.KeyboardEvent) => {
-    if (e.key !== "ArrowLeft" && e.key !== "ArrowRight") return;
-    e.preventDefault();
-    nudge(e.key === "ArrowRight" ? 5 : -5);
-  };
-
   const startResize = (e: React.PointerEvent) => {
     e.preventDefault();
     const wrapper = frameRef.current?.closest(".figure") as HTMLElement | null;
@@ -60,13 +52,7 @@ export function FigureView({ node, updateAttributes, selected }: NodeViewProps)
       <div className="figure-frame" ref={frameRef}>
         {src ? <img src={src} alt={alt} /> : <div className="figure-empty">No image</div>}
         {selected && src && resizable && (
-          <button
-            className="figure-handle"
-            aria-label="Resize image"
-            title="Drag or press arrow keys to resize"
-            onPointerDown={startResize}
-            onKeyDown={onHandleKey}
-          />
+          <div className="figure-handle" onPointerDown={startResize} title="Drag to resize" />
         )}
       </div>
       <input

src/editor/FloatingToolbar.tsx

@@ -1,15 +1,6 @@
 import { useEffect, useReducer, useRef, useState, type ReactNode } from "react";
 import type { Editor } from "@tiptap/react";
 import { Icon } from "../components/Icon";
-import { useEscapeLayer } from "../escape";
-import { useFocusTrap } from "../focus";
-import type { Alignment } from "./align";
-
-const ALIGN_ICONS: Record<Alignment, string> = {
-  left: "M4 7h16M4 12h10M4 17h13",
-  center: "M4 7h16M7 12h10M5 17h14",
-  right: "M4 7h16M10 12h10M7 17h13",
-};
 
 function readImage(file: File): Promise<string> {
   return new Promise((resolve, reject) => {
@@ -29,21 +20,14 @@ function normalizeUrl(url: string): string {
 
 export function FloatingToolbar({ editor }: { editor: Editor | null }) {
   const fileRef = useRef<HTMLInputElement>(null);
-  const linkPopRef = useRef<HTMLDivElement>(null);
-  const alignPopRef = useRef<HTMLDivElement>(null);
+  const linkInputRef = useRef<HTMLInputElement>(null);
   const [linkOpen, setLinkOpen] = useState(false);
   const [linkValue, setLinkValue] = useState("");
-  const [alignOpen, setAlignOpen] = useState(false);
   const [, forceUpdate] = useReducer((x) => x + 1, 0);
 
-  const openLink = () => {
-    if (!editor) return;
-    setLinkValue((editor.getAttributes("link").href as string) ?? "");
-    setLinkOpen(true);
-  };
-
-  useFocusTrap(linkPopRef, linkOpen);
-  useFocusTrap(alignPopRef, alignOpen);
+  useEffect(() => {
+    if (linkOpen) linkInputRef.current?.focus();
+  }, [linkOpen]);
 
   useEffect(() => {
     if (!editor) return;
@@ -54,27 +38,6 @@ export function FloatingToolbar({ editor }: { editor: Editor | null }) {
     };
   }, [editor]);
 
-  useEffect(() => {
-    if (!editor) return;
-    const onKey = (e: KeyboardEvent) => {
-      if (e.key.toLowerCase() !== "k" || !(e.metaKey || e.ctrlKey) || e.altKey || e.shiftKey) return;
-      if (!editor.isFocused && !linkOpen) return;
-      e.preventDefault();
-      e.stopPropagation();
-      if (linkOpen) setLinkOpen(false);
-      else openLink();
-    };
-    window.addEventListener("keydown", onKey, true);
-    return () => window.removeEventListener("keydown", onKey, true);
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [editor, linkOpen]);
-
-  useEscapeLayer(linkOpen, () => {
-    setLinkOpen(false);
-    editor?.commands.focus();
-  });
-  useEscapeLayer(alignOpen, () => setAlignOpen(false));
-
   if (!editor) return null;
 
   const insertImage = async (file: File) => {
@@ -82,6 +45,11 @@ export function FloatingToolbar({ editor }: { editor: Editor | null }) {
     editor.chain().focus().insertContent({ type: "figure", attrs: { src, placement: "full-width" } }).run();
   };
 
+  const openLink = () => {
+    setLinkValue((editor.getAttributes("link").href as string) ?? "");
+    setLinkOpen(true);
+  };
+
   const applyLink = () => {
     const href = normalizeUrl(linkValue);
     if (!href) {
@@ -99,13 +67,6 @@ export function FloatingToolbar({ editor }: { editor: Editor | null }) {
     setLinkOpen(false);
   };
 
-  const align: Alignment = (editor.getAttributes("heading").align ?? editor.getAttributes("paragraph").align) || "left";
-
-  const setAlign = (value: Alignment) => {
-    editor.chain().focus().setTextAlign(value).run();
-    setAlignOpen(false);
-  };
-
   const tool = (active: boolean, onClick: () => void, title: string, content: ReactNode) => (
     <button
       className="tool"
@@ -126,36 +87,15 @@ export function FloatingToolbar({ editor }: { editor: Editor | null }) {
       {tool(editor.isActive("heading", { level: 2 }), () => editor.chain().focus().toggleHeading({ level: 2 }).run(), "Heading", <Icon d="M5 5v14M5 12h8M13 5v14" />)}
       {tool(editor.isActive("blockquote"), () => editor.chain().focus().toggleBlockquote().run(), "Quote", <Icon d="M7 8h4v4a4 4 0 0 1-4 4M14 8h4v4a4 4 0 0 1-4 4" />)}
       {tool(editor.isActive("bulletList"), () => editor.chain().focus().toggleBulletList().run(), "Bulleted list", <Icon d="M8 6h12M8 12h12M8 18h12M3.5 6h.01M3.5 12h.01M3.5 18h.01" />)}
-      <span className="tool-wrap">
-        {tool(alignOpen || align !== "left", () => setAlignOpen((v) => !v), "Align", <Icon d={ALIGN_ICONS[align]} />)}
-        {alignOpen && (
-          <>
-            <div className="link-pop-backdrop" onMouseDown={() => setAlignOpen(false)} />
-            <div ref={alignPopRef} className="align-pop" onMouseDown={(e) => e.stopPropagation()}>
-              {(["left", "center", "right"] as Alignment[]).map((value) => (
-                <button
-                  key={value}
-                  className="tool"
-                  data-on={align === value}
-                  title={`Align ${value}`}
-                  onMouseDown={(e) => e.preventDefault()}
-                  onClick={() => setAlign(value)}
-                >
-                  <Icon d={ALIGN_ICONS[value]} />
-                </button>
-              ))}
-            </div>
-          </>
-        )}
-      </span>
       <span className="tool-sep" />
       <span className="tool-wrap">
-        {tool(editor.isActive("link") || linkOpen, () => (linkOpen ? setLinkOpen(false) : openLink()), "Link (⌘K)", <Icon d="M10 13a5 5 0 0 0 7 0l2-2a5 5 0 0 0-7-7l-1 1M14 11a5 5 0 0 0-7 0l-2 2a5 5 0 0 0 7 7l1-1" />)}
+        {tool(editor.isActive("link") || linkOpen, () => (linkOpen ? setLinkOpen(false) : openLink()), "Link", <Icon d="M10 13a5 5 0 0 0 7 0l2-2a5 5 0 0 0-7-7l-1 1M14 11a5 5 0 0 0-7 0l-2 2a5 5 0 0 0 7 7l1-1" />)}
         {linkOpen && (
           <>
             <div className="link-pop-backdrop" onMouseDown={() => setLinkOpen(false)} />
-            <div ref={linkPopRef} className="link-pop" onMouseDown={(e) => e.stopPropagation()}>
+            <div className="link-pop" onMouseDown={(e) => e.stopPropagation()}>
               <input
+                ref={linkInputRef}
                 className="link-input"
                 value={linkValue}
                 placeholder="https://…"
@@ -165,6 +105,9 @@ export function FloatingToolbar({ editor }: { editor: Editor | null }) {
                   if (e.key === "Enter") {
                     e.preventDefault();
                     applyLink();
+                  } else if (e.key === "Escape") {
+                    e.preventDefault();
+                    setLinkOpen(false);
                   }
                 }}
               />

src/editor/align.ts

@@ -1,64 +0,0 @@
-import { Extension } from "@tiptap/core";
-
-export type Alignment = "left" | "center" | "right";
-
-const ALIGNED_TYPES = ["paragraph", "heading"];
-
-declare module "@tiptap/core" {
-  interface Commands<ReturnType> {
-    textAlign: {
-      setTextAlign: (align: Alignment) => ReturnType;
-    };
-  }
-}
-
-export const TextAlign = Extension.create({
-  name: "textAlign",
-
-  addGlobalAttributes() {
-    return [
-      {
-        types: ALIGNED_TYPES,
-        attributes: {
-          align: {
-            default: null,
-            keepOnSplit: true,
-            parseHTML: (el) => {
-              const value = el.style.textAlign || el.getAttribute("data-align");
-              return value === "center" || value === "right" ? value : null;
-            },
-            renderHTML: (attrs) =>
-              attrs.align ? { "data-align": attrs.align, style: `text-align: ${attrs.align}` } : {},
-          },
-        },
-      },
-    ];
-  },
-
-  addCommands() {
-    return {
-      setTextAlign:
-        (align) =>
-        ({ tr, dispatch }) => {
-          const value = align === "left" ? null : align;
-          const { from, to } = tr.selection;
-          let changed = false;
-          tr.doc.nodesBetween(from, to, (node, pos) => {
-            if (ALIGNED_TYPES.includes(node.type.name) && node.attrs.align !== value) {
-              if (dispatch) tr.setNodeAttribute(pos, "align", value);
-              changed = true;
-            }
-          });
-          return changed;
-        },
-    };
-  },
-
-  addKeyboardShortcuts() {
-    return {
-      "Mod-Shift-l": () => this.editor.commands.setTextAlign("left"),
-      "Mod-Shift-e": () => this.editor.commands.setTextAlign("center"),
-      "Mod-Shift-r": () => this.editor.commands.setTextAlign("right"),
-    };
-  },
-});

src/editor/extensions.ts

@@ -3,11 +3,8 @@ import StarterKit from "@tiptap/starter-kit";
 import Placeholder from "@tiptap/extension-placeholder";
 import { Figure } from "./figure";
 import { ParagraphIndent } from "./indent";
-import { TextAlign } from "./align";
 import { SearchHighlight } from "./search";
 import { Proofing } from "./proofing";
-import { Paste } from "./paste";
-import { Shortcuts } from "./shortcuts";
 
 export const editorExtensions: Extensions = [
   StarterKit.configure({
@@ -20,9 +17,6 @@ export const editorExtensions: Extensions = [
   }),
   Figure,
   ParagraphIndent,
-  TextAlign,
   SearchHighlight,
   Proofing,
-  Paste,
-  Shortcuts,
 ];

src/editor/paste.ts

@@ -1,76 +0,0 @@
-import { Extension } from "@tiptap/core";
-import type { JSONContent } from "@tiptap/core";
-import { Plugin } from "@tiptap/pm/state";
-
-function readImage(file: File): Promise<string> {
-  return new Promise((resolve, reject) => {
-    const reader = new FileReader();
-    reader.onload = () => resolve(reader.result as string);
-    reader.onerror = reject;
-    reader.readAsDataURL(file);
-  });
-}
-
-function imageFiles(data: DataTransfer | null): File[] {
-  if (!data) return [];
-  const files = Array.from(data.files).filter((f) => f.type.startsWith("image/"));
-  if (files.length) return files;
-  return Array.from(data.items)
-    .filter((item) => item.kind === "file" && item.type.startsWith("image/"))
-    .map((item) => item.getAsFile())
-    .filter((f): f is File => f !== null);
-}
-
-function plainContent(text: string): JSONContent[] {
-  return text
-    .replace(/\r\n?/g, "\n")
-    .split(/\n{2,}/)
-    .map((block) => {
-      const content: JSONContent[] = [];
-      block.split("\n").forEach((line, i) => {
-        if (i > 0) content.push({ type: "hardBreak" });
-        if (line) content.push({ type: "text", text: line });
-      });
-      return content.length ? { type: "paragraph", content } : { type: "paragraph" };
-    });
-}
-
-export const Paste = Extension.create({
-  name: "pasteHandler",
-
-  addKeyboardShortcuts() {
-    const editor = this.editor;
-    return {
-      "Mod-Shift-v": () => {
-        navigator.clipboard
-          .readText()
-          .then((text) => {
-            if (text) editor.chain().focus().insertContent(plainContent(text)).run();
-          })
-          .catch(() => {});
-        return true;
-      },
-    };
-  },
-
-  addProseMirrorPlugins() {
-    const editor = this.editor;
-    return [
-      new Plugin({
-        props: {
-          handlePaste(_view, event) {
-            const files = imageFiles(event.clipboardData);
-            if (!files.length) return false;
-            event.preventDefault();
-            files.forEach((file) =>
-              readImage(file).then((src) =>
-                editor.chain().focus().insertContent({ type: "figure", attrs: { src, placement: "full-width" } }).run(),
-              ),
-            );
-            return true;
-          },
-        },
-      }),
-    ];
-  },
-});

src/editor/proofing.ts

@@ -37,11 +37,10 @@ interface ProofingState {
 
 export const proofingKey = new PluginKey<ProofingState>("proofing");
 
-function buildDecorations(doc: PMNode, issues: ProofIssue[], cursor: number | null): DecorationSet {
+function buildDecorations(doc: PMNode, issues: ProofIssue[]): DecorationSet {
   const size = doc.content.size;
   const decos = issues
     .filter((i) => i.from < i.to && i.to <= size)
-    .filter((i) => cursor === null || cursor < i.from || cursor > i.to)
     .map((i) => Decoration.inline(i.from, i.to, { class: `proof-mark sev-${severityFor(i.category)}` }));
   return DecorationSet.create(doc, decos);
 }
@@ -74,11 +73,9 @@ export const Proofing = Extension.create<unknown, ProofingStorage>({
         state: {
           init: () => ({ issues: [], decorations: DecorationSet.empty }),
           apply(tr, value, _old, newState) {
-            const sel = newState.selection;
-            const cursor = sel.empty ? sel.head : null;
             const meta = tr.getMeta(proofingKey) as { issues: ProofIssue[] } | { clear: true } | undefined;
             if (meta && "issues" in meta) {
-              return { issues: meta.issues, decorations: buildDecorations(newState.doc, meta.issues, cursor) };
+              return { issues: meta.issues, decorations: buildDecorations(newState.doc, meta.issues) };
             }
             if (meta && "clear" in meta) {
               return { issues: [], decorations: DecorationSet.empty };
@@ -87,10 +84,7 @@ export const Proofing = Extension.create<unknown, ProofingStorage>({
               const issues = value.issues
                 .map((i) => ({ ...i, from: tr.mapping.map(i.from), to: tr.mapping.map(i.to) }))
                 .filter((i) => i.to > i.from);
-              return { issues, decorations: buildDecorations(newState.doc, issues, cursor) };
-            }
-            if (tr.selectionSet && value.issues.length) {
-              return { issues: value.issues, decorations: buildDecorations(newState.doc, value.issues, cursor) };
+              return { issues, decorations: value.decorations.map(tr.mapping, tr.doc) };
             }
             return value;
           },

src/editor/session.ts

@@ -1,65 +0,0 @@
-import { Editor as TiptapEditor } from "@tiptap/react";
-import type { JSONContent } from "@tiptap/core";
-import type { EditorState } from "@tiptap/pm/state";
-import { editorExtensions } from "./extensions";
-
-export interface ChapterState {
-  state: EditorState;
-  content: JSONContent;
-  scroll: number;
-}
-
-export interface EditorHooks {
-  onUpdate: (content: JSONContent) => void;
-  onContentError: (error: Error) => void;
-}
-
-const SCROLL_KEEPOUT = { top: 32, right: 0, bottom: 96, left: 0 };
-const MAX_STATES = 24;
-
-const states = new Map<string, ChapterState>();
-const stateKey = (bookId: string, chapterId: string) => `${bookId}:${chapterId}`;
-
-let instance: TiptapEditor | null = null;
-let hooks: EditorHooks | null = null;
-
-export function sharedEditor(next: EditorHooks): TiptapEditor {
-  hooks = next;
-  if (!instance) {
-    instance = new TiptapEditor({
-      extensions: editorExtensions,
-      enableContentCheck: true,
-      editorProps: {
-        attributes: { class: "prose" },
-        scrollThreshold: SCROLL_KEEPOUT,
-        scrollMargin: SCROLL_KEEPOUT,
-      },
-      onContentError: ({ error }) => hooks?.onContentError(error),
-      onUpdate: ({ editor }) => hooks?.onUpdate(editor.getJSON()),
-    });
-  }
-  return instance;
-}
-
-export function loadChapterState(bookId: string, chapterId: string): ChapterState | undefined {
-  return states.get(stateKey(bookId, chapterId));
-}
-
-export function saveChapterState(bookId: string, chapterId: string, entry: ChapterState): void {
-  for (const id of states.keys()) {
-    if (!id.startsWith(`${bookId}:`)) states.delete(id);
-  }
-  const id = stateKey(bookId, chapterId);
-  states.delete(id);
-  states.set(id, entry);
-  for (const oldest of states.keys()) {
-    if (states.size <= MAX_STATES) break;
-    states.delete(oldest);
-  }
-}
-
-export function clearChapterStates(bookId: string): void {
-  for (const id of states.keys()) {
-    if (id.startsWith(`${bookId}:`)) states.delete(id);
-  }
-}

src/editor/shortcuts.ts

@@ -1,11 +0,0 @@
-import { Extension } from "@tiptap/core";
-
-export const Shortcuts = Extension.create({
-  name: "shortcuts",
-
-  addKeyboardShortcuts() {
-    return {
-      "Mod-Shift-x": () => this.editor.commands.toggleStrike(),
-    };
-  },
-});

src/escape.ts

@@ -1,36 +0,0 @@
-import { useEffect, useRef } from "react";
-
-type Handler = () => void;
-
-const layers: Handler[] = [];
-let bound = false;
-
-function onKeyDown(e: KeyboardEvent) {
-  if (e.key !== "Escape" || e.isComposing || e.defaultPrevented) return;
-  const top = layers[layers.length - 1];
-  if (!top) return;
-  e.preventDefault();
-  e.stopPropagation();
-  top();
-}
-
-function pushLayer(handler: Handler): () => void {
-  if (!bound) {
-    window.addEventListener("keydown", onKeyDown, true);
-    bound = true;
-  }
-  layers.push(handler);
-  return () => {
-    const i = layers.lastIndexOf(handler);
-    if (i !== -1) layers.splice(i, 1);
-  };
-}
-
-export function useEscapeLayer(active: boolean, onEscape: () => void): void {
-  const latest = useRef(onEscape);
-  latest.current = onEscape;
-  useEffect(() => {
-    if (!active) return;
-    return pushLayer(() => latest.current());
-  }, [active]);
-}